Merge pull request #716 from seventhmoon/branding

for #525 Replace Logo with New Design
gdg-x · Mar 29, 2017 · 6b7d717 · 6b7d717
2 parents 5a5959a + 6c4bae9
commit 6b7d717
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 5 deletions.
diff --git 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
diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png
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
@@ -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
diff --git a/app/src/main/res/drawable/ic_home_b4b4b4_24dp.xml b/app/src/main/res/drawable/ic_home_b4b4b4_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFb4b4b4"
+        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
+</vector>
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git 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
@@ -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