public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-31 13:35:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

#1694 Top level folder updates

Browse source
This commit is contained in:
Andrei 2022-07-20 18:00:20 -07:00
parent 3f2145372f
commit f56b0bdfbc
16 changed files with 44 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clients/android/NewsBlur/res/drawable-nodpi/black_folder_background_default.xml
View file

@ -1,9 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="270"
android:type="linear"
android:startColor="@color/black_folder_background_start"
android:endColor="@color/black_folder_background_end"/>
android:shape="rectangle">
<solid android:color="@color/black_folder_background" />
</shape>

9
clients/android/NewsBlur/res/drawable-nodpi/black_gradient_background_default.xml
View file

@ -1,8 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
<gradient
android:angle= "90"
android:type= "linear"
android:startColor="@color/black_folder_background_start"
android:endColor= "@color/black_folder_background_end" />
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/black_folder_background" />
</shape>

4
clients/android/NewsBlur/res/drawable-nodpi/black_selector_folder_background.xml
View file

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

8
clients/android/NewsBlur/res/drawable-nodpi/dark_folder_background_default.xml
View file

@ -1,9 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="270"
android:type="linear"
android:startColor="@color/dark_folder_background_start"
android:endColor="@color/dark_folder_background_end"/>
android:shape="rectangle">
<solid android:color="@color/dark_folder_background" />
</shape>

8
clients/android/NewsBlur/res/drawable-nodpi/dark_folder_background_highlight.xml
View file

@ -1,9 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="90"
android:type="linear"
android:startColor="@color/dark_folder_background_selected_start"
android:endColor="@color/dark_folder_background_selected_end"/>
android:shape="rectangle">
<solid android:color="@color/dark_folder_background_selected" />
</shape>

9
clients/android/NewsBlur/res/drawable-nodpi/dark_gradient_background_default.xml
View file

@ -1,8 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
<gradient
android:angle= "90"
android:type= "linear"
android:startColor="@color/dark_folder_background_start"
android:endColor= "@color/dark_folder_background_end" />
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/dark_folder_background" />
</shape>

4
clients/android/NewsBlur/res/drawable-nodpi/dark_selector_folder_background.xml
View file

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

8
clients/android/NewsBlur/res/drawable-nodpi/folder_background_default.xml
View file

@ -1,9 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="90"
android:type="linear"
android:startColor="@color/folder_background_start"
android:endColor="@color/folder_background_end"/>
android:shape="rectangle">
<solid android:color="@color/folder_background" />
</shape>

8
clients/android/NewsBlur/res/drawable-nodpi/folder_background_highlight.xml
View file

@ -1,9 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="90"
android:type="linear"
android:startColor="@color/folder_background_selected_start"
android:endColor="@color/folder_background_selected_end"/>
android:shape="rectangle">
<solid android:color="@color/folder_background_selected" />
</shape>

9
clients/android/NewsBlur/res/drawable-nodpi/gradient_background_default.xml
View file

@ -1,8 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
<gradient
android:angle= "90"
android:type= "linear"
android:startColor="@color/folder_background_start"
android:endColor= "@color/folder_background_end" />
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/folder_background" />
</shape>

4
clients/android/NewsBlur/res/drawable-nodpi/selector_feed_background.xml
View file

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

4
clients/android/NewsBlur/res/drawable-nodpi/selector_folder_background.xml
View file

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

6
clients/android/NewsBlur/res/layout/row_all_stories.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
style="?selectorFolderBackground" >
style="?selectorFolderBackground"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/row_everything_icon"

15
clients/android/NewsBlur/res/values/colors.xml
View file

@ -45,16 +45,11 @@
<color name="col_button_background_pressed">@color/gray65</color>
<color name="col_button_background_pressed_dark">@color/gray30</color>
<color name="folder_background_end">#E9EBE4</color>
<color name="folder_background_start">#DDE0D7</color>
<color name="dark_folder_background_end">@color/gray07</color>
<color name="dark_folder_background_start">@color/gray13</color>
<color name="black_folder_background_end">@color/black</color>
<color name="black_folder_background_start">@color/gray07</color>
<color name="folder_background_selected_end">#D9DBD4</color>
<color name="folder_background_selected_start">#CDD0C7</color>
<color name="dark_folder_background_selected_end">#4C4C4C</color>
<color name="dark_folder_background_selected_start">#1A1A1A</color>
<color name="folder_background">#E9EBE4</color>
<color name="dark_folder_background">@color/gray13</color>
<color name="black_folder_background">@color/gray07</color>
<color name="folder_background_selected">#CDD0C7</color>
<color name="dark_folder_background_selected">#4C4C4C</color>
<color name="row_border_top">@color/white</color>
<color name="row_border_bottom">@color/gray80</color>
<color name="dark_row_border_top">@color/gray20</color>

10
clients/android/NewsBlur/res/values/styles.xml
View file

@ -32,13 +32,17 @@
<item name="fontFamily">@font/whitney</item>
</style>
<style name="selectorFolderBackground">
<style name="selectorFolderParent">
<item name="android:paddingTop">2dp</item>
<item name="android:paddingBottom">2dp</item>
</style>
<style name="selectorFolderBackground" parent="selectorFolderParent">
<item name="android:background">@drawable/selector_folder_background</item>
</style>
<style name="selectorFolderBackground.dark">
<style name="selectorFolderBackground.dark" parent="selectorFolderParent">
<item name="android:background">@drawable/dark_selector_folder_background</item>
</style>
<style name="selectorFolderBackground.black">
<style name="selectorFolderBackground.black" parent="selectorFolderParent">
<item name="android:background">@drawable/black_selector_folder_background</item>
</style>

6
clients/android/NewsBlur/src/com/newsblur/util/SpacingStyle.kt
View file

@ -7,10 +7,8 @@ enum class SpacingStyle {
COMPACT,
;
fun getGroupTitleVerticalPadding(context: Context): Int = when (this) {
COMFORTABLE -> UIUtils.dp2px(context, 9)
COMPACT -> UIUtils.dp2px(context, 4)
}
// same spacing on groups for both styles
fun getGroupTitleVerticalPadding(context: Context): Int = UIUtils.dp2px(context, 9)
fun getChildTitleVerticalPadding(context: Context): Int = when (this) {
COMFORTABLE -> UIUtils.dp2px(context, 7)