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

Merge branch 'devel' into feature/mal

Browse Source 
# Conflicts:
#	app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
#	app/src/main/java/org/koitharu/kotatsu/scrobbling/ScrobblingModule.kt
#	app/src/main/java/org/koitharu/kotatsu/scrobbling/domain/model/ScrobblerService.kt
#	app/src/main/java/org/koitharu/kotatsu/settings/HistorySettingsFragment.kt
#	app/src/main/res/xml/pref_history.xml
This commit is contained in:
Zakhar Timoshenko
2023-01-30 00:53:13 +03:00
parent 2c71110fa5 6ca6ec28ac
commit ee2538ba7f
158 changed files with 3006 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,9 @@
<dimen name="bottom_sheet_handle_size_max">24dp</dimen>
<dimen name="dialog_radius">8dp</dimen>
<dimen name="card_indicator_size">32dp</dimen>
<dimen name="card_indicator_offset">8dp</dimen>
<dimen name="appwidget_corner_radius_inner">8dp</dimen>
<!-- FastScroller -->

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

@@ -273,6 +273,7 @@
<string name="removal_completed">Removal completed</string>
<string name="batch_manga_save_confirm">Download all selected manga and its chapters\? This can consume a lot of traffic and storage.</string>
<string name="shikimori" translatable="false">Shikimori</string>
<string name="anilist" translatable="false">AniList</string>
<string name="parallel_downloads">Parallel downloads</string>
<string name="download_slowdown">Download slowdown</string>
<string name="download_slowdown_summary">Helps avoid blocking your IP address</string>
@@ -400,4 +401,11 @@
<string name="compact">Compact</string>
<string name="mal" translatable="false">MyAnimeList</string>
<string name="source_disabled">Source disabled</string>
<string name="prefetch_content">Content preloading</string>
<string name="mark_as_current">Mark as current</string>
<string name="language">Language</string>
<string name="share_logs">Share logs</string>
<string name="enable_logging">Enable logging</string>
<string name="enable_logging_summary">Record some actions for debug purposes</string>
<string name="show_suspicious_content">Show suspicious content</string>
</resources>

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

@@ -12,6 +12,10 @@
<item name="labelVisibilityMode">labeled</item>
</style>
<style name="Widget.Kotatsu.BottomNavigationView.ColoredIndicators">
<item name="itemActiveIndicatorStyle">@style/Widget.Kotatsu.BottomNavigationView.ActiveIndicator</item>
</style>
<style name="Widget.Kotatsu.BottomNavigationView.ActiveIndicator" parent="Widget.Material3.BottomNavigationView.ActiveIndicator">
<item name="android:color">@color/bottom_menu_active_indicator</item>
</style>
@@ -24,10 +28,9 @@
<!--AlertDialog-->
<style name="ThemeOverlay.Kotatsu.MaterialAlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
<item name="android:background">?attr/colorSurface</item>
<item name="android:textColorPrimary">?attr/colorOnSurface</item>
<item name="android:textColor">?attr/colorOnSurface</item>
<item name="dialogCornerRadius">28dp</item>
<item name="android:layout">@layout/m3_alert_dialog</item>
<item name="android:background">@drawable/m3_popup_background</item>
<item name="dialogCornerRadius">@dimen/m3_alert_dialog_corner_size</item>
</style>
<!-- Bottom sheet -->
@@ -224,6 +227,11 @@
<item name="cornerSize">6dp</item>
</style>
<style name="ShapeAppearanceOverlay.Kotatsu.Circle" parent="">
<item name="cornerFamily">rounded</item>
<item name="cornerSize">50%</item>
</style>
<!--Preferences-->
<style name="PreferenceThemeOverlay.Kotatsu">

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

@@ -33,13 +33,11 @@
<item name="colorError">@color/error</item>
<item name="colorOnError">@color/onError</item>
<item name="colorErrorContainer">@color/errorContainer</item>
<item name="colorControlHighlight">?attr/colorSurfaceVariant</item>
<item name="colorOnErrorContainer">@color/onErrorContainer</item>
<item name="android:divider">@color/divider_default</item>
<!-- Ripples -->
<item name="colorControlHighlight">?attr/colorSurfaceVariant</item>
<!-- Handles RTL text -->
<item name="android:textAlignment">gravity</item>
<item name="android:textDirection">locale</item>
@@ -67,7 +65,7 @@
<item name="textInputStyle">@style/Widget.Material3.TextInputLayout.OutlinedBox</item>
<item name="toolbarStyle">@style/Widget.Material3.Toolbar</item>
<item name="appBarLayoutStyle">@style/Widget.Material3.AppBarLayout</item>
<item name="bottomNavigationStyle">@style/Widget.Kotatsu.BottomNavigationView</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="recyclerViewStyle">@style/Widget.Kotatsu.RecyclerView</item>