8000 6.01 color constants by DAGalpin · Pull Request #13 · udacity/Advanced_Android_Development · GitHub
[go: up one dir, main page]
Skip to content

6.01 color constants #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cdlei merged 22 commits into from
Dec 2, 2015
+300 −268
Merged

6.01 color constants #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
e1c557e
Revert "Adding Google Play Services and checking for Google Play Serv…
DAGalpin Aug 25, 2015
447189d
Adding required support for Google services and Google Play services
joannasmith Jun 15, 2015
fa5355a
Revert "Manifest updates for GCM"
DAGalpin Aug 25, 2015
5f5eeb7
Adding GCM permissions and class declarations to AndroidManifest
joannasmith Jun 15, 2015
1323b51
8000 Merge branch '5.01_Google_Play_Services' into 5.02_Android_Manifest
DAGalpin Aug 25, 2015
aff5418
Revert "Switched to using the Google Developer lingo for project numb…
DAGalpin Aug 25, 2015
e4d650a
Revert "Checking for registration ID and registering app"
DAGalpin Aug 25, 2015
b139832
Merge branch '5.02_Android_Manifest' into 5.03_Registering_with_GCM
DAGalpin Aug 25, 2015
b6d88a8
Registering the app with GCM
joannasmith Jun 15, 2015
2ed375e
Revert "Better message parsing and notification building"
DAGalpin Aug 25, 2015
7841f9a
Merge branch '5.03_Registering_with_GCM' into 5.04_Receiving_a_Message
DAGalpin Aug 25, 2015
c9d81d9
Merge branch '5.04_Receiving_a_Message' into 6.00_Material_Design
DAGalpin Aug 25, 2015
17bc1a5
Merge branch '6.00_Material_Design' into 6.01_Color_Constants
DAGalpin Aug 25, 2015
d93b5ff
Commented out the GCM sender ID
DAGalpin Aug 26, 2015
87571ae
Merge branch '5.03_Registering_with_GCM' into 5.04_Receiving_a_Message
DAGalpin Aug 26, 2015
a707535
Adding the GCM listener to process downstream messages
joannasmith Jun 15, 2015
c254021
Added a blank sender id and a check for it to keep things compiling.
DAGalpin Aug 26, 2015
29972d8
Added translatable=false to stub string.
DAGalpin Aug 27, 2015
8849a50
Merge branch '5.03_Registering_with_GCM' into 5.04_Receiving_a_Message
DAGalpin Aug 27, 2015
8b5aeaa
Added helper toast if senderId is zero length.
DAGalpin Aug 27, 2015
8d62089
"Merged from 5.04_Receiving_a_Message"
DAGalpin Aug 27, 2015
fc99bde
"Merged from 6.00_Material_Design"
DAGalpin Aug 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
apply plugin: 'com.android.application'
apply plugin: 'com.google.gms.google-services'

android {
compileSdkVersion 21
Expand All @@ -24,5 +25,5 @@ dependencies {
compile 'com.github.bumptech.glide:glide:3.5.2'
compile 'com.android.support:appcompat-v7:21.0.2'
compile 'com.android.support:support-annotations:22.0.0'
compile 'com.google.android.gms:play-services-gcm:7.0.0'
compile 'com.google.android.gms:play-services-gcm:7.5.0'
}
56 changes: 39 additions & 17 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,21 @@
<uses-permission android:name="android.permission.INTERNET" />

<!-- Permissions required by the sync adapter -->
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
<uses-permission
android:name="android.permission.READ_SYNC_SETTINGS"/>
<uses-permission
android:name="android.permission.WRITE_SYNC_SETTINGS"/>
<uses-permission
android:name="android.permission.AUTHENTICATE_ACCOUNTS"/>

<!-- Permissions required to make our UI more friendly -->
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission
android:name="android.permission.ACCESS_NETWORK_STATE" />

<!-- Permissions required for Google Cloud Messaging -->
<uses-permission android:name="android.permission.WAKE_LOCK" />
8000 <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
<permission
android:name="com.example.android.sunshine.app.permission.C2D_MESSAGE"
<permission android:name="com.example.android.sunshine.app.permission.C2D_MESSAGE"
android:protectionLevel="signature" />
<uses-permission android:name="com.example.android.sunshine.app.permission.C2D_MESSAGE" />

Expand All @@ -43,8 +47,8 @@
android:supportsRtl="true">
<activity
android:name=".MainActivity"
android:label="@string/app_name"
android:theme="@style/ForecastTheme" >
android:theme="@style/ForecastTheme"
android:label="@string/app_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand All @@ -63,24 +67,22 @@
android:name=".SettingsActivity"
android:label="@string/title_activity_settings"
android:parentActivityName=".MainActivity"
android:theme="@style/SettingsTheme" >
android:theme="@style/SettingsTheme">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.example.android.sunshine.app.MainActivity" />
</activity>

<provider
android:name=".data.WeatherProvider"
android:authorities="@string/content_authority"
android:name=".data.WeatherProvider"
android:exported="false"
android:syncable="true" />

<!-- SyncAdapter's dummy authentication service -->
<service android:name=".sync.SunshineAuthenticatorService" >
<service android:name=".sync.SunshineAuthenticatorService">
<intent-filter>
<action android:name="android.accounts.AccountAuthenticator" />
</intent-filter>

<meta-data
android:name="android.accounts.AccountAuthenticator"
android:resource="@xml/authenticator" />
Expand All @@ -89,25 +91,45 @@
<!-- The SyncAdapter service -->
<service
android:name=".sync.SunshineSyncService"
android:exported="true" >
android:exported="true"
>
<intent-filter>
<action android:name="android.content.SyncAdapter" />
</intent-filter>

<meta-data
android:name="android.content.SyncAdapter"
android:resource="@xml/syncadapter" />
</service>

<!-- GCM receiver -->
<!-- The Google Cloud Messaging receiver and services -->
<receiver
android:name=".GcmBroadcastReceiver"
android:name="com.google.android.gms.gcm.GcmReceiver"
android:exported="true"
android:permission="com.google.android.c2dm.permission.SEND" >
<intent-filter>
<action android:name="com.google.android.c2dm.intent.RECEIVE" />
<action android:name="com.google.android.c2dm.intent.REGISTRATION" />
<category android:name="com.example.android.sunshine.app" />
</intent-filter>
</receiver>
<service
android:name="gcm.MyGcmListenerService"
android:exported="false" >
<intent-filter>
<action android:name="com.google.android.c2dm.intent.RECEIVE" />
</intent-filter>
</service>
<service
android:name="gcm.MyInstanceIDListenerService"
android:exported="false">
<intent-filter>
<action android:name="com.google.android.gms.iid.InstanceID"/>
</intent-filter>
</service>
<service
android:name=".gcm.RegistrationIntentService"
android:exported="false" >
</service>
</application>

</manifest>
93 changes: 0 additions & 93 deletions app/src/main/java/com/example/android/sunshine/app/GcmBroadcastReceiver.java
View file
Open in desktop

This file was deleted.

Loading
0