diff options
Diffstat (limited to 'org.fox.ttrss/src/main/res/layout')
9 files changed, 151 insertions, 186 deletions
diff --git a/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml b/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml index d21c2661..1edd3bea 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml @@ -1,6 +1,5 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/headlines" - android:fitsSystemWindows="true" android:animateLayoutChanges="true" android:layout_width="fill_parent" android:layout_height="fill_parent"> diff --git a/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml b/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml index e154646f..afbddd08 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml @@ -1,6 +1,5 @@ <androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:fitsSystemWindows="true" android:id="@+id/headlines_drawer" android:layout_width="fill_parent" android:layout_height="fill_parent"> @@ -37,23 +36,20 @@ </androidx.coordinatorlayout.widget.CoordinatorLayout> - <org.fox.ttrss.util.ScrimInsetsFrameLayout + <com.google.android.material.navigation.NavigationView xmlns:app="http://schemas.android.com/apk/res-auto" - android:id="@+id/scrimInsetsFrameLayout" + android:id="@+id/navigationView" android:layout_width="300dp" android:layout_height="match_parent" - android:layout_gravity="start" - android:elevation="10dp" - android:fitsSystemWindows="true" - app:insetForeground="#4000"> + android:layout_gravity="start"> - <FrameLayout - android:id="@+id/feeds_fragment" - android:layout_width="match_parent" - android:background="?colorSurfaceContainer" - android:layout_height="match_parent" > - </FrameLayout> + <FrameLayout + android:id="@+id/feeds_fragment" + android:layout_width="match_parent" + android:background="?colorSurfaceContainer" + android:layout_height="match_parent" > + </FrameLayout> - </org.fox.ttrss.util.ScrimInsetsFrameLayout> + </com.google.android.material.navigation.NavigationView> </androidx.drawerlayout.widget.DrawerLayout> diff --git a/org.fox.ttrss/src/main/res/layout/drawer_header.xml b/org.fox.ttrss/src/main/res/layout/drawer_header.xml index 56f7a225..d9a9cb0b 100755 --- a/org.fox.ttrss/src/main/res/layout/drawer_header.xml +++ b/org.fox.ttrss/src/main/res/layout/drawer_header.xml @@ -1,24 +1,15 @@ <?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="120dp" + 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"> - <ImageView - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:id="@+id/imageView" - android:scaleType="fitXY" - android:background="?colorPrimaryDark" - android:src="?drawer_header" /> - <FrameLayout android:layout_width="match_parent" - android:background="@android:color/transparent" android:layout_height="match_parent"> <com.google.android.material.button.MaterialButton @@ -26,17 +17,15 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" app:icon="@drawable/ic_settings" - app:iconTint="?colorSurface" android:id="@+id/drawer_settings_btn" - android:layout_gravity="bottom|end" - android:layout_marginBottom="16dp" - android:layout_marginEnd="12dp" + android:layout_gravity="center_vertical|end" + android:layout_marginEnd="8dp" android:transitionName="SETTINGS_REVEAL" /> <LinearLayout android:layout_width="match_parent" - android:layout_height="56dp" + android:layout_height="wrap_content" android:orientation="vertical" android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" @@ -49,25 +38,20 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:textColor="@android:color/primary_text_dark" - tools:text="test" - android:textSize="14sp" - android:textStyle="bold" - - /> + 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:textColor="@android:color/primary_text_dark" android:layout_marginStart="16dp" - android:layout_marginTop="5dp" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" tools:text="example.org" - android:textSize="14sp" - android:textStyle="normal" - - /> + android:textAppearance="?attr/textAppearanceTitleSmall" + android:textColor="?attr/colorOnSurfaceVariant"/> </LinearLayout> </FrameLayout> diff --git a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml index bb263237..90aac490 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/feeds_row" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -19,8 +20,8 @@ android:layout_height="21dp" android:layout_weight="0" android:scaleType="fitXY" - android:tint="?colorAccent" - android:src="?ic_go_back" /> + android:src="?ic_go_back" + app:tint="?colorAccent" /> <TextView android:fontFamily="sans-serif-medium" @@ -29,10 +30,9 @@ android:gravity="center_vertical" android:layout_weight="1" android:ellipsize="end" - android:paddingStart="35dp" + android:paddingStart="16dp" android:singleLine="true" android:text=".." - android:paddingBottom="2dp" android:textColor="?feedlistTextColor" android:textSize="14sp" /> 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 6b980382..cfdc284d 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_row.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row.xml @@ -1,64 +1,64 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - 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" + <LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" + 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:layout_weight="1" - android:ellipsize="middle" - android:paddingStart="35dp" - android:paddingEnd="16dp" - android:singleLine="true" - tools:text="Feed title" - android:textAlignment="viewStart" - android:paddingBottom="2dp" - android:textColor="?feedlistTextColor" - android:textSize="14sp" /> + android:orientation="horizontal"> - <TextView - android:id="@+id/unread_counter" - android:fontFamily="sans-serif-medium" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:textAlignment="viewEnd" - android:singleLine="true" - tools:text="3200" - android:textColor="?colorOnPrimaryContainer" - android:textSize="14sp" /> + <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" /> - <!-- <ImageButton - android:id="@+id/feed_menu_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:background="@null" - android:paddingLeft="8dp" - android:visibility="gone" - android:src="?ic_dots_vertical" /> --> + <TextView + android:id="@+id/title" + android:fontFamily="sans-serif-medium" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_gravity="center_vertical" + android:ellipsize="middle" + android:paddingStart="16dp" + android:paddingEnd="16dp" + android:singleLine="true" + tools:text="Feed title" + android:textColor="?feedlistTextColor" + android:textSize="14sp" /> + + <TextView + android:id="@+id/unread_counter" + android:fontFamily="sans-serif-medium" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0" + android:textAlignment="viewEnd" + android:singleLine="true" + tools:text="3200" + android:textColor="?colorAccent" + android:textSize="14sp" /> + + <!-- <ImageButton + android:id="@+id/feed_menu_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0" + android:background="@null" + android:paddingLeft="8dp" + android:visibility="gone" + android:src="?ic_dots_vertical" /> --> -</LinearLayout>
\ No newline at end of file + </LinearLayout> 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 23a972e3..a3d66851 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 @@ -1,66 +1,72 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<com.google.android.material.card.MaterialCardView + xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/feeds_row" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:descendantFocusability="blocksDescendants" - android:background="?colorSurfaceDim" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:paddingTop="8dp" - android:paddingBottom="8dp" - android:baselineAligned="true" - android:gravity="center_vertical" - android:orientation="horizontal"> + app:cardElevation="0dp" + android:backgroundTint="?colorSurfaceDim" + android:layout_height="wrap_content"> - <ImageView - android:id="@+id/icon" - android:tint="?colorAccent" - 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" + <LinearLayout + 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:layout_weight="1" - android:ellipsize="middle" - android:paddingStart="35dp" - android:paddingEnd="16dp" - android:singleLine="true" - tools:text="Feed title" - android:textAlignment="viewStart" - android:paddingBottom="2dp" - android:textColor="?feedlistSelectedTextColor" - android:textSize="14sp" /> + android:orientation="horizontal"> - <TextView - android:id="@+id/unread_counter" - android:fontFamily="sans-serif-medium" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:textAlignment="viewEnd" - android:singleLine="true" - tools:text="3200" - android:textColor="?colorOnPrimaryContainer" - android:textSize="14sp" /> + <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" /> - <!-- <ImageButton - android:id="@+id/feed_menu_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:background="@null" - android:paddingLeft="8dp" - android:visibility="gone" - android:src="?ic_dots_vertical" /> --> + <TextView + android:id="@+id/title" + android:fontFamily="sans-serif-medium" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:ellipsize="middle" + android:paddingStart="16dp" + android:paddingEnd="16dp" + android:singleLine="true" + tools:text="Feed title" + android:textColor="?feedlistSelectedTextColor" + android:textSize="14sp" /> + + <TextView + android:id="@+id/unread_counter" + android:fontFamily="sans-serif-medium" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0" + android:textAlignment="viewEnd" + android:singleLine="true" + tools:text="3200" + android:textColor="?colorAccent" + android:textSize="14sp" /> + + <!-- <ImageButton + android:id="@+id/feed_menu_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0" + android:background="@null" + android:paddingLeft="8dp" + android:visibility="gone" + android:src="?ic_dots_vertical" /> --> + + </LinearLayout> -</LinearLayout>
\ No newline at end of file +</com.google.android.material.card.MaterialCardView> 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 index 0dbbcfc9..53947a04 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml @@ -28,15 +28,13 @@ android:fontFamily="sans-serif-medium" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:gravity="center_vertical" + android:layout_gravity="center_vertical" android:layout_weight="1" android:ellipsize="end" - android:paddingStart="35dp" + android:paddingStart="16dp" android:paddingEnd="16dp" android:singleLine="true" tools:text="Unread only" - android:textAlignment="viewStart" - android:paddingBottom="2dp" android:textColor="?feedlistTextColor" android:textSize="14sp" /> diff --git a/org.fox.ttrss/src/main/res/layout/fragment_cats.xml b/org.fox.ttrss/src/main/res/layout/fragment_cats.xml deleted file mode 100755 index 64240be6..00000000 --- a/org.fox.ttrss/src/main/res/layout/fragment_cats.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/cats_fragment.xml" - android:layout_width="match_parent" - android:layout_height="fill_parent" > - - <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="0dp" - android:divider="@null" - android:layout_width="match_parent" - android:layout_height="match_parent" > - </ListView> - </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> -</FrameLayout>
\ No newline at end of file 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 2d8d963b..bf26e3fc 100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml @@ -11,8 +11,10 @@ <ListView android:id="@+id/feeds" - android:dividerHeight="0dp" + android:dividerHeight="4dp" android:divider="@null" + android:paddingStart="4dp" + android:paddingEnd="4dp" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_alignParentLeft="true" |