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

Redesign (#24)

Browse Source
This commit is contained in:
ztimms73
2021-06-17 00:46:27 +03:00
parent cd7d6d7674
commit 09412719b7
109 changed files with 3114 additions and 685 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
app/src/main/res/values/attrs.xml
View File

@@ -1,6 +1,59 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<declare-styleable name="Theme">
<attr name="navigationBarDividerColor" format="color" />
<attr name="colorControlLight" format="color" />
<attr name="colorSurfaceSecondary" format="color" />
</declare-styleable>
<!--CoverImageView attrs-->
<declare-styleable name="CoverImageView">
<attr name="android:orientation" />
</declare-styleable>
<!--CircleImageView attrs-->
<declare-styleable name="CircleImageView">
<attr name="civ_border_width" format="dimension" />
<attr name="civ_border_color" format="color" />
<attr name="civ_border_overlay" format="boolean" />
<attr name="civ_fill_color" format="color" />
<attr name="civ_circle_background_color" format="color" />
</declare-styleable>
<!--SearchView attrs-->
<declare-styleable name="MaterialSearchView">
<attr name="search_navigationIconSupport" format="enum">
<enum name="none" value="0" />
<enum name="menu" value="1" />
<enum name="arrow" value="2" />
<enum name="search" value="3" />
</attr>
<attr name="search_navigationIcon" format="reference" />
<attr name="search_clearIcon" format="reference" />
<attr name="search_micIcon" format="reference" />
<attr name="search_menuIcon" format="reference" />
<attr name="search_textHint" format="string" />
<attr name="search_strokeColor" format="reference" />
<attr name="search_strokeWidth" format="reference" />
<attr name="search_dividerColor" format="reference" />
<attr name="search_shadowColor" format="reference" />
<attr name="search_transitionDuration" format="integer" />
<attr name="search_radius" format="integer" />
<attr name="android:elevation" />
<attr name="android:imeOptions" />
<attr name="android:inputType" />
</declare-styleable>
<!--ExpandableTextView attrs-->
<declare-styleable name="ExpandableTextView">
<attr name="expanded" format="boolean"/>
<attr name="expand_enabled" format="boolean"/>
<attr name="collapse_lines" format="integer"/>
</declare-styleable>
</resources>

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

@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<bool name="is_tablet">false</bool>
<bool name="use_light_status">false</bool>
<bool name="use_light_navigation">false</bool>
</resources>

37
app/src/main/res/values/colors.xml
View File

@@ -1,5 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="color_primary">#1976D2</color>
<color name="color_primary_variant">#1565C0</color>
<color name="color_accent">#EF5350</color>
<color name="color_on_secondary">@android:color/white</color>
<color name="color_control_light">#39000000</color> <!-- Same as textColorPrimary disabled -->
<color name="color_surface_secondary">#F8F9FA</color> <!-- Same as textColorPrimary disabled -->
<!-- Scrim colors -->
<color name="system_ui_scrim_light">#B3FFFFFF</color> <!-- 70% white -->
<color name="system_ui_scrim_black">#40000000</color> <!-- 25% black -->
<!-- We use a dark scrim by default since light status is API 23+ -->
<color name="status_bar_scrim">@color/system_ui_scrim_black</color>
<!-- We use a dark scrim by default since light nav bar is API 27+ -->
<color name="nav_bar_scrim">@color/system_ui_scrim_black</color>
<!-- Other colors with dark mode alternatives -->
<color name="highlighted_card_background">#e8f0fe</color>
<color name="event_card_header_background">@color/event_card_header_background_light</color>
<color name="list_divider">#1f000000</color>>
<!-- Other colors -->
<color name="default_tag_color">#999</color>
<color name="light_grey">#e6e6e6</color>
<color name="scrim">#33000000</color> <!-- 20% black -->
<color name="event_card_header_background_light">#f8f9fa</color>
<color name="event_card_header_background_dark">#252729</color>
<item name="chip_bg_alpha_checked" format="float" type="dimen">0.18</item>
<!-- Other Colors -->
<color name="blue_primary">#1976D2</color>
<color name="blue_primary_dark">#1565C0</color>
<color name="blue_primary_darker">#283593</color>
@@ -10,4 +45,6 @@
<color name="error">#D32F2F</color>
<color name="status_bar">#33000000</color>
<color name="tabs_line">#C3CFDD</color>
<color name="shadow">#99000000</color>
</resources>

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

@@ -1,8 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="grid_spacing">2.5dp</dimen>
<!-- Common dimensions -->
<dimen name="margin_normal">16dp</dimen>
<dimen name="margin_small">8dp</dimen>
<dimen name="margin_large">32dp</dimen>
<!-- Dialogs -->
<dimen name="dialog_corner_radius">8dp</dimen>
<dimen name="dialogPreferredPadding">24dp</dimen>
<dimen name="dialogPreferredPaddingLarge">36dp</dimen> <!-- dialogPreferredPadding + 12dp -->
<!-- Navigation -->
<dimen name="nav_drawer_width">@dimen/match_parent</dimen>
<dimen name="nav_account_image_size">32dp</dimen>
<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">6dp</dimen>
<dimen name="list_spacing">6dp</dimen>
<dimen name="grid_spacing_outer">2dp</dimen>
<dimen name="manga_list_item_height">84dp</dimen>
<dimen name="manga_list_item_height">78dp</dimen>
<dimen name="manga_list_details_item_height">120dp</dimen>
<dimen name="chapter_list_item_height">46dp</dimen>
<dimen name="preferred_grid_width">120dp</dimen>
@@ -10,4 +33,28 @@
<dimen name="elevation_large">16dp</dimen>
<dimen name="list_footer_height">48dp</dimen>
<dimen name="screen_padding">16dp</dimen>
<!--SearchView dimens-->
<dimen name="search_dp_16">16dp</dimen>
<dimen name="search_sp_16">16sp</dimen>
<dimen name="search_icon_48">48dp</dimen>
<dimen name="search_icon_56">56dp</dimen>
<dimen name="search_divider">1dp</dimen>
<dimen name="search_stroke_width">1dp</dimen>
<dimen name="search_stroke_width_focus">0dp</dimen>
<dimen name="search_layout_height">48dp</dimen>
<dimen name="search_layout_height_focus">56dp</dimen>
<dimen name="search_radius">8dp</dimen>
<dimen name="search_radius_focus">0dp</dimen>
<dimen name="search_elevation">3dp</dimen>
<dimen name="search_elevation_focus">0dp</dimen>
<dimen name="search_margins_left_right">16dp</dimen>
<dimen name="search_margins_top_bottom">8dp</dimen>
<dimen name="search_margins_focus">0dp</dimen>
<!-- per android.view.ViewGroup.LayoutParams -->
<item name="match_parent" format="integer" type="dimen">-1</item>
<item name="wrap_content" format="integer" type="dimen">-2</item>
</resources>

6
app/src/main/res/values/integers.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<integer name="search_animation_duration">@android:integer/config_shortAnimTime</integer>
</resources>

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

@@ -194,7 +194,7 @@
<string name="captcha_solve">Solve</string>
<string name="clear_cookies">Clear cookies</string>
<string name="cookies_cleared">All cookies was removed</string>
<string name="chapers_checking_progress">Checking for new chapters: %1$d of %2$d</string>
<string name="chapters_checking_progress">Checking for new chapters: %1$d of %2$d</string>
<string name="clear_feed">Clear feed</string>
<string name="text_clear_updates_feed_prompt">All updates history will be cleared and this action cannot be undone. Are you sure?</string>
<string name="new_chapters_checking">New chapters checking</string>
@@ -210,4 +210,5 @@
<string name="hide_toolbar">Hide toolbar when scrolling</string>
<string name="search_only_on_s">Search only on %s</string>
<string name="text_clear_search_history_prompt">Do you really want to remove all recent search queries? This action cannot be undone.</string>
<string name="description">Description</string>
</resources>

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

@@ -1,6 +1,52 @@
<resources>
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="AppToggleButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
<!-- Widget styles -->
<style name="Widget.Kotatsu" parent="@android:style/Widget.Material" />
<style name="Widget.Kotatsu.AppBar" parent="@style/Widget.Design.AppBarLayout">
<item name="android:background">?attr/colorSurface</item>
<item name="android:elevation">8dp</item>
</style>
<style name="Widget.Kotatsu.Toolbar" parent="Widget.MaterialComponents.Toolbar">
<item name="android:paddingEnd">8dp</item>
<item name="popupTheme">@style/ThemeOverlay.Kotatsu</item>
<item name="titleTextAppearance">@style/TextAppearance.Kotatsu.ToolbarTitle</item>
</style>
<style name="Widget.Kotatsu.Tabs" parent="@style/Widget.MaterialComponents.TabLayout">
<item name="tabIndicatorFullWidth">false</item>
<item name="android:background">@drawable/tabs_background</item>
<item name="tabIndicator">@drawable/tab_indicator</item>
<item name="tabIconTint">@color/tab_text</item>
<item name="tabSelectedTextColor">?colorPrimary</item>
<item name="tabTextColor">@color/tab_text</item>
<item name="tabTextAppearance">@style/TextAppearance.Kotatsu.Tab</item>
<item name="tabIndicatorAnimationMode">elastic</item>
</style>
<style name="Widget.Kotatsu.NavigationView" parent="@style/Widget.MaterialComponents.NavigationView">
<item name="itemBackground">@drawable/navigation_item_background</item>
<item name="itemHorizontalPadding">@dimen/nav_item_horizontal_padding</item>
</style>
<style name="Widget.Kotatsu.Chip" parent="Widget.MaterialComponents.Chip.Action">
<item name="chipStrokeWidth">1dp</item>
<item name="chipStrokeColor">?attr/colorAccent</item>
<item name="chipBackgroundColor">@android:color/transparent</item>
<item name="chipIconTint">?attr/colorPrimary</item>
<item name="android:textColor">?attr/colorAccent</item>
<!-- Smaller text/height -->
<item name="android:textSize">12sp</item>
<!-- Custom chip states -->
<item name="android:clickable">true</item>
<item name="android:focusable">true</item>
</style>
<style name="Widget.Kotatsu.ToggleButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
<item name="android:checkable">true</item>
<item name="android:gravity">center_vertical|start</item>
<item name="iconPadding">16dp</item>
@@ -8,36 +54,35 @@
<item name="android:paddingBottom">10dp</item>
</style>
<style name="AppPopupTheme" parent="ThemeOverlay.MaterialComponents.Light" />
<style name="AppToolbarTheme" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
<item name="popupTheme">@style/AppPopupTheme</item>
<item name="autoCompleteTextViewStyle">@style/AppSuggestion</item>
<style name="Widget.Kotatsu.ActionMode" parent="Widget.AppCompat.ActionMode">
<item name="titleTextStyle">?attr/textAppearanceHeadline6</item>
<item name="subtitleTextStyle">?attr/textAppearanceSubtitle1</item>
</style>
<style name="AppSuggestion" parent="Widget.AppCompat.Light.AutoCompleteTextView">
<style name="Widget.Kotatsu.AutoCompleteTextView" parent="Widget.AppCompat.Light.AutoCompleteTextView">
<item name="android:popupBackground">@android:color/background_light</item>
</style>
<style name="AppActionMode" parent="Widget.AppCompat.ActionMode">
<item name="titleTextStyle">?attr/textAppearanceHeadline6</item>
<item name="subtitleTextStyle">?attr/textAppearanceSubtitle1</item>
<item name="background">@color/grey</item>
<!-- TextAppearance -->
<style name="TextAppearance.Kotatsu.ToolbarTitle" parent="@style/TextAppearance.Widget.AppCompat.Toolbar.Title">
<item name="android:textSize" tools:ignore="SpUsage">20dp</item>
</style>
<style name="Widget.MaterialComponents.TabLayout.New">
<item name="tabIndicatorFullWidth">false</item>
<item name="android:background">@drawable/tabs_background</item>
<item name="tabIndicator">@drawable/tab_indicator</item>
<item name="tabIconTint">@color/tab_text</item>
<item name="tabSelectedTextColor">?colorPrimary</item>
<item name="tabTextColor">@color/tab_text</item>
<item name="tabTextAppearance">@style/TextAppearance.Design.Tab.New</item>
</style>
<style name="TextAppearance.Design.Tab.New">
<style name="TextAppearance.Kotatsu.Tab" parent="@style/TextAppearance.Design.Tab">
<item name="textAllCaps">false</item>
<item name="android:textAllCaps">false</item>
</style>
<style name="TextAppearance.Kotatsu.Button" parent="TextAppearance.MaterialComponents.Button">
<item name="android:letterSpacing">0</item>
<item name="android:textAllCaps">false</item>
</style>
<style name="TextAppearance.Kotatsu.ListPrimary" parent="TextAppearance.MaterialComponents.Body1">
<item name="android:letterSpacing">0</item>
</style>
<style name="TextAppearance.Kotatsu.Body2" parent="TextAppearance.MaterialComponents.Body2" />
</resources>

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

@@ -1,23 +1,62 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="BaseAppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<!-- Base application theme. -->
<style name="Base.AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/color_primary</item>
<item name="colorPrimaryVariant">@color/color_primary_variant</item>
<item name="colorSecondary">?attr/colorPrimary</item>
<item name="colorOnSecondary">@color/color_on_secondary</item>
<item name="colorControlLight">@color/color_control_light</item>
<item name="colorSurfaceSecondary">@color/color_surface_secondary</item>
<!-- Window decor -->
<item name="android:windowLightStatusBar" tools:targetApi="m">@bool/use_light_status</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">
@bool/use_light_navigation
</item>
<item name="android:navigationBarColor">@color/nav_bar_scrim</item>
<item name="popupTheme">@style/ThemeOverlay.Kotatsu</item>
<!-- Widget styles -->
<item name="toolbarStyle">@style/Widget.Kotatsu.Toolbar</item>
<item name="tabStyle">@style/Widget.Kotatsu.Tabs</item>
<item name="navigationViewStyle">@style/Widget.Kotatsu.NavigationView</item>
<!-- Text appearances -->
<item name="textAppearanceBody2">@style/TextAppearance.Kotatsu.Body2</item>
<item name="textAppearanceButton">@style/TextAppearance.Kotatsu.Button</item>
<item name="textAppearanceListItem">@style/TextAppearance.Kotatsu.ListPrimary</item>
<!-- Custom theme attrs -->
<item name="navigationBarDividerColor">?attr/colorControlLight</item>
<!-- ActionMode attrs -->
<item name="android:windowActionModeOverlay">true</item>
<item name="windowActionModeOverlay">true</item>
<item name="actionModeCloseDrawable">@drawable/ic_cross</item>
<item name="actionModeStyle">@style/AppActionMode</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
<item name="badgeStyle">@style/Widget.MaterialComponents.Badge</item>
<item name="android:statusBarColor">@color/status_bar</item>
<item name="colorOnPrimary">@android:color/white</item>
<item name="tabStyle">@style/Widget.MaterialComponents.TabLayout.New</item>
<item name="actionModeStyle">@style/Widget.Kotatsu.ActionMode</item>
</style>
<style name="AppTheme" parent="BaseAppTheme">
<item name="colorPrimary">@color/blue_primary</item>
<item name="colorPrimaryDark">@color/blue_primary_dark</item>
<item name="colorAccent">@color/red_accent</item>
<style name="ThemeOverlay.Kotatsu" parent="ThemeOverlay.MaterialComponents.Light">
<item name="colorPrimary">@color/color_primary</item>
<item name="colorPrimaryVariant">@color/color_primary_variant</item>
</style>
<style name="AppTheme" parent="Base.AppTheme">
<item name="android:statusBarColor">@color/grey</item>
</style>
<style name="AppTheme.AMOLED" parent="Base.AppTheme" />
<style name="AlertDialog.Style" parent="MaterialAlertDialog.MaterialComponents">
<item name="shapeAppearance">@style/AlertDialog.ShapeAppearance</item>
</style>
<style name="AlertDialog.ShapeAppearance" parent="ShapeAppearance.MaterialComponents.MediumComponent">
<item name="cornerSize">@dimen/dialog_corner_radius</item>
</style>
<style name="AppTheme.Amoled" />
</resources>