diff options
Diffstat (limited to 'org.fox.ttrss/src/main/res')
| -rw-r--r-- | org.fox.ttrss/src/main/res/drawable/baseline_folder_special_24.xml | 5 | ||||
| -rw-r--r-- | org.fox.ttrss/src/main/res/drawable/baseline_label_24.xml | 5 | ||||
| -rw-r--r-- | org.fox.ttrss/src/main/res/drawable/outline_folder_special_24.xml | 5 | ||||
| -rw-r--r-- | org.fox.ttrss/src/main/res/drawable/outline_label_24.xml | 5 | ||||
| -rwxr-xr-x | org.fox.ttrss/src/main/res/layout/drawer_header.xml | 70 | ||||
| -rw-r--r-- | org.fox.ttrss/src/main/res/layout/feeds_row_divider.xml (renamed from org.fox.ttrss/src/main/res/layout/drawer_divider.xml) | 0 | ||||
| -rwxr-xr-x | org.fox.ttrss/src/main/res/layout/feeds_row_goback.xml (renamed from org.fox.ttrss/src/main/res/layout/feeds_goback.xml) | 0 | ||||
| -rwxr-xr-x | org.fox.ttrss/src/main/res/layout/fragment_feeds.xml | 96 | ||||
| -rwxr-xr-x | org.fox.ttrss/src/main/res/xml/preferences.xml | 6 |
9 files changed, 97 insertions, 95 deletions
diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_folder_special_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_folder_special_24.xml new file mode 100644 index 00000000..d6017f8c --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_folder_special_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M20,6h-8l-2,-2L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM17.94,17L15,15.28 12.06,17l0.78,-3.33 -2.59,-2.24 3.41,-0.29L15,8l1.34,3.14 3.41,0.29 -2.59,2.24 0.78,3.33z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_label_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_label_24.xml new file mode 100644 index 00000000..02371e76 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_label_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M17.63,5.84C17.27,5.33 16.67,5 16,5L5,5.01C3.9,5.01 3,5.9 3,7v10c0,1.1 0.9,1.99 2,1.99L16,19c0.67,0 1.27,-0.33 1.63,-0.84L22,12l-4.37,-6.16z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/outline_folder_special_24.xml b/org.fox.ttrss/src/main/res/drawable/outline_folder_special_24.xml new file mode 100644 index 00000000..3add00b7 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/outline_folder_special_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M20,6h-8l-2,-2L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,6h5.17l2,2L20,8v10zM13.08,14.04L12.39,17 15,15.47 17.61,17l-0.69,-2.96 2.3,-1.99 -3.03,-0.26L15,9l-1.19,2.79 -3.03,0.26z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/outline_label_24.xml b/org.fox.ttrss/src/main/res/drawable/outline_label_24.xml new file mode 100644 index 00000000..f05b7a20 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/outline_label_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M17.63,5.84C17.27,5.33 16.67,5 16,5L5,5.01C3.9,5.01 3,5.9 3,7v10c0,1.1 0.9,1.99 2,1.99L16,19c0.67,0 1.27,-0.33 1.63,-0.84L22,12l-4.37,-6.16zM16,17H5V7h11l3.55,5L16,17z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/layout/drawer_header.xml b/org.fox.ttrss/src/main/res/layout/drawer_header.xml deleted file mode 100755 index f4954259..00000000 --- a/org.fox.ttrss/src/main/res/layout/drawer_header.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="72dp" - xmlns:tools="http://schemas.android.com/tools" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:orientation="vertical" - android:weightSum="1" - android:clickable="false"> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <com.google.android.material.button.MaterialButton - style="?attr/materialIconButtonStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:scaleX="1.5" - android:scaleY="1.5" - app:icon="@drawable/baseline_settings_24" - android:id="@+id/drawer_settings_btn" - android:layout_gravity="center_vertical|end" - android:layout_marginEnd="8dp" - android:transitionName="SETTINGS_REVEAL" - /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:id="@+id/linearLayout" - android:layout_gravity="center_horizontal|bottom"> - - <TextView - android:id="@+id/drawer_header_login" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - tools:text="user" - android:textAppearance="?attr/textAppearanceHeadlineSmall" - android:textColor="?attr/colorOnSurface"/> - - <TextView - android:id="@+id/drawer_header_server" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" - tools:text="example.org" - android:textAppearance="?attr/textAppearanceTitleSmall" - android:textColor="?attr/colorOnSurfaceVariant"/> - </LinearLayout> - </FrameLayout> - - <ProgressBar - style="?android:attr/progressBarStyleHorizontal" - android:visibility="invisible" - android:indeterminate="true" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:id="@+id/feeds_loading_bar" - android:layout_alignParentLeft="true" - android:layout_alignParentBottom="true" - android:layout_gravity="bottom" /> -</FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/drawer_divider.xml b/org.fox.ttrss/src/main/res/layout/feeds_row_divider.xml index 55aa5fdc..55aa5fdc 100644 --- a/org.fox.ttrss/src/main/res/layout/drawer_divider.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row_divider.xml diff --git a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml b/org.fox.ttrss/src/main/res/layout/feeds_row_goback.xml index 75ba8fe1..75ba8fe1 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row_goback.xml diff --git a/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml b/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml index bf26e3fc..9f57dda2 100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml @@ -1,24 +1,82 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.coordinatorlayout.widget.CoordinatorLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" android:id="@+id/feeds_fragment" - android:layout_width="fill_parent" - android:layout_height="fill_parent" > + android:layout_width="match_parent" + android:layout_height="wrap_content"> - <androidx.swiperefreshlayout.widget.SwipeRefreshLayout - android:id="@+id/feeds_swipe_container" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <ListView - android:id="@+id/feeds" - android:dividerHeight="4dp" - android:divider="@null" - android:paddingStart="4dp" - android:paddingEnd="4dp" + <com.google.android.material.appbar.AppBarLayout + android:background="@null" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <FrameLayout + app:layout_scrollFlags="scroll|enterAlways" android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true"> - </ListView> + android:layout_height="wrap_content"> + + <com.google.android.material.button.MaterialButton + style="?attr/materialIconButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:scaleX="1.5" + android:scaleY="1.5" + app:icon="@drawable/baseline_settings_24" + android:id="@+id/drawer_settings_btn" + android:layout_gravity="center_vertical|end" + android:layout_marginEnd="8dp" + android:transitionName="SETTINGS_REVEAL" + /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:layout_alignParentBottom="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:id="@+id/linearLayout" + android:layout_gravity="center_horizontal|bottom"> + + <TextView + android:id="@+id/drawer_header_login" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + tools:text="user" + android:textAppearance="?attr/textAppearanceHeadlineSmall" + android:textColor="?attr/colorOnSurface"/> + + <TextView + android:id="@+id/drawer_header_server" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + tools:text="example.org" + android:textAppearance="?attr/textAppearanceTitleSmall" + android:textColor="?attr/colorOnSurfaceVariant"/> + </LinearLayout> + </FrameLayout> + + </com.google.android.material.appbar.AppBarLayout> + + <androidx.swiperefreshlayout.widget.SwipeRefreshLayout + android:id="@+id/feeds_swipe_container" + app:layout_behavior="@string/appbar_scrolling_view_behavior" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <org.fox.ttrss.util.ContextMenuRecyclerView + android:id="@+id/feeds" + android:scrollbars="vertical" + + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> -</RelativeLayout>
\ No newline at end of file + +</androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml index 8d064587..27bf2a8a 100755 --- a/org.fox.ttrss/src/main/res/xml/preferences.xml +++ b/org.fox.ttrss/src/main/res/xml/preferences.xml @@ -44,13 +44,7 @@ android:title="@string/sort_feeds_by_unread" /> <SwitchPreferenceCompat - android:defaultValue="true" - android:key="enable_cats" - android:title="@string/enable_cats" /> - - <SwitchPreferenceCompat android:defaultValue="false" - android:dependency="enable_cats" android:key="browse_cats_like_feeds" android:summary="@string/browse_cats_like_feeds_summary" android:title="@string/browse_cats_like_feeds" /> |