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

Merge branch 'devel' into feature/suggestions

Browse Source
This commit is contained in:
Koitharu
2022-02-28 18:37:49 +02:00
parent 632715e6c9 cfdc3a15c5
commit 3afa782e91
56 changed files with 467 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/res/values/arrays.xml
View File

@@ -24,4 +24,9 @@
<item>@string/detailed_list</item>
<item>@string/grid</item>
</string-array>
<string-array name="screenshots_policy">
<item>@string/screenshots_allow</item>
<item>@string/screenshots_block_nsfw</item>
<item>@string/screenshots_block_all</item>
</string-array>
</resources>

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

@@ -20,4 +20,9 @@
<string-array name="values_track_sources_default" translatable="false">
<item>favourites</item>
</string-array>
<string-array name="values_screenshots_policy" translatable="false">
<item>allow</item>
<item>block_nsfw</item>
<item>block_all</item>
</string-array>
</resources>

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

@@ -7,14 +7,9 @@
<!-- Navigation -->
<dimen name="nav_header_logo_size">36dp</dimen>
<dimen name="nav_item_horizontal_padding">24dp</dimen>
<!-- Intrinsic height may vary. Use a large radius to ensure a semicircle. -->
<dimen name="nav_item_background_corner_radius_left">0dp</dimen>
<dimen name="nav_item_background_corner_radius_right">100dp</dimen>
<dimen name="nav_item_background_inset_left">0dp</dimen>
<dimen name="nav_item_background_inset_right">8dp</dimen>>
<dimen name="grid_spacing">4dp</dimen>
<dimen name="list_spacing">4dp</dimen>
<dimen name="grid_spacing">8dp</dimen>
<dimen name="list_spacing">8dp</dimen>
<dimen name="grid_spacing_outer">2dp</dimen>
<dimen name="manga_list_item_height">86dp</dimen>
<dimen name="manga_list_details_item_height">120dp</dimen>
@@ -26,6 +21,8 @@
<dimen name="list_footer_height_outer">48dp</dimen>
<dimen name="screen_padding">16dp</dimen>
<dimen name="feed_dividers_offset">72dp</dimen>
<dimen name="manga_badge_offset_horizontal">4dp</dimen>
<dimen name="manga_badge_offset_vertical">2dp</dimen>
<!--Text dimens-->
<dimen name="text_size_h1">22sp</dimen>

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

@@ -2,5 +2,5 @@
<resources>
<integer name="search_animation_duration">@android:integer/config_shortAnimTime</integer>
<integer name="manga_badge_max_character_count">3</integer>
</resources>

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

@@ -251,12 +251,16 @@
<string name="dynamic_theme">Dynamic theme</string>
<string name="dynamic_theme_summary">Applies a theme created on the color scheme of your wallpaper</string>
<string name="importing_progress">Importing manga: %1$d of %2$d</string>
<string name="suggestions">Suggestions</string>
<string name="suggestions_enable">Enable suggestions</string>
<string name="suggestions_summary">Suggest manga based on your preferences</string>
<string name="suggestions_info">All data is analyzed locally on this device. There is no transfer of your personal data to any services</string>
<string name="text_suggestion_holder">Start reading manga and you will get personalized suggestions</string>
<string name="exclude_nsfw_from_suggestions">Do not suggest NSFW manga</string>
<string name="screenshots_policy">Screenshots policy</string>
<string name="screenshots_allow">Allow</string>
<string name="screenshots_block_nsfw">Block on NSFW</string>
<string name="screenshots_block_all">Block always</string>
<string name="suggestions">Suggestions</string>
<string name="suggestions_enable">Enable suggestions</string>
<string name="suggestions_summary">Suggest manga based on your preferences</string>
<string name="suggestions_info">All data is analyzed locally on this device. There is no transfer of your personal data to any services</string>
<string name="text_suggestion_holder">Start reading manga and you will get personalized suggestions</string>
<string name="exclude_nsfw_from_suggestions">Do not suggest NSFW manga</string>
<string name="enabled">Enabled</string>
<string name="disabled">Disabled</string>
</resources>

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

@@ -137,6 +137,12 @@
<item name="android:textColor">?android:attr/textColorSecondary</item>
</style>
<!-- Shapes -->
<style name="ShapeAppearanceOverlay.Kotatsu.Cover" parent="">
<item name="cornerSize">12dp</item>
</style>
<!--Preferences-->
<style name="PreferenceThemeOverlay.Kotatsu">

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

@@ -44,7 +44,7 @@
<!-- Themes -->
<item name="android:windowLightStatusBar" tools:targetApi="M">@bool/light_status_bar</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:statusBarColor">@color/surface_amoled</item>
<item name="android:navigationBarColor">@color/surface_amoled</item>
<item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@null</item>
<item name="android:enforceNavigationBarContrast" tools:targetApi="Q">false</item>
@@ -66,7 +66,7 @@
<item name="appBarLayoutStyle">@style/Widget.Material3.AppBarLayout</item>
<item name="tabStyle">@style/Widget.Kotatsu.Tabs</item>
<item name="switchStyle">@style/Widget.Kotatsu.Switch</item>
<item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
<item name="materialCardViewStyle">@style/Widget.Material3.CardView.Filled</item>
<item name="recyclerViewStyle">@style/Widget.Kotatsu.RecyclerView</item>
<!-- Preference text appearance -->
@@ -85,4 +85,4 @@
<style name="ThemeOverlay.Kotatsu.AMOLED" parent="" />
</resources>
</resources>