Merge branch 'devel' of github.com:nv95/Kotatsu into feature/suggestions
This commit is contained in:
Koitharu
@@ -22,5 +22,6 @@
|
||||
<color name="grey_dark">#212121</color>
|
||||
<color name="dim">#99000000</color>
|
||||
<color name="shadow">#99000000</color>
|
||||
<color name="scrollbar">#66000000</color>
|
||||
|
||||
</resources>
|
||||
@@ -1,22 +1,23 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string-array name="values_theme">
|
||||
<string name="empty" translatable="false" />
|
||||
<string-array name="values_theme" translatable="false">
|
||||
<item>-1</item>
|
||||
<item>1</item>
|
||||
<item>2</item>
|
||||
</string-array>
|
||||
<string-array name="values_reader_switchers">
|
||||
<string-array name="values_reader_switchers" translatable="false">
|
||||
<item>taps</item>
|
||||
<item>volume</item>
|
||||
</string-array>
|
||||
<string-array name="values_reader_switchers_default">
|
||||
<string-array name="values_reader_switchers_default" translatable="false">
|
||||
<item>taps</item>
|
||||
</string-array>
|
||||
<string-array name="values_track_sources">
|
||||
<string-array name="values_track_sources" translatable="false">
|
||||
<item>favourites</item>
|
||||
<item>history</item>
|
||||
</string-array>
|
||||
<string-array name="values_track_sources_default">
|
||||
<string-array name="values_track_sources_default" translatable="false">
|
||||
<item>favourites</item>
|
||||
</string-array>
|
||||
</resources>
|
||||
</resources>
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
<dimen name="list_footer_height_inner">36dp</dimen>
|
||||
<dimen name="list_footer_height_outer">48dp</dimen>
|
||||
<dimen name="screen_padding">16dp</dimen>
|
||||
<dimen name="feed_dividers_offset">72dp</dimen>
|
||||
|
||||
<!--Text dimens-->
|
||||
<dimen name="text_size_h1">22sp</dimen>
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources xmlns:tools="http://schemas.android.com/tools">
|
||||
<string name="app_name" translatable="false">Kotatsu</string>
|
||||
<string name="_empty" translatable="false"/>
|
||||
<string name="close_menu">Close menu</string>
|
||||
<string name="open_menu">Open menu</string>
|
||||
<string name="local_storage">Local storage</string>
|
||||
@@ -18,6 +16,7 @@
|
||||
<string name="settings">Settings</string>
|
||||
<string name="remote_sources">Remote sources</string>
|
||||
<string name="loading_">Loading…</string>
|
||||
<string name="computing_">Computing…</string>
|
||||
<string name="chapter_d_of_d">Chapter %1$d of %2$d</string>
|
||||
<string name="close">Close</string>
|
||||
<string name="try_again">Try again</string>
|
||||
@@ -104,7 +103,7 @@
|
||||
<string name="large_manga_save_confirm">This manga has %s. Save all of it?</string>
|
||||
<string name="save_manga">Save</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="enabled_d_of_d" tools:ignore="PluralsCandidate">Turned on %1$d of %2$d</string>
|
||||
<string name="enabled_d_of_d" tools:ignore="PluralsCandidate">%1$d of %2$d on</string>
|
||||
<string name="new_chapters">New chapters</string>
|
||||
<string name="show_notification_new_chapters">Notify about updates of manga you are reading</string>
|
||||
<string name="download">Download</string>
|
||||
@@ -168,7 +167,6 @@
|
||||
<string name="prefer_rtl_reader">Prefer right-to-left (→) reader</string>
|
||||
<string name="prefer_rtl_reader_summary">Reading mode can be set up separately for each series</string>
|
||||
<string name="create_category">New category</string>
|
||||
<string name="report_github">Create issue on GitHub</string>
|
||||
<string name="scale_mode">Scale mode</string>
|
||||
<string name="zoom_mode_fit_center">Fit center</string>
|
||||
<string name="zoom_mode_fit_height">Fit to height</string>
|
||||
@@ -177,11 +175,12 @@
|
||||
<string name="black_dark_theme">Black</string>
|
||||
<string name="black_dark_theme_summary">Uses less power on AMOLED screens</string>
|
||||
<string name="restart_required">Restart required</string>
|
||||
<string name="backup_restore"><![CDATA[Backup and restore]]></string>
|
||||
<string name="backup_restore">Backup and restore</string>
|
||||
<string name="create_backup">Create data backup</string>
|
||||
<string name="restore_backup">Restore from backup</string>
|
||||
<string name="data_restored">Restored</string>
|
||||
<string name="preparing_">Preparing…</string>
|
||||
<string name="report_github">Create issue on GitHub</string>
|
||||
<string name="file_not_found">File not found</string>
|
||||
<string name="data_restored_success">All data was restored</string>
|
||||
<string name="data_restored_with_errors">The data was restored, but there are errors</string>
|
||||
@@ -251,6 +250,7 @@
|
||||
<string name="available_sources">Available sources</string>
|
||||
<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="suggestions">Suggestions</string>
|
||||
<string name="text_suggestion_holder">Start reading manga and you will get personalized suggestions</string>
|
||||
<string name="importing_progress">Importing manga: %1$d of %2$d</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="text_suggestion_holder">Start reading manga and you will get personalized suggestions</string>
|
||||
</resources>
|
||||
@@ -84,6 +84,14 @@
|
||||
<item name="rippleColor">@null</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.Kotatsu.RecyclerView" parent="">
|
||||
<item name="fastScrollHorizontalThumbDrawable">@drawable/list_thumb</item>
|
||||
<item name="fastScrollVerticalThumbDrawable">@drawable/list_thumb</item>
|
||||
<item name="fastScrollHorizontalTrackDrawable">@drawable/list_track</item>
|
||||
<item name="fastScrollVerticalTrackDrawable">@drawable/list_track</item>
|
||||
<item name="android:scrollbarStyle">outsideOverlay</item>
|
||||
</style>
|
||||
|
||||
<style name="ThemeOverlay.Kotatsu.Switch" parent="">
|
||||
<item name="elevationOverlayEnabled">@bool/elevation_overlay_enabled</item>
|
||||
</style>
|
||||
@@ -140,4 +148,4 @@
|
||||
<item name="android:layout">@layout/pref_slider</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
</resources>
|
||||
|
||||
@@ -67,6 +67,7 @@
|
||||
<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="recyclerViewStyle">@style/Widget.Kotatsu.RecyclerView</item>
|
||||
|
||||
<!-- Preference text appearance -->
|
||||
<item name="android:textAppearanceListItem">?attr/textAppearanceBodyLarge</item>
|
||||
|
||||
Reference in New Issue
Block a user