Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: udacity/Advanced_Android_Development
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: DragooNArT/Advanced_Android_Development
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 20 commits
  • 45 files changed
  • 2 contributors

Commits on Apr 17, 2016

  1. initial commit + fix a few exceptions(unable to connect to weather we… 

    …b services for some rason?)
    DragooNArT-PC committed Apr 17, 2016
    Configuration menu
    Copy the full SHA
    be9b126 View commit details
    Browse the repository at this point in the history

  2. enhance README with steps for API Key application

    DragooNArT-PC committed Apr 17, 2016
    Configuration menu
    Copy the full SHA
    9367ea6 View commit details
    Browse the repository at this point in the history

  3. enhance README with steps for API Key application

    DragooNArT-PC committed Apr 17, 2016
    Configuration menu
    Copy the full SHA
    9695564 View commit details
    Browse the repository at this point in the history

  4. tweak readme

    DragooNArT-PC committed Apr 17, 2016
    Configuration menu
    Copy the full SHA
    547e165 View commit details
    Browse the repository at this point in the history

  5. readme tweak 2

    DragooNArT-PC committed Apr 17, 2016
    Configuration menu
    Copy the full SHA
    896a003 View commit details
    Browse the repository at this point in the history

  6. readme tweak 3

    DragooNArT-PC committed Apr 17, 2016
    Configuration menu
    Copy the full SHA
    e49eb0b View commit details
    Browse the repository at this point in the history

  7. readme tweak 4

    DragooNArT-PC committed Apr 17, 2016
    Configuration menu
    Copy the full SHA
    f199211 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2016

  1. add wearable library to project

    DragooNArT-PC committed Apr 24, 2016
    Configuration menu
    Copy the full SHA
    454cc05 View commit details
    Browse the repository at this point in the history

  2. add wearable sub-application

    DragooNArT-PC committed Apr 24, 2016
    Configuration menu
    Copy the full SHA
    3e8514c View commit details
    Browse the repository at this point in the history

  3. implement and stub communication between phone and wearable, also add… 

    … a few UI components(still not ordered and mapped to data though)
    DragooNArT-PC committed Apr 24, 2016
    Configuration menu
    Copy the full SHA
    f3f7260 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2016

  1. add api key, attempts at phone to wear communication... failed

    DragooNArT-PC committed Apr 25, 2016
    Configuration menu
    Copy the full SHA
    70dc1a2 View commit details
    Browse the repository at this point in the history

  2. communication between mobile and wearable now works

    @DragooNArT
    DragooNArT committed Apr 25, 2016
    Configuration menu
    Copy the full SHA
    e3fcc12 View commit details
    Browse the repository at this point in the history

  3. add missing classess

    @DragooNArT
    DragooNArT committed Apr 25, 2016
    Configuration menu
    Copy the full SHA
    85d5b16 View commit details
    Browse the repository at this point in the history

  4. implementation

    @DragooNArT
    DragooNArT committed Apr 25, 2016
    Configuration menu
    Copy the full SHA
    5762f5b View commit details
    Browse the repository at this point in the history

  5. remove keys from project, some refactoring

    DragooNArT-PC committed Apr 25, 2016
    Configuration menu
    Copy the full SHA
    2ffd134 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2016

  1. changed activity to wearableActivity, added AmbinetMode settings , fi… 

    …xed weatherId data not propagating correctly
    @DragooNArT
    DragooNArT committed Apr 26, 2016
    Configuration menu
    Copy the full SHA
    25a3bcc View commit details
    Browse the repository at this point in the history

  2. comment out class, to avoid confusion

    @DragooNArT
    DragooNArT committed Apr 26, 2016
    Configuration menu
    Copy the full SHA
    3b6964f View commit details
    Browse the repository at this point in the history

  3. enhance notification with wearable specific stuff

    @DragooNArT
    DragooNArT committed Apr 26, 2016
    Configuration menu
    Copy the full SHA
    826b1a5 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2016

  1. added watchface implementation, fixed minor bugs

    DragooNArT-PC committed Apr 27, 2016
    Configuration menu
    Copy the full SHA
    99a4d6c View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' 

    # Conflicts:
#	app/src/main/java/com/example/android/sunshine/app/ForecastAdapter.java
#	sunshinewearapp/src/main/java/com/example/andorid/sunshine/app/SunshineWatchFaceService.java
    DragooNArT-PC committed Apr 27, 2016
    Configuration menu
    Copy the full SHA
    452d3da View commit details
    Browse the repository at this point in the history
Loading