prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ui' of github.com:KotatsuApp/Kotatsu into devel

Browse Source
This commit is contained in:
Koitharu
2024-04-08 10:41:01 +03:00
parent 62bd5008fd f4c52654a7
commit 0aec2359cf
33 changed files with 219 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseActivity.kt
View File

@@ -127,10 +127,10 @@ abstract class BaseActivity<B : ViewBinding> :
val actionModeColor = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
ColorUtils.compositeColors(
ContextCompat.getColor(this, com.google.android.material.R.color.m3_appbar_overlay_color),
getThemeColor(R.attr.m3ColorBackground),
getThemeColor(com.google.android.material.R.attr.colorSurface),
)
} else {
ContextCompat.getColor(this, R.color.kotatsu_m3_background)
ContextCompat.getColor(this, R.color.kotatsu_background)
}
defaultStatusBarColor = window.statusBarColor
window.statusBarColor = actionModeColor

4
app/src/main/kotlin/org/koitharu/kotatsu/core/ui/sheet/BaseAdaptiveSheet.kt
View File

@@ -97,10 +97,10 @@ abstract class BaseAdaptiveSheet<B : ViewBinding> : AppCompatDialogFragment() {
val actionModeColor = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
ColorUtils.compositeColors(
ContextCompat.getColor(ctx, com.google.android.material.R.color.m3_appbar_overlay_color),
ctx.getThemeColor(R.attr.m3ColorBackground),
ctx.getThemeColor(com.google.android.material.R.attr.colorSurface),
)
} else {
ContextCompat.getColor(ctx, R.color.kotatsu_m3_background)
ContextCompat.getColor(ctx, R.color.kotatsu_surface)
}
dialog?.window?.let {
defaultStatusBarColor = it.statusBarColor

4
app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/CoverImageView.kt
View File

@@ -10,8 +10,8 @@ import com.google.android.material.imageview.ShapeableImageView
import org.koitharu.kotatsu.R
import kotlin.math.roundToInt
private const val ASPECT_RATIO_HEIGHT = 18f
private const val ASPECT_RATIO_WIDTH = 13f
private const val ASPECT_RATIO_HEIGHT = 3f
private const val ASPECT_RATIO_WIDTH = 2f
class CoverImageView @JvmOverloads constructor(
context: Context,

2
app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/TipView.kt
View File

@@ -75,7 +75,7 @@ class TipView @JvmOverloads constructor(
val shapeAppearanceModel = ShapeAppearanceModel.builder(context, attrs, defStyleAttr, 0).build()
background = MaterialShapeDrawable(shapeAppearanceModel).also {
it.fillColor = getColorStateList(R.styleable.TipView_cardBackgroundColor)
?: context.getThemeColorStateList(R.attr.m3ColorExploreButton)
?: context.getThemeColorStateList(com.google.android.material.R.attr.colorSurfaceContainerHigh)
it.strokeWidth = getDimension(R.styleable.TipView_strokeWidth, 0f)
it.strokeColor = getColorStateList(R.styleable.TipView_strokeColor)
it.elevation = getDimension(R.styleable.TipView_elevation, 0f)

2
app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Android.kt
View File

@@ -141,7 +141,7 @@ fun Window.setNavigationBarTransparentCompat(context: Context, elevation: Float,
} else {
// Set navbar scrim 70% of navigationBarColor
ElevationOverlayProvider(context).compositeOverlayIfNeeded(
context.getThemeColor(R.attr.m3ColorBottomMenuBackground, alphaFactor),
context.getThemeColor(com.google.android.material.R.attr.colorSurfaceContainer, alphaFactor),
elevation,
)
}

1
app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity2.kt
View File

@@ -527,6 +527,7 @@ class DetailsActivity2 :
viewBinding.root.updatePadding(
left = insets.left,
right = insets.right,
bottom = insets.bottom
)
}

27
app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt
View File

@@ -1,16 +1,13 @@
package org.koitharu.kotatsu.list.ui.adapter
import android.view.View
import androidx.core.view.isVisible
import androidx.lifecycle.LifecycleOwner
import coil.ImageLoader
import com.google.android.material.badge.BadgeDrawable
import com.google.android.material.chip.Chip
import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.core.ui.image.CoverSizeResolver
import org.koitharu.kotatsu.core.ui.image.TrimTransformation
import org.koitharu.kotatsu.core.ui.widgets.ChipsView
import org.koitharu.kotatsu.core.util.ext.enqueueWith
import org.koitharu.kotatsu.core.util.ext.newImageRequest
import org.koitharu.kotatsu.core.util.ext.setOnContextClickListenerCompat
@@ -20,7 +17,6 @@ import org.koitharu.kotatsu.databinding.ItemMangaListDetailsBinding
import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
import org.koitharu.kotatsu.list.ui.model.ListModel
import org.koitharu.kotatsu.list.ui.model.MangaListDetailedModel
import org.koitharu.kotatsu.parsers.model.MangaTag
fun mangaListDetailedItemAD(
coil: ImageLoader,
@@ -31,28 +27,18 @@ fun mangaListDetailedItemAD(
) {
var badge: BadgeDrawable? = null
val listenerAdapter = object : View.OnClickListener, View.OnLongClickListener, ChipsView.OnChipClickListener {
override fun onClick(v: View) = when (v.id) {
R.id.button_read -> clickListener.onReadClick(item.manga, v)
else -> clickListener.onItemClick(item.manga, v)
}
val listenerAdapter = object : View.OnClickListener, View.OnLongClickListener {
override fun onClick(v: View) = clickListener.onItemClick(item.manga, v)
override fun onLongClick(v: View): Boolean = clickListener.onItemLongClick(item.manga, v)
override fun onChipClick(chip: Chip, data: Any?) {
val tag = data as? MangaTag ?: return
clickListener.onTagClick(item.manga, tag, chip)
}
}
itemView.setOnClickListener(listenerAdapter)
itemView.setOnLongClickListener(listenerAdapter)
itemView.setOnContextClickListenerCompat(listenerAdapter)
binding.buttonRead.setOnClickListener(listenerAdapter)
binding.chipsTags.onChipClickListener = listenerAdapter
bind { payloads ->
binding.textViewTitle.text = item.title
binding.textViewSubtitle.textAndVisible = item.subtitle
binding.textViewAuthor.textAndVisible = item.manga.author
binding.progressView.setPercent(item.progress, ListModelDiffCallback.PAYLOAD_PROGRESS_CHANGED in payloads)
binding.imageViewCover.newImageRequest(lifecycleOwner, item.coverUrl)?.run {
size(CoverSizeResolver(binding.imageViewCover))
@@ -65,12 +51,7 @@ fun mangaListDetailedItemAD(
source(item.source)
enqueueWith(coil)
}
if (payloads.isEmpty()) {
binding.scrollViewTags.scrollTo(0, 0)
}
binding.chipsTags.setChips(item.tags)
binding.ratingBar.isVisible = item.manga.hasRating
binding.ratingBar.rating = binding.ratingBar.numStars * item.manga.rating
binding.textViewTags.text = item.tags.joinToString(separator = ", ") { it.title }
badge = itemView.bindBadge(badge, item.counter)
}
}

2
app/src/main/res/color-v23/colored_button.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/m3ColorExploreButton" />
<item android:color="?attr/colorSurfaceContainerHigh" />
</selector>

2
app/src/main/res/color/colored_button.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/white" />
<item android:color="@color/kotatsu_surfaceContainerHigh" />
</selector>

4
app/src/main/res/color/navigation_bar_scrim.xml
View File

@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:alpha="0.7" android:color="?attr/m3ColorBottomMenuBackground" />
</selector>

2
app/src/main/res/drawable-v23/tabs_background.xml
View File

@@ -12,7 +12,7 @@
android:bottom="1dp">
<shape
android:shape="rectangle">
<solid android:color="?attr/m3ColorBackground"/>
<solid android:color="?android:attr/colorBackground"/>
</shape>
</item>
</layer-list>

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

@@ -3,6 +3,6 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="16dp" />
<solid android:color="?m3ColorCardBackground" />
<corners android:radius="12dp" />
<solid android:color="?colorSurface" />
</shape>

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

@@ -12,7 +12,7 @@
android:bottom="1dp">
<shape
android:shape="rectangle">
<solid android:color="@color/kotatsu_m3_background"/>
<solid android:color="@color/kotatsu_background"/>
</shape>
</item>
</layer-list>

3
app/src/main/res/layout-w600dp-land/activity_settings.xml
View File

@@ -70,8 +70,7 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:theme="@style/ThemeOverlay.Kotatsu.CardContainer" />
android:layout_height="match_parent" />
</LinearLayout>

1
app/src/main/res/layout-w600dp-land/fragment_settings_sources.xml
View File

@@ -10,6 +10,5 @@
android:clipToPadding="false"
android:orientation="vertical"
android:scrollbars="vertical"
android:theme="@style/ThemeOverlay.Kotatsu.CardContainer"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem="@layout/item_source_config" />

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

@@ -40,7 +40,6 @@
style="@style/Widget.Material3.BottomSheet"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:backgroundTint="?attr/m3ColorBottomMenuBackground"
android:orientation="vertical"
android:visibility="gone"
app:behavior_hideable="false"

3
app/src/main/res/layout/activity_details_new.xml
View File

@@ -5,7 +5,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/coordinator"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:clipToPadding="false">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appbar"

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

@@ -34,8 +34,9 @@
<FrameLayout
android:id="@+id/toolbar_card"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginVertical="8dp"
android:layout_height="56dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="8dp"
android:background="@drawable/search_bar_background"
android:theme="@style/ThemeOverlay.Kotatsu.MainToolbar"
app:layout_scrollFlags="scroll|enterAlways|snap">

5
app/src/main/res/layout/activity_reader.xml
View File

@@ -36,7 +36,6 @@
android:id="@+id/appbar_top"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?m3ColorBottomMenuBackground"
android:elevation="@dimen/m3_card_elevated_elevation"
app:elevation="@dimen/m3_card_elevated_elevation"
app:liftOnScroll="false">
@@ -59,7 +58,6 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_margin="8dp"
app:cardBackgroundColor="?m3ColorBottomMenuBackground"
app:layout_insetEdge="bottom">
<com.google.android.material.appbar.MaterialToolbar
@@ -74,8 +72,7 @@
android:layout_height="wrap_content"
android:stepSize="1.0"
android:valueFrom="0"
app:labelBehavior="floating"
app:trackColorInactive="?attr/m3ColorBackground" />
app:labelBehavior="floating" />
</com.google.android.material.appbar.MaterialToolbar>

77
app/src/main/res/layout/item_manga_grid.xml
View File

@@ -1,57 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.card.MaterialCardView
<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:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipChildren="false"
app:cardCornerRadius="16dp"
android:orientation="vertical"
tools:layout_width="140dp">
<LinearLayout
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:layout_height="wrap_content">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<org.koitharu.kotatsu.core.ui.widgets.CoverImageView
android:id="@+id/imageView_cover"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?colorSurfaceContainer"
android:orientation="horizontal"
android:scaleType="centerCrop"
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover"
tools:ignore="ContentDescription"
tools:src="@tools:sample/backgrounds/scenic[5]" />
<org.koitharu.kotatsu.history.ui.util.ReadingProgressView
android:id="@+id/progressView"
android:layout_width="@dimen/card_indicator_size"
android:layout_height="@dimen/card_indicator_size"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/card_indicator_offset" />
</FrameLayout>
<TextView
android:id="@+id/textView_title"
<org.koitharu.kotatsu.core.ui.widgets.CoverImageView
android:id="@+id/imageView_cover"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:elegantTextHeight="false"
android:ellipsize="end"
android:lines="2"
android:padding="8dp"
android:textAppearance="?attr/textAppearanceTitleSmall"
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/thumbnail"
tools:text="@tools:sample/lorem" />
android:background="?colorSurfaceContainer"
android:orientation="horizontal"
android:scaleType="centerCrop"
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover"
tools:ignore="ContentDescription"
tools:src="@tools:sample/backgrounds/scenic[5]" />
</LinearLayout>
<org.koitharu.kotatsu.history.ui.util.ReadingProgressView
android:id="@+id/progressView"
android:layout_width="@dimen/card_indicator_size"
android:layout_height="@dimen/card_indicator_size"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/card_indicator_offset" />
</com.google.android.material.card.MaterialCardView>
</FrameLayout>
<TextView
android:id="@+id/textView_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:elegantTextHeight="false"
android:ellipsize="end"
android:lines="2"
android:paddingVertical="4dp"
android:textAppearance="?attr/textAppearanceTitleSmall"
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/thumbnail"
tools:text="@tools:sample/lorem" />
</LinearLayout>

133
app/src/main/res/layout/item_manga_list_details.xml
View File

@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.card.MaterialCardView
<FrameLayout
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:background="?attr/selectableItemBackground"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardCornerRadius="16dp">
android:layout_height="wrap_content">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@@ -13,14 +13,15 @@
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/imageView_cover"
android:layout_width="98dp"
android:layout_height="0dp"
android:layout_width="0dp"
android:layout_height="118dp"
android:background="?colorSurfaceContainer"
android:scaleType="centerCrop"
app:layout_constraintDimensionRatio="13:18"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="2:3"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover"
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover.Medium"
tools:src="@tools:sample/backgrounds/scenic" />
<org.koitharu.kotatsu.history.ui.util.ReadingProgressView
@@ -31,88 +32,58 @@
app:layout_constraintBottom_toBottomOf="@id/imageView_cover"
app:layout_constraintEnd_toEndOf="@id/imageView_cover" />
<TextView
android:id="@+id/textView_title"
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="12dp"
android:ellipsize="end"
android:maxLines="2"
android:textAppearance="?attr/textAppearanceTitleMedium"
android:layout_height="match_parent"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/imageView_cover"
app:layout_constraintTop_toTopOf="parent"
tools:text="@tools:sample/lorem" />
android:layout_marginStart="16dp"
android:layout_marginEnd="12dp">
<TextView
android:id="@+id/textView_subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="12dp"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxLines="2"
android:textAppearance="?attr/textAppearanceBodySmall"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/imageView_cover"
app:layout_constraintTop_toBottomOf="@+id/textView_title"
tools:text="@tools:sample/lorem/random" />
<HorizontalScrollView
android:id="@+id/scrollView_tags"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:scrollIndicators="start|end"
android:scrollbars="none"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/imageView_cover"
app:layout_constraintTop_toBottomOf="@id/textView_subtitle"
app:layout_goneMarginTop="12dp"
tools:ignore="UnusedAttribute">
<org.koitharu.kotatsu.core.ui.widgets.ChipsView
android:id="@+id/chips_tags"
android:layout_width="wrap_content"
<TextView
android:id="@+id/textView_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="12dp"
app:chipSpacingHorizontal="6dp"
app:chipSpacingVertical="6dp"
app:singleLine="true" />
</HorizontalScrollView>
android:ellipsize="end"
app:lineHeight="18dp"
android:maxLines="3"
android:textAppearance="?attr/textAppearanceBodyLarge"
tools:text="@tools:sample/lorem/random" />
<RatingBar
android:id="@+id/ratingBar"
style="?android:ratingBarStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:isIndicator="true"
android:paddingVertical="8dp"
app:layout_constraintEnd_toEndOf="@id/imageView_cover"
app:layout_constraintStart_toStartOf="@id/imageView_cover"
app:layout_constraintTop_toBottomOf="@id/imageView_cover" />
<TextView
android:id="@+id/textView_author"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxLines="1"
android:textAppearance="?attr/textAppearanceBodyMedium"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/imageView_cover"
app:layout_constraintTop_toBottomOf="@+id/textView_title"
tools:text="@tools:sample/lorem/random" />
<ImageView
android:id="@+id/button_read"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="12dp"
android:layout_marginBottom="12dp"
android:background="@drawable/bg_circle_button"
android:contentDescription="@string/read"
android:scaleType="center"
android:src="@drawable/ic_read"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/scrollView_tags"
app:layout_constraintVertical_bias="1" />
<TextView
android:id="@+id/textView_tags"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:ellipsize="end"
app:lineHeight="14dp"
android:gravity="center_vertical"
android:maxLines="2"
android:textAppearance="?attr/textAppearanceBodySmall"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/imageView_cover"
app:layout_constraintTop_toBottomOf="@+id/textView_author"
tools:text="@tools:sample/lorem/random" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
</FrameLayout>

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

@@ -39,7 +39,6 @@
<com.google.android.material.card.MaterialCardView
android:id="@+id/card_order"
style="?m3SpinnerStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
@@ -70,7 +69,6 @@
<com.google.android.material.card.MaterialCardView
android:id="@+id/card_locale"
style="?m3SpinnerStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"

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

@@ -113,7 +113,6 @@
<com.google.android.material.card.MaterialCardView
android:id="@+id/card_order"
style="?m3SpinnerStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"

28
app/src/main/res/values-night-v23/color_themes.xml
View File

@@ -36,10 +36,6 @@
<item name="colorOnErrorContainer">#FFDAD6</item>
<item name="colorOutline">#899391</item>
<item name="colorOutlineVariant">#3F4947</item>
<item name="m3ColorBackground">@color/background_miku</item>
<item name="m3ColorExploreButton">#1D2020</item>
<item name="m3ColorCardBackground">#282C2C</item>
<item name="m3ColorBottomMenuBackground">#272B2A</item>
</style>
<style name="Theme.Kotatsu.Asuka">
@@ -77,10 +73,6 @@
<item name="colorOnErrorContainer">#FFDAD6</item>
<item name="colorOutline">#A08C8B</item>
<item name="colorOutlineVariant">#534342</item>
<item name="m3ColorBackground">@color/background_asuka</item>
<item name="m3ColorExploreButton">#251E1E</item>
<item name="m3ColorCardBackground">#2E2525</item>
<item name="m3ColorBottomMenuBackground">#2F2828</item>
</style>
<style name="Theme.Kotatsu.Mion">
@@ -118,10 +110,6 @@
<item name="colorOnErrorContainer">#FFDAD6</item>
<item name="colorOutline">#8A938C</item>
<item name="colorOutlineVariant">#404943</item>
<item name="m3ColorBackground">@color/background_mion</item>
<item name="m3ColorExploreButton">#1D201E</item>
<item name="m3ColorCardBackground">#262B28</item>
<item name="m3ColorBottomMenuBackground">#272B28</item>
</style>
<style name="Theme.Kotatsu.Rikka">
@@ -159,10 +147,6 @@
<item name="colorOnErrorContainer">#FFDAD6</item>
<item name="colorOutline">#9F8C8C</item>
<item name="colorOutlineVariant">#524343</item>
<item name="m3ColorBackground">@color/background_rikka</item>
<item name="m3ColorExploreButton">#241E1E</item>
<item name="m3ColorCardBackground">#302828</item>
<item name="m3ColorBottomMenuBackground">#2F2828</item>
</style>
<style name="Theme.Kotatsu.Sakura">
@@ -200,10 +184,6 @@
<item name="colorOnErrorContainer">#FFDAD6</item>
<item name="colorOutline">#899296</item>
<item name="colorOutlineVariant">#40484B</item>
<item name="m3ColorBackground">@color/background_sakura</item>
<item name="m3ColorExploreButton">#1D2021</item>
<item name="m3ColorCardBackground">#25292B</item>
<item name="m3ColorBottomMenuBackground">#272A2C</item>
</style>
<style name="Theme.Kotatsu.Mamimi">
@@ -241,10 +221,6 @@
<item name="colorOnErrorContainer">#FFDAD6</item>
<item name="colorOutline">#9F8C8D</item>
<item name="colorOutlineVariant">#524344</item>
<item name="m3ColorBackground">@color/background_mamimi</item>
<item name="m3ColorExploreButton">#241E1E</item>
<item name="m3ColorCardBackground">#2B2323</item>
<item name="m3ColorBottomMenuBackground">#2F2828</item>
</style>
<style name="Theme.Kotatsu.Kanade">
@@ -282,9 +258,5 @@
<item name="colorOnErrorContainer">#FFDAD6</item>
<item name="colorOutline">#959595</item>
<item name="colorOutlineVariant">#494949</item>
<item name="m3ColorBackground">@color/background_kanade</item>
<item name="m3ColorExploreButton">#292929</item>
<item name="m3ColorCardBackground">#303030</item>
<item name="m3ColorBottomMenuBackground">#2C2C2C</item>
</style>
</resources>

119
app/src/main/res/values-night-v31/themes.xml
View File

@@ -9,95 +9,66 @@
<!-- From ThemeOverlay.Material3.DynamicColors.Dark -->
<style name="Theme.Kotatsu.Monet">
<item name="android:navigationBarColor">@android:color/transparent</item>
<item name="isMaterial3DynamicColorApplied">true</item>
<!-- Color palettes -->
<item name="colorPrimary">@color/m3_sys_color_dynamic_dark_primary</item>
<item name="colorPrimaryContainer">@color/m3_sys_color_dynamic_dark_primary_container</item>
<item name="colorOnPrimary">@color/m3_sys_color_dynamic_dark_on_primary</item>
<item name="colorOnPrimaryContainer">@color/m3_sys_color_dynamic_dark_on_primary_container
</item>
<item name="colorPrimaryInverse">@color/m3_sys_color_dynamic_dark_inverse_primary</item>
<item name="colorPrimaryContainer">@color/m3_sys_color_dynamic_dark_primary_container</item>
<item name="colorOnPrimaryContainer">@color/m3_sys_color_dynamic_dark_on_primary_container</item>
<item name="colorPrimaryFixed">@color/m3_sys_color_dynamic_primary_fixed</item>
<item name="colorPrimaryFixedDim">@color/m3_sys_color_dynamic_primary_fixed_dim</item>
<item name="colorOnPrimaryFixed">@color/m3_sys_color_dynamic_on_primary_fixed</item>
<item name="colorOnPrimaryFixedVariant">@color/m3_sys_color_dynamic_on_primary_fixed_variant</item>
<item name="colorSecondary">@color/m3_sys_color_dynamic_dark_secondary</item>
<item name="colorSecondaryContainer">@color/m3_sys_color_dynamic_dark_secondary_container
</item>
<item name="colorOnSecondary">@color/m3_sys_color_dynamic_dark_on_secondary</item>
<item name="colorOnSecondaryContainer">
@color/m3_sys_color_dynamic_dark_on_secondary_container
</item>
<item name="colorSecondaryContainer">@color/m3_sys_color_dynamic_dark_secondary_container</item>
<item name="colorOnSecondaryContainer">@color/m3_sys_color_dynamic_dark_on_secondary_container</item>
<item name="colorSecondaryFixed">@color/m3_sys_color_dynamic_secondary_fixed</item>
<item name="colorSecondaryFixedDim">@color/m3_sys_color_dynamic_secondary_fixed_dim</item>
<item name="colorOnSecondaryFixed">@color/m3_sys_color_dynamic_on_secondary_fixed</item>
<item name="colorOnSecondaryFixedVariant">@color/m3_sys_color_dynamic_on_secondary_fixed_variant</item>
<item name="colorTertiary">@color/m3_sys_color_dynamic_dark_tertiary</item>
<item name="colorTertiaryContainer">@color/m3_sys_color_dynamic_dark_tertiary_container
</item>
<item name="colorOnTertiary">@color/m3_sys_color_dynamic_dark_on_tertiary</item>
<item name="colorOnTertiaryContainer">
@color/m3_sys_color_dynamic_dark_on_tertiary_container
</item>
<item name="colorSurface">@color/m3_sys_color_dynamic_dark_surface</item>
<item name="colorSurfaceDim">@color/m3_sys_color_dynamic_dark_surface_dim</item>
<item name="colorSurfaceBright">@color/m3_sys_color_dynamic_dark_surface_bright</item>
<item name="colorSurfaceContainerLowest">
@color/m3_sys_color_dynamic_dark_surface_container_lowest
</item>
<item name="colorSurfaceContainerLow">
@color/m3_sys_color_dynamic_dark_surface_container_low
</item>
<item name="colorSurfaceContainer">@color/m3_sys_color_dynamic_dark_surface_container</item>
<item name="colorSurfaceContainerHigh">
@color/m3_sys_color_dynamic_dark_surface_container_high
</item>
<item name="colorSurfaceContainerHighest">
@color/m3_sys_color_dynamic_dark_surface_container_highest
</item>
<item name="colorSurfaceVariant">@color/m3_sys_color_dynamic_dark_surface_variant</item>
<item name="colorOnSurface">@color/m3_sys_color_dynamic_dark_on_surface</item>
<item name="colorOnSurfaceVariant">@color/m3_sys_color_dynamic_dark_on_surface_variant
</item>
<item name="colorSurfaceInverse">@color/m3_sys_color_dynamic_dark_inverse_surface</item>
<item name="colorOnSurfaceInverse">@color/m3_sys_color_dynamic_dark_inverse_on_surface
</item>
<item name="colorTertiaryContainer">@color/m3_sys_color_dynamic_dark_tertiary_container</item>
<item name="colorOnTertiaryContainer">@color/m3_sys_color_dynamic_dark_on_tertiary_container</item>
<item name="colorTertiaryFixed">@color/m3_sys_color_dynamic_tertiary_fixed</item>
<item name="colorTertiaryFixedDim">@color/m3_sys_color_dynamic_tertiary_fixed_dim</item>
<item name="colorOnTertiaryFixed">@color/m3_sys_color_dynamic_on_tertiary_fixed</item>
<item name="colorOnTertiaryFixedVariant">@color/m3_sys_color_dynamic_on_tertiary_fixed_variant</item>
<item name="android:colorBackground">@color/m3_sys_color_dynamic_dark_background</item>
<item name="colorOnBackground">@color/m3_sys_color_dynamic_dark_on_background</item>
<item name="colorError">@color/m3_sys_color_dark_error</item>
<item name="colorErrorContainer">@color/m3_sys_color_dark_error_container</item>
<item name="colorOnError">@color/m3_sys_color_dark_on_error</item>
<item name="colorOnErrorContainer">@color/m3_sys_color_dark_on_error_container</item>
<item name="colorSurface">@color/m3_sys_color_dynamic_dark_surface</item>
<item name="colorOnSurface">@color/m3_sys_color_dynamic_dark_on_surface</item>
<item name="colorSurfaceVariant">@color/m3_sys_color_dynamic_dark_surface_variant</item>
<item name="colorOnSurfaceVariant">@color/m3_sys_color_dynamic_dark_on_surface_variant</item>
<item name="colorSurfaceInverse">@color/m3_sys_color_dynamic_dark_inverse_surface</item>
<item name="colorOnSurfaceInverse">@color/m3_sys_color_dynamic_dark_inverse_on_surface</item>
<item name="colorSurfaceBright">@color/m3_sys_color_dynamic_dark_surface_bright</item>
<item name="colorSurfaceDim">@color/m3_sys_color_dynamic_dark_surface_dim</item>
<item name="colorSurfaceContainer">@color/m3_sys_color_dynamic_dark_surface_container</item>
<item name="colorSurfaceContainerLow">@color/m3_sys_color_dynamic_dark_surface_container_low</item>
<item name="colorSurfaceContainerHigh">@color/m3_sys_color_dynamic_dark_surface_container_high</item>
<item name="colorSurfaceContainerLowest">@color/m3_sys_color_dynamic_dark_surface_container_lowest</item>
<item name="colorSurfaceContainerHighest">@color/m3_sys_color_dynamic_dark_surface_container_highest</item>
<item name="colorOutline">@color/m3_sys_color_dynamic_dark_outline</item>
<item name="colorOutlineVariant">@color/m3_sys_color_dynamic_dark_outline_variant</item>
<item name="android:colorBackground">@color/m3_sys_color_dynamic_dark_surface</item>
<item name="m3ColorBackground">@color/m3_sys_color_dynamic_dark_surface</item>
<item name="m3ColorExploreButton">@color/m3_sys_color_dynamic_dark_surface_container_low</item>
<item name="m3ColorCardBackground">@color/m3_sys_color_dynamic_dark_surface_container_low</item>
<item name="m3ColorBottomMenuBackground">@color/m3_sys_color_dynamic_dark_surface_container_low</item>
<!-- Default Framework Text Colors. -->
<item name="android:textColorPrimary">@color/m3_dynamic_dark_default_color_primary_text
</item>
<item name="android:textColorPrimaryInverse">@color/m3_dynamic_default_color_primary_text
</item>
<item name="android:textColorSecondary">
@color/m3_dynamic_dark_default_color_secondary_text
</item>
<item name="android:textColorSecondaryInverse">
@color/m3_dynamic_default_color_secondary_text
</item>
<item name="android:textColorTertiary">@color/m3_dynamic_dark_default_color_secondary_text
</item>
<item name="android:textColorTertiaryInverse">
@color/m3_dynamic_default_color_secondary_text
</item>
<item name="android:textColorPrimaryDisableOnly">
@color/m3_dynamic_dark_primary_text_disable_only
</item>
<item name="android:textColorPrimaryInverseDisableOnly">
@color/m3_dynamic_primary_text_disable_only
</item>
<item name="colorError">@color/material_dynamic_color_dark_error</item>
<item name="colorOnError">@color/material_dynamic_color_dark_on_error</item>
<item name="colorErrorContainer">@color/material_dynamic_color_dark_error_container</item>
<item name="colorOnErrorContainer">@color/material_dynamic_color_dark_on_error_container</item>
<item name="android:textColorPrimary">@color/m3_dynamic_dark_default_color_primary_text</item>
<item name="android:textColorPrimaryInverse">@color/m3_dynamic_default_color_primary_text</item>
<item name="android:textColorSecondary">@color/m3_dynamic_dark_default_color_secondary_text</item>
<item name="android:textColorSecondaryInverse">@color/m3_dynamic_default_color_secondary_text</item>
<item name="android:textColorTertiary">@color/m3_dynamic_dark_default_color_secondary_text</item>
<item name="android:textColorTertiaryInverse">@color/m3_dynamic_default_color_secondary_text</item>
<item name="android:textColorPrimaryDisableOnly">@color/m3_dynamic_dark_primary_text_disable_only</item>
<item name="android:textColorPrimaryInverseDisableOnly">@color/m3_dynamic_primary_text_disable_only</item>
<item name="android:textColorHint">@color/m3_dynamic_dark_hint_foreground</item>
<item name="android:textColorHintInverse">@color/m3_dynamic_hint_foreground</item>
<item name="android:textColorHighlight">@color/m3_dynamic_dark_highlighted_text</item>
<item name="android:textColorHighlightInverse">@color/m3_dynamic_highlighted_text</item>
<item name="android:textColorAlertDialogListItem">
@color/m3_dynamic_dark_default_color_primary_text
</item>
<!-- Fixes -->
<item name="bottomNavigationStyle">@style/Widget.Kotatsu.BottomNavigationView</item>
<item name="android:textColorAlertDialogListItem">@color/m3_dynamic_dark_default_color_primary_text</item>
</style>
<style name="Theme.Kotatsu.AppWidgetContainer" parent="@android:style/Theme.DeviceDefault.DayNight">

4
app/src/main/res/values-night/colors_kotatsu.xml
View File

@@ -41,8 +41,4 @@
<color name="kotatsu_shadow">#000000</color>
<color name="kotatsu_surfaceTint">#ABC7FF</color>
<color name="kotatsu_scrim">#000000</color>
<color name="kotatsu_m3_background">#1A1B1F</color>
<color name="kotatsu_m3_exploreButton">#292A2D</color>
<color name="kotatsu_m3_cardBackground">#313235</color>
<color name="kotatsu_m3_bottom_menu">#2F3033</color>
</resources>

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

@@ -8,10 +8,6 @@
<style name="ThemeOverlay.Kotatsu.Amoled" parent="">
<item name="colorSurface">@color/surface_amoled</item>
<item name="android:colorBackground">@color/background_amoled</item>
<item name="m3ColorBackground">@color/background_amoled</item>
<item name="m3ColorExploreButton">@color/surface_amoled</item>
<item name="m3ColorCardBackground">@color/surface_amoled</item>
<item name="m3ColorBottomMenuBackground">@color/surface_amoled</item>
</style>
</resources>

28
app/src/main/res/values-v23/color_themes.xml
View File

@@ -36,10 +36,6 @@
<item name="colorOnErrorContainer">#410002</item>
<item name="colorOutline">#6F7977</item>
<item name="colorOutlineVariant">#BEC9C6</item>
<item name="m3ColorBackground">@color/background_miku</item>
<item name="m3ColorExploreButton">#FFFFFF</item>
<item name="m3ColorCardBackground">#FFFFFF</item>
<item name="m3ColorBottomMenuBackground">#C4FFF7</item>
</style>
<style name="Theme.Kotatsu.Asuka">
@@ -77,10 +73,6 @@
<item name="colorOnErrorContainer">#410002</item>
<item name="colorOutline">#857372</item>
<item name="colorOutlineVariant">#D8C1C0</item>
<item name="m3ColorBackground">@color/background_asuka</item>
<item name="m3ColorExploreButton">#FFFFFF</item>
<item name="m3ColorCardBackground">#FFFFFF</item>
<item name="m3ColorBottomMenuBackground">#FFDAD7</item>
</style>
<style name="Theme.Kotatsu.Mion">
@@ -118,10 +110,6 @@
<item name="colorOnErrorContainer">#410002</item>
<item name="colorOutline">#707973</item>
<item name="colorOutlineVariant">#C0C9C1</item>
<item name="m3ColorBackground">@color/background_mion</item>
<item name="m3ColorExploreButton">#FFFFFF</item>
<item name="m3ColorCardBackground">#FFFFFF</item>
<item name="m3ColorBottomMenuBackground">#CDFFE1</item>
</style>
<style name="Theme.Kotatsu.Rikka">
@@ -159,10 +147,6 @@
<item name="colorOnErrorContainer">#410002</item>
<item name="colorOutline">#787680</item>
<item name="colorOutlineVariant">#C8C5D0</item>
<item name="m3ColorBackground">@color/background_rikka</item>
<item name="m3ColorExploreButton">#FFFFFF</item>
<item name="m3ColorCardBackground">#FFFFFF</item>
<item name="m3ColorBottomMenuBackground">#F0EBFF</item>
</style>
<style name="Theme.Kotatsu.Sakura">
@@ -200,10 +184,6 @@
<item name="colorOnErrorContainer">#410002</item>
<item name="colorOutline">#837377</item>
<item name="colorOutlineVariant">#D5C2C6</item>
<item name="m3ColorBackground">@color/background_sakura</item>
<item name="m3ColorExploreButton">#FFFFFF</item>
<item name="m3ColorCardBackground">#FFFFFF</item>
<item name="m3ColorBottomMenuBackground">#FFE8ED</item>
</style>
<style name="Theme.Kotatsu.Mamimi">
@@ -241,10 +221,6 @@
<item name="colorOnErrorContainer">#410002</item>
<item name="colorOutline">#857373</item>
<item name="colorOutlineVariant">#D7C1C2</item>
<item name="m3ColorBackground">@color/background_mamimi</item>
<item name="m3ColorExploreButton">#FFFFFF</item>
<item name="m3ColorCardBackground">#FFFFFF</item>
<item name="m3ColorBottomMenuBackground">#FFE1E2</item>
</style>
<style name="Theme.Kotatsu.Kanade">
@@ -282,9 +258,5 @@
<item name="colorOnErrorContainer">#410002</item>
<item name="colorOutline">#808080</item>
<item name="colorOutlineVariant">#D5D5D5</item>
<item name="m3ColorBackground">@color/background_kanade</item>
<item name="m3ColorExploreButton">#FFFFFF</item>
<item name="m3ColorCardBackground">#FFFFFF</item>
<item name="m3ColorBottomMenuBackground">#DCDCDC</item>
</style>
</resources>

119
app/src/main/res/values-v31/themes.xml
View File

@@ -11,97 +11,66 @@
<!-- From ThemeOverlay.Material3.DynamicColors.Light -->
<style name="Theme.Kotatsu.Monet">
<item name="android:navigationBarColor">@android:color/transparent</item>
<item name="isMaterial3DynamicColorApplied">true</item>
<!-- Color palettes -->
<item name="colorPrimary">@color/m3_sys_color_dynamic_light_primary</item>
<item name="colorPrimaryContainer">@color/m3_sys_color_dynamic_light_primary_container
</item>
<item name="colorOnPrimary">@color/m3_sys_color_dynamic_light_on_primary</item>
<item name="colorOnPrimaryContainer">
@color/m3_sys_color_dynamic_light_on_primary_container
</item>
<item name="colorPrimaryInverse">@color/m3_sys_color_dynamic_light_inverse_primary</item>
<item name="colorPrimaryContainer">@color/m3_sys_color_dynamic_light_primary_container</item>
<item name="colorOnPrimaryContainer">@color/m3_sys_color_dynamic_light_on_primary_container</item>
<item name="colorPrimaryFixed">@color/m3_sys_color_dynamic_primary_fixed</item>
<item name="colorPrimaryFixedDim">@color/m3_sys_color_dynamic_primary_fixed_dim</item>
<item name="colorOnPrimaryFixed">@color/m3_sys_color_dynamic_on_primary_fixed</item>
<item name="colorOnPrimaryFixedVariant">@color/m3_sys_color_dynamic_on_primary_fixed_variant</item>
<item name="colorSecondary">@color/m3_sys_color_dynamic_light_secondary</item>
<item name="colorSecondaryContainer">@color/m3_sys_color_dynamic_light_secondary_container
</item>
<item name="colorOnSecondary">@color/m3_sys_color_dynamic_light_on_secondary</item>
<item name="colorOnSecondaryContainer">
@color/m3_sys_color_dynamic_light_on_secondary_container
</item>
<item name="colorSecondaryContainer">@color/m3_sys_color_dynamic_light_secondary_container</item>
<item name="colorOnSecondaryContainer">@color/m3_sys_color_dynamic_light_on_secondary_container</item>
<item name="colorSecondaryFixed">@color/m3_sys_color_dynamic_secondary_fixed</item>
<item name="colorSecondaryFixedDim">@color/m3_sys_color_dynamic_secondary_fixed_dim</item>
<item name="colorOnSecondaryFixed">@color/m3_sys_color_dynamic_on_secondary_fixed</item>
<item name="colorOnSecondaryFixedVariant">@color/m3_sys_color_dynamic_on_secondary_fixed_variant</item>
<item name="colorTertiary">@color/m3_sys_color_dynamic_light_tertiary</item>
<item name="colorTertiaryContainer">@color/m3_sys_color_dynamic_light_tertiary_container
</item>
<item name="colorOnTertiary">@color/m3_sys_color_dynamic_light_on_tertiary</item>
<item name="colorOnTertiaryContainer">
@color/m3_sys_color_dynamic_light_on_tertiary_container
</item>
<item name="colorSurface">@color/m3_sys_color_dynamic_light_surface</item>
<item name="colorSurfaceDim">@color/m3_sys_color_dynamic_light_surface_dim</item>
<item name="colorSurfaceBright">@color/m3_sys_color_dynamic_light_surface_bright</item>
<item name="colorSurfaceContainerLowest">
@color/m3_sys_color_dynamic_light_surface_container_lowest
</item>
<item name="colorSurfaceContainerLow">
@color/m3_sys_color_dynamic_light_surface_container_low
</item>
<item name="colorSurfaceContainer">@color/m3_sys_color_dynamic_light_surface_container
</item>
<item name="colorSurfaceContainerHigh">
@color/m3_sys_color_dynamic_light_surface_container_high
</item>
<item name="colorSurfaceContainerHighest">
@color/m3_sys_color_dynamic_light_surface_container_highest
</item>
<item name="colorSurfaceVariant">@color/m3_sys_color_dynamic_light_surface_variant</item>
<item name="colorOnSurface">@color/m3_sys_color_dynamic_light_on_surface</item>
<item name="colorOnSurfaceVariant">@color/m3_sys_color_dynamic_light_on_surface_variant
</item>
<item name="colorSurfaceInverse">@color/m3_sys_color_dynamic_light_inverse_surface</item>
<item name="colorOnSurfaceInverse">@color/m3_sys_color_dynamic_light_inverse_on_surface
</item>
<item name="colorTertiaryContainer">@color/m3_sys_color_dynamic_light_tertiary_container</item>
<item name="colorOnTertiaryContainer">@color/m3_sys_color_dynamic_light_on_tertiary_container</item>
<item name="colorTertiaryFixed">@color/m3_sys_color_dynamic_tertiary_fixed</item>
<item name="colorTertiaryFixedDim">@color/m3_sys_color_dynamic_tertiary_fixed_dim</item>
<item name="colorOnTertiaryFixed">@color/m3_sys_color_dynamic_on_tertiary_fixed</item>
<item name="colorOnTertiaryFixedVariant">@color/m3_sys_color_dynamic_on_tertiary_fixed_variant</item>
<item name="android:colorBackground">@color/m3_sys_color_dynamic_light_background</item>
<item name="colorOnBackground">@color/m3_sys_color_dynamic_light_on_background</item>
<item name="colorError">@color/m3_sys_color_light_error</item>
<item name="colorErrorContainer">@color/m3_sys_color_light_error_container</item>
<item name="colorOnError">@color/m3_sys_color_light_on_error</item>
<item name="colorOnErrorContainer">@color/m3_sys_color_light_on_error_container</item>
<item name="colorSurface">@color/m3_sys_color_dynamic_light_surface</item>
<item name="colorOnSurface">@color/m3_sys_color_dynamic_light_on_surface</item>
<item name="colorSurfaceVariant">@color/m3_sys_color_dynamic_light_surface_variant</item>
<item name="colorOnSurfaceVariant">@color/m3_sys_color_dynamic_light_on_surface_variant</item>
<item name="colorSurfaceInverse">@color/m3_sys_color_dynamic_light_inverse_surface</item>
<item name="colorOnSurfaceInverse">@color/m3_sys_color_dynamic_light_inverse_on_surface</item>
<item name="colorSurfaceBright">@color/m3_sys_color_dynamic_light_surface_bright</item>
<item name="colorSurfaceDim">@color/m3_sys_color_dynamic_light_surface_dim</item>
<item name="colorSurfaceContainer">@color/m3_sys_color_dynamic_light_surface_container</item>
<item name="colorSurfaceContainerLow">@color/m3_sys_color_dynamic_light_surface_container_low</item>
<item name="colorSurfaceContainerHigh">@color/m3_sys_color_dynamic_light_surface_container_high</item>
<item name="colorSurfaceContainerLowest">@color/m3_sys_color_dynamic_light_surface_container_lowest</item>
<item name="colorSurfaceContainerHighest">@color/m3_sys_color_dynamic_light_surface_container_highest</item>
<item name="colorOutline">@color/m3_sys_color_dynamic_light_outline</item>
<item name="colorOutlineVariant">@color/m3_sys_color_dynamic_light_outline_variant</item>
<item name="android:colorBackground">@android:color/system_neutral2_50</item>
<item name="m3ColorBackground">@android:color/system_neutral2_50</item>
<item name="m3ColorExploreButton">@android:color/white</item>
<item name="m3ColorCardBackground">@android:color/white</item>
<item name="m3ColorBottomMenuBackground">@android:color/system_neutral2_100</item>
<!-- Default Framework Text Colors. -->
<item name="colorError">@color/material_dynamic_color_light_error</item>
<item name="colorOnError">@color/material_dynamic_color_light_on_error</item>
<item name="colorErrorContainer">@color/material_dynamic_color_light_error_container</item>
<item name="colorOnErrorContainer">@color/material_dynamic_color_light_on_error_container</item>
<item name="android:textColorPrimary">@color/m3_dynamic_default_color_primary_text</item>
<item name="android:textColorPrimaryInverse">
@color/m3_dynamic_dark_default_color_primary_text
</item>
<item name="android:textColorSecondary">@color/m3_dynamic_default_color_secondary_text
</item>
<item name="android:textColorSecondaryInverse">
@color/m3_dynamic_dark_default_color_secondary_text
</item>
<item name="android:textColorPrimaryInverse">@color/m3_dynamic_dark_default_color_primary_text</item>
<item name="android:textColorSecondary">@color/m3_dynamic_default_color_secondary_text</item>
<item name="android:textColorSecondaryInverse">@color/m3_dynamic_dark_default_color_secondary_text</item>
<item name="android:textColorTertiary">@color/m3_dynamic_default_color_secondary_text</item>
<item name="android:textColorTertiaryInverse">
@color/m3_dynamic_dark_default_color_secondary_text
</item>
<item name="android:textColorPrimaryDisableOnly">
@color/m3_dynamic_primary_text_disable_only
</item>
<item name="android:textColorPrimaryInverseDisableOnly">
@color/m3_dynamic_dark_primary_text_disable_only
</item>
<item name="android:textColorTertiaryInverse">@color/m3_dynamic_dark_default_color_secondary_text</item>
<item name="android:textColorPrimaryDisableOnly">@color/m3_dynamic_primary_text_disable_only</item>
<item name="android:textColorPrimaryInverseDisableOnly">@color/m3_dynamic_dark_primary_text_disable_only</item>
<item name="android:textColorHint">@color/m3_dynamic_hint_foreground</item>
<item name="android:textColorHintInverse">@color/m3_dynamic_dark_hint_foreground</item>
<item name="android:textColorHighlight">@color/m3_dynamic_highlighted_text</item>
<item name="android:textColorHighlightInverse">@color/m3_dynamic_dark_highlighted_text
</item>
<item name="android:textColorAlertDialogListItem">
@color/m3_dynamic_default_color_primary_text
</item>
<!-- Fixes -->
<item name="bottomNavigationStyle">@style/Widget.Kotatsu.BottomNavigationView</item>
<item name="android:textColorHighlightInverse">@color/m3_dynamic_dark_highlighted_text</item>
<item name="android:textColorAlertDialogListItem">@color/m3_dynamic_default_color_primary_text</item>
</style>
<style name="Theme.Kotatsu.AppWidgetContainer" parent="@android:style/Theme.DeviceDefault.DayNight">

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

@@ -9,11 +9,6 @@
<attr name="fastScrollerStyle" />
<attr name="tipViewStyle" />
<attr name="progressButtonStyle" />
<attr name="m3ColorBackground" />
<attr name="m3ColorExploreButton" />
<attr name="m3ColorCardBackground" />
<attr name="m3ColorBottomMenuBackground" />
<attr name="m3SpinnerStyle" />
<!--CoverImageView attrs-->
<declare-styleable name="CoverImageView">
@@ -160,4 +155,8 @@
<attr name="progressColor" format="color" />
</declare-styleable>
<declare-styleable name="NonFilteringAutoCompleteTextView">
<attr name="readOnly" format="boolean" />
</declare-styleable>
</resources>

7
app/src/main/res/values/colors_kotatsu.xml
View File

@@ -41,11 +41,4 @@
<color name="kotatsu_shadow">#000000</color>
<color name="kotatsu_surfaceTint">#0059C8</color>
<color name="kotatsu_scrim">#000000</color>
<!-- Primary 95 -->
<color name="kotatsu_m3_background">#EDF0FF</color>
<!-- White -->
<color name="kotatsu_m3_exploreButton">#FFFFFF</color>
<color name="kotatsu_m3_cardBackground">#FFFFFF</color>
<!-- Primary 90 -->
<color name="kotatsu_m3_bottom_menu">#D9E2FF</color>
</resources>

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

@@ -3,18 +3,18 @@
<!--Toolbars-->
<style name="Widget.Kotatsu.CollapsingToolbar" parent="@style/Widget.Material3.CollapsingToolbar.Medium">
<item name="contentScrim">?attr/m3ColorBottomMenuBackground</item>
<item name="contentScrim">?attr/colorSurfaceContainer</item>
</style>
<style name="Widget.Kotatsu.AppBarLayout" parent="@style/Widget.Material3.AppBarLayout">
<item name="android:background">?attr/m3ColorBackground</item>
<item name="android:background">?android:attr/colorBackground</item>
</style>
<!--Navigation Views-->
<style name="Widget.Kotatsu.BottomNavigationView" parent="Widget.Material3.BottomNavigationView">
<item name="labelVisibilityMode">labeled</item>
<item name="android:background">?attr/m3ColorBottomMenuBackground</item>
<item name="android:background">?attr/colorSurfaceContainer</item>
<item name="itemActiveIndicatorStyle">@style/Widget.Kotatsu.BottomNavigationView.ActiveIndicator</item>
<item name="itemIconTint">@color/bottom_menu_active_item</item>
</style>
@@ -47,10 +47,6 @@
<item name="android:windowAnimationStyle">@style/Animation.Kotatsu.BottomSheetDialog</item>
</style>
<style name="Widget.Kotatsu.BottomSheet.Modal" parent="Widget.Material3.BottomSheet.Modal">
<item name="backgroundTint">?attr/m3ColorBottomMenuBackground</item>
</style>
<style name="Widget.Kotatsu.BottomSheet.DragHandle" parent="Widget.Material3.BottomSheet.DragHandle">
<!-- Fix weird bottom padding -->
<item name="android:paddingBottom">0dp</item>
@@ -90,7 +86,6 @@
</style>
<style name="Widget.Kotatsu.CardView.Filled" parent="Widget.Material3.CardView.Filled">
<item name="cardBackgroundColor">?attr/m3ColorCardBackground</item>
<item name="shapeAppearance">?attr/shapeAppearanceCornerExtraLarge</item>
</style>
@@ -200,7 +195,7 @@
</style>
<style name="Widget.Kotatsu.ExploreButton" parent="Widget.Material3.Button.ElevatedButton.Icon">
<item name="android:minHeight">54dp</item>
<item name="android:minHeight">56dp</item>
<item name="android:singleLine">true</item>
<item name="shapeAppearance">?shapeAppearanceCornerExtraLarge</item>
<item name="android:ellipsize">marquee</item>
@@ -214,7 +209,7 @@
<item name="android:insetBottom">2dp</item>
<item name="android:gravity">start|center_vertical</item>
<item name="android:textAppearance">?textAppearanceButton</item>
<item name="backgroundTint">?attr/m3ColorExploreButton</item>
<item name="backgroundTint">?attr/colorSurfaceContainerHigh</item>
<!-- Hack. Removing shadow. For AMOLED -->
<item name="android:outlineProvider">none</item>
<item name="elevation">24dp</item>
@@ -240,10 +235,6 @@
<item name="colorControlHighlight">@color/selector_overlay</item>
</style>
<style name="ThemeOverlay.Kotatsu.CardContainer" parent="">
<item name="android:colorBackground">?m3ColorCardBackground</item>
</style>
<style name="ThemeOverlay.Kotatsu.ActionMode" parent="">
<item name="colorOnSurface">?colorPrimary</item>
<item name="colorControlNormal">?colorPrimary</item>
@@ -265,8 +256,8 @@
<style name="TextAppearance.Kotatsu.Menu" parent="TextAppearance.Material3.BodyLarge" />
<style name="TextAppearance.Kotatsu.SectionHeader" parent="TextAppearance.Material3.LabelLarge">
<item name="android:textColor">?android:attr/textColorSecondary</item>
<style name="TextAppearance.Kotatsu.SectionHeader" parent="TextAppearance.Material3.BodyLarge">
<item name="android:textStyle"></item>
</style>
<style name="TextAppearance.Kotatsu.SectionHeader2" parent="TextAppearance.Material3.LabelSmall">
@@ -286,17 +277,17 @@
<!-- Shapes -->
<style name="ShapeAppearanceOverlay.Kotatsu.Cover" parent="">
<item name="cornerSize">16dp</item>
</style>
<style name="ShapeAppearanceOverlay.Kotatsu.Cover.Medium" parent="">
<item name="cornerSize">12dp</item>
</style>
<style name="ShapeAppearanceOverlay.Kotatsu.Cover.Small" parent="">
<style name="ShapeAppearanceOverlay.Kotatsu.Cover.Medium" parent="">
<item name="cornerSize">8dp</item>
</style>
<style name="ShapeAppearanceOverlay.Kotatsu.Cover.Small" parent="">
<item name="cornerSize">4dp</item>
</style>
<style name="ShapeAppearanceOverlay.Kotatsu.Circle" parent="">
<item name="cornerFamily">rounded</item>
<item name="cornerSize">50%</item>

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

@@ -34,11 +34,6 @@
<item name="colorOnSurfaceVariant">@color/kotatsu_onSurfaceVariant</item>
<item name="colorSurfaceInverse">@color/kotatsu_inverseSurface</item>
<item name="colorOnSurfaceInverse">@color/kotatsu_inverseOnSurface</item>
<item name="android:colorBackground">@color/kotatsu_m3_background</item>
<item name="m3ColorBackground">@color/kotatsu_m3_background</item>
<item name="m3ColorExploreButton">@color/kotatsu_m3_exploreButton</item>
<item name="m3ColorCardBackground">@color/kotatsu_m3_cardBackground</item>
<item name="m3ColorBottomMenuBackground">@color/kotatsu_m3_bottom_menu</item>
<item name="colorOnBackground">@color/kotatsu_onSurface</item>
<item name="colorError">@color/error</item>
<item name="colorErrorContainer">@color/errorContainer</item>
@@ -91,11 +86,9 @@
<item name="circularProgressIndicatorStyle">
@style/Widget.Kotatsu.CircularProgressIndicator
</item>
<item name="linearProgressIndicatorStyle">@style/Widget.Kotatsu.LinearProgressIndicator
</item>
<item name="linearProgressIndicatorStyle">@style/Widget.Kotatsu.LinearProgressIndicator</item>
<item name="bottomSheetDragHandleStyle">@style/Widget.Kotatsu.BottomSheet.DragHandle</item>
<item name="android:dropDownSpinnerStyle">@style/Widget.Kotatsu.Spinner.DropDown</item>
<item name="m3SpinnerStyle">@style/Widget.Kotatsu.Material3.Spinner</item>
<!-- Text appearance -->
<item name="actionMenuTextAppearance">@style/TextAppearance.Kotatsu.Menu</item>