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

Tweak collapsing toolbars

Browse Source
This commit is contained in:
Zakhar Timoshenko
2022-07-10 12:51:48 +03:00
parent 5b066c9dde
commit 21891d2d9d
8 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/koitharu/kotatsu/core/github/GithubRepository.kt
View File

@@ -10,7 +10,7 @@ class GithubRepository(private val okHttp: OkHttpClient) {
suspend fun getLatestVersion(): AppVersion { suspend fun getLatestVersion(): AppVersion {
val request = Request.Builder() val request = Request.Builder()
.get() .get()
.url("https://api.github.com/repos/nv95/Kotatsu/releases/latest") .url("https://api.github.com/repos/KotatsuApp/Kotatsu/releases/latest")
val json = okHttp.newCall(request.build()).await().parseJson() val json = okHttp.newCall(request.build()).await().parseJson()
val asset = json.getJSONArray("assets").getJSONObject(0) val asset = json.getJSONArray("assets").getJSONObject(0)
return AppVersion( return AppVersion(

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

@@ -13,9 +13,9 @@
<com.google.android.material.appbar.CollapsingToolbarLayout <com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsingToolbarLayout" android:id="@+id/collapsingToolbarLayout"
style="?attr/collapsingToolbarLayoutMediumStyle" style="?attr/collapsingToolbarLayoutLargeStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/collapsingToolbarLayoutMediumSize" android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
app:layout_scrollFlags="scroll|exitUntilCollapsed" app:layout_scrollFlags="scroll|exitUntilCollapsed"
app:toolbarId="@id/toolbar"> app:toolbarId="@id/toolbar">

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

@@ -14,8 +14,9 @@
<com.google.android.material.appbar.CollapsingToolbarLayout <com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsingToolbarLayout" android:id="@+id/collapsingToolbarLayout"
style="?attr/collapsingToolbarLayoutLargeStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/toolbar_height_expanded" android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
app:layout_scrollFlags="scroll|exitUntilCollapsed" app:layout_scrollFlags="scroll|exitUntilCollapsed"
app:toolbarId="@id/toolbar"> app:toolbarId="@id/toolbar">

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

@@ -13,8 +13,9 @@
<com.google.android.material.appbar.CollapsingToolbarLayout <com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsingToolbarLayout" android:id="@+id/collapsingToolbarLayout"
style="?attr/collapsingToolbarLayoutLargeStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/toolbar_height_expanded" android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
app:layout_scrollFlags="scroll|exitUntilCollapsed" app:layout_scrollFlags="scroll|exitUntilCollapsed"
app:toolbarId="@id/toolbar"> app:toolbarId="@id/toolbar">

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

@@ -6,10 +6,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:clipToPadding="false" android:clipToPadding="false"
android:paddingLeft="@dimen/list_spacing" android:paddingHorizontal="@dimen/list_spacing">
android:paddingTop="@dimen/grid_spacing_outer"
android:paddingRight="@dimen/list_spacing"
android:paddingBottom="@dimen/grid_spacing_outer">
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView" android:id="@+id/recyclerView"

6
app/src/main/res/menu/nav_bottom.xml
View File

@@ -5,12 +5,12 @@
<item <item
android:id="@+id/nav_library" android:id="@+id/nav_library"
android:icon="@drawable/ic_bookshelf_selector" android:icon="@drawable/ic_bookshelf_selector"
android:title="Library" /> android:title="@string/manga_shelf" />
<item <item
android:id="@+id/nav_explore" android:id="@+id/nav_explore"
android:icon="@drawable/ic_explore_selector" android:icon="@drawable/ic_explore_selector"
android:title="Explore" /> android:title="@string/explore" />
<item <item
android:id="@+id/nav_feed" android:id="@+id/nav_feed"
@@ -20,6 +20,6 @@
<item <item
android:id="@+id/nav_tools" android:id="@+id/nav_tools"
android:icon="@drawable/ic_tools" android:icon="@drawable/ic_tools"
android:title="Tools" /> android:title="@string/tools" />
</menu> </menu>

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

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="url_github">https://github.com/nv95/Kotatsu</string> <string name="url_github">https://github.com/KotatsuApp/Kotatsu</string>
<string name="url_discord">https://discord.gg/NNJ5RgVBC5</string> <string name="url_discord">https://discord.gg/NNJ5RgVBC5</string>
<string name="url_forpda">https://4pda.to/forum/index.php?showtopic=697669</string> <string name="url_forpda">https://4pda.to/forum/index.php?showtopic=697669</string>
<string name="url_twitter">https://twitter.com/kotatsuapp</string> <string name="url_twitter">https://twitter.com/kotatsuapp</string>

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

@@ -333,4 +333,7 @@
<string name="categories_delete_confirm">Are you sure you want to delete the selected favorite categories?\nAll manga in it will be lost and this cannot be undone.</string> <string name="categories_delete_confirm">Are you sure you want to delete the selected favorite categories?\nAll manga in it will be lost and this cannot be undone.</string>
<string name="reorder">Reorder</string> <string name="reorder">Reorder</string>
<string name="empty">Empty</string> <string name="empty">Empty</string>
<string name="changelog">Changelog</string>
<string name="explore">Explore</string>
<string name="tools">Tools</string>
</resources> </resources>