change colors

app/src/main/AndroidManifest.xml

@@ -243,6 +243,12 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/action_about"
             android:theme="@style/AppThemeBar" />
+
+        <activity
+            android:name=".activities.ThemeSettingsActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:label="@string/theming"
+            android:theme="@style/AppThemeBar" />
         <activity
             android:name=".activities.admin.AdminDomainBlockActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"

app/src/main/java/app/fedilab/android/activities/ThemeSettingsActivity.java

@@ -18,20 +18,20 @@ package app.fedilab.android.activities;
 import android.os.Bundle;
 import android.view.MenuItem;
 
-import app.fedilab.android.databinding.ActivityAboutBinding;
+import app.fedilab.android.databinding.ActivityThemeSettingsBinding;
 
 
 public class ThemeSettingsActivity extends BaseActivity {
 
 
-    private ActivityAboutBinding binding;
+    private ActivityThemeSettingsBinding binding;
 
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        binding = ActivityAboutBinding.inflate(getLayoutInflater());
+        binding = ActivityThemeSettingsBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
         if (getSupportActionBar() != null) {

app/src/main/res/drawable/ic_display_less.xml

@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?colorAccent"
+    android:tint="?colorPrimary"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path

app/src/main/res/drawable/ic_display_more.xml

@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?colorAccent"
+    android:tint="?colorPrimary"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path

app/src/main/res/drawable/reaction_border.xml

@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <stroke
         android:width="1dp"
-        android:color="?colorAccent" />
+        android:color="?colorPrimary" />
     <corners android:radius="10dp" />
 </shape>

app/src/main/res/drawable/reaction_voted.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?colorAccent" />
+    <solid android:color="?colorPrimary" />
     <stroke
         android:width="1dp"
-        android:color="?colorAccent" />
+        android:color="?colorPrimary" />
     <corners android:radius="10dp" />
 </shape>

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="?colorPrimary" />
     <corners android:radius="4dp" />
 </shape>

app/src/main/res/layout/activity_about.xml

@@ -54,7 +54,7 @@
             android:gravity="center_vertical"
             android:padding="5dp"
             android:text="@string/about_developer"
-            android:textColor="?colorAccent"
+            android:textColor="?colorPrimary"
             android:textSize="16sp"
             android:visibility="gone" />
 

app/src/main/res/layout/activity_admin_account.xml

@@ -32,7 +32,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fitsSystemWindows="true"
-            app:contentScrim="?colorPrimaryDark"
+            app:contentScrim="?colorPrimary"
             app:expandedTitleGravity="top"
             app:expandedTitleMarginEnd="64dp"
             app:expandedTitleMarginStart="48dp"

app/src/main/res/layout/activity_edit_image.xml

@@ -73,7 +73,6 @@
         android:id="@+id/rvConstraintTools"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/tool_bg"
         android:orientation="horizontal"
         android:paddingTop="4dp"
         android:paddingBottom="4dp"
@@ -87,7 +86,6 @@
         android:id="@+id/rvFilterView"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="@color/tool_bg"
         android:orientation="horizontal"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         app:layout_constraintBottom_toBottomOf="@+id/rvConstraintTools"

app/src/main/res/layout/activity_profile.xml

@@ -32,7 +32,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fitsSystemWindows="true"
-            app:contentScrim="?colorPrimaryDark"
+            app:contentScrim="?colorPrimary"
             app:expandedTitleGravity="top"
             app:expandedTitleMarginEnd="64dp"
             app:expandedTitleMarginStart="48dp"

app/src/main/res/layout/activity_theme_settings.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+    Copyright 2022 Thomas Schneider
+
+    This file is a part of Fedilab
+
+    This program is free software; you can redistribute it and/or modify it under the terms of the
+    GNU General Public License as published by the Free Software Foundation; either version 3 of the
+    License, or (at your option) any later version.
+
+    Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+    the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+    Public License for more details.
+
+    You should have received a copy of the GNU General Public License along with Fedilab; if not,
+    see <http://www.gnu.org/licenses>.
+-->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
+</ScrollView>

app/src/main/res/layout/drawer_account.xml

@@ -17,7 +17,7 @@
 <com.google.android.material.card.MaterialCardView 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"
-    app:cardBackgroundColor="?carViewBackground"
+
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="6dp"

app/src/main/res/layout/drawer_account_list.xml

@@ -19,7 +19,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    app:cardBackgroundColor="?carViewBackground"
+
     android:layout_marginHorizontal="12dp"
     android:layout_marginTop="12dp"
     app:cardElevation="5dp"

app/src/main/res/layout/drawer_announcement.xml

@@ -20,7 +20,7 @@
     android:id="@+id/cardview_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    app:cardBackgroundColor="?carViewBackground"
+
     android:layout_marginHorizontal="@dimen/card_margin"
     android:layout_marginTop="@dimen/card_margin"
     android:clipChildren="false"

app/src/main/res/layout/drawer_conversation.xml

@@ -20,7 +20,7 @@
     android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    app:cardBackgroundColor="?carViewBackground"
+
     android:layout_margin="12dp"
     app:cardElevation="5dp"
     app:strokeWidth="0dp">

app/src/main/res/layout/drawer_domain_block.xml

@@ -19,7 +19,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="12dp"
-    app:cardBackgroundColor="?carViewBackground"
+
     app:cardElevation="5dp"
     app:strokeWidth="0dp">
 

app/src/main/res/layout/drawer_follow.xml

@@ -21,7 +21,7 @@
     android:layout_height="wrap_content"
     android:layout_margin="6dp"
     app:cardElevation="5dp"
-    app:cardBackgroundColor="?carViewBackground"
+
     app:strokeWidth="0dp">
 
     <androidx.appcompat.widget.LinearLayoutCompat

app/src/main/res/layout/drawer_instance_reg.xml

@@ -20,7 +20,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="12dp"
-    app:cardBackgroundColor="?carViewBackground"
+
     app:cardElevation="5dp"
     app:strokeWidth="0dp">
 

app/src/main/res/layout/drawer_status.xml

@@ -20,7 +20,7 @@
     android:id="@+id/cardview_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    app:cardBackgroundColor="?carViewBackground"
+
     android:layout_marginHorizontal="@dimen/card_margin"
     android:layout_marginTop="@dimen/card_margin"
     android:clipToPadding="false"
@@ -197,7 +197,7 @@
                 android:layout_gravity="center_vertical|end"
                 android:layout_marginStart="6dp"
                 android:layout_marginEnd="6dp"
-                android:tint="?colorAccent"
+                android:tint="?colorPrimary"
                 android:visibility="gone" />
 
         </androidx.appcompat.widget.LinearLayoutCompat>
@@ -440,7 +440,7 @@
             android:alpha="0.8"
             android:gravity="center_vertical"
             android:padding="6dp"
-            android:textColor="?colorAccent"
+            android:textColor="?colorPrimary"
             android:visibility="gone"
             tools:text="1 January 2021, 12:00"
             tools:visibility="visible" />
@@ -455,7 +455,7 @@
             android:alpha="0.8"
             android:gravity="center_vertical"
             android:padding="6dp"
-            android:textColor="?colorAccent"
+            android:textColor="?colorPrimary"
             android:visibility="gone"
             tools:text="Fedilab"
             tools:visibility="visible" />

app/src/main/res/layout/drawer_status_compose.xml

@@ -21,7 +21,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:clipChildren="false"
-    app:cardBackgroundColor="?carViewBackground"
+
     android:clipToPadding="false"
     app:cardElevation="5dp"
     app:strokeWidth="0dp">

app/src/main/res/layout/drawer_status_draft.xml

@@ -21,7 +21,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="12dp"
-    app:cardBackgroundColor="?carViewBackground"
+
     app:cardElevation="5dp"
     app:strokeWidth="0dp">
 

app/src/main/res/layout/drawer_status_filtered.xml

@@ -23,7 +23,7 @@
     android:layout_marginHorizontal="@dimen/card_margin"
     android:layout_marginTop="@dimen/card_margin"
     android:clipChildren="false"
-    app:cardBackgroundColor="?carViewBackground"
+
     android:clipToPadding="false"
     app:cardElevation="5dp"
     app:strokeWidth="0dp">

app/src/main/res/layout/drawer_status_filtered_hide.xml

@@ -23,7 +23,7 @@
     android:layout_marginHorizontal="@dimen/card_margin"
     android:layout_marginTop="@dimen/card_margin"
     android:clipChildren="false"
-    app:cardBackgroundColor="?carViewBackground"
+
     android:clipToPadding="false"
     app:cardElevation="5dp"
     app:strokeWidth="0dp">

app/src/main/res/layout/drawer_status_history.xml

@@ -24,7 +24,7 @@
     android:layout_marginTop="12dp"
     android:clipChildren="false"
     android:clipToPadding="false"
-    app:cardBackgroundColor="?carViewBackground"
+
     app:cardElevation="5dp"
     app:strokeWidth="0dp">
 

app/src/main/res/layout/drawer_status_scheduled.xml

@@ -21,7 +21,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="12dp"
-    app:cardBackgroundColor="?carViewBackground"
+
     app:cardElevation="5dp"
     app:strokeWidth="0dp">
 

app/src/main/res/layout/drawer_status_simple.xml

@@ -22,7 +22,7 @@
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="12dp"
     android:layout_marginTop="12dp"
-    app:cardBackgroundColor="?carViewBackground"
+
     android:clipChildren="false"
     android:clipToPadding="false"
     app:cardElevation="5dp"

app/src/main/res/layout/drawer_suggestion.xml

@@ -21,7 +21,7 @@
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="6dp"
     android:layout_marginTop="6dp"
-    app:cardBackgroundColor="?carViewBackground"
+
     app:cardElevation="5dp"
     app:strokeWidth="0dp">
 

app/src/main/res/layout/drawer_tag.xml

@@ -19,7 +19,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="12dp"
-    app:cardBackgroundColor="?carViewBackground"
+
     app:cardElevation="5dp"
     app:strokeWidth="0dp">
 

app/src/main/res/layout/popup_add_filter.xml

@@ -64,7 +64,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/filter_context_explanations"
-            android:textColor="?colorAccent"
+            android:textColor="?colorPrimary"
             android:textSize="12sp" />
 
 
@@ -139,7 +139,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/filter_action_explanations"
-            android:textColor="?colorAccent"
+            android:textColor="?colorPrimary"
             android:textSize="12sp" />
 
         <RadioGroup

app/src/main/res/layout/popup_links.xml

@@ -39,9 +39,9 @@
         android:layout_marginBottom="10dp"
         android:drawableEnd="@drawable/ic_baseline_navigate_next_24"
         android:text="@string/open_other_app"
-        android:textColor="?colorAccent"
+        android:textColor="?colorPrimary"
         android:textSize="16sp"
-        app:drawableTint="?colorAccent" />
+        app:drawableTint="?colorPrimary" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/copy_link"
@@ -51,9 +51,9 @@
         android:layout_marginBottom="10dp"
         android:drawableEnd="@drawable/ic_baseline_navigate_next_24"
         android:text="@string/copy_link"
-        android:textColor="?colorAccent"
+        android:textColor="?colorPrimary"
         android:textSize="16sp"
-        app:drawableTint="?colorAccent" />
+        app:drawableTint="?colorPrimary" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/check_redirect"
@@ -63,7 +63,7 @@
         android:layout_marginBottom="10dp"
         android:drawableEnd="@drawable/ic_baseline_navigate_next_24"
         android:text="@string/check_redirect"
-        android:textColor="?colorAccent"
+        android:textColor="?colorPrimary"
         android:textSize="16sp"
-        app:drawableTint="?colorAccent" />
+        app:drawableTint="?colorPrimary" />
 </LinearLayout>

app/src/main/res/layout/popup_status_theme.xml

@@ -124,7 +124,7 @@
                         android:layout_marginTop="6dp"
                         android:text="@string/show_content"
                         android:textAppearance="@style/TextAppearance.AppCompat.Body2"
-                        android:textColor="?colorAccent" />
+                        android:textColor="?colorPrimary" />
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/status_content"
@@ -246,7 +246,7 @@
                                         android:layout_height="wrap_content"
                                         android:maxLines="1"
                                         android:text="Maecenas sollicitudin, eros quis interdum posuere, quam lorem tempus dui."
-                                        android:textColor="?colorAccent"
+                                        android:textColor="?colorPrimary"
                                         tools:ignore="HardcodedText" />
 
                                     <androidx.appcompat.widget.AppCompatTextView

app/src/main/res/layout/thumbnail.xml

@@ -6,7 +6,7 @@
     android:layout_height="wrap_content"
     android:layout_marginVertical="6dp"
     android:layout_marginStart="6dp"
-    app:cardBackgroundColor="?carViewBackground"
+
     app:cardElevation="2dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout

app/src/main/res/values/styles.xml

@@ -1,25 +1,19 @@
 <resources>
-    <attr name="linkColor" type="color" />
+
-    <attr name="carViewBackground" type="color" />
 
     <style name="AppTheme" parent="Theme.Material3.Light.NoActionBar">
 
 
-        <item name="carViewBackground">@color/white</item>
-        <item name="linkColor">@color/dark_link_toot</item>
-
-
         <item name="colorPrimary">@color/mastodon_accent_dark</item>
         <item name="colorPrimaryVariant">@color/mastodon_accent_dark</item>
         <item name="colorOnPrimary">@color/white</item>
-
         <item name="colorSecondary">@color/mastodon_accent_dark</item>
         <item name="colorSecondaryVariant">@color/mastodon_accent_dark</item>
         <item name="colorOnSecondary">@color/white</item>
-
         <item name="colorError">@color/red_900</item>
-        <item name="windowNoTitle">true</item>
 
+
+        <item name="windowNoTitle">true</item>
         <!-- specify shared element transitions -->
         <item name="android:windowSharedElementEnterTransition">
             @transition/change_image_transform
@@ -33,19 +27,16 @@
     <style name="AppThemeDark" parent="Theme.Material3.Dark.NoActionBar">
 
 
-        <item name="carViewBackground">@color/mastodon_dark_background</item>
-        <item name="linkColor">@color/dark_link_toot</item>
-
 
         <item name="colorPrimary">@color/mastodon_accent_dark</item>
         <item name="colorPrimaryVariant">@color/mastodon_accent_dark</item>
         <item name="colorOnPrimary">@color/white</item>
-
         <item name="colorSecondary">@color/mastodon_accent_dark</item>
         <item name="colorSecondaryVariant">@color/mastodon_accent_dark</item>
         <item name="colorOnSecondary">@color/white</item>
-
         <item name="colorError">@color/red_900</item>
+
+
         <item name="windowNoTitle">true</item>
         <!-- specify enter and exit transitions -->
         <item name="android:windowEnterTransition">@android:transition/explode</item>
@@ -62,49 +53,35 @@
 
     <style name="AppThemeBar" parent="Theme.Material3.Light">
 
-        <item name="carViewBackground">@color/white</item>
-        <item name="linkColor">@color/dark_link_toot</item>
-
-
         <item name="colorPrimary">@color/mastodon_accent_dark</item>
         <item name="colorPrimaryVariant">@color/mastodon_accent_dark</item>
         <item name="colorOnPrimary">@color/white</item>
-
         <item name="colorSecondary">@color/mastodon_accent_dark</item>
         <item name="colorSecondaryVariant">@color/mastodon_accent_dark</item>
         <item name="colorOnSecondary">@color/white</item>
-
         <item name="colorError">@color/red_900</item>
 
     </style>
 
     <style name="AppThemeBarDark" parent="Theme.Material3.Dark">
 
-        <item name="carViewBackground">@color/mastodon_dark_background</item>
-        <item name="linkColor">@color/dark_link_toot</item>
 
         <item name="colorPrimary">@color/mastodon_accent_dark</item>
         <item name="colorPrimaryVariant">@color/mastodon_accent_dark</item>
         <item name="colorOnPrimary">@color/white</item>
-
         <item name="colorSecondary">@color/mastodon_accent_dark</item>
         <item name="colorSecondaryVariant">@color/mastodon_accent_dark</item>
         <item name="colorOnSecondary">@color/white</item>
-
-
         <item name="colorError">@color/red_900</item>
 
     </style>
 
-
     <style name="TransparentDark" parent="Theme.Material3.Dark">
         <item name="android:colorBackgroundCacheHint">@null</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowIsFloating">false</item>
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowNoTitle">true</item>
-        <item name="android:windowBackground">@color/black</item>
     </style>
 
-
 </resources>