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

Update UI

Browse Source
This commit is contained in:
Zakhar Timoshenko
2023-08-18 07:49:29 +03:00
parent 20a7e5a6a8
commit b00bc22ead
32 changed files with 150 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/TypedListSpacingDecoration.kt
View File

@@ -13,6 +13,7 @@ class TypedListSpacingDecoration(
private val spacingList = context.resources.getDimensionPixelOffset(R.dimen.list_spacing)
private val spacingGrid = context.resources.getDimensionPixelOffset(R.dimen.grid_spacing)
private val spacingGridTop = context.resources.getDimensionPixelOffset(R.dimen.grid_spacing_top)
override fun getItemOffsets(
outRect: Rect,
@@ -28,7 +29,7 @@ class TypedListSpacingDecoration(
ListItemType.FILTER_TAG -> outRect.set(0)
ListItemType.HEADER -> outRect.set(spacingList, 0, spacingList, 0)
ListItemType.MANGA_LIST -> outRect.set(0)
ListItemType.MANGA_LIST -> outRect.set(spacingList)
ListItemType.DOWNLOAD,
ListItemType.MANGA_LIST_DETAILED -> outRect.set(spacingList)
@@ -48,7 +49,7 @@ class TypedListSpacingDecoration(
null -> outRect.set(0)
ListItemType.TIP -> outRect.set(0) // TODO
ListItemType.HINT_EMPTY -> outRect.set(spacingList)
ListItemType.HINT_EMPTY,
ListItemType.FEED -> outRect.set(spacingList, 0, spacingList, 0)
}
}

10
app/src/main/kotlin/org/koitharu/kotatsu/search/ui/MangaListActivity.kt
View File

@@ -12,6 +12,7 @@ import androidx.core.view.updatePadding
import androidx.fragment.app.Fragment
import androidx.fragment.app.commit
import com.google.android.material.appbar.AppBarLayout
import com.google.android.material.appbar.AppBarLayout.OnOffsetChangedListener
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.flowOn
@@ -24,6 +25,7 @@ import org.koitharu.kotatsu.core.ui.BaseActivity
import org.koitharu.kotatsu.core.ui.model.titleRes
import org.koitharu.kotatsu.core.util.ext.getParcelableExtraCompat
import org.koitharu.kotatsu.core.util.ext.getSerializableExtraCompat
import org.koitharu.kotatsu.core.util.ext.getThemeColor
import org.koitharu.kotatsu.core.util.ext.observe
import org.koitharu.kotatsu.core.util.ext.setTextAndVisible
import org.koitharu.kotatsu.databinding.ActivityMangaListBinding
@@ -38,6 +40,7 @@ import org.koitharu.kotatsu.parsers.model.Manga
import org.koitharu.kotatsu.parsers.model.MangaSource
import org.koitharu.kotatsu.parsers.model.MangaTag
import org.koitharu.kotatsu.remotelist.ui.RemoteListFragment
import kotlin.math.abs
@AndroidEntryPoint
class MangaListActivity :
@@ -57,6 +60,13 @@ class MangaListActivity :
setContentView(ActivityMangaListBinding.inflate(layoutInflater))
val tags = intent.getParcelableExtraCompat<ParcelableMangaTags>(EXTRA_TAGS)?.tags
supportActionBar?.setDisplayHomeAsUpEnabled(true)
appBar.addOnOffsetChangedListener { appBarLayout, verticalOffset ->
if (abs(verticalOffset) - appBarLayout.totalScrollRange == 0) {
viewBinding.containerFilterHeader?.setBackgroundColor(com.google.android.material.R.attr.backgroundColor)
} else {
viewBinding.containerFilterHeader?.setBackgroundColor(R.attr.m3ColorBackground)
}
}
val source = intent.getSerializableExtraCompat(EXTRA_SOURCE) ?: tags?.firstOrNull()?.source
if (source == null) {
finishAfterTransition()

4
app/src/main/res/color-v23/bottom_menu_background.xml Normal file
View File

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

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/colorSurfaceContainerLow" />
<item android:color="?attr/m3ColorExploreButton" />
</selector>

4
app/src/main/res/color/bottom_menu_background.xml Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/kotatsu_m3_bottom_menu" />
</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="@color/kotatsu_surfaceContainerLow" />
<item android:color="@android:color/white" />
</selector>

2
app/src/main/res/color/navigation_bar_scrim.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:alpha="0.7" android:color="?attr/colorSurfaceContainerHigh" />
<item android:alpha="0.7" android:color="?attr/m3ColorBackground" />
</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/colorSurfaceContainerHigh"/>
<solid android:color="?attr/m3ColorBackground"/>
</shape>
</item>
</layer-list>

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

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

3
app/src/main/res/drawable/ic_explore_normal.xml
View File

@@ -2,10 +2,9 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#000000"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:fillColor="?attr/colorControlNormal"
android:pathData="M12,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,8zM6.5,17.5l7.51,-3.49L17.5,6.5 9.99,9.99 6.5,17.5zM12,10.9c0.61,0 1.1,0.49 1.1,1.1s-0.49,1.1 -1.1,1.1 -1.1,-0.49 -1.1,-1.1 0.49,-1.1 1.1,-1.1z" />
</vector>

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_surfaceContainerHigh"/>
<solid android:color="@color/kotatsu_m3_background"/>
</shape>
</item>
</layer-list>

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

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

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

@@ -102,7 +102,6 @@
<com.google.android.material.card.MaterialCardView
android:id="@+id/card_chapters"
style="@style/Widget.Kotatsu.CardView.Light"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="@dimen/side_card_offset"

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

@@ -35,7 +35,6 @@
<com.google.android.material.card.MaterialCardView
android:id="@+id/card_side"
style="@style/Widget.Kotatsu.CardView.Light"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="@dimen/side_card_offset"

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

@@ -39,7 +39,6 @@
<com.google.android.material.card.MaterialCardView
android:id="@+id/card_details"
style="@style/Widget.Kotatsu.CardView.Light"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="@dimen/side_card_offset"

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

@@ -10,7 +10,8 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="true">
android:fitsSystemWindows="true"
app:liftOnScroll="true">
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsingToolbarLayout"
@@ -36,7 +37,7 @@
android:layout_height="wrap_content"
android:visibility="invisible"
app:icon="@drawable/ic_reorder"
tools:text="@string/manage"
tools:text="@string/newest"
tools:visibility="visible" />
</LinearLayout>

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

@@ -17,10 +17,11 @@
android:layout_height="match_parent"
android:clipToPadding="false"
android:orientation="vertical"
android:paddingHorizontal="@dimen/list_spacing"
android:paddingVertical="@dimen/list_spacing"
app:bubbleSize="small"
tools:layoutManager="org.koitharu.kotatsu.core.ui.list.FitHeightLinearLayoutManager"
tools:listitem="@layout/item_manga_list" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
</FrameLayout>

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

@@ -3,7 +3,6 @@
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"
style="@style/Widget.Kotatsu.CardView.Light"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:contentPadding="@dimen/margin_normal">

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

@@ -3,12 +3,10 @@
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"
style="@style/Widget.Kotatsu.CardView.Outlined"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipChildren="false"
app:cardBackgroundColor="?attr/colorSurfaceContainerHighest"
app:cardCornerRadius="12dp"
app:cardCornerRadius="16dp"
tools:layout_width="140dp">
<LinearLayout

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

@@ -4,7 +4,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="72dp"
android:layout_height="wrap_content"
android:background="@drawable/list_selector"
android:clipChildren="false">
@@ -13,8 +13,8 @@
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:background="?colorSurfaceContainer"
android:scaleType="centerCrop"
app:layout_constraintBottom_toBottomOf="parent"

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

@@ -3,7 +3,6 @@
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"
style="?materialCardViewOutlinedStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_small">

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

@@ -7,7 +7,6 @@
android:layout_height="wrap_content"
android:layout_marginVertical="8dp"
android:layout_marginHorizontal="8dp"
app:cardBackgroundColor="?attr/colorSurfaceContainerLow"
app:shapeAppearance="?shapeAppearanceCornerExtraLarge"
tools:icon="@drawable/ic_notification"
tools:primaryButtonText="@string/settings"

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

@@ -37,7 +37,10 @@
<item name="colorOnErrorContainer">@color/m3_sys_color_dark_on_error_container</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_container_high</item>
<item name="android:colorBackground">@android:color/system_neutral2_900</item>
<item name="m3ColorBackground">@android:color/system_neutral2_900</item>
<item name="m3ColorExploreButton">@android:color/system_neutral2_800</item>
<item name="m3ColorBottomMenuBackground">@android:color/system_neutral2_800</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>

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

@@ -4,41 +4,45 @@
~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
-->
<resources>
<color name="kotatsu_primary">#D0BCFF</color>
<color name="kotatsu_primaryContainer">#4F378B</color>
<color name="kotatsu_onPrimary">#371E73</color>
<color name="kotatsu_onPrimaryContainer">#EADDFF</color>
<color name="kotatsu_inversePrimary">#6750A4</color>
<color name="kotatsu_secondary">#CCC2DC</color>
<color name="kotatsu_secondaryContainer">#4A4458</color>
<color name="kotatsu_onSecondary">#332D41</color>
<color name="kotatsu_onSecondaryContainer">#E8DEF8</color>
<color name="kotatsu_tertiary">#EFB8C8</color>
<color name="kotatsu_tertiaryContainer">#633B48</color>
<color name="kotatsu_onTertiary">#492532</color>
<color name="kotatsu_onTertiaryContainer">#FFD8E4</color>
<color name="kotatsu_surface">#141218</color>
<color name="kotatsu_surfaceDim">#141218</color>
<color name="kotatsu_surfaceBright">#141218</color>
<color name="kotatsu_surfaceContainerLowest">#0F0D13</color>
<color name="kotatsu_surfaceContainerLow">#1D1B20</color>
<color name="kotatsu_surfaceContainer">#211F26</color>
<color name="kotatsu_surfaceContainerHigh">#2B2930</color>
<color name="kotatsu_surfaceContainerHighest">#36343B</color>
<color name="kotatsu_surfaceVariant">#49454F</color>
<color name="kotatsu_onSurface">#E6E1E5</color>
<color name="kotatsu_onSurfaceVariant">#CAC4D0</color>
<color name="kotatsu_inverseSurface">#E6E1E5</color>
<color name="kotatsu_inverseOnSurface">#313033</color>
<color name="kotatsu_background">#141218</color>
<color name="kotatsu_onBackground">#E6E1E5</color>
<color name="kotatsu_error">#F2B8B5</color>
<color name="kotatsu_errorContainer">#8C1D18</color>
<color name="kotatsu_onError">#601410</color>
<color name="kotatsu_onErrorContainer">#F9DEDC</color>
<color name="kotatsu_outline">#938F99</color>
<color name="kotatsu_outlineVariant">#444746</color>
<color name="kotatsu_primary">#ABC7FF</color>
<color name="kotatsu_primaryContainer">#00458F</color>
<color name="kotatsu_onPrimary">#002F65</color>
<color name="kotatsu_onPrimaryContainer">#D7E3FF</color>
<color name="kotatsu_inversePrimary">#205DAF</color>
<color name="kotatsu_secondary">#BEC6DC</color>
<color name="kotatsu_secondaryContainer">#3E4759</color>
<color name="kotatsu_onSecondary">#283041</color>
<color name="kotatsu_onSecondaryContainer">#DAE2F9</color>
<color name="kotatsu_tertiary">#DDBCE0</color>
<color name="kotatsu_tertiaryContainer">#573E5C</color>
<color name="kotatsu_onTertiary">#3F2844</color>
<color name="kotatsu_onTertiaryContainer">#FAD8FD</color>
<color name="kotatsu_surface">#121316</color>
<color name="kotatsu_surfaceDim">#121316</color>
<color name="kotatsu_surfaceBright">#38393C</color>
<color name="kotatsu_surfaceContainerLowest">#0D0E11</color>
<color name="kotatsu_surfaceContainerLow">#1A1B1F</color>
<color name="kotatsu_surfaceContainer">#1F1F23</color>
<color name="kotatsu_surfaceContainerHigh">#292A2D</color>
<color name="kotatsu_surfaceContainerHighest">#343538</color>
<color name="kotatsu_surfaceVariant">#44474E</color>
<color name="kotatsu_onSurface">#C7C6CA</color>
<color name="kotatsu_onSurfaceVariant">#C4C6D0</color>
<color name="kotatsu_inverseSurface">#E3E2E6</color>
<color name="kotatsu_inverseOnSurface">#1A1B1F</color>
<color name="kotatsu_background">#1A1B1F</color>
<color name="kotatsu_onBackground">#E3E2E6</color>
<color name="kotatsu_error">#FFB4AB</color>
<color name="kotatsu_errorContainer">#93000A</color>
<color name="kotatsu_onError">#690005</color>
<color name="kotatsu_onErrorContainer">#FFDAD6</color>
<color name="kotatsu_outline">#8E9099</color>
<color name="kotatsu_outlineVariant">#44474E</color>
<color name="kotatsu_shadow">#000000</color>
<color name="kotatsu_surfaceTint">#D0BCFF</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_bottom_menu">#2F3033</color>
<color name="kotatsu_m3_content_scrim">#2F3033</color>
</resources>

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

@@ -6,6 +6,9 @@
<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="m3ColorBottomMenuBackground">@color/surface_amoled</item>
</style>
</resources>

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

@@ -45,7 +45,11 @@
<item name="colorOnErrorContainer">@color/m3_sys_color_light_on_error_container</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">@color/m3_sys_color_dynamic_light_surface_container_high</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="m3ColorBottomMenuBackground">@android:color/system_neutral2_100</item>
<item name="liftOnScrollColor">@android:color/system_neutral2_100</item>
<!-- Default Framework Text Colors. -->
<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>

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

@@ -8,6 +8,9 @@
<attr name="listItemTextViewStyle" />
<attr name="fastScrollerStyle" />
<attr name="tipViewStyle" />
<attr name="m3ColorBackground" />
<attr name="m3ColorExploreButton" />
<attr name="m3ColorBottomMenuBackground" />
<!--CoverImageView attrs-->
<declare-styleable name="CoverImageView">

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

@@ -7,6 +7,7 @@
<color name="onErrorContainer">#410001</color>
<!-- AMOLED Theme -->
<color name="view_amoled">#0C0C0C</color>
<color name="surface_amoled">#000001</color>
<color name="background_amoled">#000000</color>

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

@@ -4,41 +4,45 @@
~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
-->
<resources>
<color name="kotatsu_primary">#6750A4</color>
<color name="kotatsu_primaryContainer">#EADDFF</color>
<color name="kotatsu_primary">#0059C8</color>
<color name="kotatsu_primaryContainer">#D9E2FF</color>
<color name="kotatsu_onPrimary">#FFFFFF</color>
<color name="kotatsu_onPrimaryContainer">#21005E</color>
<color name="kotatsu_inversePrimary">#D0BCFF</color>
<color name="kotatsu_secondary">#625B71</color>
<color name="kotatsu_secondaryContainer">#E8DEF8</color>
<color name="kotatsu_onPrimaryContainer">#001944</color>
<color name="kotatsu_inversePrimary">#AFC6FF</color>
<color name="kotatsu_secondary">#575E71</color>
<color name="kotatsu_secondaryContainer">#DBE2F9</color>
<color name="kotatsu_onSecondary">#FFFFFF</color>
<color name="kotatsu_onSecondaryContainer">#1E192B</color>
<color name="kotatsu_tertiary">#7D5260</color>
<color name="kotatsu_tertiaryContainer">#FFD8E4</color>
<color name="kotatsu_onSecondaryContainer">#141B2C</color>
<color name="kotatsu_tertiary">#725573</color>
<color name="kotatsu_tertiaryContainer">#FDD7FB</color>
<color name="kotatsu_onTertiary">#FFFFFF</color>
<color name="kotatsu_onTertiaryContainer">#370B1E</color>
<color name="kotatsu_surface">#FEF7FF</color>
<color name="kotatsu_surfaceDim">#DED8E1</color>
<color name="kotatsu_surfaceBright">#FEF7FF</color>
<color name="kotatsu_onTertiaryContainer">#2A132C</color>
<color name="kotatsu_surface">#FBF8FD</color>
<color name="kotatsu_surfaceDim">#DBD9DD</color>
<color name="kotatsu_surfaceBright">#FBF8FD</color>
<color name="kotatsu_surfaceContainerLowest">#FFFFFF</color>
<color name="kotatsu_surfaceContainerLow">#F7F2FA</color>
<color name="kotatsu_surfaceContainer">#F3EDF7</color>
<color name="kotatsu_surfaceContainerHigh">#ECE6F0</color>
<color name="kotatsu_surfaceContainerHighest">#E6E0E9</color>
<color name="kotatsu_surfaceVariant">#E7E0EC</color>
<color name="kotatsu_onSurface">#1C1B1F</color>
<color name="kotatsu_onSurfaceVariant">#49454E</color>
<color name="kotatsu_inverseSurface">#313033</color>
<color name="kotatsu_inverseOnSurface">#F4EFF4</color>
<color name="kotatsu_background">#FEF7FF</color>
<color name="kotatsu_onBackground">#1C1B1F</color>
<color name="kotatsu_error">#B3261E</color>
<color name="kotatsu_errorContainer">#F9DEDC</color>
<color name="kotatsu_surfaceContainerLow">#F5F3F7</color>
<color name="kotatsu_surfaceContainer">#EFEDF1</color>
<color name="kotatsu_surfaceContainerHigh">#E9E7EC</color>
<color name="kotatsu_surfaceContainerHighest">#E3E2E6</color>
<color name="kotatsu_surfaceVariant">#E1E2EC</color>
<color name="kotatsu_onSurface">#1B1B1F</color>
<color name="kotatsu_onSurfaceVariant">#44464F</color>
<color name="kotatsu_inverseSurface">#303034</color>
<color name="kotatsu_inverseOnSurface">#F2F0F4</color>
<color name="kotatsu_background">#FEFBFF</color>
<color name="kotatsu_onBackground">#1B1B1F</color>
<color name="kotatsu_error">#BA1A1A</color>
<color name="kotatsu_errorContainer">#FFDAD6</color>
<color name="kotatsu_onError">#FFFFFF</color>
<color name="kotatsu_onErrorContainer">#410E0B</color>
<color name="kotatsu_outline">#74777F</color>
<color name="kotatsu_outlineVariant">#C4C7C5</color>
<color name="kotatsu_onErrorContainer">#410002</color>
<color name="kotatsu_outline">#757780</color>
<color name="kotatsu_outlineVariant">#C5C6D0</color>
<color name="kotatsu_shadow">#000000</color>
<color name="kotatsu_surfaceTint">#6750A4</color>
<color name="kotatsu_surfaceTint">#0059C8</color>
<color name="kotatsu_scrim">#000000</color>
<color name="kotatsu_m3_background">#EDF0FF</color>
<color name="kotatsu_m3_exploreButton">#FFFFFF</color>
<color name="kotatsu_m3_bottom_menu">#D9E2FF</color>
<color name="kotatsu_m3_content_scrim">#D9E2FF</color>
</resources>

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

@@ -9,6 +9,7 @@
<dimen name="toolbar_height_expanded">172dp</dimen>
<dimen name="grid_spacing">8dp</dimen>
<dimen name="grid_spacing_top">12dp</dimen>
<dimen name="list_spacing">8dp</dimen>
<dimen name="grid_spacing_outer">2dp</dimen>
<dimen name="grid_spacing_outer_double">4dp</dimen>

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

@@ -2,15 +2,19 @@
<!--Toolbars-->
<style name="Widget.Kotatsu.CollapsingToolbar" parent="@style/Widget.Material3.CollapsingToolbar.Medium">
<item name="contentScrim">?attr/m3ColorBottomMenuBackground</item>
</style>
<style name="Widget.Kotatsu.AppBarLayout" parent="@style/Widget.Material3.AppBarLayout">
<item name="android:background">?attr/colorSurfaceContainerHigh</item>
<item name="android:background">?attr/m3ColorBackground</item>
</style>
<!--Navigation Views-->
<style name="Widget.Kotatsu.BottomNavigationView" parent="Widget.Material3.BottomNavigationView">
<item name="labelVisibilityMode">labeled</item>
<item name="android:background">?attr/colorSurfaceContainerHighest</item>
<item name="android:background">?attr/m3ColorBottomMenuBackground</item>
<item name="itemActiveIndicatorStyle">@style/Widget.Kotatsu.BottomNavigationView.ActiveIndicator</item>
<item name="itemIconTint">@color/bottom_menu_active_item</item>
</style>
@@ -73,8 +77,9 @@
<item name="cardBackgroundColor">?attr/colorSurfaceContainerLow</item>
</style>
<style name="Widget.Kotatsu.CardView.Light" parent="Widget.Material3.CardView.Filled">
<item name="cardBackgroundColor">?colorBackgroundFloating</item>
<style name="Widget.Kotatsu.MaterialCardView.Filled" parent="Widget.Material3.CardView.Filled">
<item name="cardBackgroundColor">?attr/m3ColorExploreButton</item>
<item name="shapeAppearance">?attr/shapeAppearanceCornerExtraLarge</item>
</style>
<style name="Widget.Kotatsu.Tabs" parent="@style/Widget.Material3.TabLayout">
@@ -102,7 +107,7 @@
</style>
<style name="Widget.Kotatsu.Chip" parent="Widget.Material3.Chip.Suggestion">
<item name="chipBackgroundColor">?attr/colorSurfaceContainerHigh</item>
<item name="chipBackgroundColor">?attr/m3ColorBackground</item>
<item name="android:textColor">?attr/colorOnSurfaceVariant</item>
<item name="chipStrokeColor">?attr/colorOutline</item>
<item name="chipIconTint">?attr/colorControlNormal</item>
@@ -188,7 +193,7 @@
<item name="subtitleTextAppearance">?attr/textAppearanceBodySmall</item>
</style>
<style name="Widget.Kotatsu.ExploreButton" parent="Widget.Material3.Button.TonalButton.Icon">
<style name="Widget.Kotatsu.ExploreButton" parent="Widget.Material3.Button.ElevatedButton.Icon">
<item name="android:minHeight">54dp</item>
<item name="android:singleLine">true</item>
<item name="shapeAppearance">?shapeAppearanceCornerExtraLarge</item>
@@ -203,7 +208,10 @@
<item name="android:insetBottom">2dp</item>
<item name="android:gravity">start|center_vertical</item>
<item name="android:textAppearance">?textAppearanceButton</item>
<item name="backgroundTint">?attr/colorSurfaceContainerLow</item>
<item name="backgroundTint">?attr/m3ColorExploreButton</item>
<!-- Hack. Removing shadow. For AMOLED -->
<item name="android:outlineProvider">none</item>
<item name="elevation">3dp</item>
</style>
<style name="Widget.Kotatsu.TextView.Indicator" parent="Widget.MaterialComponents.TextView">

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

@@ -34,7 +34,11 @@
<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_surfaceContainerHigh</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="m3ColorBottomMenuBackground">@color/kotatsu_m3_bottom_menu</item>
<item name="liftOnScrollColor">@color/kotatsu_m3_content_scrim</item>
<item name="colorOnBackground">@color/kotatsu_onSurface</item>
<item name="colorError">@color/error</item>
<item name="colorErrorContainer">@color/errorContainer</item>
@@ -74,13 +78,13 @@
<item name="appBarLayoutStyle">@style/Widget.Kotatsu.AppBarLayout</item>
<item name="bottomNavigationStyle">@style/Widget.Kotatsu.BottomNavigationView.ColoredIndicators</item>
<item name="tabStyle">@style/Widget.Kotatsu.Tabs</item>
<item name="materialCardViewStyle">@style/Widget.Material3.CardView.Filled</item>
<item name="materialCardViewStyle">@style/Widget.Kotatsu.MaterialCardView.Filled</item>
<item name="recyclerViewStyle">@style/Widget.Kotatsu.RecyclerView</item>
<item name="fastScrollerStyle">@style/Widget.Kotatsu.FastScroller</item>
<item name="listItemTextViewStyle">@style/Widget.Kotatsu.ListItemTextView</item>
<item name="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>
<item name="switchPreferenceCompatStyle">@style/Preference.SwitchPreferenceCompat.M3</item>
<item name="collapsingToolbarLayoutStyle">@style/Widget.Material3.CollapsingToolbar.Medium</item>
<item name="collapsingToolbarLayoutStyle">@style/Widget.Kotatsu.CollapsingToolbar</item>
<item name="circularProgressIndicatorStyle">@style/Widget.Kotatsu.CircularProgressIndicator</item>
<item name="linearProgressIndicatorStyle">@style/Widget.Kotatsu.LinearProgressIndicator</item>
<item name="bottomSheetDragHandleStyle">@style/Widget.Kotatsu.BottomSheet.DragHandle</item>