Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-12-22 19:41:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make incognito bar use primary colors (#5558)

Browse Source 
Looks better than the odd forced gray used for all themes
This commit is contained in:
Soitora 2021-07-15 23:28:10 +02:00 committed by GitHub
parent 0d62aedfbb
commit 4ce4ee3c00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/layout-sw720dp/main_activity.xml
View File

@ -52,7 +52,7 @@
android:id="@+id/incognito_mode" android:id="@+id/incognito_mode"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/incognitoBackgroundColor" android:background="?attr/colorPrimary"
android:visibility="gone" android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -65,7 +65,7 @@
android:layout_gravity="center" android:layout_gravity="center"
android:padding="4dp" android:padding="4dp"
android:text="@string/pref_incognito_mode" android:text="@string/pref_incognito_mode"
android:textColor="@color/md_white_1000" /> android:textColor="?attr/colorOnPrimary" />
</FrameLayout> </FrameLayout>

4
app/src/main/res/layout/main_activity.xml
View File

@ -47,7 +47,7 @@
android:id="@+id/incognito_mode" android:id="@+id/incognito_mode"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/incognitoBackgroundColor" android:background="?attr/colorPrimary"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"> tools:visibility="visible">
@ -57,7 +57,7 @@
android:layout_gravity="center" android:layout_gravity="center"
android:padding="4dp" android:padding="4dp"
android:text="@string/pref_incognito_mode" android:text="@string/pref_incognito_mode"
android:textColor="@color/md_white_1000" /> android:textColor="?attr/colorOnPrimary" />
</FrameLayout> </FrameLayout>

4
app/src/main/res/layout/main_activity_toolbar.xml
View File

@ -40,7 +40,7 @@
android:id="@+id/incognito_mode" android:id="@+id/incognito_mode"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/incognitoBackgroundColor" android:background="?attr/colorPrimary"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"> tools:visibility="visible">
@ -50,7 +50,7 @@
android:layout_gravity="center" android:layout_gravity="center"
android:padding="4dp" android:padding="4dp"
android:text="@string/pref_incognito_mode" android:text="@string/pref_incognito_mode"
android:textColor="@color/md_white_1000" /> android:textColor="?attr/colorOnPrimary" />
</FrameLayout> </FrameLayout>

1
app/src/main/res/values-night/colors.xml
View File

@ -22,7 +22,6 @@
<color name="ripple_colored_tako">#1FF3B375</color> <color name="ripple_colored_tako">#1FF3B375</color>
<color name="surface_tako">#2A2A3C</color> <color name="surface_tako">#2A2A3C</color>
<color name="background_tako">#21212E</color> <color name="background_tako">#21212E</color>
<color name="incognito_background_tako">#17171C</color>
<color name="filter_tako">@color/accent_tako</color> <color name="filter_tako">@color/accent_tako</color>
<!-- Yin & Yang Theme --> <!-- Yin & Yang Theme -->

3
app/src/main/res/values/attrs.xml
View File

@ -32,9 +32,6 @@
<attr name="lightSystemBarsOnPrimary" format="reference|boolean"/> <attr name="lightSystemBarsOnPrimary" format="reference|boolean"/>
<!-- Custom color for incognito mode bar -->
<attr name="incognitoBackgroundColor" format="reference|integer"/>
<!-- Setting chip color values for specific themes --> <!-- Setting chip color values for specific themes -->
<attr name="chipTextColor" format="reference|integer"/> <attr name="chipTextColor" format="reference|integer"/>

1
app/src/main/res/values/colors.xml
View File

@ -36,7 +36,6 @@
<color name="ripple_colored_tako">#1F66577E</color> <color name="ripple_colored_tako">#1F66577E</color>
<color name="surface_tako">#F7F5FF</color> <color name="surface_tako">#F7F5FF</color>
<color name="background_tako">#F2EDF7</color> <color name="background_tako">#F2EDF7</color>
<color name="incognito_background_tako">@color/accent_tako</color>
<color name="filter_tako">#F29940</color> <color name="filter_tako">#F29940</color>
<!-- Yin & Yang Theme --> <!-- Yin & Yang Theme -->

4
app/src/main/res/values/themes.xml
View File

@ -53,7 +53,6 @@
<item name="toolbarNavigationButtonStyle">@style/Widget.Tachiyomi.Toolbar.Button.Navigation</item> <item name="toolbarNavigationButtonStyle">@style/Widget.Tachiyomi.Toolbar.Button.Navigation</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay</item> <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
<item name="bottomSheetDialogTheme">@style/ThemeOverlay.Tachiyomi.BottomSheetDialog</item> <item name="bottomSheetDialogTheme">@style/ThemeOverlay.Tachiyomi.BottomSheetDialog</item>
<item name="incognitoBackgroundColor">@color/md_grey_800</item>
<item name="chipStyle">@style/Widget.Tachiyomi.Chip.Action</item> <item name="chipStyle">@style/Widget.Tachiyomi.Chip.Action</item>
<item name="chipTextColor">?android:attr/textColorPrimary</item> <item name="chipTextColor">?android:attr/textColorPrimary</item>
<item name="chipBackgroundColor">?attr/colorControlHighlight</item> <item name="chipBackgroundColor">?attr/colorControlHighlight</item>
@ -119,9 +118,6 @@
<item name="colorSurface">@color/surface_tako</item> <item name="colorSurface">@color/surface_tako</item>
<item name="android:colorBackground">@color/background_tako</item> <item name="android:colorBackground">@color/background_tako</item>
<!-- Themes -->
<item name="incognitoBackgroundColor">@color/incognito_background_tako</item>
<!-- Custom Attributes--> <!-- Custom Attributes-->
<item name="colorFilterActive">@color/filter_tako</item> <item name="colorFilterActive">@color/filter_tako</item>
</style> </style>