Fix icon colors

2022-11-28 15:14:37 +01:00 · 2022-11-28 15:14:37 +01:00 · ee22181a91
commit ee22181a91
parent 320f913c63
36 changed files with 39 additions and 38 deletions
--- a/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java
+++ b/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java
@ -508,7 +508,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
        int theme_text_header_1_line = -1;
        int theme_text_header_2_line = -1;
        int link_color = -1;
-        if (sharedpreferences.getBoolean("use_custom_theme", false)) {
+       /* if (sharedpreferences.getBoolean("use_custom_theme", false)) {
            //Getting custom colors
            theme_icons_color = sharedpreferences.getInt("theme_icons_color", -1);
            theme_statuses_color = sharedpreferences.getInt("theme_statuses_color", -1);
@ -519,7 +519,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
            theme_text_color = sharedpreferences.getInt("theme_text_color", -1);
            link_color = sharedpreferences.getInt("theme_link_color", -1);

-        }
+        }*/
        if (currentAccount != null && currentAccount.api == Account.API.PLEROMA) {
            holder.binding.statusAddCustomEmoji.setVisibility(View.VISIBLE);
            holder.binding.statusEmoji.setVisibility(View.VISIBLE);
--- a/app/src/main/res/drawable-anydpi-v24/ic_notification.xml
+++ b/app/src/main/res/drawable-anydpi-v24/ic_notification.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <group
--- a/app/src/main/res/drawable/ic_baseline_account_circle_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_account_circle_24.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_baseline_audiotrack_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_audiotrack_24.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_baseline_cached_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_cached_24.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_baseline_edit_note_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_edit_note_24.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_baseline_filter_asc_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_filter_asc_24.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <group
--- a/app/src/main/res/drawable/ic_baseline_filter_center_focus_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_filter_center_focus_24.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_baseline_filter_desc_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_filter_desc_24.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_baseline_keyboard_double_arrow_down_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_keyboard_double_arrow_down_24.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_baseline_keyboard_double_arrow_up_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_keyboard_double_arrow_up_24.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_baseline_manage_search_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_manage_search_24.xml
@ -2,7 +2,7 @@
    android:width="24dp"
    android:height="24dp"
    android:autoMirrored="true"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_baseline_message_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_message_24.xml
@ -2,7 +2,7 @@
    android:width="24dp"
    android:height="24dp"
    android:autoMirrored="true"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_baseline_mode_comment_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_mode_comment_24.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_baseline_mode_edit_message_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_mode_edit_message_24.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_baseline_more_horiz_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_more_horiz_24.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_baseline_notes_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_notes_24.xml
@ -2,7 +2,7 @@
    android:width="24dp"
    android:height="24dp"
    android:autoMirrored="true"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_baseline_person_add_alt_1_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_person_add_alt_1_24.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_baseline_play_circle_filled_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_play_circle_filled_24.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_baseline_post_add_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_post_add_24.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_baseline_reply_16.xml
+++ b/app/src/main/res/drawable/ic_baseline_reply_16.xml
@ -2,7 +2,7 @@
    android:width="16dp"
    android:height="16dp"
    android:autoMirrored="true"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_baseline_report_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_report_24.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_baseline_storage_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_storage_24.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_baseline_supervisor_account_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_supervisor_account_24.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_baseline_tag_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_tag_24.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_baseline_translate_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_translate_24.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_baseline_trending_up_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_trending_up_24.xml
@ -2,7 +2,7 @@
    android:width="24dp"
    android:height="24dp"
    android:autoMirrored="true"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_baseline_volume_mute_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_volume_mute_24.xml
@ -2,7 +2,7 @@
    android:width="24dp"
    android:height="24dp"
    android:autoMirrored="true"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_crop.xml
+++ b/app/src/main/res/drawable/ic_crop.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_fetch_more_arrow_downward.xml
+++ b/app/src/main/res/drawable/ic_fetch_more_arrow_downward.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_fetch_more_arrow_upward.xml
+++ b/app/src/main/res/drawable/ic_fetch_more_arrow_upward.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_outline_note_alt_24.xml
+++ b/app/src/main/res/drawable/ic_outline_note_alt_24.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_photo_filter.xml
+++ b/app/src/main/res/drawable/ic_photo_filter.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24.0"
    android:viewportHeight="24.0">
    <path
--- a/app/src/main/res/drawable/ic_tl_list.xml
+++ b/app/src/main/res/drawable/ic_tl_list.xml
@ -2,7 +2,7 @@
    android:width="24dp"
    android:height="24dp"
    android:autoMirrored="true"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_tl_tag.xml
+++ b/app/src/main/res/drawable/ic_tl_tag.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/layout/drawer_status.xml
+++ b/app/src/main/res/layout/drawer_status.xml
@ -22,9 +22,10 @@
    android:layout_height="wrap_content"
    android:layout_marginHorizontal="@dimen/card_margin"
    android:layout_marginTop="@dimen/card_margin"
-    android:clipChildren="false"
    android:clipToPadding="false"
-    app:cardElevation="1dp">
+    app:cardElevation="5dp"
+    android:clipChildren="false"
+    app:strokeWidth="0dp">

    <androidx.appcompat.widget.LinearLayoutCompat
        android:id="@+id/main_container"