updating logo and color scheme

guardianproject · Oct 30, 2017 · 7fe0319 · 7fe0319
1 parent 9c9d3fb
commit 7fe0319
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 8 deletions.
diff --git a/src/main/res/drawable/web_hi_res_512.png b/src/main/res/drawable/web_hi_res_512.png
diff --git a/src/main/res/layout/activity_list.xml b/src/main/res/layout/activity_list.xml
@@ -11,7 +11,6 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/appbar_height"
         android:theme="@style/AppTheme.AppBarOverlay"
-
         >
 
         <android.support.design.widget.CollapsingToolbarLayout
@@ -24,7 +23,7 @@
             app:expandedTitleMarginEnd="64dp"
             app:expandedTitleMarginStart="48dp"
             app:layout_scrollFlags="scroll|exitUntilCollapsed"
-            app:title="@string/app_name">
+            app:title="@string/main_screen_title">
 
             <android.support.v7.widget.Toolbar
                 android:id="@+id/toolbar"

diff --git a/src/main/res/mipmap-hdpi/ic_launcher.png b/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/src/main/res/mipmap-mdpi/ic_launcher.png b/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/src/main/res/mipmap-xhdpi/ic_launcher.png b/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/src/main/res/mipmap-xxhdpi/ic_launcher.png b/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Palette generated by Material Palette - materialpalette.com/blue/amber -->
 <resources>
-    <color name="colorPrimary">#faa300</color>
-    <color name="colorPrimaryDark">#314651</color>
-    <color name="colorAccent">#0080ff</color>
-</resources>
+<color name="colorPrimary">#2196F3</color>
+<color name="colorPrimaryDark">#1976D2</color>
+<color name="primary_light">#BBDEFB</color>
+<color name="colorAccent">#FFC107</color>
+<color name="primary_text">#212121</color>
+<color name="secondary_text">#757575</color>
+<color name="icons">#FFFFFF</color>
+<color name="divider">#BDBDBD</color>
+</resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
@@ -104,4 +104,6 @@
     <string name="camera_none">None</string>
 
     <string name="action_configure">Configure</string>
+
+    <string name="main_screen_title">Your Haven Log</string>
 </resources>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
@@ -2,17 +2,19 @@
 
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
+
     </style>
 
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
 
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Dark" />
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+
 
 </resources>