From c5efa9916a13453b39fdfd29090dcc9e146971ed Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Fri, 8 Nov 2019 18:53:57 +0100
Subject: [PATCH] Define themes

---
 app/build.gradle                                    |  2 +-
 .../fedilab/android/activities/MainApplication.java |  5 -----
 .../fedilab/android/drawers/StatusListAdapter.java  |  4 +++-
 app/src/main/res/drawable/card_border_black.xml     |  2 +-
 app/src/main/res/drawable/translation_border.xml    |  2 +-
 app/src/main/res/layout/activity_main.xml           |  4 ++--
 app/src/main/res/layout/nav_header_main.xml         | 13 ++++++-------
 7 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 10c039571..c44b98112 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,7 +11,7 @@ android {
         multiDexEnabled true
         renderscriptTargetApi 28 as int
         renderscriptSupportModeEnabled true
-        vectorDrawables.useSupportLibrary = true
+
     }
     dexOptions {
         javaMaxHeapSize "4g"
diff --git a/app/src/main/java/app/fedilab/android/activities/MainApplication.java b/app/src/main/java/app/fedilab/android/activities/MainApplication.java
index b04a46ec6..a24b94a37 100644
--- a/app/src/main/java/app/fedilab/android/activities/MainApplication.java
+++ b/app/src/main/java/app/fedilab/android/activities/MainApplication.java
@@ -91,11 +91,6 @@ public class MainApplication extends MultiDexApplication {
         }
 
 
-
-
-
-
-
         ApplicationJob.cancelAllJob(BackupStatusesSyncJob.BACKUP_SYNC);
         BackupStatusesSyncJob.schedule(false);
         ApplicationJob.cancelAllJob(BackupNotificationsSyncJob.BACKUP_NOTIFICATIONS_SYNC);
diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
index 9c5a7daca..a5da56e7f 100644
--- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
@@ -2076,7 +2076,9 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                 holder.status_boosted_by_info.setBackgroundColor(reblogColor);
             }
             int statusColor = prefs.getInt("theme_statuses_color", ThemeHelper.getAttColor(context, R.attr.cardviewColor));
-            holder.main_card_container.setCardBackgroundColor(ThemeHelper.getAttColor(context, R.attr.cardviewColor));
+            if(  holder.main_card_container != null ) {
+                holder.main_card_container.setCardBackgroundColor(ThemeHelper.getAttColor(context, R.attr.cardviewColor));
+            }
 
             if(  holder.main_linear_container != null && statusColor != -1  ){
                 holder.main_linear_container.setBackgroundColor(statusColor);
diff --git a/app/src/main/res/drawable/card_border_black.xml b/app/src/main/res/drawable/card_border_black.xml
index e34a2d7c8..5c0850841 100644
--- a/app/src/main/res/drawable/card_border_black.xml
+++ b/app/src/main/res/drawable/card_border_black.xml
@@ -4,7 +4,7 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/cardBorderBlack" />
+        android:color="@color/colorAccent" />
 
     <corners
         android:bottomRightRadius="3dp"
diff --git a/app/src/main/res/drawable/translation_border.xml b/app/src/main/res/drawable/translation_border.xml
index 90d684404..aa618de1a 100644
--- a/app/src/main/res/drawable/translation_border.xml
+++ b/app/src/main/res/drawable/translation_border.xml
@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <stroke
         android:width="1dp"
-        android:color="?attr/colorAccent" />
+        android:color="@color/colorAccent" />
     <corners android:radius="4dp" />
 </shape>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c6524d267..27cb41030 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -80,7 +80,7 @@
                         android:layout_gravity="center_vertical"
                         android:visibility="gone"
                         android:id="@+id/delete_instance"
-                        android:src="@drawable/ic_delete"
+                        app:srcCompat="@drawable/ic_delete"
                         android:contentDescription="@string/delete_instance"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content" />
@@ -89,7 +89,7 @@
                         android:layout_gravity="center_vertical"
                         android:visibility="gone"
                         android:id="@+id/display_timeline"
-                        android:src="@drawable/ic_more_horiz_black"
+                        app:srcCompat="@drawable/ic_more_horiz_black"
                         android:contentDescription="@string/display_timeline"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index 2104d29b8..62adbc193 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -55,24 +55,24 @@
             <LinearLayout
                 android:id="@+id/more_option_container"
                 android:layout_width="0dp"
-                android:paddingLeft="20dp"
+                android:layout_marginStart="20dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                tools:ignore="UselessLeaf"></LinearLayout>
+                tools:ignore="UselessLeaf"/>
 
             <LinearLayout
                 android:id="@+id/more_account_container"
                 android:layout_width="0dp"
-                android:paddingLeft="20dp"
+                android:layout_marginStart="20dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                tools:ignore="UselessLeaf"></LinearLayout>
+                tools:ignore="UselessLeaf"/>
 
             <ImageView
                 android:gravity="center_vertical|end"
-                android:src="@drawable/ic_more_vert"
+                app:srcCompat="@drawable/ic_more_vert"
                 android:id="@+id/header_option_menu"
                 android:layout_width="30dp"
                 android:layout_height="30dp"
@@ -97,7 +97,6 @@
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:gravity="center_vertical"
-                android:layout_marginLeft="5dp"
                 android:layout_marginStart="5dp"
                 android:id="@+id/owner_accounts"
                 android:layout_width="30dp"
@@ -115,7 +114,7 @@
 
         <ImageView
             android:layout_gravity="center_vertical|end"
-            android:src="@drawable/ic_info_outline"
+            app:srcCompat="@drawable/ic_info_outline"
             android:id="@+id/header_option_info"
             android:layout_width="20dp"
             android:layout_height="20dp"