From fb4209b13f27ee787797a99c842936c010b7383b Mon Sep 17 00:00:00 2001
From: Gregor Santner <gdev@live.de>
Date: Thu, 15 Sep 2016 23:08:03 +0200
Subject: [PATCH] bottom toolbar overflow style

---
 app/src/main/res/layout/main__app_bar.xml    | 31 ++++++++++----------
 app/src/main/res/values-de/strings-about.xml |  2 ++
 app/src/main/res/values-it/strings-about.xml |  2 ++
 app/src/main/res/values-it/strings.xml       |  4 +++
 app/src/main/res/values/styles.xml           | 10 +++++++
 5 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/app/src/main/res/layout/main__app_bar.xml b/app/src/main/res/layout/main__app_bar.xml
index e4ef0e24..b5be6807 100644
--- a/app/src/main/res/layout/main__app_bar.xml
+++ b/app/src/main/res/layout/main__app_bar.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".activity.MainActivity">
+                                                 xmlns:app="http://schemas.android.com/apk/res-auto"
+                                                 xmlns:tools="http://schemas.android.com/tools"
+                                                 android:layout_width="match_parent"
+                                                 android:layout_height="match_parent"
+                                                 tools:context=".activity.MainActivity">
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
@@ -12,17 +12,17 @@
 
         android:theme="@style/AppTheme.AppBarOverlay">
 
-            <android.support.v7.widget.Toolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:background="?attr/colorPrimary"
-                app:layout_scrollFlags="scroll|enterAlways|snap"
-                app:popupTheme="@style/AppTheme.PopupOverlay" />
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:layout_scrollFlags="scroll|enterAlways|snap"
+            app:popupTheme="@style/AppTheme.PopupOverlay"/>
 
     </android.support.design.widget.AppBarLayout>
 
-    <include layout="@layout/main__content" />
+    <include layout="@layout/main__content"/>
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
@@ -35,9 +35,10 @@
             android:id="@+id/toolbar2"
             android:layout_width="match_parent"
             android:layout_height="45dp"
-            android:background="?attr/colorPrimary"
+            android:background="@color/colorPrimary"
+            android:theme="@style/BottomToolbarMenuOverflowStyle"
             app:layout_scrollFlags="scroll|enterAlways|snap"
-            app:popupTheme="@style/AppTheme.PopupOverlay" />
+            app:popupTheme="@style/Theme.AppCompat.NoActionBar"/>
 
     </android.support.design.widget.AppBarLayout>
 
diff --git a/app/src/main/res/values-de/strings-about.xml b/app/src/main/res/values-de/strings-about.xml
index af9ebf99..db5fe69d 100644
--- a/app/src/main/res/values-de/strings-about.xml
+++ b/app/src/main/res/values-de/strings-about.xml
@@ -8,11 +8,13 @@
   <string name="fragment_debug__section_app">Anwendung</string>
   <string name="fragment_debug__section_device">Gerät</string>
   <string name="fragment_debug__section_pod">Diaspora Pod</string>
+  <string name="fragment_debug__section_log">Debug-Protokoll</string>
   <string name="fragment_debug__app_version">App Version: %1$s</string>
   <string name="fragment_debug__package_name">Paketname: %1$s</string>
   <string name="fragment_debug__android_version">Android Version: %1$s</string>
   <string name="fragment_debug__device_name">Gerätename: %1$s</string>
   <string name="fragment_debug__pod_domain">Pod-Adresse: %1$s</string>
+  <string name="fragment_debug__toast_log_copied">Debug-Protokoll in Zwischenablage kopiert</string>
   <string name="fragment_license__3rd_party_libs_title">Verwendete Drittanbieter-Bibliotheken</string>
   <!-- About (large amount of text) -->
   <string name="fragment_about__about_content">
diff --git a/app/src/main/res/values-it/strings-about.xml b/app/src/main/res/values-it/strings-about.xml
index 833edea5..34a663aa 100644
--- a/app/src/main/res/values-it/strings-about.xml
+++ b/app/src/main/res/values-it/strings-about.xml
@@ -8,11 +8,13 @@
   <string name="fragment_debug__section_app">Applicazione</string>
   <string name="fragment_debug__section_device">Dispositivo</string>
   <string name="fragment_debug__section_pod">Pod Diaspora</string>
+  <string name="fragment_debug__section_log">Log di debug</string>
   <string name="fragment_debug__app_version">Versione app: %1$s</string>
   <string name="fragment_debug__package_name">Nome pacchetto: %1$s</string>
   <string name="fragment_debug__android_version">Versione Android: %1$s</string>
   <string name="fragment_debug__device_name">Nome dispositivo: %1$s</string>
   <string name="fragment_debug__pod_domain">Dominio pod: %1$s</string>
+  <string name="fragment_debug__toast_log_copied">Log di debug copiato negli appunti</string>
   <string name="fragment_license__3rd_party_libs_title">Librerie di terze parti usate</string>
   <!-- About (large amount of text) -->
   <string name="fragment_about__about_content">
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 090ec8f9..0d3b5547 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -64,6 +64,10 @@
         chiudere completamente l\'app o riavviare il dispositivo. Se non permetti l\'accesso alla memoria ma vuoi usare la 
         funzione degli screenshot più avanti, puoi garantire il permesso successivamente. Vai su: Impostazioni - App -
         Diaspora. Nella sezione dei permessi puoi garantire il permesso per la scrittura sul dispositivo.</string>
+  <string name="permissions_image">Devi garantire il permesso di accesso alla memoria per poter salvare e caricare le immagini. Dopodiché devi
+        chiudere completamente l\'app o riavviare il dispositivo. Se non permetti l\'accesso alla memoria ma vuoi 
+        salvare le immagini più avanti, puoi garantire il permesso successivamente. Vai su: Impostazioni - App -
+        Diaspora. Nella sezione dei permessi puoi garantire il permesso per la scrittura sul dispositivo.</string>
   <string name="permission_denied">Permesso negato.</string>
   <string name="permission_granted_try_again">Permesso garantito. Si prega di riprovare.</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 545b9c6d..a95b417b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -6,6 +6,7 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+        <item name="actionMenuTextColor">@color/colorAccent</item>
     </style>
 
     <style name="AppTheme.NoActionBar">
@@ -17,4 +18,13 @@
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 
+    <style name="BottomToolbarMenuOverflowStyle" parent="Theme.AppCompat.NoActionBar">
+        <!-- Text in overflow  -->
+        <item name="android:textColorPrimary">@color/primary_text</item>
+        <!-- overflow icon (three vertical dots) -->
+        <item name="android:textColorSecondary">@color/white</item>
+        <!-- popup background color -->
+         <item name="android:background">@color/white</item>
+    </style>
+
 </resources>