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

Styles fixes

Browse Source
This commit is contained in:
Koitharu
2025-05-11 19:18:39 +03:00
parent 94ef64c4b7
commit ff021b56f4
13 changed files with 34 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/res/drawable/ic_expand_collapse.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:drawable="@drawable/ic_expand_less" android:state_checked="true" />
<item android:drawable="@drawable/ic_expand_more" android:state_checked="false" />
</selector>

11
app/src/main/res/drawable/ic_expand_less.xml
View File

@@ -1,11 +0,0 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M7,14l5,-5 5,5z" />
</vector>

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

@@ -70,13 +70,9 @@
<org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
android:id="@+id/button_pick_file"
android:layout_width="0dp"
android:layout_height="?android:listPreferredItemHeightSmall"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:drawablePadding="?android:listPreferredItemPaddingStart"
android:paddingStart="?android:listPreferredItemPaddingStart"
android:paddingEnd="?android:listPreferredItemPaddingEnd"
android:text="@string/pick_custom_file"
android:textAppearance="?attr/textAppearanceButton"
app:drawableStartCompat="@drawable/ic_folder_file"
app:layout_constraintEnd_toEndOf="@id/textView_cover_title"
app:layout_constraintStart_toStartOf="@id/textView_cover_title"
@@ -85,12 +81,8 @@
<org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
android:id="@+id/button_pick_page"
android:layout_width="0dp"
android:layout_height="?android:listPreferredItemHeightSmall"
android:drawablePadding="?android:listPreferredItemPaddingStart"
android:paddingStart="?android:listPreferredItemPaddingStart"
android:paddingEnd="?android:listPreferredItemPaddingEnd"
android:layout_height="wrap_content"
android:text="@string/pick_manga_page"
android:textAppearance="?attr/textAppearanceButton"
android:visibility="gone"
app:drawableStartCompat="@drawable/ic_grid"
app:layout_constraintEnd_toEndOf="@id/textView_cover_title"
@@ -100,12 +92,8 @@
<org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
android:id="@+id/button_reset_cover"
android:layout_width="0dp"
android:layout_height="?android:listPreferredItemHeightSmall"
android:drawablePadding="?android:listPreferredItemPaddingStart"
android:paddingStart="?android:listPreferredItemPaddingStart"
android:paddingEnd="?android:listPreferredItemPaddingEnd"
android:layout_height="wrap_content"
android:text="@string/use_default_cover"
android:textAppearance="?attr/textAppearanceButton"
app:drawableStartCompat="@drawable/ic_revert"
app:layout_constraintEnd_toEndOf="@id/textView_cover_title"
app:layout_constraintStart_toStartOf="@id/textView_cover_title"
@@ -120,6 +108,7 @@
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/layout_name"
style="?textInputOutlinedStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/screen_padding"

18
app/src/main/res/layout/dialog_download.xml
View File

@@ -47,7 +47,7 @@
android:id="@+id/option_whole_branch"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:button="@drawable/ic_expand_more"
android:button="?expandCollapseIndicator"
android:drawablePadding="?android:listPreferredItemPaddingStart"
android:minHeight="?android:listPreferredItemHeightSmall"
android:paddingStart="?android:listPreferredItemPaddingStart"
@@ -62,7 +62,7 @@
android:id="@+id/option_first_chapters"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:button="@drawable/ic_expand_more"
android:button="?expandCollapseIndicator"
android:drawablePadding="?android:listPreferredItemPaddingStart"
android:minHeight="?android:listPreferredItemHeightSmall"
android:paddingStart="?android:listPreferredItemPaddingStart"
@@ -76,7 +76,7 @@
android:id="@+id/option_unread_chapters"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:button="@drawable/ic_expand_more"
android:button="?expandCollapseIndicator"
android:drawablePadding="?android:listPreferredItemPaddingStart"
android:minHeight="?android:listPreferredItemHeightSmall"
android:paddingStart="?android:listPreferredItemPaddingStart"
@@ -105,33 +105,35 @@
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/switch_start"
android:layout_width="match_parent"
android:layout_height="?android:listPreferredItemHeightSmall"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_small"
android:checked="true"
android:drawablePadding="?android:listPreferredItemPaddingStart"
android:ellipsize="end"
android:minHeight="?android:listPreferredItemHeightSmall"
android:paddingStart="?android:listPreferredItemPaddingStart"
android:paddingEnd="?android:listPreferredItemPaddingEnd"
android:singleLine="true"
android:text="@string/start_download"
android:textAppearance="?attr/textAppearanceButton"
android:textAppearance="?textAppearanceListItem"
android:textColor="?colorOnSurfaceVariant" />
<CheckedTextView
android:id="@+id/textView_more"
android:layout_width="match_parent"
android:layout_height="?android:listPreferredItemHeightSmall"
android:layout_height="wrap_content"
android:background="@drawable/list_selector"
android:checked="false"
android:drawableEnd="@drawable/ic_expand_collapse"
android:drawableEnd="?expandCollapseIndicator"
android:drawablePadding="?android:listPreferredItemPaddingStart"
android:ellipsize="end"
android:gravity="center_vertical"
android:minHeight="?android:listPreferredItemHeightSmall"
android:paddingStart="?android:listPreferredItemPaddingStart"
android:paddingEnd="?android:listPreferredItemPaddingEnd"
android:singleLine="true"
android:text="@string/more_options"
android:textAppearance="?attr/textAppearanceButton"
android:textAppearance="?textAppearanceListItem"
android:textColor="?colorOnSurfaceVariant" />
<TextView

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

@@ -3,9 +3,6 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="?android:listPreferredItemHeightSmall"
android:drawablePadding="?android:listPreferredItemPaddingStart"
android:paddingStart="?android:listPreferredItemPaddingStart"
android:paddingEnd="?android:listPreferredItemPaddingEnd"
android:textAppearance="?attr/textAppearanceButton"
android:layout_height="wrap_content"
android:textAppearance="?attr/textAppearanceListItem"
tools:text="@tools:sample/full_names" />

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

@@ -51,7 +51,7 @@
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_expand_collapse"
app:srcCompat="@drawable/m3_split_button_chevron_avd"
app:tint="?colorControlActivated"
tools:visibility="visible" />

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

@@ -64,7 +64,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:minWidth="48dp"
app:icon="@drawable/m3_split_button_chevron_avd"
app:icon="?expandCollapseIndicator"
app:toggleCheckedStateOnClick="false" />
</com.google.android.material.button.MaterialSplitButton>

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

@@ -143,7 +143,7 @@
android:paddingEnd="?android:listPreferredItemPaddingEnd"
android:singleLine="true"
android:text="@string/group"
android:textAppearance="?attr/textAppearanceButton"
android:textAppearance="?attr/textAppearanceListItem"
android:textColor="?colorOnSurfaceVariant"
android:visibility="gone"
app:drawableStartCompat="@drawable/ic_list_group"

28
app/src/main/res/layout/sheet_reader_config.xml
View File

@@ -30,10 +30,6 @@
android:id="@+id/button_save_page"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawablePadding="?android:listPreferredItemPaddingStart"
android:minHeight="?android:listPreferredItemHeightSmall"
android:paddingStart="?android:listPreferredItemPaddingStart"
android:paddingEnd="?android:listPreferredItemPaddingEnd"
android:text="@string/save_page"
app:drawableStartCompat="@drawable/ic_save" />
@@ -41,10 +37,6 @@
android:id="@+id/button_bookmark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawablePadding="?android:listPreferredItemPaddingStart"
android:minHeight="?android:listPreferredItemHeightSmall"
android:paddingStart="?android:listPreferredItemPaddingStart"
android:paddingEnd="?android:listPreferredItemPaddingEnd"
android:text="@string/bookmark_add"
app:drawableStartCompat="@drawable/ic_bookmark" />
@@ -53,10 +45,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableEnd="@drawable/ic_expand_more_22px"
android:drawablePadding="?android:listPreferredItemPaddingStart"
android:minHeight="?android:listPreferredItemHeightSmall"
android:paddingStart="?android:listPreferredItemPaddingStart"
android:paddingEnd="?android:listPreferredItemPaddingEnd"
android:text="@string/image_server"
android:visibility="gone"
app:drawableStartCompat="@drawable/ic_images"
@@ -145,10 +133,6 @@
android:id="@+id/button_screen_rotate"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawablePadding="?android:listPreferredItemPaddingStart"
android:minHeight="?android:listPreferredItemHeightSmall"
android:paddingStart="?android:listPreferredItemPaddingStart"
android:paddingEnd="?android:listPreferredItemPaddingEnd"
android:text="@string/rotate_screen"
android:visibility="gone"
app:drawableStartCompat="@drawable/ic_screen_rotation"
@@ -175,10 +159,6 @@
android:id="@+id/button_scroll_timer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawablePadding="?android:listPreferredItemPaddingStart"
android:minHeight="?android:listPreferredItemHeightSmall"
android:paddingStart="?android:listPreferredItemPaddingStart"
android:paddingEnd="?android:listPreferredItemPaddingEnd"
android:text="@string/automatic_scroll"
app:drawableStartCompat="@drawable/ic_timer" />
@@ -186,10 +166,6 @@
android:id="@+id/button_color_filter"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawablePadding="?android:listPreferredItemPaddingStart"
android:minHeight="?android:listPreferredItemHeightSmall"
android:paddingStart="?android:listPreferredItemPaddingStart"
android:paddingEnd="?android:listPreferredItemPaddingEnd"
android:text="@string/color_correction"
app:drawableStartCompat="@drawable/ic_appearance" />
@@ -197,10 +173,6 @@
android:id="@+id/button_settings"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawablePadding="?android:listPreferredItemPaddingStart"
android:minHeight="?android:listPreferredItemHeightSmall"
android:paddingStart="?android:listPreferredItemPaddingStart"
android:paddingEnd="?android:listPreferredItemPaddingEnd"
android:text="@string/settings"
app:drawableStartCompat="@drawable/ic_settings" />

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

@@ -26,14 +26,16 @@
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:text="@tools:sample/cities" />
tools:text="@tools:sample/cities"
tools:textAppearance="?textAppearanceListItem" />
<TextView
android:id="@+id/subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
tools:text="@tools:sample/lorem[12]" />
tools:text="@tools:sample/lorem[12]"
tools:textAppearance="?textAppearanceBodySmall" />
</LinearLayout>
@@ -46,5 +48,5 @@
android:minWidth="?minTouchTargetSize"
android:minHeight="?minTouchTargetSize"
android:scaleType="center"
tools:src="@drawable/ic_expand_more" />
tools:src="?expandCollapseIndicator" />
</merge>

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

@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<attr name="expandCollapseIndicator" format="reference" />
<attr name="sliderPreferenceStyle" />
<attr name="multiAutoCompleteTextViewPreferenceStyle" />
<attr name="autoCompleteTextViewPreferenceStyle" />

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

@@ -144,6 +144,10 @@
<item name="android:insetTop">2dp</item>
<item name="android:insetBottom">2dp</item>
<item name="android:textAppearance">?textAppearanceListItem</item>
<item name="android:minHeight">?android:listPreferredItemHeightSmall</item>
<item name="android:drawablePadding">?android:listPreferredItemPaddingStart</item>
<item name="android:paddingStart">?android:listPreferredItemPaddingStart</item>
<item name="android:paddingEnd">?android:listPreferredItemPaddingEnd</item>
</style>
<style name="Widget.Kotatsu.TwoLinesItemView" parent="">
@@ -155,7 +159,7 @@
<item name="android:insetBottom">2dp</item>
<item name="android:orientation">horizontal</item>
<item name="android:textColor">@color/list_item_text_color</item>
<item name="titleTextAppearance">?attr/textAppearanceButton</item>
<item name="titleTextAppearance">?attr/textAppearanceTitleSmall</item>
<item name="subtitleTextAppearance">?attr/textAppearanceBodySmall</item>
</style>
@@ -264,7 +268,6 @@
<!--Preferences-->
<style name="PreferenceThemeOverlay.Kotatsu">
<item name="preferenceCategoryTitleTextAppearance">?attr/textAppearanceBodyMedium</item>
<item name="singleLineTitle">false</item>
</style>

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

@@ -38,11 +38,11 @@
<item name="colorOnErrorContainer">@color/onErrorContainer</item>
<item name="colorOutline">@color/kotatsu_outline</item>
<item name="colorOutlineVariant">@color/kotatsu_outline</item>
<!--<item name="android:divider">@color/kotatsu_outline</item>-->
<!-- Drawables (icons) -->
<item name="actionModeCloseDrawable">@drawable/abc_ic_clear_material</item>
<item name="actionModeWebSearchDrawable">@drawable/abc_ic_search_api_material</item>
<item name="expandCollapseIndicator">@drawable/m3_split_button_chevron_avd</item>
<!-- Base attributes -->
<item name="android:windowLightStatusBar" tools:targetApi="M">@bool/light_status_bar</item>
@@ -57,8 +57,6 @@
<item name="alertDialogTheme">@style/ThemeOverlay.Kotatsu.AlertDialog</item>
<item name="bottomSheetDialogTheme">@style/ThemeOverlay.Kotatsu.BottomSheetDialog</item>
<item name="sideSheetDialogTheme">@style/ThemeOverlay.Kotatsu.SideSheetDialog</item>
<item name="textInputStyle">?textInputOutlinedStyle</item>
<item name="materialCardViewStyle">?materialCardViewFilledStyle</item>
<item name="recyclerViewStyle">@style/Widget.Kotatsu.RecyclerView</item>
<item name="android:dropDownSpinnerStyle">@style/Widget.Kotatsu.Spinner.DropDown</item>
<item name="switchPreferenceCompatStyle">@style/Preference.SwitchPreferenceCompat.M3</item>
@@ -85,11 +83,8 @@
<style name="ThemeOverlay.Kotatsu.Monet" parent="ThemeOverlay.Material3.DynamicColors.Light" />
<!-- Expressive Monet theme -->
<style name="ThemeOverlay.Kotatsu.Expressive" parent="Theme.Material3Expressive.DynamicColors.DayNight.NoActionBar">
<item name="windowActionModeOverlay">true</item>
<item name="bottomSheetDialogTheme">@style/ThemeOverlay.Kotatsu.BottomSheetDialog</item>
<item name="sideSheetDialogTheme">@style/ThemeOverlay.Kotatsu.SideSheetDialog</item>
<style name="ThemeOverlay.Kotatsu.Expressive" parent="ThemeOverlay.Material3Expressive.DynamicColors.DayNight">
<!-- TODO -->
</style>
<!-- Changes only for night -->