Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Black-Red theme (#95)

Browse Source 
* Appveyor

* stuff

* resolve conflict

* Let's try this again

* try again

* More fixing

* remove appveyor

* revert build.gradle

* Revert "revert build.gradle"

This reverts commit feaaa78157ffe8d6d6af7d6d63a74bc14b92f584.

* Undo line change

* Update build.gradle

* Update MainActivity.kt

Co-authored-by: AbdullahM0hamed<AbdullahM0hamed@users.noreply.github.com>
This commit is contained in:
AbdullahM0hamed 2020-09-10 22:06:49 +01:00 committed by GitHub
parent f62d277894
commit c8a4ec37e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -368,7 +368,7 @@ task copyResources(type: Copy) {
preBuild.dependsOn(ktlintFormat, copyResources)
if (!getGradle().getStartParameter().getTaskRequests().toString().contains("Dev")) {
if (!getGradle().getStartParameter().getTaskRequests().toString().contains("Debug")) {
apply plugin: 'com.google.gms.google-services'
// Firebase Crashlytics
apply plugin: 'com.google.firebase.crashlytics'

1
app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
View File

@ -23,6 +23,7 @@ object PreferenceValues {
default,
blue,
amoled,
red,
}
enum class DisplayMode {

1
app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt
View File

@ -49,6 +49,7 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
when (preferences.themeDark().get()) {
Values.DarkThemeVariant.blue -> R.style.Theme_Tachiyomi_DarkBlue
Values.DarkThemeVariant.amoled -> R.style.Theme_Tachiyomi_Amoled
Values.DarkThemeVariant.red -> R.style.Theme_Tachiyomi_Red
else -> R.style.Theme_Tachiyomi_Dark
}
}

6
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
View File

@ -126,12 +126,14 @@ class SettingsGeneralController : SettingsController() {
entriesRes = arrayOf(
R.string.theme_dark_default,
R.string.theme_dark_blue,
R.string.theme_dark_amoled
R.string.theme_dark_amoled,
R.string.theme_dark_red
)
entryValues = arrayOf(
Values.DarkThemeVariant.default.name,
Values.DarkThemeVariant.blue.name,
Values.DarkThemeVariant.amoled.name
Values.DarkThemeVariant.amoled.name,
Values.DarkThemeVariant.red.name
)
defaultValue = Values.DarkThemeVariant.default.name
summary = "%s"

1
app/src/main/res/layout/source_comfortable_grid_item.xml
View File

@ -130,6 +130,7 @@
android:maxLines="2"
android:padding="4dp"
android:shadowColor="@color/textColorPrimaryLight"
android:textColor="?md_color_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/card"
tools:text="Sample name" />

2
app/src/main/res/layout/source_compact_grid_item.xml
View File

@ -124,7 +124,7 @@
android:shadowDx="0"
android:shadowDy="0"
android:shadowRadius="4"
android:textColor="@color/md_white_1000"
android:textColor="?md_color_title"
tools:text="Sample name" />
<ProgressBar

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

@ -33,6 +33,9 @@
<color name="dialogDark">@color/colorDarkPrimary</color>
<color name="selectorColorDark">@color/md_blue_A200_50</color>
<color name="red">#FF0000</color>
<color name="dark_red">#880000</color>
<!-- Reader Theme -->
<color name="readerColorDarkPrimary">@color/colorDarkPrimary</color>
<color name="pageNumberBackgroundLight">@color/md_grey_50_75</color>

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

@ -150,6 +150,7 @@
<string name="theme_dark_default">Default</string>
<string name="theme_dark_blue">Dark blue</string>
<string name="theme_dark_amoled">AMOLED black</string>
<string name="theme_dark_red">Black-Red</string>
<string name="pref_start_screen">Start screen</string>
<string name="pref_language">Language</string>
<string name="system_default">Default</string>

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

@ -6,6 +6,10 @@
<!--========-->
<style name="Theme.Toolbar" parent="@style/ThemeOverlay.MaterialComponents.ActionBar" />
<style name="Theme.Toolbar.Red" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
<item name="android:textColorPrimary">@color/red</item>
</style>
<style name="Theme.Toolbar.Light" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
<item name="popupTheme">@style/ThemeOverlay.MaterialComponents.Light</item>
</style>

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

@ -194,6 +194,22 @@
<item name="colorLibrarySelectionActive">@color/selectorColorDark</item>
</style>
<style name="Theme.Tachiyomi.Red" parent="Theme.Tachiyomi.Amoled">
<item name="actionBarTheme">@style/Theme.Toolbar.Red</item>
<item name="colorPrimary">@color/md_black_1000</item>
<item name="colorPrimaryVariant">@color/red</item>
<item name="colorSecondary">@color/dark_red</item>
<item name="colorOnSurface">@color/red</item>
<item name="colorAccent">@color/dark_red</item>
<item name="colorOnPrimary">@color/red</item>
<item name="android:navigationBarColor">@color/red</item>
<item name="android:textColor">@color/red</item>
<item name="android:textColorPrimary">@color/red</item>
<item name="android:textColorSecondary">@color/dark_red</item>
<item name="android:textColorHint">@color/dark_red</item>
<item name="md_color_title">@color/red</item>
</style>
<!--==============-->
<!-- Reader Theme -->
<!--==============-->