diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1b5b32fde..cf9fbe1c4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -34,7 +34,7 @@ android:allowBackup="true" android:backupAgent=".app.BackupAgent" android:hardwareAccelerated="true" - android:icon="@drawable/icon" + android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:largeHeap="true" android:logo="@drawable/ic_logo_wide" diff --git a/app/src/main/assets/product_sans.ttf b/app/src/main/assets/product_sans.ttf new file mode 100644 index 000000000..c0442ee29 Binary files /dev/null and b/app/src/main/assets/product_sans.ttf differ diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png new file mode 100644 index 000000000..a2ae10cf9 Binary files /dev/null and b/app/src/main/ic_launcher-web.png differ diff --git a/app/src/main/java/org/gdg/frisbee/android/common/GdgNavDrawerActivity.java b/app/src/main/java/org/gdg/frisbee/android/common/GdgNavDrawerActivity.java index 0bc0f31fa..07342ce06 100644 --- a/app/src/main/java/org/gdg/frisbee/android/common/GdgNavDrawerActivity.java +++ b/app/src/main/java/org/gdg/frisbee/android/common/GdgNavDrawerActivity.java @@ -110,7 +110,7 @@ public void onClick(View view) { } private void populateMainGroup(Menu menu) { - menu.add(GROUP_ID, DRAWER_HOME, Menu.NONE, R.string.home_gdg).setIcon(R.drawable.ic_drawer_home_gdg); + menu.add(GROUP_ID, DRAWER_HOME, Menu.NONE, R.string.home_gdg).setIcon(R.drawable.ic_home_b4b4b4_24dp); menu.add(GROUP_ID, DRAWER_GDE, Menu.NONE, R.string.gde).setIcon(R.drawable.ic_drawer_gde); menu.add(GROUP_ID, DRAWER_PULSE, Menu.NONE, R.string.pulse).setIcon(R.drawable.ic_drawer_pulse); diff --git a/app/src/main/res/drawable-xxhdpi/ic_drawer_home_gdg.png b/app/src/main/res/drawable-xxhdpi/ic_drawer_home_gdg.png deleted file mode 100644 index 56c6cb78d..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_drawer_home_gdg.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_home_b4b4b4_24dp.xml b/app/src/main/res/drawable/ic_home_b4b4b4_24dp.xml new file mode 100644 index 000000000..1a090f2b1 --- /dev/null +++ b/app/src/main/res/drawable/ic_home_b4b4b4_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..4dc4fbd4f Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..146a5a0be Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..9878f639a Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..dc6e199d3 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..23a8725ee Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/build.gradle b/build.gradle index 7275355f6..2254c3c31 100644 --- a/build.gradle +++ b/build.gradle @@ -61,7 +61,7 @@ ext { buildToolsVersion = '25.0.2' // App dependencies - supportLibraryVersion = '25.1.0' + supportLibraryVersion = '25.2.0' playServicesVersion = '9.6.1' butterKnifeVersion = '8.4.0' jodaTimeAndroidVersion = '2.9.5.1' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8a4d8561b..aced79971 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Dec 24 15:23:43 CET 2016 +#Sun Mar 12 10:04:45 CST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-all.zip