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

Some cleanup

Browse Source
This commit is contained in:
Zakhar Timoshenko
2022-07-16 17:42:35 +03:00
parent 71351ad701
commit 5d0dac6947
9 changed files with 2 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/res/drawable/list_thumb.xml
View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/thumb_activated" android:state_pressed="true" />
<item android:drawable="@drawable/thumb" />
</selector>

5
app/src/main/res/drawable/list_track.xml
View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/track" android:state_pressed="true" />
<item android:drawable="@drawable/track" />
</selector>

12
app/src/main/res/drawable/thumb.xml
View File

@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="10dp" />
<padding
android:bottom="10dp"
android:left="10dp"
android:right="10dp"
android:top="10dp" />
<solid android:color="@color/scrollbar" />
</shape>

12
app/src/main/res/drawable/thumb_activated.xml
View File

@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="10dp" />
<padding
android:bottom="10dp"
android:left="10dp"
android:right="10dp"
android:top="10dp" />
<solid android:color="?colorControlActivated" />
</shape>

4
app/src/main/res/drawable/track.xml
View File

@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" />

1
app/src/main/res/layout-w600dp/fragment_details.xml
View File

@@ -193,6 +193,7 @@
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:layout_marginBottom="6dp" android:layout_marginBottom="6dp"
android:clipToPadding="false" android:clipToPadding="false"
android:nestedScrollingEnabled="false"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingStart="12dp" android:paddingStart="12dp"
android:paddingEnd="12dp" android:paddingEnd="12dp"

1
app/src/main/res/layout/fragment_details.xml
View File

@@ -190,6 +190,7 @@
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:layout_marginBottom="6dp" android:layout_marginBottom="6dp"
android:clipToPadding="false" android:clipToPadding="false"
android:nestedScrollingEnabled="false"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingStart="12dp" android:paddingStart="12dp"
android:paddingEnd="12dp" android:paddingEnd="12dp"

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

@@ -17,15 +17,6 @@
<item name="theme">@style/ThemeOverlay.Kotatsu.ActionMode</item> <item name="theme">@style/ThemeOverlay.Kotatsu.ActionMode</item>
</style> </style>
<!--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>
</style>
<!-- Bottom sheet --> <!-- Bottom sheet -->
<style name="ThemeOverlay.Kotatsu.BottomSheetDialog" parent="ThemeOverlay.Material3.BottomSheetDialog"> <style name="ThemeOverlay.Kotatsu.BottomSheetDialog" parent="ThemeOverlay.Material3.BottomSheetDialog">
@@ -107,14 +98,6 @@
<item name="iconPadding">16dp</item> <item name="iconPadding">16dp</item>
</style> </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="Widget.Kotatsu.FastScroller" parent=""> <style name="Widget.Kotatsu.FastScroller" parent="">
<item name="thumbColor">?colorTertiary</item> <item name="thumbColor">?colorTertiary</item>
<item name="bubbleColor">?colorTertiary</item> <item name="bubbleColor">?colorTertiary</item>

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

@@ -52,9 +52,7 @@
<item name="android:enforceNavigationBarContrast" tools:targetApi="Q">false</item> <item name="android:enforceNavigationBarContrast" tools:targetApi="Q">false</item>
<item name="android:enforceStatusBarContrast" tools:targetApi="Q">false</item> <item name="android:enforceStatusBarContrast" tools:targetApi="Q">false</item>
<item name="android:itemTextAppearance">@style/TextAppearance.Widget.Menu</item> <item name="android:itemTextAppearance">@style/TextAppearance.Widget.Menu</item>
<item name="alertDialogTheme">@style/ThemeOverlay.Kotatsu.MaterialAlertDialog</item>
<item name="bottomSheetDialogTheme">@style/ThemeOverlay.Kotatsu.BottomSheetDialog</item> <item name="bottomSheetDialogTheme">@style/ThemeOverlay.Kotatsu.BottomSheetDialog</item>
<item name="materialAlertDialogTheme">@style/ThemeOverlay.Kotatsu.MaterialAlertDialog</item>
<item name="textAppearanceButton">@style/TextAppearance.Kotatsu.Button</item> <item name="textAppearanceButton">@style/TextAppearance.Kotatsu.Button</item>
<item name="android:buttonStyle">?attr/borderlessButtonStyle</item> <item name="android:buttonStyle">?attr/borderlessButtonStyle</item>
<item name="android:backgroundDimAmount">0.32</item> <item name="android:backgroundDimAmount">0.32</item>
@@ -70,7 +68,6 @@
<item name="bottomNavigationStyle">@style/Widget.Kotatsu.BottomNavigationView</item> <item name="bottomNavigationStyle">@style/Widget.Kotatsu.BottomNavigationView</item>
<item name="tabStyle">@style/Widget.Kotatsu.Tabs</item> <item name="tabStyle">@style/Widget.Kotatsu.Tabs</item>
<item name="materialCardViewStyle">@style/Widget.Material3.CardView.Filled</item> <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Filled</item>
<item name="recyclerViewStyle">@style/Widget.Kotatsu.RecyclerView</item>
<item name="fastScrollerStyle">@style/Widget.Kotatsu.FastScroller</item> <item name="fastScrollerStyle">@style/Widget.Kotatsu.FastScroller</item>
<item name="listItemTextViewStyle">@style/Widget.Kotatsu.ListItemTextView</item> <item name="listItemTextViewStyle">@style/Widget.Kotatsu.ListItemTextView</item>
<item name="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item> <item name="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>