diff options
author | Andrew Dolgov <[email protected]> | 2015-06-04 14:27:41 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-06-04 14:27:41 +0300 |
commit | 42358f6f6d738b97a9e724688e3b497b693a57ba (patch) | |
tree | 1929563ded07f643d566363af8830473d4120725 /org.fox.ttrss/src/main/res | |
parent | 9f776be2ee1c5e7c22d99cc4317c403f64cd91c2 (diff) |
move settings and unread only switch to the drawer
Diffstat (limited to 'org.fox.ttrss/src/main/res')
-rwxr-xr-x | org.fox.ttrss/src/main/res/drawable-hdpi/ic_settings_dark.png | bin | 0 -> 1288 bytes | |||
-rwxr-xr-x | org.fox.ttrss/src/main/res/drawable-xhdpi/ic_settings_dark.png | bin | 0 -> 1778 bytes | |||
-rwxr-xr-x | org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_settings_dark.png | bin | 0 -> 2576 bytes | |||
-rwxr-xr-x | org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_settings_dark.png | bin | 0 -> 3725 bytes | |||
-rwxr-xr-x | org.fox.ttrss/src/main/res/layout/feeds_row.xml | 2 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml | 2 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml | 46 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/layout/headlines_divider.xml | 15 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/menu/main_menu.xml | 8 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/menu/offline_menu.xml | 4 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/values/attrs.xml | 1 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/values/strings.xml | 1 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/values/style.xml | 2 |
13 files changed, 73 insertions, 8 deletions
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_settings_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_settings_dark.png Binary files differnew file mode 100755 index 00000000..1069b9a5 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_settings_dark.png diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_settings_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_settings_dark.png Binary files differnew file mode 100755 index 00000000..888fe55d --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_settings_dark.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_settings_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_settings_dark.png Binary files differnew file mode 100755 index 00000000..b6fe478a --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_settings_dark.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_settings_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_settings_dark.png Binary files differnew file mode 100755 index 00000000..6bde63cd --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_settings_dark.png diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row.xml b/org.fox.ttrss/src/main/res/layout/feeds_row.xml index 138cede3..b8fe5724 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_row.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row.xml @@ -2,7 +2,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/feeds_row" android:layout_width="match_parent" - android:layout_height="?android:attr/listPreferredItemHeight" + android:layout_height="wrap_content" android:descendantFocusability="blocksDescendants" android:paddingLeft="16dp" android:paddingRight="16dp" diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml index 53e62215..601712fd 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml @@ -2,7 +2,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/feeds_row" android:layout_width="match_parent" - android:layout_height="?android:attr/listPreferredItemHeight" + android:layout_height="wrap_content" android:descendantFocusability="blocksDescendants" android:background="?feedsSelectedBackground" android:paddingLeft="16dp" diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml b/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml new file mode 100755 index 00000000..e871a4a2 --- /dev/null +++ b/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/feeds_row" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:descendantFocusability="blocksDescendants" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:baselineAligned="true" + android:gravity="center_vertical" + android:orientation="horizontal"> + + <ImageView + android:id="@+id/icon" + android:layout_gravity="center_vertical" + android:layout_width="21dp" + android:layout_height="21dp" + android:layout_weight="0" + android:scaleType="fitXY" + android:src="?ic_rss_box" /> + + <TextView + android:id="@+id/title" + android:fontFamily="sans-serif-medium" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:layout_weight="1" + android:ellipsize="end" + android:paddingLeft="35dp" + android:singleLine="true" + android:text="Feed" + android:paddingBottom="2dp" + android:textColor="?feedlistTextColor" + android:textSize="14sp" /> + + <android.support.v7.widget.SwitchCompat + android:id="@+id/row_switch" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0" + android:layout_marginLeft="16dp" /> + +</LinearLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/headlines_divider.xml b/org.fox.ttrss/src/main/res/layout/headlines_divider.xml new file mode 100755 index 00000000..40294376 --- /dev/null +++ b/org.fox.ttrss/src/main/res/layout/headlines_divider.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/headlines_footer" + android:layout_width="fill_parent" + android:layout_height="fill_parent"> + + <View + android:layout_gravity="top|center_horizontal" + android:layout_marginTop="10dp" + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="?headlineFooterColor"/> + +</FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/menu/main_menu.xml b/org.fox.ttrss/src/main/res/menu/main_menu.xml index f3715010..8693dc2b 100755 --- a/org.fox.ttrss/src/main/res/menu/main_menu.xml +++ b/org.fox.ttrss/src/main/res/menu/main_menu.xml @@ -9,11 +9,11 @@ app:showAsAction="" android:title="@string/subscribe_to_feed"/> <!-- iRroom --> - <item + <!-- <item android:id="@+id/show_feeds" android:icon="@drawable/ic_filter_remove" app:showAsAction="" - android:title="@string/menu_all_feeds"/> + android:title="@string/menu_all_feeds"/> --> <item android:id="@+id/go_offline" android:icon="@drawable/ic_cloud_download" @@ -114,12 +114,12 @@ app:showAsAction="" android:title="@string/trial_purchase"/> - <item + <!-- <item android:orderInCategory="999" android:id="@+id/preferences" android:icon="@drawable/ic_settings" app:showAsAction="" - android:title="@string/preferences"/> + android:title="@string/preferences"/> --> </group> diff --git a/org.fox.ttrss/src/main/res/menu/offline_menu.xml b/org.fox.ttrss/src/main/res/menu/offline_menu.xml index f51521b7..11c37642 100755 --- a/org.fox.ttrss/src/main/res/menu/offline_menu.xml +++ b/org.fox.ttrss/src/main/res/menu/offline_menu.xml @@ -7,11 +7,11 @@ app:showAsAction="" android:title="@string/go_online" android:visible="false"/> <!-- ifRoom|withText --> - <item + <!-- <item android:id="@+id/show_feeds" android:icon="@drawable/ic_filter_remove" app:showAsAction="" - android:title="@string/menu_all_feeds"/> + android:title="@string/menu_all_feeds"/> --> </group> <group android:id="@+id/menu_group_headlines" > <item diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml index 68278455..dd208c91 100755 --- a/org.fox.ttrss/src/main/res/values/attrs.xml +++ b/org.fox.ttrss/src/main/res/values/attrs.xml @@ -36,4 +36,5 @@ <attr name="ic_star_outline" format="reference" /> <attr name="ic_share" format="reference" /> <attr name="ic_keyboard_backspace" format="reference" /> + <attr name="ic_settings" format="reference" /> </resources>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml index 39246126..1d88f150 100755 --- a/org.fox.ttrss/src/main/res/values/strings.xml +++ b/org.fox.ttrss/src/main/res/values/strings.xml @@ -23,6 +23,7 @@ <string name="loading_message">Loading, please wait…</string> <string name="menu_unread_feeds">Show unread feeds</string> <string name="menu_all_feeds">Show all feeds</string> + <string name="unread_only">Unread only</string> <string name="update_feeds">Refresh</string> <string name="share_article">Share article</string> <string name="catchup">Mark read</string> diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml index ffe02dc8..a3fe17f7 100755 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -44,6 +44,7 @@ <item name="ic_star_outline">@drawable/ic_star_outline_dark</item> <item name="ic_share">@drawable/ic_share_dark</item> <item name="ic_keyboard_backspace">@drawable/ic_keyboard_backspace_dark</item> + <item name="ic_settings">@drawable/ic_settings_dark</item> </style> <style name="DarkTheme" parent="Theme.AppCompat.NoActionBar"> @@ -90,6 +91,7 @@ <item name="ic_star_outline">@drawable/ic_star_outline</item> <item name="ic_share">@drawable/ic_share</item> <item name="ic_keyboard_backspace">@drawable/ic_keyboard_backspace</item> + <item name="ic_settings">@drawable/ic_settings</item> </style> <style name="DarkDialogTheme" parent="android:Theme"></style> |