diff --git a/app/src/main/res/layout-sw720dp/main_activity.xml b/app/src/main/res/layout-sw720dp/main_activity.xml index f11ab0286f..e83094ff3e 100644 --- a/app/src/main/res/layout-sw720dp/main_activity.xml +++ b/app/src/main/res/layout-sw720dp/main_activity.xml @@ -52,7 +52,7 @@ android:id="@+id/incognito_mode" android:layout_width="0dp" android:layout_height="wrap_content" - android:background="?attr/incognitoBackgroundColor" + android:background="?attr/colorPrimary" android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -65,7 +65,7 @@ android:layout_gravity="center" android:padding="4dp" android:text="@string/pref_incognito_mode" - android:textColor="@color/md_white_1000" /> + android:textColor="?attr/colorOnPrimary" /> diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml index 908360fcda..a5ce51509b 100644 --- a/app/src/main/res/layout/main_activity.xml +++ b/app/src/main/res/layout/main_activity.xml @@ -47,7 +47,7 @@ android:id="@+id/incognito_mode" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/incognitoBackgroundColor" + android:background="?attr/colorPrimary" android:visibility="gone" tools:visibility="visible"> @@ -57,7 +57,7 @@ android:layout_gravity="center" android:padding="4dp" android:text="@string/pref_incognito_mode" - android:textColor="@color/md_white_1000" /> + android:textColor="?attr/colorOnPrimary" /> diff --git a/app/src/main/res/layout/main_activity_toolbar.xml b/app/src/main/res/layout/main_activity_toolbar.xml index 6bca157438..d52c973111 100644 --- a/app/src/main/res/layout/main_activity_toolbar.xml +++ b/app/src/main/res/layout/main_activity_toolbar.xml @@ -40,7 +40,7 @@ android:id="@+id/incognito_mode" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/incognitoBackgroundColor" + android:background="?attr/colorPrimary" android:visibility="gone" tools:visibility="visible"> @@ -50,7 +50,7 @@ android:layout_gravity="center" android:padding="4dp" android:text="@string/pref_incognito_mode" - android:textColor="@color/md_white_1000" /> + android:textColor="?attr/colorOnPrimary" /> diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 7c8adb3381..f1ce4138ab 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -22,7 +22,6 @@ #1FF3B375 #2A2A3C #21212E - #17171C @color/accent_tako diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 2a96500f8b..f5b2ffba80 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -32,9 +32,6 @@ - - - diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index b2a8f38f28..89b3195f14 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -36,7 +36,6 @@ #1F66577E #F7F5FF #F2EDF7 - @color/accent_tako #F29940 diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index a09a091de0..b784ce3d46 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -53,7 +53,6 @@ @style/Widget.Tachiyomi.Toolbar.Button.Navigation @style/PreferenceThemeOverlay @style/ThemeOverlay.Tachiyomi.BottomSheetDialog - @color/md_grey_800 @style/Widget.Tachiyomi.Chip.Action ?android:attr/textColorPrimary ?attr/colorControlHighlight @@ -119,9 +118,6 @@ @color/surface_tako @color/background_tako - - @color/incognito_background_tako - @color/filter_tako