Added Saikou theme (#40)
* Update colors.xml * Update themes.xml * Update themes.xml * Update ThemeManager.kt * Update ThemeManager.kt * Update ThemeManager.kt * Update ThemeManager.kt * Update DevelopersDialogFragment.kt * Update activity_main.xml * Update item_anime_page.xml * Update item_manga_page.xml * Update fragment_login.xml * Update activity_media.xml * Update activity_media.xml * Update item_anime_page.xml * Update item_manga_page.xml * Update themes.xml * Update themes.xml * Update exo_player_control_view.xml * Update activity_author.xml * Update activity_studio.xml * Update activity_manga_reader.xml * Update activity_novel_reader.xml * Update activity_media.xml Fix * Update tab_layout_icon.xml * Update activity_media.xml * Update activity_media.xml * Update tab_layout_icon.xml Changed selected layout icon from primary to secondary * Update activity_list.xml * Update ListActivity.kt Unbound listTabLayout, listAppBar and listTitle because it stopped color reallocation * Update CalendarActivity.kt Unbound listTabLayout, listAppBar and listTitle because it stopped color reallocation * Update button_switch_track.xml * Update CalendarActivity.kt Undo * Update ListActivity.kt Undo * Update CalendarActivity.kt * Update ListActivity.kt * Update ListActivity.kt * Update CalendarActivity.kt (Saikou theme complete!) I'll just need to check for bugs and request to merge * Update ThemeManager.kt Took Sakiou theme out of beta * Update tab_layout_icon.xml Changes to media tabs (less accurate to Saikou but selected menu is more vibrant and supports other themes better) * Update activity_media.xml Changes to media tabs (less accurate to Saikou but selected menu is more vibrant and supports other themes better) * Update activity_media.xml Changes to media tabs (less accurate to Saikou but selected menu is more vibrant and supports other themes better) * Update control_background_40dp.xml * Update build.gradle Changed version number
This commit is contained in:
parent
a58e9a523a
commit
eee1242964
22 changed files with 201 additions and 67 deletions
|
@ -38,21 +38,24 @@ class CalendarActivity : AppCompatActivity() {
|
|||
|
||||
|
||||
val typedValue = TypedValue()
|
||||
theme.resolveAttribute(com.google.android.material.R.attr.colorOnPrimary, typedValue, true)
|
||||
theme.resolveAttribute(com.google.android.material.R.attr.colorSurface, typedValue, true)
|
||||
val primaryColor = typedValue.data
|
||||
val typedValue2 = TypedValue()
|
||||
theme.resolveAttribute(com.google.android.material.R.attr.colorPrimary, typedValue2, true)
|
||||
val primaryTextColor = typedValue2.data
|
||||
theme.resolveAttribute(com.google.android.material.R.attr.colorOnBackground, typedValue2, true)
|
||||
val titleTextColor = typedValue2.data
|
||||
val typedValue3 = TypedValue()
|
||||
theme.resolveAttribute(com.google.android.material.R.attr.colorSecondary, typedValue3, true)
|
||||
val secondaryColor = typedValue3.data
|
||||
theme.resolveAttribute(com.google.android.material.R.attr.colorPrimary, typedValue3, true)
|
||||
val primaryTextColor = typedValue3.data
|
||||
val typedValue4 = TypedValue()
|
||||
theme.resolveAttribute(com.google.android.material.R.attr.colorOutline, typedValue4, true)
|
||||
val secondaryTextColor = typedValue4.data
|
||||
|
||||
window.statusBarColor = primaryColor
|
||||
window.navigationBarColor = primaryColor
|
||||
binding.listTabLayout.setBackgroundColor(primaryColor)
|
||||
binding.listAppBar.setBackgroundColor(primaryColor)
|
||||
binding.listTitle.setTextColor(primaryTextColor)
|
||||
binding.listTabLayout.setTabTextColors(primaryTextColor, primaryTextColor)
|
||||
binding.listTitle.setTextColor(titleTextColor)
|
||||
binding.listTabLayout.setTabTextColors(secondaryTextColor, primaryTextColor)
|
||||
binding.listTabLayout.setSelectedTabIndicatorColor(primaryTextColor)
|
||||
val uiSettings = loadData<UserInterfaceSettings>("ui_settings") ?: UserInterfaceSettings()
|
||||
if (!uiSettings.immersiveMode) {
|
||||
|
@ -103,4 +106,4 @@ class CalendarActivity : AppCompatActivity() {
|
|||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -36,21 +36,24 @@ class ListActivity : AppCompatActivity() {
|
|||
binding = ActivityListBinding.inflate(layoutInflater)
|
||||
|
||||
val typedValue = TypedValue()
|
||||
theme.resolveAttribute(com.google.android.material.R.attr.colorOnPrimary, typedValue, true)
|
||||
theme.resolveAttribute(com.google.android.material.R.attr.colorSurface, typedValue, true)
|
||||
val primaryColor = typedValue.data
|
||||
val typedValue2 = TypedValue()
|
||||
theme.resolveAttribute(com.google.android.material.R.attr.colorPrimary, typedValue2, true)
|
||||
val primaryTextColor = typedValue2.data
|
||||
theme.resolveAttribute(com.google.android.material.R.attr.colorOnBackground, typedValue2, true)
|
||||
val titleTextColor = typedValue2.data
|
||||
val typedValue3 = TypedValue()
|
||||
theme.resolveAttribute(com.google.android.material.R.attr.colorSecondary, typedValue3, true)
|
||||
val secondaryColor = typedValue3.data
|
||||
theme.resolveAttribute(com.google.android.material.R.attr.colorPrimary, typedValue3, true)
|
||||
val primaryTextColor = typedValue3.data
|
||||
val typedValue4 = TypedValue()
|
||||
theme.resolveAttribute(com.google.android.material.R.attr.colorOutline, typedValue4, true)
|
||||
val secondaryTextColor = typedValue4.data
|
||||
|
||||
window.statusBarColor = primaryColor
|
||||
window.navigationBarColor = primaryColor
|
||||
binding.listTabLayout.setBackgroundColor(primaryColor)
|
||||
binding.listAppBar.setBackgroundColor(primaryColor)
|
||||
binding.listTitle.setTextColor(primaryTextColor)
|
||||
binding.listTabLayout.setTabTextColors(primaryTextColor, primaryTextColor)
|
||||
binding.listTitle.setTextColor(titleTextColor)
|
||||
binding.listTabLayout.setTabTextColors(secondaryTextColor, primaryTextColor)
|
||||
binding.listTabLayout.setSelectedTabIndicatorColor(primaryTextColor)
|
||||
val uiSettings = loadData<UserInterfaceSettings>("ui_settings") ?: UserInterfaceSettings()
|
||||
if (!uiSettings.immersiveMode) {
|
||||
|
@ -126,4 +129,4 @@ class ListActivity : AppCompatActivity() {
|
|||
popup.show()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -14,7 +14,7 @@ class DevelopersDialogFragment : BottomSheetDialogFragment() {
|
|||
|
||||
private val developers = arrayOf(
|
||||
Developer("rebelonion","https://avatars.githubusercontent.com/u/87634197?v=4","Owner and Maintainer","https://github.com/rebelonion"),
|
||||
Developer("Wai What", "https://cdn.discordapp.com/avatars/928202695611908126/aeac4c867acbb8c3783356497055a426.webp?size=80", "Icon Designer", ""),
|
||||
Developer("Wai What", "https://avatars.githubusercontent.com/u/149729762?v=4", "Icon Designer", "https://github.com/WaiWhat"),
|
||||
)
|
||||
|
||||
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
|
||||
|
|
|
@ -20,6 +20,7 @@ class ThemeManager(private val context: Context) {
|
|||
"RED" -> if (useOLED) R.style.Theme_Dantotsu_RedOLED else R.style.Theme_Dantotsu_Red
|
||||
"LAVENDER" -> if (useOLED) R.style.Theme_Dantotsu_LavenderOLED else R.style.Theme_Dantotsu_Lavender
|
||||
"MONOCHROME (BETA)" -> if (useOLED) R.style.Theme_Dantotsu_MonochromeOLED else R.style.Theme_Dantotsu_Monochrome
|
||||
"SAIKOU" -> if (useOLED) R.style.Theme_Dantotsu_SaikouOLED else R.style.Theme_Dantotsu_Saikou
|
||||
else -> if (useOLED) R.style.Theme_Dantotsu_PurpleOLED else R.style.Theme_Dantotsu_Purple
|
||||
}
|
||||
|
||||
|
@ -44,7 +45,8 @@ class ThemeManager(private val context: Context) {
|
|||
PINK("PINK"),
|
||||
RED("RED"),
|
||||
LAVENDER("LAVENDER"),
|
||||
MONOCHROME("MONOCHROME (BETA)");
|
||||
MONOCHROME("MONOCHROME (BETA)"),
|
||||
SAIKOU("SAIKOU");
|
||||
|
||||
companion object {
|
||||
fun fromString(value: String): Theme {
|
||||
|
@ -53,4 +55,4 @@ class ThemeManager(private val context: Context) {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:color="?attr/colorOnBackground" android:state_checked="false"/>
|
||||
<item android:color="?attr/colorPrimaryContainer" android:state_checked="true"/>
|
||||
</selector>
|
||||
<item android:color="?attr/colorPrimary" android:state_checked="true"/>
|
||||
</selector>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_selected="true" android:color="?attr/colorPrimary"/>
|
||||
<item android:color="?attr/colorSecondary"/>
|
||||
</selector>
|
||||
<item android:color="?attr/colorOutline"/>
|
||||
</selector>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:color="?attr/colorSecondaryContainer"
|
||||
android:radius="20dp" />
|
||||
android:color="?attr/colorPrimary"
|
||||
android:radius="20dp" />
|
||||
|
|
|
@ -138,8 +138,8 @@
|
|||
android:singleLine="true"
|
||||
android:text="@string/add"
|
||||
android:textAllCaps="true"
|
||||
android:textColor="?attr/colorPrimary"
|
||||
app:strokeColor="?attr/colorPrimary"
|
||||
android:textColor="?attr/colorSecondary"
|
||||
app:strokeColor="@color/bg_opp"
|
||||
android:textSize="14sp"
|
||||
android:textStyle="bold"
|
||||
app:cornerRadius="16dp"
|
||||
|
@ -220,7 +220,7 @@
|
|||
android:padding="8dp"
|
||||
android:tintMode="src_atop"
|
||||
app:srcCompat="@drawable/ic_round_favorite_border_24"
|
||||
app:tint="?attr/colorSecondary"
|
||||
app:tint="@color/bg_opp"
|
||||
tools:ignore="ContentDescription,ImageContrastCheck" />
|
||||
|
||||
<ImageView
|
||||
|
@ -230,7 +230,7 @@
|
|||
android:layout_marginStart="-8dp"
|
||||
android:padding="8dp"
|
||||
app:srcCompat="@drawable/ic_round_share_24"
|
||||
app:tint="?attr/colorSecondary"
|
||||
app:tint="@color/bg_opp"
|
||||
app:tintMode="src_atop"
|
||||
tools:ignore="ContentDescription,ImageContrastCheck" />
|
||||
|
||||
|
@ -303,4 +303,4 @@
|
|||
</FrameLayout>
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
<com.google.android.material.appbar.AppBarLayout
|
||||
|
||||
android:layout_width="match_parent"
|
||||
android:background="?attr/colorSecondary"
|
||||
android:background="?attr/colorSurface"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
|
@ -21,7 +21,7 @@
|
|||
android:singleLine="true"
|
||||
android:textAlignment="center"
|
||||
android:textSize="20sp"
|
||||
android:textColor="?attr/colorOnSecondary"
|
||||
android:textColor="@color/bg_opp"
|
||||
tools:text="@string/name" />
|
||||
|
||||
|
||||
|
@ -57,7 +57,7 @@
|
|||
android:layout_gravity="end"
|
||||
android:layout_margin="16dp"
|
||||
android:translationZ="2dp"
|
||||
app:cardBackgroundColor="?attr/colorSecondary"
|
||||
app:cardBackgroundColor="@color/nav_bg"
|
||||
app:cardCornerRadius="16dp">
|
||||
|
||||
<androidx.constraintlayout.utils.widget.ImageFilterView
|
||||
|
@ -69,4 +69,4 @@
|
|||
</androidx.cardview.widget.CardView>
|
||||
|
||||
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
android:id="@+id/listAppBar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="?attr/colorPrimaryContainer"
|
||||
android:background="?attr/colorSurface"
|
||||
android:theme="@style/Theme.Dantotsu.AppBarOverlay">
|
||||
|
||||
<LinearLayout
|
||||
|
@ -36,7 +36,7 @@
|
|||
android:gravity="center"
|
||||
android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title"
|
||||
android:textSize="16sp"
|
||||
android:textColor="?attr/colorOnPrimaryContainer"
|
||||
android:textColor="?attr/colorOnBackground"
|
||||
tools:text="@string/app_name" />
|
||||
|
||||
<Space
|
||||
|
@ -61,7 +61,7 @@
|
|||
android:id="@+id/listTabLayout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="48dp"
|
||||
android:background="?attr/colorPrimaryContainer"
|
||||
android:background="?attr/colorSurface"
|
||||
app:tabContentStart="32dp"
|
||||
app:tabMode="scrollable"
|
||||
app:tabPaddingEnd="16dp"
|
||||
|
@ -76,4 +76,4 @@
|
|||
android:layout_height="match_parent"
|
||||
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
|
||||
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
app:abb_indicatorLocation="bottom"
|
||||
app:abb_indicatorMargin="28dp"
|
||||
app:abb_selectedTabType="text"
|
||||
app:abb_tabColor="?attr/colorSecondary"
|
||||
app:abb_tabColor="?attr/colorOutline"
|
||||
app:abb_tabColorDisabled="?attr/colorPrimaryContainer"
|
||||
app:abb_tabColorSelected="?attr/colorPrimary"
|
||||
app:abb_tabs="@menu/bottom_navbar_menu"
|
||||
|
@ -58,4 +58,4 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
</FrameLayout>
|
||||
</FrameLayout>
|
||||
</FrameLayout>
|
||||
|
|
|
@ -362,7 +362,7 @@
|
|||
app:thumbRadius="8dp"
|
||||
app:tickColor="#0000"
|
||||
app:trackColorInactive="@color/grey_60"
|
||||
app:trackColorActive="?attr/colorOnBackground"
|
||||
app:trackColorActive="?attr/colorPrimary"
|
||||
app:trackHeight="2dp" />
|
||||
|
||||
</FrameLayout>
|
||||
|
|
|
@ -122,8 +122,8 @@
|
|||
android:singleLine="true"
|
||||
android:text="@string/add"
|
||||
android:textAllCaps="true"
|
||||
android:textColor="?attr/colorPrimary"
|
||||
app:strokeColor="?attr/colorPrimary"
|
||||
android:textColor="?attr/colorSecondary"
|
||||
app:strokeColor="@color/bg_opp"
|
||||
android:textSize="14sp"
|
||||
android:textStyle="bold"
|
||||
app:cornerRadius="16dp"
|
||||
|
@ -202,7 +202,7 @@
|
|||
android:padding="8dp"
|
||||
android:tintMode="src_atop"
|
||||
app:srcCompat="@drawable/ic_round_favorite_border_24"
|
||||
app:tint="?attr/colorSecondary"
|
||||
app:tint="@color/bg_opp"
|
||||
tools:ignore="ContentDescription,ImageContrastCheck" />
|
||||
|
||||
<ImageView
|
||||
|
@ -212,7 +212,7 @@
|
|||
android:layout_marginStart="-8dp"
|
||||
android:padding="8dp"
|
||||
app:srcCompat="@drawable/ic_round_share_24"
|
||||
app:tint="?attr/colorSecondary"
|
||||
app:tint="@color/bg_opp"
|
||||
app:tintMode="src_atop"
|
||||
tools:ignore="ContentDescription,ImageContrastCheck" />
|
||||
|
||||
|
@ -301,4 +301,4 @@
|
|||
android:visibility="gone">
|
||||
</FrameLayout>
|
||||
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||
|
|
|
@ -176,7 +176,8 @@
|
|||
app:labelStyle="@style/fontTooltip"
|
||||
app:thumbRadius="8dp"
|
||||
app:tickColor="#0000"
|
||||
app:trackColorInactive="@color/bg_white"
|
||||
app:trackColorInactive="@color/grey_60"
|
||||
app:trackColorActive="?attr/colorPrimary"
|
||||
app:trackHeight="2dp" />
|
||||
|
||||
</FrameLayout>
|
||||
|
@ -303,4 +304,4 @@
|
|||
android:layout_gravity="center"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"/>
|
||||
</FrameLayout>
|
||||
</FrameLayout>
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
<com.google.android.material.appbar.AppBarLayout
|
||||
|
||||
android:layout_width="match_parent"
|
||||
android:background="?attr/colorSecondary"
|
||||
android:background="?attr/colorSurface"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
|
@ -21,7 +21,7 @@
|
|||
android:singleLine="true"
|
||||
android:textAlignment="center"
|
||||
android:textSize="20sp"
|
||||
android:textColor="?attr/colorOnSecondary"
|
||||
android:textColor="@color/bg_opp"
|
||||
tools:text="@string/main_studio" />
|
||||
|
||||
|
||||
|
@ -57,7 +57,7 @@
|
|||
android:layout_gravity="end"
|
||||
android:layout_margin="16dp"
|
||||
android:translationZ="2dp"
|
||||
app:cardBackgroundColor="?attr/colorSecondary"
|
||||
app:cardBackgroundColor="@color/nav_bg"
|
||||
app:cardCornerRadius="16dp">
|
||||
|
||||
<androidx.constraintlayout.utils.widget.ImageFilterView
|
||||
|
@ -69,4 +69,4 @@
|
|||
</androidx.cardview.widget.CardView>
|
||||
|
||||
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||
|
|
|
@ -530,7 +530,7 @@
|
|||
app:ad_marker_color="#A9FFFFFF"
|
||||
app:bar_height="2dp"
|
||||
app:played_color="?attr/colorPrimary"
|
||||
app:scrubber_color="?attr/colorPrimaryContainer"
|
||||
app:scrubber_color="?attr/colorPrimary"
|
||||
tools:ignore="SpeakableTextPresentCheck" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -557,4 +557,4 @@
|
|||
|
||||
</FrameLayout>
|
||||
|
||||
</FrameLayout>
|
||||
</FrameLayout>
|
||||
|
|
|
@ -64,7 +64,7 @@
|
|||
android:layout_weight="1"
|
||||
android:padding="6dp"
|
||||
android:src="@drawable/ic_discord"
|
||||
app:tint="?attr/colorSecondary"
|
||||
app:tint="?attr/colorOutline"
|
||||
tools:ignore="ContentDescription" />
|
||||
|
||||
<ImageView
|
||||
|
@ -74,7 +74,7 @@
|
|||
android:layout_margin="8dp"
|
||||
android:padding="6dp"
|
||||
android:src="@drawable/ic_github"
|
||||
app:tint="?attr/colorSecondary"
|
||||
app:tint="?attr/colorOutline"
|
||||
tools:ignore="ContentDescription" />
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
android:layout_marginEnd="8dp"
|
||||
android:layout_weight="1"
|
||||
android:hint="@string/anime"
|
||||
android:textColorHint="?attr/colorPrimary"
|
||||
android:textColorHint="@color/bg_opp"
|
||||
android:transitionName="@string/search"
|
||||
app:boxBackgroundColor="?attr/colorPrimaryContainer"
|
||||
app:boxCornerRadiusBottomEnd="28dp"
|
||||
|
@ -42,7 +42,7 @@
|
|||
app:boxCornerRadiusTopEnd="28dp"
|
||||
app:boxCornerRadiusTopStart="28dp"
|
||||
app:endIconDrawable="@drawable/ic_round_search_24"
|
||||
app:endIconTint="?attr/colorPrimary"
|
||||
app:endIconTint="@color/bg_opp"
|
||||
app:boxStrokeColor="@color/text_input_layout_stroke_color"
|
||||
app:hintAnimationEnabled="true">
|
||||
|
||||
|
@ -73,7 +73,7 @@
|
|||
android:layout_width="52dp"
|
||||
android:layout_height="52dp"
|
||||
android:scaleType="center"
|
||||
android:tint="?attr/colorPrimary"
|
||||
android:tint="@color/bg_opp"
|
||||
app:srcCompat="@drawable/ic_round_settings_24"
|
||||
tools:ignore="ContentDescription,ImageContrastCheck" />
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
android:layout_marginEnd="8dp"
|
||||
android:layout_weight="1"
|
||||
android:hint="@string/manga"
|
||||
android:textColorHint="?attr/colorPrimary"
|
||||
android:textColorHint="@color/bg_opp"
|
||||
android:transitionName="@string/search"
|
||||
app:boxBackgroundColor="?attr/colorPrimaryContainer"
|
||||
app:boxCornerRadiusBottomEnd="28dp"
|
||||
|
@ -43,7 +43,7 @@
|
|||
app:boxCornerRadiusTopEnd="28dp"
|
||||
app:boxCornerRadiusTopStart="28dp"
|
||||
app:endIconDrawable="@drawable/ic_round_search_24"
|
||||
app:endIconTint="?attr/colorPrimary"
|
||||
app:endIconTint="@color/bg_opp"
|
||||
app:boxStrokeColor="@color/text_input_layout_stroke_color"
|
||||
app:hintAnimationEnabled="true">
|
||||
|
||||
|
@ -75,7 +75,7 @@
|
|||
android:layout_width="52dp"
|
||||
android:layout_height="52dp"
|
||||
android:scaleType="center"
|
||||
android:tint="?attr/colorPrimary"
|
||||
android:tint="@color/bg_opp"
|
||||
app:srcCompat="@drawable/ic_round_settings_24"
|
||||
tools:ignore="ContentDescription,ImageContrastCheck" />
|
||||
|
||||
|
|
|
@ -145,7 +145,7 @@
|
|||
<item name="colorOnSurface">@color/bg_white</item>
|
||||
<item name="colorSurfaceVariant">@color/bg_black</item>
|
||||
<item name="colorOnSurfaceVariant">@color/bg_white</item>
|
||||
<item name="colorOutline">@color/bg_black</item>
|
||||
<item name="colorOutline">@color/bg_white</item>
|
||||
<item name="colorOnSurfaceInverse">@color/bg_white</item>
|
||||
<item name="colorSurfaceInverse">@color/bg_black</item>
|
||||
<item name="colorPrimaryInverse">@color/bg_black</item>
|
||||
|
@ -209,6 +209,35 @@
|
|||
<item name="colorPrimaryInverse">@color/md_1_theme_dark_inversePrimary</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Dantotsu.Saikou" parent="Theme.Base">
|
||||
<item name="colorPrimary">@color/md_theme_dark_5_primary</item>
|
||||
<item name="colorOnPrimary">@color/md_theme_dark_5_onPrimary</item>
|
||||
<item name="colorPrimaryContainer">@color/md_theme_dark_5_primaryContainer</item>
|
||||
<item name="colorOnPrimaryContainer">@color/md_theme_dark_5_onPrimaryContainer</item>
|
||||
<item name="colorSecondary">@color/md_theme_dark_5_secondary</item>
|
||||
<item name="colorOnSecondary">@color/md_theme_dark_5_onSecondary</item>
|
||||
<item name="colorSecondaryContainer">@color/md_theme_dark_5_secondaryContainer</item>
|
||||
<item name="colorOnSecondaryContainer">@color/md_theme_dark_5_onSecondaryContainer</item>
|
||||
<item name="colorTertiary">@color/md_theme_dark_5_tertiary</item>
|
||||
<item name="colorOnTertiary">@color/md_theme_dark_5_onTertiary</item>
|
||||
<item name="colorTertiaryContainer">@color/md_theme_dark_5_tertiaryContainer</item>
|
||||
<item name="colorOnTertiaryContainer">@color/md_theme_dark_5_onTertiaryContainer</item>
|
||||
<item name="colorError">@color/md_theme_dark_5_error</item>
|
||||
<item name="colorErrorContainer">@color/md_theme_dark_5_errorContainer</item>
|
||||
<item name="colorOnError">@color/md_theme_dark_5_onError</item>
|
||||
<item name="colorOnErrorContainer">@color/md_theme_dark_5_onErrorContainer</item>
|
||||
<item name="android:colorBackground">@color/md_theme_dark_5_background</item>
|
||||
<item name="colorOnBackground">@color/md_theme_dark_5_onBackground</item>
|
||||
<item name="colorSurface">@color/md_theme_dark_5_surface</item>
|
||||
<item name="colorOnSurface">@color/md_theme_dark_5_onSurface</item>
|
||||
<item name="colorSurfaceVariant">@color/md_theme_dark_5_surfaceVariant</item>
|
||||
<item name="colorOnSurfaceVariant">@color/md_theme_dark_5_onSurfaceVariant</item>
|
||||
<item name="colorOutline">@color/md_theme_dark_5_outline</item>
|
||||
<item name="colorOnSurfaceInverse">@color/md_theme_dark_5_inverseOnSurface</item>
|
||||
<item name="colorSurfaceInverse">@color/md_theme_dark_5_inverseSurface</item>
|
||||
<item name="colorPrimaryInverse">@color/md_theme_dark_5_inversePrimary</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Dantotsu.BlueOLED" parent="Theme.Dantotsu.Blue">
|
||||
<item name="android:colorBackground">@color/darkest_Black</item>
|
||||
<item name="colorSurface">@color/darkest_Black</item>
|
||||
|
@ -244,4 +273,9 @@
|
|||
<item name="colorSurface">@color/darkest_Black</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
<style name="Theme.Dantotsu.SaikouOLED" parent="Theme.Dantotsu.Saikou">
|
||||
<item name="android:colorBackground">@color/darkest_Black</item>
|
||||
<item name="colorSurface">@color/darkest_Black</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
|
|
@ -273,6 +273,68 @@
|
|||
<color name="md_theme_dark_4_outlineVariant">#504349</color>
|
||||
<color name="md_theme_dark_4_scrim">#000000</color>
|
||||
|
||||
<color name="seed_7">#FF007F</color> <!-- this theme is still VERY work in progress and the problems listed below are not even close to all of them so wait for "Wai What" to organize the list of problems before fixing anything -->
|
||||
<color name="md_theme_light_5_primary">#FF007F</color> <!-- good -->
|
||||
<color name="md_theme_light_5_onPrimary">#EEEEEE</color> <!-- good but shared with anime and manga list headers -->
|
||||
<color name="md_theme_light_5_primaryContainer">#000000</color> <!-- good-ish, it's shared with slider colors so I've had to set it to "#000000" instead of "#78757C" -->
|
||||
<color name="md_theme_light_5_onPrimaryContainer">#FF007F</color> <!-- good (login button text, "#EEEEEE" also works) -->
|
||||
<color name="md_theme_light_5_secondary">#91A6FF</color> <!-- good -->
|
||||
<color name="md_theme_light_5_onSecondary">#EEEEEE</color> <!-- good -->
|
||||
<color name="md_theme_light_5_secondaryContainer">#91A6FF</color> <!-- good but shared with youtube play -->
|
||||
<color name="md_theme_light_5_onSecondaryContainer">#EEEEEE</color> <!-- good -->
|
||||
<color name="md_theme_light_5_tertiary">#91A6FF</color> <!-- good -->
|
||||
<color name="md_theme_light_5_onTertiary">#00FF00</color>
|
||||
<color name="md_theme_light_5_tertiaryContainer">#00FF00</color>
|
||||
<color name="md_theme_light_5_onTertiaryContainer">#00FF00</color>
|
||||
<color name="md_theme_light_5_error">#00FF00</color>
|
||||
<color name="md_theme_light_5_errorContainer">#00FF00</color>
|
||||
<color name="md_theme_light_5_onError">#00FF00</color>
|
||||
<color name="md_theme_light_5_onErrorContainer">#00FF00</color>
|
||||
<color name="md_theme_light_5_background">#EEEEEE</color> <!-- good -->
|
||||
<color name="md_theme_light_5_onBackground">#000000</color> <!-- good -->
|
||||
<color name="md_theme_light_5_surface">#EEEEEE</color> <!-- good -->
|
||||
<color name="md_theme_light_5_onSurface">#1C1B20</color> <!-- good -->
|
||||
<color name="md_theme_light_5_surfaceVariant">#E7DFEC</color> <!-- good -->
|
||||
<color name="md_theme_light_5_onSurfaceVariant">#000000</color> <!-- guessed -->
|
||||
<color name="md_theme_light_5_outline">#78757C</color> <!-- good-ish -->
|
||||
<color name="md_theme_light_5_inverseOnSurface">#00FF00</color>
|
||||
<color name="md_theme_light_5_inverseSurface">#00FF00</color>
|
||||
<color name="md_theme_light_5_inversePrimary">#00FF00</color>
|
||||
<color name="md_theme_light_5_shadow">#00FF00</color>
|
||||
<color name="md_theme_light_5_surfaceTint">#00FF00</color>
|
||||
<color name="md_theme_light_5_outlineVariant">#00FF00</color>
|
||||
<color name="md_theme_light_5_scrim">#00FF00</color>
|
||||
<color name="md_theme_dark_5_primary">#FF5DAE</color> <!-- good -->
|
||||
<color name="md_theme_dark_5_onPrimary">#EEEEEE</color> <!-- good but shared with anime and manga list headers -->
|
||||
<color name="md_theme_dark_5_primaryContainer">#EEEEEE</color> <!-- good-ish, it's shared with slider colors so I've had to set it to "#EEEEEE" instead of "#928F98" -->
|
||||
<color name="md_theme_dark_5_onPrimaryContainer">#FF5DAE</color> <!-- good (login button text, "#000000" also works) -->
|
||||
<color name="md_theme_dark_5_secondary">#91A6FF</color> <!-- good -->
|
||||
<color name="md_theme_dark_5_onSecondary">#EEEEEE</color> <!-- good -->
|
||||
<color name="md_theme_dark_5_secondaryContainer">#91A6FF</color> <!-- good but shared with youtube play -->
|
||||
<color name="md_theme_dark_5_onSecondaryContainer">#EEEEEE</color> <!-- good -->
|
||||
<color name="md_theme_dark_5_tertiary">#91A6FF</color> <!-- good -->
|
||||
<color name="md_theme_dark_5_onTertiary">#00FF00</color>
|
||||
<color name="md_theme_dark_5_tertiaryContainer">#00FF00</color>
|
||||
<color name="md_theme_dark_5_onTertiaryContainer">#00FF00</color>
|
||||
<color name="md_theme_dark_5_error">#00FF00</color>
|
||||
<color name="md_theme_dark_5_errorContainer">#00FF00</color>
|
||||
<color name="md_theme_dark_5_onError">#00FF00</color>
|
||||
<color name="md_theme_dark_5_onErrorContainer">#00FF00</color>
|
||||
<color name="md_theme_dark_5_background">#000000</color> <!-- good -->
|
||||
<color name="md_theme_dark_5_onBackground">#EEEEEE</color> <!-- good -->
|
||||
<color name="md_theme_dark_5_surface">#1C1B20</color> <!-- good -->
|
||||
<color name="md_theme_dark_5_onSurface">#EEEEEE</color> <!-- good -->
|
||||
<color name="md_theme_dark_5_surfaceVariant">#48454E</color> <!-- good -->
|
||||
<color name="md_theme_dark_5_onSurfaceVariant">#EEEEEE</color> <!-- guessed -->
|
||||
<color name="md_theme_dark_5_outline">#928F98</color> <!-- good-ish -->
|
||||
<color name="md_theme_dark_5_inverseOnSurface">#00FF00</color>
|
||||
<color name="md_theme_dark_5_inverseSurface">#00FF00</color>
|
||||
<color name="md_theme_dark_5_inversePrimary">#00FF00</color>
|
||||
<color name="md_theme_dark_5_shadow">#00FF00</color>
|
||||
<color name="md_theme_dark_5_surfaceTint">#00FF00</color>
|
||||
<color name="md_theme_dark_5_outlineVariant">#00FF00</color>
|
||||
<color name="md_theme_dark_5_scrim">#00FF00</color>
|
||||
|
||||
<color name="seed_5">#c9000b</color>
|
||||
<color name="md_0_theme_light_primary">#C0000A</color>
|
||||
<color name="md_0_theme_light_onPrimary">#FFFFFF</color>
|
||||
|
@ -400,4 +462,4 @@
|
|||
<color name="CustomColor2">#68AF86</color>
|
||||
<color name="CustomColor3">#0096AE</color>
|
||||
<color name="CustomColor4">#000000</color>
|
||||
</resources>
|
||||
</resources>
|
||||
|
|
|
@ -215,7 +215,7 @@
|
|||
<item name="colorOnSurface">@color/bg_black</item>
|
||||
<item name="colorSurfaceVariant">@color/bg_white</item>
|
||||
<item name="colorOnSurfaceVariant">@color/bg_black</item>
|
||||
<item name="colorOutline">@color/bg_white</item>
|
||||
<item name="colorOutline">@color/bg_black</item>
|
||||
<item name="colorOnSurfaceInverse">@color/bg_black</item>
|
||||
<item name="colorSurfaceInverse">@color/bg_white</item>
|
||||
<item name="colorPrimaryInverse">@color/bg_white</item>
|
||||
|
@ -279,4 +279,33 @@
|
|||
<item name="colorPrimaryInverse">@color/md_1_theme_light_inversePrimary</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
<style name="Theme.Dantotsu.Saikou" parent="Theme.Base">
|
||||
<item name="colorPrimary">@color/md_theme_light_5_primary</item>
|
||||
<item name="colorOnPrimary">@color/md_theme_light_5_onPrimary</item>
|
||||
<item name="colorPrimaryContainer">@color/md_theme_light_5_primaryContainer</item>
|
||||
<item name="colorOnPrimaryContainer">@color/md_theme_light_5_onPrimaryContainer</item>
|
||||
<item name="colorSecondary">@color/md_theme_light_5_secondary</item>
|
||||
<item name="colorOnSecondary">@color/md_theme_light_5_onSecondary</item>
|
||||
<item name="colorSecondaryContainer">@color/md_theme_light_5_secondaryContainer</item>
|
||||
<item name="colorOnSecondaryContainer">@color/md_theme_light_5_onSecondaryContainer</item>
|
||||
<item name="colorTertiary">@color/md_theme_light_5_tertiary</item>
|
||||
<item name="colorOnTertiary">@color/md_theme_light_5_onTertiary</item>
|
||||
<item name="colorTertiaryContainer">@color/md_theme_light_5_tertiaryContainer</item>
|
||||
<item name="colorOnTertiaryContainer">@color/md_theme_light_5_onTertiaryContainer</item>
|
||||
<item name="colorError">@color/md_theme_light_5_error</item>
|
||||
<item name="colorErrorContainer">@color/md_theme_light_5_errorContainer</item>
|
||||
<item name="colorOnError">@color/md_theme_light_5_onError</item>
|
||||
<item name="colorOnErrorContainer">@color/md_theme_light_5_onErrorContainer</item>
|
||||
<item name="android:colorBackground">@color/md_theme_light_5_background</item>
|
||||
<item name="colorOnBackground">@color/md_theme_light_5_onBackground</item>
|
||||
<item name="colorSurface">@color/md_theme_light_5_surface</item>
|
||||
<item name="colorOnSurface">@color/md_theme_light_5_onSurface</item>
|
||||
<item name="colorSurfaceVariant">@color/md_theme_light_5_surfaceVariant</item>
|
||||
<item name="colorOnSurfaceVariant">@color/md_theme_light_5_onSurfaceVariant</item>
|
||||
<item name="colorOutline">@color/md_theme_light_5_outline</item>
|
||||
<item name="colorOnSurfaceInverse">@color/md_theme_light_5_inverseOnSurface</item>
|
||||
<item name="colorSurfaceInverse">@color/md_theme_light_5_inverseSurface</item>
|
||||
<item name="colorPrimaryInverse">@color/md_theme_light_5_inversePrimary</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue