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

Update chapters list ui, add bookmark indicator

Browse Source
This commit is contained in:
Koitharu
2023-06-01 17:55:57 +03:00
parent 84f41810c5
commit 2e3be00e26
26 changed files with 202 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?colorControlNormal"
android:tint="?colorError"
android:viewportWidth="24"
android:viewportHeight="24">
<path

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

@@ -48,38 +48,51 @@
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.BottomSheet"
tools:visibility="visible">
<org.koitharu.kotatsu.core.ui.widgets.BottomSheetHeaderBar
android:id="@+id/header_chapters"
<LinearLayout
android:id="@+id/layout_bs_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.Kotatsu.MainToolbar"
app:fitStatusBar="true"
tools:menu="@menu/opt_chapters">
android:orientation="vertical">
<ImageView
android:id="@+id/button_dropdown"
android:layout_width="wrap_content"
<com.google.android.material.bottomsheet.BottomSheetDragHandleView
android:id="@+id/dragHandle"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar_chapters"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical"
android:background="?selectableItemBackgroundBorderless"
android:padding="@dimen/margin_small"
android:src="@drawable/ic_expand_more" />
android:theme="@style/ThemeOverlay.Kotatsu.MainToolbar"
tools:menu="@menu/opt_chapters">
<com.google.android.material.button.MaterialButton
android:id="@+id/button_read"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:layout_marginHorizontal="@dimen/toolbar_button_margin"
android:enabled="false"
android:text="@string/read"
android:textAllCaps="false"
app:iconGravity="textStart"
app:iconPadding="8dp"
tools:enabled="true"
tools:icon="@drawable/ic_read" />
<ImageView
android:id="@+id/button_dropdown"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical"
android:background="?selectableItemBackgroundBorderless"
android:contentDescription="@string/translations"
android:padding="@dimen/margin_small"
android:src="@drawable/ic_expand_more" />
</org.koitharu.kotatsu.core.ui.widgets.BottomSheetHeaderBar>
<com.google.android.material.button.MaterialButton
android:id="@+id/button_read"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:layout_marginHorizontal="@dimen/toolbar_button_margin"
android:enabled="false"
android:text="@string/read"
android:textAllCaps="false"
app:iconGravity="textStart"
app:iconPadding="8dp"
tools:enabled="true"
tools:icon="@drawable/ic_read" />
</com.google.android.material.appbar.MaterialToolbar>
</LinearLayout>
<androidx.fragment.app.FragmentContainerView
android:id="@+id/container_chapters"

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

@@ -22,7 +22,6 @@
android:paddingRight="@dimen/list_spacing"
android:paddingBottom="@dimen/grid_spacing_outer"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:trackColor="?attr/colorOutline"
tools:listitem="@layout/item_feed" />
</FrameLayout>

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

@@ -38,6 +38,7 @@
android:id="@+id/textView_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawablePadding="4dp"
android:ellipsize="end"
android:singleLine="true"
android:textAppearance="?attr/textAppearanceBodyLarge"
@@ -55,18 +56,19 @@
</LinearLayout>
<ImageView
android:id="@+id/imageView_new"
android:id="@+id/imageView_bookmarked"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="?android:listPreferredItemPaddingEnd"
android:src="@drawable/ic_new"
app:tint="?colorError" />
android:contentDescription="@string/bookmarks"
app:srcCompat="@drawable/ic_bookmark" />
<ImageView
android:id="@+id/imageView_downloaded"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="?android:listPreferredItemPaddingEnd"
android:src="@drawable/ic_save_ok" />
android:contentDescription="@string/downloaded"
app:srcCompat="@drawable/ic_save_ok" />
</LinearLayout>

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

@@ -26,8 +26,6 @@
android:scrollIndicators="top"
app:bubbleSize="normal"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:scrollerOffset="6dp"
app:trackColor="?attr/colorOutline"
tools:ignore="UnusedAttribute"
tools:listitem="@layout/item_checkable_new" />
</FrameLayout>

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

@@ -26,7 +26,6 @@
app:bubbleSize="small"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:spanCount="3"
app:trackColor="?attr/colorOutline"
tools:listitem="@layout/item_page_thumb"
tools:targetApi="m" />

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

@@ -425,4 +425,5 @@
<string name="proxy">Proxy</string>
<string name="invalid_value_message">Invalid value</string>
<string name="manga_branch_title_template">%1$s (%2$s)</string>
<string name="downloaded">Downloaded</string>
</resources>

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

@@ -133,6 +133,7 @@
<item name="bubbleTextColor">?colorOnTertiary</item>
<item name="trackColor">?colorOutline</item>
<item name="bubbleSize">normal</item>
<item name="scrollerOffset">6dp</item>
</style>
<style name="Widget.Kotatsu.ListItemTextView" parent="">