From 7f4a6f9e402adb7cc04a20c00b6214350032387a Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Sun, 26 May 2019 22:26:23 +0200
Subject: [PATCH] fix text color in dropdown of light theme (#1286)

* fix text color in dropdown of light theme

* rename theme to make clear where it is used
---
 app/src/main/res/layout/activity_view_media.xml | 16 +++++++++-------
 app/src/main/res/values/styles.xml              |  6 ++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/src/main/res/layout/activity_view_media.xml b/app/src/main/res/layout/activity_view_media.xml
index 78278fea3..933e2a472 100644
--- a/app/src/main/res/layout/activity_view_media.xml
+++ b/app/src/main/res/layout/activity_view_media.xml
@@ -1,28 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/black">
+    android:background="@android:color/black"
+    android:orientation="vertical">
 
     <com.keylesspalace.tusky.view.ImageViewPager
+        android:id="@+id/viewPager"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/viewPager" />
+        android:layout_height="match_parent" />
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:background="@color/toolbar_view_media"
-        android:theme="@style/AppTheme.Account.AppBarLayout"/>
+        android:theme="@style/ViewMediaActivity.AppBarLayout"
+        app:titleTextColor="@color/white" />
 
     <ProgressBar
         android:id="@+id/progressBarShare"
         style="?android:attr/progressBarStyleLarge"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:visibility="gone"
-        android:layout_gravity="center"/>
+        android:layout_gravity="center"
+        android:visibility="gone" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index bd57ff49c..f34c6324e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -30,10 +30,8 @@
         <item name="status_text_large">22sp</item>
     </style>
 
-    <style name="AppTheme.Account.AppBarLayout" parent="ThemeOverlay.AppCompat">
-        <item name="android:textColorPrimary">@color/text_color_primary_dark</item>
-        <item name="android:textColorSecondary">@color/text_color_secondary_dark</item>
-        <item name="android:textColorTertiary">@color/text_color_tertiary_dark</item>
+    <style name="ViewMediaActivity.AppBarLayout" parent="ThemeOverlay.AppCompat">
+        <item name="android:colorControlNormal">@color/white</item>
     </style>
 
     <style name="SplashTheme" parent="Theme.MaterialComponents.Light.NoActionBar">