DataHearth/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed spinner + improved ripple (#310)

Browse Source
This commit is contained in:
Bram van de Kerkhof 2016-05-25 00:09:24 +02:00 committed by inorichi
parent 6af78418a4
commit 26f4f53ec2
10 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueFragment.kt
View File

@ -164,7 +164,7 @@ class CatalogueFragment : BaseRxFragment<CataloguePresenter>(), FlexibleViewHold
val spinnerAdapter = ArrayAdapter(themedContext, val spinnerAdapter = ArrayAdapter(themedContext,
android.R.layout.simple_spinner_item, presenter.sources) android.R.layout.simple_spinner_item, presenter.sources)
spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) spinnerAdapter.setDropDownViewResource(R.layout.spinner_item)
val onItemSelected = object : AdapterView.OnItemSelectedListener { val onItemSelected = object : AdapterView.OnItemSelectedListener {
override fun onItemSelected(parent: AdapterView<*>, view: View?, position: Int, id: Long) { override fun onItemSelected(parent: AdapterView<*>, view: View?, position: Int, id: Long) {

12
app/src/main/res/drawable-v21/list_item_selector_dark.xml
View File

@ -1,16 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ripple <ripple xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/rippleColorDark">
android:color="@color/colorAccentDark"
>
<item> <item>
<selector> <selector>
<item android:state_selected="true"> <item android:state_selected="true">
<color android:color="@color/selectorColorDark" /> <color android:color="@color/rippleColorDark"/>
</item> </item>
<item android:state_activated="true"> <item android:state_activated="true">
<color android:color="@color/selectorColorDark" /> <color android:color="@color/rippleColorDark"/>
</item> </item>
<item> <item>
@ -18,6 +16,4 @@
</item> </item>
</selector> </selector>
</item> </item>
</ripple> </ripple>

12
app/src/main/res/drawable-v21/list_item_selector_light.xml
View File

@ -1,16 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ripple <ripple xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/rippleColorLight">
android:color="@color/colorAccentLight"
>
<item> <item>
<selector> <selector>
<item android:state_selected="true"> <item android:state_selected="true">
<color android:color="@color/selectorColorLight" /> <color android:color="@color/rippleColorLight"/>
</item> </item>
<item android:state_activated="true"> <item android:state_activated="true">
<color android:color="@color/selectorColorLight" /> <color android:color="@color/rippleColorLight"/>
</item> </item>
<item> <item>
@ -18,6 +16,4 @@
</item> </item>
</selector> </selector>
</item> </item>
</ripple> </ripple>

10
app/src/main/res/drawable/list_item_selector_dark.xml
View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector android:exitFadeDuration="@android:integer/config_longAnimTime" <selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"> android:exitFadeDuration="@android:integer/config_longAnimTime">
<item android:state_focused="true" android:drawable="@color/selectorColorDark"/> <item android:drawable="@color/rippleColorDark" android:state_focused="true"/>
<item android:state_pressed="true" android:drawable="@color/selectorColorDark"/> <item android:drawable="@color/rippleColorDark" android:state_pressed="true"/>
<item android:state_activated="true" android:drawable="@color/selectorColorDark"/> <item android:drawable="@color/rippleColorDark" android:state_activated="true"/>
<item android:drawable="@color/dialogDark"/> <item android:drawable="@color/dialogDark"/>
</selector> </selector>

10
app/src/main/res/drawable/list_item_selector_light.xml
View File

@ -8,12 +8,12 @@
<!--<item android:drawable="?android:attr/colorBackground"/>--> <!--<item android:drawable="?android:attr/colorBackground"/>-->
<!--</selector>--> <!--</selector>-->
<selector android:exitFadeDuration="@android:integer/config_longAnimTime" <selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"> android:exitFadeDuration="@android:integer/config_longAnimTime">
<item android:state_focused="true" android:drawable="@color/selectorColorLight"/> <item android:drawable="@color/rippleColorLight" android:state_focused="true"/>
<item android:state_pressed="true" android:drawable="@color/selectorColorLight"/> <item android:drawable="@color/rippleColorLight" android:state_pressed="true"/>
<item android:state_activated="true" android:drawable="@color/selectorColorLight"/> <item android:drawable="@color/rippleColorLight" android:state_activated="true"/>
<item android:drawable="@color/dialogLight"/> <item android:drawable="@color/dialogLight"/>
</selector> </selector>

8
app/src/main/res/layout/spinner_item.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
style="@style/Theme.Widget.SpinnerItem"
android:layout_width="match_parent"
android:layout_height="?attr/dropdownListPreferredItemHeight"
android:ellipsize="marquee"
android:singleLine="true"/>

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

@ -21,4 +21,5 @@
<attr name="selectable_list_drawable" format="reference|integer" /> <attr name="selectable_list_drawable" format="reference|integer" />
<attr name="selectable_library_drawable" format="reference|integer"/> <attr name="selectable_library_drawable" format="reference|integer"/>
<attr name="divider_drawable" format="reference|integer" /> <attr name="divider_drawable" format="reference|integer" />
<attr name="text_color_primary" format="reference|integer"/>
</resources> </resources>

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

@ -10,6 +10,8 @@
<color name="textColorSecondaryLight">@color/md_black_1000_54</color> <color name="textColorSecondaryLight">@color/md_black_1000_54</color>
<color name="textColorHintLight">@color/md_black_1000_38</color> <color name="textColorHintLight">@color/md_black_1000_38</color>
<color name="dividerLight">@color/md_black_1000_12</color> <color name="dividerLight">@color/md_black_1000_12</color>
<color name="rippleColorLight">@color/md_black_1000_12</color>
<color name="statusBarLight">@color/md_grey_300</color> <color name="statusBarLight">@color/md_grey_300</color>
<color name="appBarLight">@color/md_grey_100</color> <color name="appBarLight">@color/md_grey_100</color>
@ -24,6 +26,7 @@
<color name="textColorSecondaryDark">@color/md_white_1000_70</color> <color name="textColorSecondaryDark">@color/md_white_1000_70</color>
<color name="textColorHintDark">@color/md_white_1000_50</color> <color name="textColorHintDark">@color/md_white_1000_50</color>
<color name="dividerDark">@color/md_white_1000_12</color> <color name="dividerDark">@color/md_white_1000_12</color>
<color name="rippleColorDark">@color/md_white_1000_20</color>
<color name="statusBarDark">@color/md_black_1000</color> <color name="statusBarDark">@color/md_black_1000</color>
<color name="appBarDark">@color/md_grey_900</color> <color name="appBarDark">@color/md_grey_900</color>
@ -45,6 +48,7 @@
<color name="md_white_1000">#FFFFFFFF</color> <color name="md_white_1000">#FFFFFFFF</color>
<color name="md_white_1000_70">#B3FFFFFF</color> <color name="md_white_1000_70">#B3FFFFFF</color>
<color name="md_white_1000_50">#80FFFFFF</color> <color name="md_white_1000_50">#80FFFFFF</color>
<color name="md_white_1000_20">#33FFFFFF</color>
<color name="md_white_1000_12">#1FFFFFFF</color> <color name="md_white_1000_12">#1FFFFFFF</color>
<!-- Material Design Colors --> <!-- Material Design Colors -->

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

@ -4,9 +4,7 @@
<!--========--> <!--========-->
<!--Toolbars--> <!--Toolbars-->
<!--========--> <!--========-->
<style name="Theme.ActionBar" parent="@style/ThemeOverlay.AppCompat.ActionBar"> <style name="Theme.ActionBar" parent="@style/ThemeOverlay.AppCompat.ActionBar"/>
<item name="android:spinnerDropDownItemStyle">@style/ActionBarSpinnerItem</item>
</style>
<style name="Theme.ActionBar.Light" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> <style name="Theme.ActionBar.Light" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
<item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item> <item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
@ -160,6 +158,12 @@
<item name="buttonTint">@color/md_white_1000</item> <item name="buttonTint">@color/md_white_1000</item>
</style> </style>
<style name="Theme.Widget.SpinnerItem" parent="Widget.AppCompat.DropDownItem.Spinner">
<item name="android:textColor">?attr/text_color_primary</item>
<item name="android:background">?attr/selectable_list_drawable</item>
</style>
<!--===--> <!--===-->
<!--OLD--> <!--OLD-->
<!--===--> <!--===-->
@ -172,11 +176,6 @@
<item name="android:textColor">?android:attr/textColorPrimary</item> <item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textAppearance">@style/TextAppearance.AppCompat.Title</item> <item name="android:textAppearance">@style/TextAppearance.AppCompat.Title</item>
</style> </style>
<style name="ActionBarSpinnerItem" parent="@style/Widget.AppCompat.Light.DropDownItem.Spinner">
<item name="android:textColor">@color/textColorPrimaryLight</item>
<item name="android:background">@drawable/list_item_selector_light</item>
</style>
<style name="FilePickerTheme" parent="NNF_BaseTheme.Light"> <style name="FilePickerTheme" parent="NNF_BaseTheme.Light">
<item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimary">@color/colorPrimary</item>

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

@ -32,6 +32,7 @@
<item name="selectable_list_drawable">@drawable/list_item_selector_light</item> <item name="selectable_list_drawable">@drawable/list_item_selector_light</item>
<item name="selectable_library_drawable">@drawable/library_item_selector_light</item> <item name="selectable_library_drawable">@drawable/library_item_selector_light</item>
<item name="divider_drawable">@drawable/line_divider_light</item> <item name="divider_drawable">@drawable/line_divider_light</item>
<item name="text_color_primary">@color/textColorPrimaryLight</item>
</style> </style>
<style name="Theme.Tachiyomi" parent="Theme.Base"> <style name="Theme.Tachiyomi" parent="Theme.Base">
@ -66,6 +67,7 @@
<item name="selectable_list_drawable">@drawable/list_item_selector_dark</item> <item name="selectable_list_drawable">@drawable/list_item_selector_dark</item>
<item name="selectable_library_drawable">@drawable/library_item_selector_dark</item> <item name="selectable_library_drawable">@drawable/library_item_selector_dark</item>
<item name="divider_drawable">@drawable/line_divider_dark</item> <item name="divider_drawable">@drawable/line_divider_dark</item>
<item name="text_color_primary">@color/textColorPrimaryDark</item>
</style> </style>
<style name="Theme.Tachiyomi.Dark" parent="Theme.Base.Dark"> <style name="Theme.Tachiyomi.Dark" parent="Theme.Base.Dark">