From fe97276e47979cafeb63dd180af7eff2d8f376dd Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Sat, 9 Nov 2019 16:02:19 +0100
Subject: [PATCH] fixes

---
 app/src/main/AndroidManifest.xml              |  4 ++--
 .../android/activities/TootActivity.java      |  9 +++++--
 .../res/layout/activity_pixelfed_compose.xml  |  6 +++--
 app/src/main/res/layout/activity_toot.xml     | 24 +++++++++----------
 4 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a5a16ea2f..c6d173802 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -429,7 +429,7 @@
             android:fitsSystemWindows="true"
             android:configChanges="orientation|screenSize"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme_NoActionBar_Fedilab" />
+            android:theme="@style/AppThemeDark" />
         <activity
             android:name="app.fedilab.android.activities.PixelfedComposeActivity"
             android:launchMode="singleTop"
@@ -437,7 +437,7 @@
             android:fitsSystemWindows="true"
             android:configChanges="orientation|screenSize"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme_NoActionBar_Fedilab" />
+            android:theme="@style/AppThemeDark" />
         <activity
             android:name="app.fedilab.android.activities.EditProfileActivity"
             android:windowSoftInputMode="stateAlwaysHidden"
diff --git a/app/src/main/java/app/fedilab/android/activities/TootActivity.java b/app/src/main/java/app/fedilab/android/activities/TootActivity.java
index ff9f4beae..417e55e6b 100644
--- a/app/src/main/java/app/fedilab/android/activities/TootActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/TootActivity.java
@@ -303,6 +303,9 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
             case Helper.THEME_LIGHT:
                 setTheme(R.style.AppTheme_Fedilab);
                 break;
+            case Helper.THEME_DARK:
+                setTheme(R.style.AppThemeDark);
+                break;
             case Helper.THEME_BLACK:
                 setTheme(R.style.AppThemeBlack);
                 break;
@@ -321,7 +324,8 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
 
 
         autocomplete = false;
-        setContentView(R.layout.activity_toot);
+        if (getSupportActionBar() != null)
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
@@ -377,12 +381,13 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
                     }
                 }
             });
+
             title = actionBar.getCustomView().findViewById(R.id.toolbar_title);
             pp_actionBar = actionBar.getCustomView().findViewById(R.id.pp_actionBar);
             pp_progress = actionBar.getCustomView().findViewById(R.id.pp_progress);
 
         }
-
+        setContentView(R.layout.activity_toot);
 
         //By default the toot is not restored so the id -1 is defined
         currentToId = -1;
diff --git a/app/src/main/res/layout/activity_pixelfed_compose.xml b/app/src/main/res/layout/activity_pixelfed_compose.xml
index 398309a4e..f84d8bf09 100644
--- a/app/src/main/res/layout/activity_pixelfed_compose.xml
+++ b/app/src/main/res/layout/activity_pixelfed_compose.xml
@@ -183,7 +183,8 @@
                     android:background="@color/transparent"
                     android:contentDescription="@string/post_visibility_tilte"
                     android:scaleType="centerCrop"
-                    android:src="@drawable/ic_public" />
+                    android:src="@drawable/ic_public"
+                    android:tint="?attr/iconColor"/>
 
 
                 <ImageButton
@@ -199,7 +200,8 @@
                     android:minWidth="0dp"
                     android:minHeight="0dp"
                     android:scaleType="centerCrop"
-                    android:src="@drawable/ic_insert_emoticon" />
+                    android:src="@drawable/ic_insert_emoticon"
+                    android:tint="?attr/iconColor"/>
 
                 <CheckBox
                     android:id="@+id/toot_sensitive"
diff --git a/app/src/main/res/layout/activity_toot.xml b/app/src/main/res/layout/activity_toot.xml
index f2be6dca6..a0aaec603 100644
--- a/app/src/main/res/layout/activity_toot.xml
+++ b/app/src/main/res/layout/activity_toot.xml
@@ -166,7 +166,7 @@
                     android:gravity="center_vertical"
                     android:maxHeight="100dp"
                     android:orientation="horizontal"
-                    android:padding="5dp"></LinearLayout>
+                    android:padding="5dp"/>
             </HorizontalScrollView>
 
             <LinearLayout
@@ -206,12 +206,12 @@
                     android:layout_height="28dp"
                     android:layout_gravity="center"
                     android:layout_marginEnd="5dp"
-                    android:layout_marginRight="5dp"
                     android:adjustViewBounds="true"
                     android:background="@color/transparent"
                     android:contentDescription="@string/toot_select_image"
                     android:scaleType="centerCrop"
-                    android:src="@drawable/ic_insert_photo" />
+                    android:src="@drawable/ic_insert_photo"
+                    android:tint="?attr/iconColor"/>
 
                 <ImageButton
                     android:id="@+id/poll_action"
@@ -225,6 +225,7 @@
                     android:contentDescription="@string/poll"
                     android:scaleType="centerCrop"
                     android:src="@drawable/ic_view_list_poll"
+                    android:tint="?attr/iconColor"
                     android:visibility="gone" />
 
                 <ImageButton
@@ -238,19 +239,17 @@
                     android:background="@color/transparent"
                     android:contentDescription="@string/toot_visibility_tilte"
                     android:scaleType="centerCrop"
-                    android:src="@drawable/ic_public" />
+                    android:src="@drawable/ic_public"
+                    android:tint="?attr/iconColor"/>
 
                 <Button
                     android:id="@+id/toot_cw"
-                    android:layout_width="40dp"
-                    android:layout_height="28dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="40dp"
                     android:layout_gravity="center"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
-                    android:adjustViewBounds="true"
-                    android:background="@color/transparent"
+                    style="@style/Widget.AppCompat.Button.Small"
                     android:text="@string/cw"
-                    android:textSize="20sp" />
+                    />
 
                 <ImageButton
                     android:id="@+id/toot_emoji"
@@ -265,7 +264,8 @@
                     android:minWidth="0dp"
                     android:minHeight="0dp"
                     android:scaleType="centerCrop"
-                    android:src="@drawable/ic_insert_emoticon" />
+                    android:src="@drawable/ic_insert_emoticon"
+                    android:tint="?attr/iconColor"/>
 
                 <TextView
                     android:id="@+id/toot_space_left"