Seil0/teapod
Seil0
/
teapod
1
0
Fork 0
Code Issues 7 Pull Requests Releases 17 Wiki Activity

Merge pull request 'migrate to material 3' (#70) from feature/material-3 into develop 

Reviewed-on: #70
This commit is contained in:
Jannik 2023-04-15 23:51:08 +02:00
parent fdcb76e26e f266731115
commit 7580093649
43 changed files with 331 additions and 293 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -10,7 +10,7 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme.Dark">
android:theme="@style/AppTheme">
<activity
android:exported="true"
android:name="org.mosad.teapod.ui.activity.main.MainActivity"

6
app/src/main/java/org/mosad/teapod/preferences/Preferences.kt
View File

@ -18,7 +18,7 @@ object Preferences {
internal set
var devSettings = false
internal set
var theme = DataTypes.Theme.DARK
var theme = DataTypes.Theme.SYSTEM
internal set
// dev settings
@ -122,8 +122,8 @@ object Preferences {
)
theme = DataTypes.Theme.valueOf(
sharedPref.getString(
context.getString(R.string.save_key_theme), DataTypes.Theme.DARK.toString()
) ?: DataTypes.Theme.DARK.toString()
context.getString(R.string.save_key_theme), DataTypes.Theme.SYSTEM.toString()
) ?: DataTypes.Theme.SYSTEM.toString()
)
// dev settings

22
app/src/main/java/org/mosad/teapod/ui/activity/main/MainActivity.kt
View File

@ -28,6 +28,7 @@ import android.util.Log
import android.view.MenuItem
import androidx.activity.addCallback
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.app.AppCompatDelegate
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
import androidx.fragment.app.Fragment
import androidx.fragment.app.commit
@ -69,7 +70,14 @@ class MainActivity : AppCompatActivity(), NavigationBarView.OnItemSelectedListen
super.onCreate(savedInstanceState)
load() // start the initial loading
theme.applyStyle(getThemeResource(), true)
// theming
val mode = when (Preferences.theme) {
DataTypes.Theme.LIGHT -> AppCompatDelegate.MODE_NIGHT_NO
DataTypes.Theme.DARK -> AppCompatDelegate.MODE_NIGHT_YES
else -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
}
AppCompatDelegate.setDefaultNightMode(mode)
binding = ActivityMainBinding.inflate(layoutInflater)
binding.navView.setOnItemSelectedListener(this)
@ -122,12 +130,12 @@ class MainActivity : AppCompatActivity(), NavigationBarView.OnItemSelectedListen
return ret
}
private fun getThemeResource(): Int {
return when (Preferences.theme) {
DataTypes.Theme.LIGHT -> R.style.AppTheme_Light
else -> R.style.AppTheme_Dark
}
}
// private fun getThemeResource(): Int {
// return when (Preferences.theme) {
// DataTypes.Theme.LIGHT -> R.style.AppTheme_Light
// else -> R.style.AppTheme_Dark
// }
// }
/**
* initial loading and login are run in parallel, as initial loading doesn't require

13
app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/AccountFragment.kt
View File

@ -68,8 +68,9 @@ class AccountFragment : Fragment() {
binding.switchSecondary.isChecked = Preferences.preferSubbed
binding.switchAutoplay.isChecked = Preferences.autoplay
binding.textThemeSelected.text = when (Preferences.theme) {
Theme.SYSTEM -> getString(R.string.theme_system)
Theme.LIGHT -> getString(R.string.theme_light)
Theme.DARK -> getString(R.string.theme_dark)
else -> getString(R.string.theme_light)
}
binding.linearDevSettings.isVisible = Preferences.devSettings
@ -180,17 +181,19 @@ class AccountFragment : Fragment() {
private fun showThemeDialog() {
val items = arrayOf(
resources.getString(R.string.theme_system),
resources.getString(R.string.theme_light),
resources.getString(R.string.theme_dark)
)
MaterialAlertDialogBuilder(requireContext())
.setTitle(R.string.settings_content_language)
.setTitle(R.string.theme)
.setSingleChoiceItems(items, Preferences.theme.ordinal){ _, which ->
when(which) {
0 -> Preferences.saveTheme(requireContext(), Theme.LIGHT)
1 -> Preferences.saveTheme(requireContext(), Theme.DARK)
else -> Preferences.saveTheme(requireContext(), Theme.DARK)
0 -> Preferences.saveTheme(requireContext(), Theme.SYSTEM)
1 -> Preferences.saveTheme(requireContext(), Theme.LIGHT)
2 -> Preferences.saveTheme(requireContext(), Theme.DARK)
else -> Preferences.saveTheme(requireContext(), Theme.SYSTEM)
}
(activity as MainActivity).restart()

4
app/src/main/java/org/mosad/teapod/ui/activity/player/fragment/LanguageSettingsDialogFragment.kt
View File

@ -109,7 +109,7 @@ class LanguageSettingsDialogFragment : DialogFragment() {
gravity = Gravity.CENTER_VERTICAL
text = if (locale == Locale.ROOT) context.getString(R.string.no_subtitles) else locale.displayLanguage
setTextSize(TypedValue.COMPLEX_UNIT_SP, 16f)
setTextColor(context.resources.getColor(R.color.textSecondaryDark, context.theme))
setTextColor(context.resources.getColor(R.color.player_text, context.theme))
setPadding(75, 0, 0, 0)
setOnClickListener(onClick)
@ -131,7 +131,7 @@ class LanguageSettingsDialogFragment : DialogFragment() {
languageLayout.children.forEach { child ->
if (child is TextView) {
child.apply {
setTextColor(context.resources.getColor(R.color.textPrimaryDark, context.theme))
setTextColor(context.resources.getColor(R.color.player_text, context.theme))
setTypeface(null, Typeface.NORMAL)
setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0)
setPadding(75, 0, 0, 0)

1
app/src/main/java/org/mosad/teapod/util/DataTypes.kt
View File

@ -10,6 +10,7 @@ class DataTypes {
}
enum class Theme(val str: String) {
SYSTEM("System"),
LIGHT("Light"),
DARK("Dark")
}

5
app/src/main/res/color/bottom_nav_item_tint.xml
View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/colorPrimary" android:state_checked="true"/>
<item android:color="?attr/iconColor"/>
</selector>

2
app/src/main/res/drawable/dot_default.xml
View File

@ -6,7 +6,7 @@
android:shape="ring"
android:thickness="4dp"
android:useLevel="false">
<solid android:color="?iconColor"/>
<solid android:color="?colorOutline"/>
</shape>
</item>
</layer-list>

2
app/src/main/res/drawable/dot_selected.xml
View File

@ -6,7 +6,7 @@
android:shape="ring"
android:thickness="4dp"
android:useLevel="false">
<solid android:color="@color/colorAccent" />
<solid android:color="?colorSecondary" />
</shape>
</item>
</layer-list>

17
app/src/main/res/drawable/ic_baseline_access_time_24.xml
View File

@ -1,6 +1,13 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
<path android:fillColor="@android:color/white" android:pathData="M12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
<path
android:fillColor="@android:color/white"
android:pathData="M12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z" />
</vector>

6
app/src/main/res/drawable/ic_baseline_add_24.xml
View File

@ -4,7 +4,7 @@
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
<path
android:fillColor="@android:color/white"
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
</vector>

13
app/src/main/res/drawable/ic_baseline_code_24.xml
View File

@ -1,5 +1,10 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M9.4,16.6L4.8,12l4.6,-4.6L8,6l-6,6 6,6 1.4,-1.4zM14.6,16.6l4.6,-4.6 -4.6,-4.6L16,6l6,6 -6,6 -1.4,-1.4z"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M9.4,16.6L4.8,12l4.6,-4.6L8,6l-6,6 6,6 1.4,-1.4zM14.6,16.6l4.6,-4.6 -4.6,-4.6L16,6l6,6 -6,6 -1.4,-1.4z"/>
</vector>

13
app/src/main/res/drawable/ic_baseline_description_24.xml
View File

@ -1,5 +1,10 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M14,2L6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6zM16,18L8,18v-2h8v2zM16,14L8,14v-2h8v2zM13,9L13,3.5L18.5,9L13,9z"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M14,2L6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6zM16,18L8,18v-2h8v2zM16,14L8,14v-2h8v2zM13,9L13,3.5L18.5,9L13,9z"/>
</vector>

13
app/src/main/res/drawable/ic_baseline_language_24.xml
View File

@ -1,5 +1,10 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"/>
</vector>

9
app/src/main/res/drawable/ic_baseline_people_24.xml
View File

@ -1,5 +1,8 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path android:fillColor="@android:color/white" android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z"/>
</vector>

2
app/src/main/res/drawable/ic_baseline_search_24.xml
View File

@ -3,7 +3,7 @@
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/iconColor">
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>

13
app/src/main/res/drawable/ic_baseline_style_24.xml
View File

@ -1,5 +1,10 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M2.53,19.65l1.34,0.56v-9.03l-2.43,5.86c-0.41,1.02 0.08,2.19 1.09,2.61zM22.03,15.95L17.07,3.98c-0.31,-0.75 -1.04,-1.21 -1.81,-1.23 -0.26,0 -0.53,0.04 -0.79,0.15L7.1,5.95c-0.75,0.31 -1.21,1.03 -1.23,1.8 -0.01,0.27 0.04,0.54 0.15,0.8l4.96,11.97c0.31,0.76 1.05,1.22 1.83,1.23 0.26,0 0.52,-0.05 0.77,-0.15l7.36,-3.05c1.02,-0.42 1.51,-1.59 1.09,-2.6zM7.88,8.75c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM5.88,19.75c0,1.1 0.9,2 2,2h1.45l-3.45,-8.34v6.34z"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M2.53,19.65l1.34,0.56v-9.03l-2.43,5.86c-0.41,1.02 0.08,2.19 1.09,2.61zM22.03,15.95L17.07,3.98c-0.31,-0.75 -1.04,-1.21 -1.81,-1.23 -0.26,0 -0.53,0.04 -0.79,0.15L7.1,5.95c-0.75,0.31 -1.21,1.03 -1.23,1.8 -0.01,0.27 0.04,0.54 0.15,0.8l4.96,11.97c0.31,0.76 1.05,1.22 1.83,1.23 0.26,0 0.52,-0.05 0.77,-0.15l7.36,-3.05c1.02,-0.42 1.51,-1.59 1.09,-2.6zM7.88,8.75c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM5.88,19.75c0,1.1 0.9,2 2,2h1.45l-3.45,-8.34v6.34z"/>
</vector>

4
app/src/main/res/drawable/ic_outline_info_24.xml
View File

@ -1,9 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#FFFFFF"
android:viewportWidth="24"
android:viewportHeight="24">
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z" />

2
app/src/main/res/drawable/placeholder_image.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="?shapeTextBackground"/>
<solid android:color="?colorSurfaceVariant"/>
<size
android:width="1920px"
android:height="1080px"/>

2
app/src/main/res/drawable/shape_rounded_corner.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="?attr/shapeTextBackground"/>
<solid android:color="?colorSurfaceVariant"/>
<corners android:radius="3dp"/>
</shape>

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

@ -9,8 +9,6 @@
android:id="@+id/nav_view"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="?themeSecondary"
app:itemIconTint="@color/bottom_nav_item_tint"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"

32
app/src/main/res/layout/fragment_about.xml
View File

@ -1,11 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?themePrimary"
tools:context=".ui.activity.main.fragments.AboutFragment">
<LinearLayout
@ -67,8 +64,7 @@
android:minHeight="48dp"
android:padding="9dp"
android:scaleType="fitXY"
android:src="@drawable/ic_outline_info_24"
app:tint="?iconColor" />
android:src="@drawable/ic_outline_info_24" />
<LinearLayout
android:layout_width="match_parent"
@ -89,8 +85,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/version_desc"
android:textColor="?textSecondary" />
android:text="@string/version_desc" />
</LinearLayout>
</LinearLayout>
@ -112,8 +107,7 @@
android:minHeight="48dp"
android:padding="9dp"
android:scaleType="fitXY"
android:src="@drawable/ic_baseline_people_24"
app:tint="?iconColor" />
android:src="@drawable/ic_baseline_people_24" />
<LinearLayout
android:layout_width="match_parent"
@ -134,8 +128,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/author_desc"
android:textColor="?textSecondary" />
android:text="@string/author_desc" />
</LinearLayout>
</LinearLayout>
@ -157,8 +150,7 @@
android:minHeight="48dp"
android:padding="9dp"
android:scaleType="fitXY"
android:src="@drawable/ic_baseline_code_24"
app:tint="?iconColor" />
android:src="@drawable/ic_baseline_code_24" />
<LinearLayout
android:layout_width="match_parent"
@ -179,8 +171,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/teapod_repo"
android:textColor="?textSecondary" />
android:text="@string/teapod_repo" />
</LinearLayout>
</LinearLayout>
@ -202,8 +193,7 @@
android:minHeight="48dp"
android:padding="9dp"
android:scaleType="fitXY"
android:src="@drawable/ic_baseline_description_24"
app:tint="?iconColor" />
android:src="@drawable/ic_baseline_description_24" />
<LinearLayout
android:layout_width="match_parent"
@ -224,8 +214,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/license_desc"
android:textColor="?textSecondary" />
android:text="@string/license_desc" />
</LinearLayout>
</LinearLayout>
@ -267,8 +256,7 @@
android:layout_marginEnd="7dp"
android:paddingBottom="5dp"
android:text="@string/tmdb_notice"
android:textAlignment="center"
android:textColor="?textSecondary" />
android:textAlignment="center" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>

89
app/src/main/res/layout/fragment_account.xml
View File

@ -4,7 +4,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?themePrimary"
tools:context=".ui.activity.main.fragments.AccountFragment">
<ScrollView
@ -23,7 +22,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:background="?themeSecondary"
android:elevation="5dp"
android:orientation="vertical">
@ -34,7 +32,7 @@
android:paddingStart="7dp"
android:paddingEnd="7dp"
android:text="@string/account"
android:textSize="16sp"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:textStyle="bold" />
<LinearLayout
@ -55,8 +53,7 @@
android:minHeight="48dp"
android:padding="9dp"
android:scaleType="fitXY"
android:src="@drawable/ic_baseline_account_box_24"
app:tint="?iconColor" />
android:src="@drawable/ic_baseline_account_box_24" />
<LinearLayout
android:layout_width="match_parent"
@ -69,15 +66,14 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/account_login_ex"
android:textSize="16sp" />
android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />
<TextView
android:id="@+id/text_account_login_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/account_login_desc"
android:textColor="?textSecondary" />
android:text="@string/account_login_desc" />
</LinearLayout>
</LinearLayout>
@ -99,8 +95,7 @@
android:minHeight="48dp"
android:padding="9dp"
android:scaleType="fitXY"
android:src="@drawable/ic_baseline_access_time_24"
app:tint="?iconColor" />
android:src="@drawable/ic_baseline_access_time_24" />
<LinearLayout
android:layout_width="match_parent"
@ -113,15 +108,14 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/loading"
android:textSize="16sp" />
android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />
<TextView
android:id="@+id/text_account_subscription_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/account_tier"
android:textColor="?textSecondary" />
android:text="@string/account_tier" />
</LinearLayout>
</LinearLayout>
@ -132,7 +126,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:background="?themeSecondary"
android:elevation="5dp"
android:orientation="vertical">
@ -143,7 +136,7 @@
android:paddingStart="7dp"
android:paddingEnd="7dp"
android:text="@string/settings"
android:textSize="16sp"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:textStyle="bold" />
<LinearLayout
@ -162,8 +155,7 @@
android:minHeight="48dp"
android:padding="9dp"
android:scaleType="fitXY"
android:src="@drawable/ic_baseline_language_24"
app:tint="?iconColor" />
android:src="@drawable/ic_baseline_language_24" />
<LinearLayout
android:layout_width="match_parent"
@ -175,14 +167,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings_content_language"
android:textSize="16sp" />
android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />
<TextView
android:id="@+id/text_settings_content_language_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings_content_language_desc"
android:textColor="?textSecondary" />
android:text="@string/settings_content_language_desc" />
</LinearLayout>
</LinearLayout>
@ -203,8 +194,7 @@
android:minHeight="48dp"
android:padding="9dp"
android:scaleType="fitXY"
android:src="@drawable/ic_baseline_subtitles_24"
app:tint="?iconColor" />
android:src="@drawable/ic_baseline_subtitles_24" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@ -226,7 +216,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/settings_prefer_subbed"
android:textSize="16sp" />
android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />
<TextView
android:id="@+id/text_settings_secondary_desc"
@ -234,8 +224,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:maxLines="2"
android:text="@string/settings_prefer_subbed_desc"
android:textColor="?textSecondary" />
android:text="@string/settings_prefer_subbed_desc" />
</LinearLayout>
<com.google.android.material.switchmaterial.SwitchMaterial
@ -268,8 +257,7 @@
android:minWidth="48dp"
android:minHeight="48dp"
android:padding="9dp"
android:src="@drawable/ic_baseline_autorenew_24"
app:tint="?iconColor" />
android:src="@drawable/ic_baseline_autorenew_24" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@ -290,14 +278,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings_autoplay"
android:textSize="16sp" />
android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />
<TextView
android:id="@+id/text_settings_auoplay_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings_autoplay_desc"
android:textColor="?textSecondary" />
android:text="@string/settings_autoplay_desc" />
</LinearLayout>
<com.google.android.material.switchmaterial.SwitchMaterial
@ -331,8 +318,7 @@
android:minHeight="48dp"
android:padding="9dp"
android:scaleType="fitXY"
android:src="@drawable/ic_baseline_style_24"
app:tint="?iconColor" />
android:src="@drawable/ic_baseline_style_24" />
<LinearLayout
android:layout_width="match_parent"
@ -345,15 +331,14 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/theme"
android:textSize="16sp" />
android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />
<TextView
android:id="@+id/text_theme_selected"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/theme_light"
android:textColor="?textSecondary" />
android:text="@string/theme_light" />
</LinearLayout>
</LinearLayout>
@ -365,7 +350,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:background="?themeSecondary"
android:clipToPadding="false"
android:elevation="5dp"
android:orientation="vertical">
@ -377,7 +361,7 @@
android:paddingStart="7dp"
android:paddingEnd="7dp"
android:text="@string/dev_settings"
android:textSize="16sp"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:textStyle="bold" />
<LinearLayout
@ -397,8 +381,7 @@
android:minHeight="48dp"
android:padding="9dp"
android:scaleType="fitXY"
android:src="@drawable/ic_baseline_access_time_24"
app:tint="?iconColor" />
android:src="@drawable/ic_baseline_access_time_24" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@ -419,14 +402,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/update_playhead"
android:textSize="16sp" />
android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />
<TextView
android:id="@+id/text_update_playhead_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/update_playhead_desc"
android:textColor="?textSecondary" />
android:text="@string/update_playhead_desc" />
</LinearLayout>
<com.google.android.material.switchmaterial.SwitchMaterial
@ -462,8 +444,7 @@
android:minHeight="48dp"
android:padding="9dp"
android:scaleType="fitXY"
app:srcCompat="@drawable/ic_outline_upload_24"
app:tint="?iconColor" />
app:srcCompat="@drawable/ic_outline_upload_24" />
<LinearLayout
android:layout_width="match_parent"
@ -483,8 +464,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/export_data_desc"
android:textColor="?textSecondary" />
android:text="@string/export_data_desc" />
</LinearLayout>
</LinearLayout>
@ -508,8 +488,7 @@
android:minHeight="48dp"
android:padding="9dp"
android:scaleType="fitXY"
app:srcCompat="@drawable/ic_outline_download_24"
app:tint="?iconColor" />
app:srcCompat="@drawable/ic_outline_download_24" />
<LinearLayout
android:layout_width="match_parent"
@ -529,8 +508,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/import_data_desc"
android:textColor="?textSecondary" />
android:text="@string/import_data_desc" />
</LinearLayout>
</LinearLayout>
@ -542,7 +520,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:background="?themeSecondary"
android:clipToPadding="false"
android:elevation="5dp"
android:orientation="vertical">
@ -554,7 +531,7 @@
android:paddingStart="7dp"
android:paddingEnd="7dp"
android:text="@string/info"
android:textSize="16sp"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:textStyle="bold" />
<LinearLayout
@ -575,8 +552,7 @@
android:minHeight="48dp"
android:padding="9dp"
android:scaleType="fitXY"
app:srcCompat="@drawable/ic_outline_info_24"
app:tint="?iconColor" />
app:srcCompat="@drawable/ic_outline_info_24" />
<LinearLayout
android:layout_width="match_parent"
@ -589,7 +565,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/info_about"
android:textSize="16sp" />
android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />
<TextView
android:id="@+id/text_info_about_desc"
@ -597,7 +573,8 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/info_about_desc"
android:textColor="?textSecondary" />
/>
<!-- android:textColor="?textSecondary" -->
</LinearLayout>
</LinearLayout>

10
app/src/main/res/layout/fragment_home.xml
View File

@ -5,7 +5,6 @@
android:id="@+id/ff_test"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?themePrimary"
tools:context=".ui.activity.main.fragments.HomeFragment">
<ScrollView
@ -70,9 +69,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/my_list"
android:textColor="?textSecondary"
android:textSize="12sp"
app:drawableTint="?buttonBackground"
app:drawableTopCompat="@drawable/ic_baseline_add_24" />
<Space
@ -87,12 +84,9 @@
android:gravity="center"
android:text="@string/button_play"
android:textAllCaps="false"
android:textColor="?themePrimary"
android:textSize="16sp"
app:backgroundTint="?buttonBackground"
app:icon="@drawable/ic_baseline_play_arrow_24"
app:iconGravity="textStart"
app:iconTint="?themePrimary" />
app:iconGravity="textStart" />
<Space
android:layout_width="0dp"
@ -105,9 +99,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/info"
android:textColor="?textSecondary"
android:textSize="12sp"
app:drawableTint="?buttonBackground"
app:drawableTopCompat="@drawable/ic_outline_info_24" />
<Space

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

@ -4,14 +4,12 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?themePrimary"
tools:context=".ui.activity.main.fragments.LibraryFragment">
<org.mosad.teapod.ui.components.EmptySubmitSearchView
android:id="@+id/search_text"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="?themeSecondary"
android:elevation="8dp"
android:iconifiedByDefault="false"
android:paddingBottom="5dp"

19
app/src/main/res/layout/fragment_media.xml
View File

@ -4,7 +4,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?themePrimary"
tools:context=".ui.activity.main.fragments.MediaFragment">
<androidx.coordinatorlayout.widget.CoordinatorLayout
@ -14,8 +13,7 @@
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?themePrimary">
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/linear_media"
@ -108,12 +106,9 @@
android:gravity="center"
android:text="@string/button_play"
android:textAllCaps="false"
android:textColor="?themePrimary"
android:textSize="16sp"
app:backgroundTint="?buttonBackground"
app:icon="@drawable/ic_baseline_play_arrow_24"
app:iconGravity="textStart"
app:iconTint="?themePrimary" />
app:iconGravity="textStart" />
<TextView
android:id="@+id/text_title"
@ -163,15 +158,13 @@
android:paddingTop="11dp"
android:paddingEnd="11dp"
android:paddingBottom="7dp"
android:src="@drawable/ic_baseline_add_24"
app:tint="?buttonBackground" />
android:src="@drawable/ic_baseline_add_24" />
<TextView
android:id="@+id/text_my_list_action"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/my_list"
android:textColor="?textSecondary"
android:textSize="12sp" />
</LinearLayout>
@ -186,9 +179,7 @@
android:layout_marginEnd="7dp"
android:background="@android:color/transparent"
app:tabGravity="start"
app:tabMode="scrollable"
app:tabSelectedTextColor="?textPrimary"
app:tabTextColor="?textSecondary" />
app:tabMode="scrollable" />
</LinearLayout>
</com.google.android.material.appbar.AppBarLayout>
@ -207,7 +198,7 @@
android:id="@+id/frame_loading"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?themePrimary"
android:background="?android:colorBackground"
android:visibility="gone">
<com.google.android.material.progressindicator.CircularProgressIndicator

6
app/src/main/res/layout/fragment_my_lists.xml
View File

@ -4,7 +4,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?themePrimary"
tools:context=".ui.activity.main.fragments.MyListsFragment">
<com.google.android.material.tabs.TabLayout
@ -15,9 +14,8 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tabMode="fixed"
app:tabSelectedTextColor="?textPrimary"
app:tabTextColor="?textSecondary">
app:tabMode="fixed">
<!-- TODO app:tabTextColor="?colorOnPrimary" -->
<com.google.android.material.tabs.TabItem
android:layout_width="wrap_content"

7
app/src/main/res/layout/fragment_on_login.xml
View File

@ -2,8 +2,7 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?themePrimary">
android:layout_height="match_parent">
<ImageView
android:id="@+id/image_login"
@ -11,12 +10,12 @@
android:layout_height="128dp"
android:contentDescription="@string/app_name"
android:scaleType="fitCenter"
android:tint="?colorTeapodIcon"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_launcher_foreground"
app:tint="?buttonBackground" />
app:srcCompat="@drawable/ic_launcher_foreground" />
<LinearLayout
android:id="@+id/linear_login"

8
app/src/main/res/layout/fragment_on_welcome.xml
View File

@ -1,11 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?themePrimary">
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@ -17,12 +15,12 @@
android:layout_height="128dp"
android:contentDescription="@string/app_name"
android:scaleType="fitCenter"
android:tint="?colorTeapodIcon"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_launcher_foreground"
app:tint="?buttonBackground" />
app:srcCompat="@drawable/ic_launcher_foreground" />
<LinearLayout
android:id="@+id/linearLayout3"

12
app/src/main/res/layout/item_episode.xml
View File

@ -24,8 +24,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@string/component_poster_desc"
app:shapeAppearance="@style/ShapeAppearance.Teapod.RoundedPoster"
app:srcCompat="@color/imagePlaceholder" />
android:src="@drawable/placeholder_image"
app:shapeAppearance="@style/ShapeAppearance.Teapod.RoundedPoster" />
<ImageView
android:id="@+id/image_episode_play"
@ -56,7 +56,6 @@
android:ellipsize="end"
android:maxLines="3"
android:text="@string/component_episode_title"
android:textColor="?textPrimary"
android:textSize="16sp" />
<ImageView
@ -65,8 +64,7 @@
android:layout_height="30dp"
android:layout_margin="2dp"
android:contentDescription="@string/component_watched_desc"
app:srcCompat="@drawable/ic_baseline_check_circle_24"
app:tint="?iconColor" />
app:srcCompat="@drawable/ic_baseline_check_circle_24" />
</LinearLayout>
<TextView
@ -74,6 +72,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="3"
android:textColor="?textSecondary" />
android:maxLines="3" />
<!-- TODO android:textColor="?textSecondary" -->
</LinearLayout>

10
app/src/main/res/layout/item_episode_player.xml
View File

@ -15,8 +15,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@string/component_poster_desc"
app:shapeAppearance="@style/ShapeAppearance.Teapod.RoundedPoster"
app:srcCompat="@color/imagePlaceholder" />
android:src="@drawable/placeholder_image"
app:shapeAppearance="@style/ShapeAppearance.Teapod.RoundedPoster" />
<ImageView
android:id="@+id/image_episode_play"
@ -44,7 +44,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="7dp"
android:text="@string/component_episode_title"
android:textColor="@color/textPrimaryDark"
android:textColor="@color/player_text"
android:textSize="16sp" />
<View
@ -53,7 +53,7 @@
android:layout_height="1dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:background="@color/textSecondaryDark" />
android:background="@color/player_text_secondary" />
<TextView
android:id="@+id/text_episode_desc2"
@ -62,6 +62,6 @@
android:layout_marginTop="5dp"
android:maxLines="10"
android:text="@string/text_overview_ex"
android:textColor="@color/textPrimaryDark" />
android:textColor="@color/player_text" />
</LinearLayout>

9
app/src/main/res/layout/item_highlight_shimmer.xml
View File

@ -3,8 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?themePrimary">
android:layout_height="wrap_content">
<ImageView
android:id="@+id/shimmer_image_highlight"
@ -21,7 +20,6 @@
android:id="@+id/shimmer_linear_highlight"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="?themePrimary"
android:orientation="vertical"
android:paddingBottom="7dp"
app:layout_constraintBottom_toBottomOf="parent"
@ -56,7 +54,6 @@
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="12sp"
app:drawableTint="?shapeTextBackground"
app:drawableTopCompat="@drawable/ic_baseline_add_24" />
<Space
@ -69,8 +66,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="16sp"
app:backgroundTint="?shapeTextBackground" />
android:textSize="16sp" />
<Space
android:layout_width="0dp"
@ -82,7 +78,6 @@
android:layout_width="64dp"
android:layout_height="wrap_content"
android:gravity="center"
app:drawableTint="?shapeTextBackground"
app:drawableTopCompat="@drawable/ic_outline_info_24" />
<Space

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

@ -8,7 +8,6 @@
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:backgroundTint="?themeSecondary"
app:cardCornerRadius="7dp"
app:cardElevation="4dp"
app:cardUseCompatPadding="true"

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

@ -8,7 +8,6 @@
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:backgroundTint="?themeSecondary"
app:cardCornerRadius="7dp"
app:cardElevation="4dp"
app:cardUseCompatPadding="true"
@ -35,7 +34,6 @@
android:id="@+id/image_poster"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?shapeTextBackground"
tools:ignore="ContentDescription" />
</FrameLayout>

7
app/src/main/res/layout/modal_bottom_sheet_login.xml
View File

@ -4,7 +4,6 @@
android:id="@+id/standard_bottom_sheet"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?themeSecondary"
android:orientation="vertical"
android:paddingTop="24dp"
android:paddingStart="24dp"
@ -61,8 +60,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="24dp"
android:text="@string/cancel"
android:textColor="?colorPrimary" />
android:text="@string/cancel" />
<Button
android:id="@+id/positive_button"
@ -70,8 +68,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="24dp"
android:text="@string/save"
android:textColor="?colorPrimary" />
android:text="@string/save" />
</LinearLayout>
</LinearLayout>

8
app/src/main/res/layout/player_language_settings.xml
View File

@ -138,9 +138,9 @@
android:layout_marginEnd="7dp"
android:text="@string/cancel"
android:textAllCaps="false"
android:textColor="@color/player_white"
android:textColor="@color/button_text_color_light"
android:textSize="16sp"
app:backgroundTint="@color/buttonBackgroundLight"
app:backgroundTint="@color/button_background_light"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -151,9 +151,9 @@
android:layout_height="wrap_content"
android:text="@string/apply"
android:textAllCaps="false"
android:textColor="@color/themePrimaryDark"
android:textColor="@color/button_text_color_dark"
android:textSize="16sp"
app:backgroundTint="@color/buttonBackgroundDark"
app:backgroundTint="@color/button_background_dark"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"

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

@ -55,6 +55,7 @@
<string name="theme">Design</string>
<string name="theme_light">Hell</string>
<string name="theme_dark">Dunkel</string>
<string name="theme_system">System</string>
<string name="dev_settings">Entwickler Einstellungen</string>
<string name="update_playhead">Playhead Updates</string>
<string name="update_playhead_desc">Fortschritt bei Episoden auf cr updaten</string>

44
app/src/main/res/values-night/themes.xml Normal file
View File

@ -0,0 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Widget.App.Button" parent="Widget.Material3.Button">
<item name="backgroundTint">@color/button_background_dark</item>
<item name="android:textColor">@color/button_text_color_dark</item>
<item name="iconTint">@color/button_text_color_dark</item>
</style>
<style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar">
<!-- <item name="materialButtonStyle">@style/Widget.App.Button</item>-->
<item name="searchViewStyle">@style/SearchViewStyle</item>
<item name="materialCardViewStyle">?attr/materialCardViewElevatedStyle</item>
<item name="colorPrimary">@color/seed</item>
<item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
<item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/md_theme_dark_onPrimaryContainer</item>
<item name="colorSecondary">@color/md_theme_dark_secondary</item>
<item name="colorOnSecondary">@color/md_theme_dark_onSecondary</item>
<item name="colorSecondaryContainer">@color/md_theme_dark_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/md_theme_dark_onSecondaryContainer</item>
<item name="colorTertiary">@color/md_theme_dark_tertiary</item>
<item name="colorOnTertiary">@color/md_theme_dark_onTertiary</item>
<item name="colorTertiaryContainer">@color/md_theme_dark_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/md_theme_dark_onTertiaryContainer</item>
<item name="colorError">@color/md_theme_dark_error</item>
<item name="colorErrorContainer">@color/md_theme_dark_errorContainer</item>
<item name="colorOnError">@color/md_theme_dark_onError</item>
<item name="colorOnErrorContainer">@color/md_theme_dark_onErrorContainer</item>
<item name="android:colorBackground">@color/md_theme_dark_background</item>
<item name="colorOnBackground">@color/md_theme_dark_onBackground</item>
<item name="colorSurface">@color/md_theme_dark_surface</item>
<item name="colorOnSurface">@color/md_theme_dark_onSurface</item>
<item name="colorSurfaceVariant">@color/md_theme_dark_surfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/md_theme_dark_onSurfaceVariant</item>
<item name="colorOutline">@color/md_theme_dark_outline</item>
<item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item>
<item name="colorTeapodIcon">@color/button_background_dark</item>
</style>
</resources>

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

@ -1,10 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<attr format="color" name="themePrimary"/>
<attr format="color" name="themeSecondary"/>
<attr format="color" name="textPrimary"/>
<attr format="color" name="textSecondary"/>
<attr format="color" name="iconColor"/>
<attr format="color" name="buttonBackground"/>
<attr format="color" name="shapeTextBackground"/>
<attr format="color" name="colorTeapodIcon"/>
</resources>

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

@ -1,34 +1,83 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- base theme colors -->
<color name="colorPrimary">#66aa00</color>
<color name="colorPrimaryLight">#99dc45</color>
<color name="colorPrimaryDark">#317a00</color>
<color name="colorAccent">#607d8b</color>
<color name="imagePlaceholder">#c2c2c2</color>
<!-- light theme colors -->
<color name="themePrimaryLight">#ffffff</color>
<color name="themeSecondaryLight">#ffffff</color>
<color name="textPrimaryLight">#de000000</color>
<color name="textSecondaryLight">#99000000</color>
<color name="textBackgroundLight">#55000000</color>
<color name="iconColorLight">#99000000</color>
<color name="buttonBackgroundLight">#000000</color>
<color name="button_background_light">#000000</color>
<color name="button_text_color_light">#ffffff</color>
<!-- dark theme colors -->
<color name="themePrimaryDark">#121212</color>
<color name="themeSecondaryDark">#202020</color>
<color name="textPrimaryDark">#deffffff</color>
<color name="textSecondaryDark">#99ffffff</color>
<color name="textBackgroundDark">#55ffffff</color>
<color name="iconColorDark">#99ffffff</color>
<color name="buttonBackgroundDark">#ffffff</color>
<color name="controlHighlightDark">#11ffffff</color>
<color name="button_background_dark">#ffffff</color>
<color name="button_text_color_dark">#000000</color>
<!-- material3 colors -->
<color name="seed">#66aa00</color> <!-- base/primary color -->
<color name="md_theme_light_primary">#3E6A00</color>
<color name="md_theme_light_onPrimary">#FFFFFF</color>
<color name="md_theme_light_primaryContainer">#99d853</color>
<color name="md_theme_light_onPrimaryContainer">#0F2000</color>
<color name="md_theme_light_secondary">#416916</color>
<color name="md_theme_light_onSecondary">#FFFFFF</color>
<color name="md_theme_light_secondaryContainer">#C1F18E</color>
<color name="md_theme_light_onSecondaryContainer">#0E2000</color>
<color name="md_theme_light_tertiary">#006783</color>
<color name="md_theme_light_onTertiary">#FFFFFF</color>
<color name="md_theme_light_tertiaryContainer">#BDE9FF</color>
<color name="md_theme_light_onTertiaryContainer">#001F2A</color>
<color name="md_theme_light_error">#BA1A1A</color>
<color name="md_theme_light_errorContainer">#FFDAD6</color>
<color name="md_theme_light_onError">#FFFFFF</color>
<color name="md_theme_light_onErrorContainer">#410002</color>
<color name="md_theme_light_background">#FDFCF5</color>
<color name="md_theme_light_onBackground">#1B1C18</color>
<color name="md_theme_light_surface">#FDFCF5</color>
<color name="md_theme_light_onSurface">#1B1C18</color>
<color name="md_theme_light_surfaceVariant">#E1E4D5</color>
<color name="md_theme_light_onSurfaceVariant">#44483D</color>
<color name="md_theme_light_outline">#75796C</color>
<color name="md_theme_light_inverseOnSurface">#F2F1E9</color>
<color name="md_theme_light_inverseSurface">#30312C</color>
<color name="md_theme_light_inversePrimary">#92DA3E</color>
<color name="md_theme_light_shadow">#000000</color>
<color name="md_theme_light_surfaceTint">#3E6A00</color>
<color name="md_theme_light_outlineVariant">#C5C8BA</color>
<color name="md_theme_light_scrim">#000000</color>
<color name="md_theme_dark_primary">#92DA3E</color>
<color name="md_theme_dark_onPrimary">#1E3700</color>
<color name="md_theme_dark_primaryContainer">#2D5000</color>
<color name="md_theme_dark_onPrimaryContainer">#ACF758</color>
<color name="md_theme_dark_secondary">#A6D475</color>
<color name="md_theme_dark_onSecondary">#1D3700</color>
<color name="md_theme_dark_secondaryContainer">#2C5000</color>
<color name="md_theme_dark_onSecondaryContainer">#C1F18E</color>
<color name="md_theme_dark_tertiary">#65D3FF</color>
<color name="md_theme_dark_onTertiary">#003546</color>
<color name="md_theme_dark_tertiaryContainer">#004D64</color>
<color name="md_theme_dark_onTertiaryContainer">#BDE9FF</color>
<color name="md_theme_dark_error">#FFB4AB</color>
<color name="md_theme_dark_errorContainer">#93000A</color>
<color name="md_theme_dark_onError">#690005</color>
<color name="md_theme_dark_onErrorContainer">#FFDAD6</color>
<color name="md_theme_dark_background">#1B1C18</color>
<color name="md_theme_dark_onBackground">#E3E3DB</color>
<color name="md_theme_dark_surface">#1B1C18</color>
<color name="md_theme_dark_onSurface">#E3E3DB</color>
<color name="md_theme_dark_surfaceVariant">#44483D</color>
<color name="md_theme_dark_onSurfaceVariant">#C5C8BA</color>
<color name="md_theme_dark_outline">#8E9285</color>
<color name="md_theme_dark_inverseOnSurface">#1B1C18</color>
<color name="md_theme_dark_inverseSurface">#E3E3DB</color>
<color name="md_theme_dark_inversePrimary">#3E6A00</color>
<color name="md_theme_dark_shadow">#000000</color>
<color name="md_theme_dark_surfaceTint">#92DA3E</color>
<color name="md_theme_dark_outlineVariant">#44483D</color>
<color name="md_theme_dark_scrim">#000000</color>
<!-- player colors -->
<color name="player_white">#ffffff</color>
<color name="player_text">#deffffff</color>
<color name="player_text_secondary">#99ffffff</color>
<!-- launcher/splash screen colors -->
<color name="ic_launcher_background">#ffffff</color>
<color name="ic_splash_background">#ffffff</color>
</resources>

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

@ -69,6 +69,7 @@
<string name="theme">Theme</string>
<string name="theme_light">Light</string>
<string name="theme_dark">Dark</string>
<string name="theme_system">System</string>
<string name="dev_settings">Developer Settings</string>
<string name="update_playhead">Playhead updates</string>
<string name="update_playhead_desc">Update episode playhead on cr</string>

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

@ -1,57 +1,6 @@
<resources>
<!-- application themes -->
<style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="popupMenuStyle">@style/Widget.App.PopupMenu</item>
<item name="searchViewStyle">@style/SearchViewStyle</item>
</style>
<style name="AppTheme.Light" parent="AppTheme">
<item name="themePrimary">@color/themePrimaryLight</item>
<item name="themeSecondary">@color/themeSecondaryLight</item>
<item name="textPrimary">@color/textPrimaryLight</item>
<item name="textSecondary">@color/textSecondaryLight</item>
<item name="android:textColor">@color/textPrimaryLight</item>
<item name="android:textColorPrimary">@color/textPrimaryLight</item>
<item name="android:textColorHint">@color/textSecondaryLight</item>
<item name="shapeTextBackground">@color/textBackgroundLight</item>
<item name="iconColor">@color/iconColorLight</item>
<item name="buttonBackground">@color/buttonBackgroundLight</item>
</style>
<style name="AppTheme.Dark" parent="AppTheme">
<item name="themePrimary">@color/themePrimaryDark</item>
<item name="themeSecondary">@color/themeSecondaryDark</item>
<item name="textPrimary">@color/textPrimaryDark</item>
<item name="textSecondary">@color/textSecondaryDark</item>
<item name="android:textColor">@color/textPrimaryDark</item>
<item name="android:textColorPrimary">@color/textPrimaryDark</item>
<item name="android:textColorHint">@color/textSecondaryDark</item>
<item name="shapeTextBackground">@color/textBackgroundDark</item>
<item name="iconColor">@color/iconColorDark</item>
<item name="buttonBackground">@color/buttonBackgroundDark</item>
<item name="materialAlertDialogTheme">@style/ThemeOverlay.App.MaterialAlertDialog.Dark</item>
<!-- change on click indicator color for manually set components -->
<item name="colorControlHighlight">@color/controlHighlightDark</item>
</style>
<!-- dialog themes -->
<style name="ThemeOverlay.App.MaterialAlertDialog.Dark" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorSurface">@color/themeSecondaryDark</item>
<item name="colorOnSurface">@color/textPrimaryDark</item>
<item name="android:colorControlNormal">@color/textSecondaryDark</item> <!-- Radio button unchecked-->
<item name="materialAlertDialogTitleTextStyle">@style/MaterialAlertDialog.App.Title.Text</item>
</style>
<style name="MaterialAlertDialog.App.Title.Text" parent="MaterialAlertDialog.MaterialComponents.Title.Text">
<item name="android:textColor">?textPrimary</item>
</style>
<!-- search view theme -->
<!-- search view style -->
<style name="SearchViewStyle" parent="Widget.AppCompat.SearchView.ActionBar">
<item name="iconifiedByDefault">false</item>
<item name="searchIcon">@drawable/ic_baseline_search_24</item>
@ -79,7 +28,7 @@
<item name="windowSplashScreenAnimationDuration">200</item>
<!-- Set the theme of the Activity that directly follows your splash screen. -->
<item name="postSplashScreenTheme">@style/AppTheme.Dark</item> # Required.
<item name="postSplashScreenTheme">@style/AppTheme</item> <!-- Required -->
</style>
<!-- shapes -->
@ -88,11 +37,6 @@
<item name="cornerSize">5dp</item>
</style>
<!-- popup menus -->
<style name="Widget.App.PopupMenu" parent="Widget.MaterialComponents.PopupMenu">
<item name="android:popupBackground">?themeSecondary</item>
</style>
<!-- fullscreen dialog fragments -->
<style name="FullScreenDialogStyle" parent="AppTheme">
<item name="android:windowFullscreen">true</item>

42
app/src/main/res/values/themes.xml Normal file
View File

@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Widget.App.Button" parent="Widget.Material3.Button">
<item name="backgroundTint">@color/button_background_light</item>
<item name="android:textColor">@color/button_text_color_light</item>
<item name="iconTint">@color/button_text_color_light</item>
</style>
<style name="AppTheme" parent="Theme.Material3.Light.NoActionBar">
<!-- <item name="materialButtonStyle">@style/Widget.App.Button</item>-->
<item name="searchViewStyle">@style/SearchViewStyle</item>
<item name="materialCardViewStyle">?attr/materialCardViewElevatedStyle</item>
<item name="colorPrimary">@color/seed</item>
<item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
<item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item>
<item name="colorSecondary">@color/md_theme_light_secondary</item>
<item name="colorOnSecondary">@color/md_theme_light_onSecondary</item>
<item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item>
<item name="colorTertiary">@color/md_theme_light_tertiary</item>
<item name="colorOnTertiary">@color/md_theme_light_onTertiary</item>
<item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/md_theme_light_onTertiaryContainer</item>
<item name="colorError">@color/md_theme_light_error</item>
<item name="colorErrorContainer">@color/md_theme_light_errorContainer</item>
<item name="colorOnError">@color/md_theme_light_onError</item>
<item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item>
<item name="android:colorBackground">@color/md_theme_light_background</item>
<item name="colorOnBackground">@color/md_theme_light_onBackground</item>
<item name="colorSurface">@color/md_theme_light_surface</item>
<item name="colorOnSurface">@color/md_theme_light_onSurface</item>
<item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item>
<item name="colorOutline">@color/md_theme_light_outline</item>
<item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>
<item name="colorTeapodIcon">@color/button_background_light</item>
</style>
</resources>