diff options
| author | Andrew Dolgov <fox@fakecake.org> | 2025-05-09 12:12:03 +0300 |
|---|---|---|
| committer | Andrew Dolgov <fox@fakecake.org> | 2025-05-09 12:12:03 +0300 |
| commit | d720a53e0b94ce2872fd4141e3f044ff7ec4baab (patch) | |
| tree | 0e9ba206f2a0fae00373ce6591f36ad55e1f3836 /org.fox.ttrss/src/main/res/layout | |
| parent | be2aec246a4d096cf6ee36353ddf84cea59da448 (diff) | |
| parent | 961104e4426ac48aa390915f118be6f6ff0387ce (diff) | |
Merge branch 'protected/spring-cleaning' into 'master'
Protected/spring cleaning
See merge request tt-rss/tt-rss-android!29
Diffstat (limited to 'org.fox.ttrss/src/main/res/layout')
34 files changed, 662 insertions, 877 deletions
diff --git a/org.fox.ttrss/src/main/res/layout/activity_detail.xml b/org.fox.ttrss/src/main/res/layout/activity_detail.xml index 8f36bbd6..8cb1ba10 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_detail.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_detail.xml @@ -1,9 +1,10 @@ <?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="match_parent"> + xmlns:android="http://schemas.android.com/apk/res/android" + android:fitsSystemWindows="true" + android:layout_width="match_parent" + android:layout_height="match_parent"> -<include layout="@layout/activity_detail_phone" /> + <include layout="@layout/layout_detail_phone" /> </FrameLayout>
\ No newline at end of file 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 6d9a8dbd..8cb1ba10 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,48 +1,10 @@ -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/headlines" +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" android:fitsSystemWindows="true" - android:animateLayoutChanges="true" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> - <androidx.coordinatorlayout.widget.CoordinatorLayout - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <com.google.android.material.floatingactionbutton.FloatingActionButton - android:id="@+id/detail_fab" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="end|bottom" - android:visibility="gone" - android:src="@drawable/ic_action_web_site" - android:layout_margin="16dp" /> - - <com.google.android.material.appbar.AppBarLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <include layout="@layout/toolbar" android:id="@+id/toolbar" /> - - </com.google.android.material.appbar.AppBarLayout> - - <FrameLayout - android:id="@+id/article_fragment" - app:layout_behavior=".util.DetailActivityScrollingViewBehavior" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="?articleBackground"> - </FrameLayout> - - </androidx.coordinatorlayout.widget.CoordinatorLayout> - - <FrameLayout - android:id="@+id/headlines_fragment" - android:visibility="gone" - android:layout_height="0dp" - android:layout_width="0dp" - android:background="?headlinesBackground"> - </FrameLayout> + <include layout="@layout/layout_detail_phone" /> </FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml index 7f47de50..f44bb74b 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml @@ -1,9 +1,8 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:fitsSystemWindows="true" + xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/article_images" android:layout_width="fill_parent" android:animateLayoutChanges="true" - android:background="@android:color/black" android:layout_height="fill_parent"> <com.bogdwellers.pinchtozoom.view.ImageViewPager @@ -12,18 +11,16 @@ android:layout_height="fill_parent" android:layout_alignParentTop="true" /> - <ImageView + <com.google.android.material.button.MaterialButton + style="?attr/materialIconButtonStyle" android:id="@+id/gallery_overflow" - android:clickable="true" android:layout_width="wrap_content" - android:layout_height="26dp" + android:layout_height="wrap_content" android:layout_weight="0" - android:background="@drawable/ripple" - android:src="@drawable/ic_dots_vertical_circle" + app:icon="?ic_dots_vertical" android:layout_alignParentRight="true" - android:tint="?colorAccent" - android:layout_marginRight="8dp" - android:layout_marginTop="@dimen/activity_vertical_margin" /> + android:layout_marginTop="48dp" + app:iconTint="?colorTertiary" /> <ProgressBar style="?android:attr/progressBarStyleHorizontal" @@ -44,7 +41,8 @@ <me.relex.circleindicator.CircleIndicator android:id="@+id/gallery_pager_indicator" android:layout_width="fill_parent" - android:layout_height="40dp" + android:layout_height="32dp" + android:layout_marginBottom="55dp" android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" diff --git a/org.fox.ttrss/src/main/res/layout/activity_logcat.xml b/org.fox.ttrss/src/main/res/layout/activity_logcat.xml index f6cccd22..f13a17b3 100755 --- a/org.fox.ttrss/src/main/res/layout/activity_logcat.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_logcat.xml @@ -1,5 +1,4 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:background="?android:colorBackground" android:fitsSystemWindows="true" android:layout_width="fill_parent" android:layout_height="fill_parent" > diff --git a/org.fox.ttrss/src/main/res/layout/activity_login.xml b/org.fox.ttrss/src/main/res/layout/activity_login.xml index 8f6cf4ed..829e0897 100755 --- a/org.fox.ttrss/src/main/res/layout/activity_login.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_login.xml @@ -1,5 +1,4 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:background="?android:colorBackground" android:fitsSystemWindows="true" android:layout_width="fill_parent" android:layout_height="fill_parent" > diff --git a/org.fox.ttrss/src/main/res/layout/activity_master.xml b/org.fox.ttrss/src/main/res/layout/activity_master.xml index 9bb9bff5..4ea81118 100755 --- a/org.fox.ttrss/src/main/res/layout/activity_master.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_master.xml @@ -4,5 +4,5 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <include layout="@layout/activity_master_phone" /> + <include layout="@layout/layout_master_phone" /> </FrameLayout>
\ No newline at end of file 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 6ae5064f..4ea81118 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,59 +1,8 @@ - <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"> - - <androidx.coordinatorlayout.widget.CoordinatorLayout - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <com.google.android.material.floatingactionbutton.FloatingActionButton - android:id="@+id/master_fab" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="end|bottom" - android:visibility="gone" - android:src="@drawable/ic_refresh" - android:layout_margin="16dp" /> - - <com.google.android.material.appbar.AppBarLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <include layout="@layout/toolbar" android:id="@+id/toolbar" /> - - </com.google.android.material.appbar.AppBarLayout> - - <FrameLayout - android:id="@+id/headlines_fragment" - app:layout_behavior=".util.FabAwareScrollingViewBehavior" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="?headlinesBackground" /> - - </androidx.coordinatorlayout.widget.CoordinatorLayout> - - <org.fox.ttrss.util.ScrimInsetsFrameLayout - xmlns:app="http://schemas.android.com/apk/res-auto" - android:id="@+id/scrimInsetsFrameLayout" - android:layout_width="300dp" - android:layout_height="match_parent" - android:layout_gravity="start" - android:background="@android:color/white" - android:elevation="10dp" - android:fitsSystemWindows="true" - app:insetForeground="#4000"> - - <FrameLayout - android:id="@+id/feeds_fragment" - android:layout_width="match_parent" - android:background="?feedlistBackground" - android:layout_height="match_parent" > - </FrameLayout> - - </org.fox.ttrss.util.ScrimInsetsFrameLayout> - - </androidx.drawerlayout.widget.DrawerLayout> +<?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="match_parent"> + + <include layout="@layout/layout_master_phone" /> +</FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/activity_preferences.xml b/org.fox.ttrss/src/main/res/layout/activity_preferences.xml index 519bfe61..6032b951 100755 --- a/org.fox.ttrss/src/main/res/layout/activity_preferences.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_preferences.xml @@ -2,11 +2,11 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" + android:fitsSystemWindows="true" android:layout_height="match_parent"> <FrameLayout android:id="@+id/preferences_container" - android:background="?android:colorBackground" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_alignParentLeft="true" diff --git a/org.fox.ttrss/src/main/res/layout/activity_tasker_settings.xml b/org.fox.ttrss/src/main/res/layout/activity_tasker_settings.xml deleted file mode 100644 index efdd76ab..00000000 --- a/org.fox.ttrss/src/main/res/layout/activity_tasker_settings.xml +++ /dev/null @@ -1,36 +0,0 @@ -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/main" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:padding="5dp" > - - <Button - android:id="@+id/close_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_centerHorizontal="true" - android:text="@string/tasker_save_and_close" /> - - <RadioGroup - android:id="@+id/taskerActions" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" > - - <RadioButton - android:id="@+id/actionDownload" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:checked="true" - android:text="@string/download_articles_and_go_offline" /> - - <RadioButton - android:id="@+id/actionUpload" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/synchronize_read_articles_and_go_online" /> - </RadioGroup> - -</RelativeLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/activity_youtube_player.xml b/org.fox.ttrss/src/main/res/layout/activity_youtube_player.xml deleted file mode 100644 index 0b423edc..00000000 --- a/org.fox.ttrss/src/main/res/layout/activity_youtube_player.xml +++ /dev/null @@ -1,29 +0,0 @@ -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" - android:fitsSystemWindows="true" - android:background="@android:color/black"> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_below="@+id/toolbar"> - - <fragment - android:name="com.google.android.youtube.player.YouTubePlayerSupportFragment" - android:id="@+id/fragment_youtube_player" - android:layout_width="match_parent" - android:layout_height="match_parent" /> - - <ProgressBar - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/video_loading" - android:layout_gravity="center" - android:indeterminate="true" /> - - </FrameLayout> - - <include layout="@layout/toolbar" android:id="@+id/toolbar" /> - -</RelativeLayout> diff --git a/org.fox.ttrss/src/main/res/layout/drawer_divider.xml b/org.fox.ttrss/src/main/res/layout/drawer_divider.xml index d47c3b5b..55aa5fdc 100644 --- a/org.fox.ttrss/src/main/res/layout/drawer_divider.xml +++ b/org.fox.ttrss/src/main/res/layout/drawer_divider.xml @@ -1,14 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="wrap_content"> - <View - android:layout_gravity="top|center_horizontal" - android:layout_marginTop="10dp" + <com.google.android.material.divider.MaterialDivider android:layout_width="match_parent" - android:layout_height="1dp" - android:background="?headlineFooterColor"/> + app:dividerInsetEnd="16dp" + app:dividerInsetStart="16dp" + android:layout_marginTop="8dp" + android:layout_height="wrap_content"/> </FrameLayout>
\ No newline at end of file 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 6779a950..f4954259 100755 --- a/org.fox.ttrss/src/main/res/layout/drawer_header.xml +++ b/org.fox.ttrss/src/main/res/layout/drawer_header.xml @@ -1,40 +1,33 @@ <?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"> - <ImageView + <com.google.android.material.button.MaterialButton + style="?attr/materialIconButtonStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_settings" + android:scaleX="1.5" + android:scaleY="1.5" + app:icon="@drawable/baseline_settings_24" android:id="@+id/drawer_settings_btn" - android:layout_gravity="bottom|end" - android:clickable="true" - android:layout_marginBottom="16dp" - android:layout_marginEnd="12dp" + android:layout_gravity="center_vertical|end" + android:layout_marginEnd="8dp" android:transitionName="SETTINGS_REVEAL" - android:background="@drawable/ripple" /> + /> <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" @@ -47,25 +40,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..f4c580a3 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="?colorTertiary" /> <TextView android:fontFamily="sans-serif-medium" @@ -29,11 +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" /> </LinearLayout>
\ No newline at end of file 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 7a10bc23..32e20c26 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="?unreadCounterColor" - 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" + app:tint="?colorOnPrimaryContainer" + 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: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="?colorTertiary" + 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 d5b6cb3c..c12c732d 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,73 @@ <?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="?feedsSelectedBackground" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:paddingTop="8dp" - android:paddingBottom="8dp" - android:baselineAligned="true" - android:gravity="center_vertical" - android:orientation="horizontal"> + app:strokeWidth="0dp" + app:cardBackgroundColor="?colorTertiaryContainer" + 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="?unreadCounterColor" - 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" + app:tint="?colorOnTertiaryContainer" + 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="?colorOnTertiaryContainer" + 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="?colorTertiary" + 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 f9f377f6..d4451bbe 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 @@ -1,14 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <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:orientation="horizontal"> @@ -20,6 +19,7 @@ android:layout_height="21dp" android:layout_weight="0" android:scaleType="fitXY" + app:tint="?colorOnPrimaryContainer" android:src="?ic_rss_box" /> <TextView @@ -27,19 +27,16 @@ 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" + tools:text="@string/unread_only" android:textSize="14sp" /> - <androidx.appcompat.widget.SwitchCompat + <com.google.android.material.materialswitch.MaterialSwitch android:id="@+id/row_switch" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml index 61215a40..e75980b0 100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml @@ -3,8 +3,8 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/article_fragment" android:layout_width="fill_parent" - android:layout_height="match_parent" - android:background="?articleBackground"> + android:background="?colorSurfaceContainer" + android:layout_height="match_parent"> <FrameLayout android:id="@+id/article_fullscreen_video" @@ -17,105 +17,63 @@ android:layout_height="wrap_content"> <com.google.android.material.appbar.AppBarLayout - android:background="?articleHeader" - android:elevation="0dp" - app:elevation="0dp" android:layout_width="match_parent" + android:background="?colorSurfaceContainer" android:layout_height="match_parent"> - <LinearLayout + <com.google.android.material.card.MaterialCardView app:layout_scrollFlags="scroll|enterAlways" - android:padding="16dp" + app:strokeWidth="0dp" + app:shapeAppearance="@style/ShapeAppearanceArticleHeader" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <LinearLayout android:id="@+id/article_header" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingBottom="6dp"> + android:orientation="vertical"> <LinearLayout android:orientation="horizontal" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:layout_width="match_parent" android:layout_height="match_parent"> <TextView android:id="@+id/title" - android:background="@drawable/ripple" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:layout_marginEnd="8dp" - android:textAlignment="viewStart" + android:textColor="?colorPrimary" tools:text="Unreasonably long article title blah blah blah blah blah blah" - android:textColor="?articleHeaderTextColor" android:textSize="18sp" - android:layout_marginRight="8dp" android:gravity="start" /> - <ImageView - android:id="@+id/score" - android:layout_width="wrap_content" - android:layout_height="24dp" - android:layout_weight="0" - android:background="@drawable/ripple" - android:clickable="true" - android:layout_marginLeft="8dp" - android:src="?ic_action_trending_flat" - android:layout_gravity="center_vertical|end" /> - - <ImageView - android:id="@+id/attachments" - android:background="@drawable/ripple" - android:layout_width="wrap_content" - android:layout_height="24dp" - android:layout_weight="0" - android:layout_marginLeft="8dp" - android:clickable="true" - android:src="?ic_attachment_vert" - android:layout_gravity="center_vertical|end" /> - - <ImageView - android:id="@+id/share" - android:background="@drawable/ripple" - android:layout_width="wrap_content" - android:layout_height="24dp" - android:layout_weight="0" - android:clickable="true" - android:src="?ic_share" - android:layout_gravity="center_vertical|end" /> </LinearLayout> <TextView android:id="@+id/comments" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" tools:text="comments" - android:background="@drawable/ripple" android:layout_width="match_parent" android:layout_height="wrap_content" android:textAlignment="viewStart" android:layout_weight="1" android:fontFamily="sans-serif-light" - android:paddingTop="8dp" - android:textColor="?headlineSecondaryTextColor" + android:layout_marginTop="8dp" + android:textColor="?colorPrimary" android:textSize="12sp" /> - <TextView - android:id="@+id/host" - tools:text="host" - android:background="@drawable/ripple" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textAlignment="viewStart" - android:layout_weight="1" - android:fontFamily="sans-serif-light" - android:paddingTop="8dp" - android:textColor="?headlineSecondaryTextColor" - android:textSize="12sp" - android:visibility="gone"/> - <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingTop="8dp"> + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:layout_marginBottom="8dp" + android:layout_marginTop="8dp"> <TextView android:id="@+id/tags" @@ -127,7 +85,7 @@ android:textAlignment="viewStart" android:singleLine="true" android:fontFamily="sans-serif-light" - android:textColor="?headlineSecondaryTextColor" + android:textColor="?colorSecondary" android:textSize="12sp" /> <TextView @@ -136,69 +94,64 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="0.3" - android:gravity="" android:textAlignment="viewEnd" android:fontFamily="sans-serif-light" android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="?headlineSecondaryTextColor" + android:textColor="?colorSecondary" android:textSize="12sp" /> </LinearLayout> - </LinearLayout> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> - <View - android:layout_gravity="top|center_horizontal" - android:layout_width="match_parent" - android:layout_height="1dp" - android:background="?articleHeaderSeparator"/> + <com.google.android.material.card.MaterialCardView + android:id="@+id/note_container" + android:layout_width="match_parent" + app:cardBackgroundColor="?colorTertiaryContainer" + android:layout_margin="8dp" + app:strokeWidth="0dp" + android:layout_height="match_parent"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_margin="8dp" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/note" + tools:text="Article note (if any...)" + android:layout_gravity="center_vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginEnd="8dp" + android:textColor="?colorOnTertiaryContainer" + android:layout_weight="1" + android:textSize="12sp"/> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + app:tint="?colorOnTertiaryContainer" + android:src="@drawable/baseline_note_24"/> + + </LinearLayout> + </com.google.android.material.card.MaterialCardView> + + </LinearLayout> + </LinearLayout> + </com.google.android.material.card.MaterialCardView> </com.google.android.material.appbar.AppBarLayout> - <androidx.core.widget.NestedScrollView - android:id="@+id/article_scrollview" - android:scrollbars="vertical|horizontal" + <com.telefonica.nestedscrollwebview.NestedScrollWebView + android:id="@+id/article_content" app:layout_behavior="@string/appbar_scrolling_view_behavior" android:layout_width="match_parent" - android:layout_height="match_parent"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:descendantFocusability="blocksDescendants" - android:orientation="vertical" > - - <TextView - android:id="@+id/note" - tools:text="Article note (if any...)" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - android:background="?articleNoteBackground" - android:textColor="?articleNoteTextColor" - android:textSize="12sp" - android:paddingLeft="16dp" - android:paddingTop="8dp" - android:paddingRight="16dp" - android:paddingBottom="8dp" /> - - <org.fox.ttrss.util.LessBrokenWebView - android:layout_margin="16dp" - android:id="@+id/article_content" - android:scrollbars="none" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - </LinearLayout> - </androidx.core.widget.NestedScrollView> + android:layout_height="wrap_content" /> </com.otaliastudios.nestedscrollcoordinatorlayout.NestedScrollCoordinatorLayout> - <TextView - android:layout_width="match_parent" - android:layout_height="match_parent" - android:id="@+id/article_status_message" - android:gravity="center" - android:visibility="gone" /> - </FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/article_pager.xml b/org.fox.ttrss/src/main/res/layout/fragment_article_pager.xml index 62b3fea4..1a687b1d 100755 --- a/org.fox.ttrss/src/main/res/layout/article_pager.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_article_pager.xml @@ -2,6 +2,5 @@ <androidx.viewpager.widget.ViewPager xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/article_pager" - android:background="?android:colorBackground" - android:layout_width="fill_parent" - android:layout_height="fill_parent"/> + android:layout_width="match_parent" + android:layout_height="wrap_content"/> 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" diff --git a/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml b/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml index 9f09290f..2783a1e4 100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/headlines_fragment" - android:background="?android:colorBackground" android:layout_width="fill_parent" android:layout_height="fill_parent"> @@ -12,6 +11,7 @@ <org.fox.ttrss.util.ContextMenuRecyclerView android:id="@+id/headlines_list" + android:background="?colorSurfaceContainer" android:drawSelectorOnTop="true" android:scrollbars="vertical" android:layout_width="match_parent" diff --git a/org.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml b/org.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml index 6e43864a..4ce8c1dd 100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/headlines_fragment" - android:background="?android:colorBackground" android:layout_width="fill_parent" android:layout_height="fill_parent"> @@ -12,7 +11,11 @@ <ListView android:id="@+id/headlines_list" + android:background="?colorSurfaceContainer" android:drawSelectorOnTop="true" + android:padding="8dp" + android:dividerHeight="8dp" + android:divider="@null" android:layout_width="match_parent" android:layout_height="match_parent" /> </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_footer.xml b/org.fox.ttrss/src/main/res/layout/headlines_footer.xml index a734a294..b4d52fd5 100644 --- a/org.fox.ttrss/src/main/res/layout/headlines_footer.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_footer.xml @@ -11,6 +11,6 @@ android:layout_marginBottom="10dp" android:layout_width="128dp" android:layout_height="1dp" - android:background="?headlineFooterColor"/> + android:background="?colorPrimary"/> </FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml index 2e997e2c..52bbae56 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml @@ -1,7 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> -<FrameLayout 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" + xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/headlines_row" + android:layout_marginStart="8dp" + android:layout_marginEnd="8dp" + android:layout_marginTop="8dp" + app:strokeWidth="0dp" android:layout_width="wrap_content" android:layout_height="wrap_content"> @@ -12,162 +17,136 @@ android:shrinkColumns="0,1" android:stretchColumns="0,1"> - <TableRow android:layout_width="fill_parent" android:layout_height="wrap_content"> - <FrameLayout - android:id="@+id/flavorImageHolder" + <RelativeLayout + android:id="@+id/headline_header" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_span="2"> + android:clickable="true" + android:layout_span="2" + android:padding="16dp"> - <RelativeLayout + <TextView + android:id="@+id/title" android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:ellipsize="end" + android:maxLines="3" + android:paddingBottom="8dp" + android:singleLine="false" + android:textColor="?colorPrimary" + android:textSize="18sp" + android:textStyle="normal" + tools:text="Sample entry title which is overwhelmingly long blah blah blah" /> - <ProgressBar - android:id="@+id/flavorImageLoadingBar" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:visibility="visible" - style="?android:attr/progressBarStyleHorizontal" - android:layout_alignParentTop="false" - android:layout_alignParentRight="false" - android:layout_alignParentEnd="true" - android:max="100" - android:indeterminate="false" - android:layout_toRightOf="@+id/flavor_video" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" /> + <LinearLayout + android:id="@+id/linearLayout2" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@+id/title" + android:orientation="horizontal"> - <ImageView - android:id="@+id/flavor_image" - android:foreground="@drawable/ripple" - android:layout_width="match_parent" + <TextView + android:id="@+id/feed_title" + android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_gravity="center" - android:adjustViewBounds="true" - android:background="@android:color/transparent" - android:cropToPadding="true" - android:scaleType="fitCenter" - android:visibility="visible" /> + android:layout_weight="0.5" + android:ellipsize="middle" + android:fontFamily="sans-serif-light" + android:singleLine="true" + android:textAlignment="viewStart" + android:textColor="?colorSecondary" + android:textSize="12sp" + tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" /> - <TextureView - android:id="@+id/flavor_video" - android:foreground="@null" - android:layout_width="match_parent" + <TextView + android:id="@+id/date" + android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_gravity="center" - android:adjustViewBounds="true" - android:background="@null" - android:cropToPadding="true" - android:src="@drawable/drawer_header" - android:scaleType="fitCenter" - android:visibility="gone" - android:layout_alignBottom="@+id/flavor_image" - android:layout_alignTop="@+id/flavor_image" /> + android:layout_weight="0.5" + android:ellipsize="none" + android:fontFamily="sans-serif-light" + android:singleLine="true" + android:textAlignment="viewEnd" + android:textColor="?colorSecondary" + android:textSize="12sp" + tools:text="Jan 01, 12:00, 1970" /> - <RelativeLayout - android:id="@+id/headline_header" - android:clickable="true" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="?headlineHeaderBackground" - android:padding="16dp"> + </LinearLayout> - <TextView - android:id="@+id/title" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@drawable/ripple" - android:ellipsize="end" - android:textAlignment="viewStart" - android:gravity="center_vertical" - android:maxLines="3" - android:paddingBottom="8dp" - android:singleLine="false" - android:textColor="?headlineExcerptTextColor" - android:textSize="18sp" - android:textStyle="normal" - tools:text="Sample entry title" /> + </RelativeLayout> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_below="@+id/title" - android:orientation="horizontal" - android:id="@+id/linearLayout2"> + </TableRow> - <TextView - android:id="@+id/feed_title" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="0.5" - android:ellipsize="middle" - android:fontFamily="sans-serif-light" - android:gravity="center_vertical" - android:textAlignment="viewStart" - android:singleLine="true" - tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" - android:textColor="?headlineSecondaryTextColor" - android:textSize="12sp" /> + <TableRow + android:layout_width="match_parent" + android:layout_height="match_parent" > - <TextView - android:id="@+id/date" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="0.5" - android:ellipsize="none" - android:fontFamily="sans-serif-light" - android:gravity="center_vertical" - android:textAlignment="viewEnd" - android:singleLine="true" - tools:text="Jan 01, 12:00, 1970" - android:textColor="?headlineSecondaryTextColor" - android:textSize="12sp" /> + <FrameLayout + android:id="@+id/flavorImageHolder" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_span="2"> - </LinearLayout> + <ProgressBar + android:id="@+id/flavorImageLoadingBar" + style="?android:attr/progressBarStyleHorizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:indeterminate="false" + android:max="100" + android:visibility="visible" /> - </RelativeLayout> + <ImageView + android:id="@+id/flavor_image" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:adjustViewBounds="true" + android:background="@android:color/transparent" + android:cropToPadding="true" + android:scaleType="centerCrop" + tools:src="@drawable/ic_launcher_background" + android:visibility="visible" /> - </RelativeLayout> + <TextureView + android:id="@+id/flavor_video" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:adjustViewBounds="true" + android:background="@null" + android:cropToPadding="true" + android:foreground="@null" + android:scaleType="fitCenter" + android:visibility="gone" /> <ImageView android:id="@+id/flavor_video_kind" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="start|bottom" + android:layout_marginStart="8dp" + android:layout_marginBottom="10dp" + android:elevation="4dp" android:scaleType="fitXY" - android:src="@drawable/ic_play_circle" + android:src="@drawable/baseline_play_circle_24" android:visibility="visible" - android:layout_below="@+id/headline_header" - android:layout_alignParentRight="true" - android:layout_alignParentEnd="true" - android:elevation="4dp" - android:tint="?colorAccent" - android:layout_marginBottom="8dp" - android:layout_marginStart="8dp" /> + app:tint="?colorTertiary" /> - <ImageView + <com.google.android.material.button.MaterialButton android:id="@+id/gallery_overflow" - android:clickable="true" + style="?attr/materialIconButtonStyle" android:layout_width="wrap_content" - android:layout_height="24dp" - android:layout_weight="0" - android:background="@drawable/ripple" - android:paddingLeft="4dp" - android:paddingRight="4dp" - android:src="@drawable/ic_dots_vertical_circle" + android:layout_height="wrap_content" android:layout_gravity="bottom|end" - android:elevation="4dp" - android:tint="?colorAccent" - android:layout_marginBottom="10dp" - tools:targetApi="lollipop" /> + android:layout_marginEnd="-8dp" + app:icon="@drawable/baseline_more_vert_24" + app:iconTint="?colorTertiary"/> </FrameLayout> </TableRow> @@ -187,7 +166,6 @@ android:maxLines="5" android:padding="16dp" tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." - android:textColor="?headlineExcerptTextColor" android:textSize="13sp" /> </TableRow> @@ -204,7 +182,7 @@ android:paddingBottom="8dp" android:paddingLeft="8dp"> - <CheckBox + <com.google.android.material.checkbox.MaterialCheckBox android:id="@+id/selected" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -222,65 +200,60 @@ android:singleLine="true" tools:text="by Author" android:textAlignment="viewStart" - android:textColor="?headlineSecondaryTextColor" + android:textColor="?colorSecondary" android:textSize="12sp" android:textStyle="italic" /> - <ImageView + <com.google.android.material.button.MaterialButton + style="?attr/materialIconButtonStyle" android:id="@+id/score" android:layout_width="wrap_content" - android:layout_height="24dp" + android:layout_height="wrap_content" android:layout_weight="0" - android:background="@drawable/ripple" - android:clickable="true" android:paddingLeft="4dp" android:paddingRight="4dp" - android:src="?ic_action_trending_flat" /> + app:icon="?ic_action_trending_flat" /> - <ImageView + <com.google.android.material.button.MaterialButton + style="?attr/materialIconButtonStyle" android:id="@+id/attachments" android:layout_width="wrap_content" - android:layout_height="24dp" + android:layout_height="wrap_content" android:layout_weight="0" - android:background="@drawable/ripple" - android:clickable="true" android:paddingLeft="4dp" android:paddingRight="4dp" - android:src="?ic_attachment" /> + app:icon="?ic_attachment" /> - <ImageView + <com.google.android.material.button.MaterialButton + style="?attr/materialIconButtonStyle" android:id="@+id/marked" android:layout_width="wrap_content" - android:layout_height="24dp" + android:layout_height="wrap_content" android:layout_weight="0" - android:background="@drawable/ripple" - android:clickable="true" android:paddingLeft="4dp" android:paddingRight="4dp" - android:src="?ic_star_outline" /> + app:icon="?ic_star_outline" /> - <ImageView + <com.google.android.material.button.MaterialButton + style="?attr/materialIconButtonStyle" android:id="@+id/published" android:layout_width="wrap_content" - android:layout_height="24dp" + android:layout_height="wrap_content" android:layout_weight="0" - android:background="@drawable/ripple" - android:clickable="true" android:paddingLeft="4dp" android:paddingRight="4dp" - android:src="?ic_rss_box" /> + app:icon="?ic_rss_box" /> - <ImageView + <com.google.android.material.button.MaterialButton + style="?attr/materialIconButtonStyle" android:id="@+id/article_menu_button" android:layout_width="wrap_content" - android:layout_height="24dp" + android:layout_height="wrap_content" android:layout_weight="0" - android:background="@drawable/ripple" android:paddingLeft="4dp" android:paddingRight="4dp" - android:src="?ic_dots_vertical" /> + app:icon="?ic_dots_vertical" /> </LinearLayout> </TableRow> </TableLayout> - -</FrameLayout>
\ No newline at end of file +</com.google.android.material.card.MaterialCardView>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml index d139313e..fd328276 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml @@ -2,6 +2,7 @@ <LinearLayout xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/headlines_row" android:padding="@dimen/activity_horizontal_margin" android:layout_width="fill_parent" @@ -48,7 +49,7 @@ android:maxLines="2" android:ellipsize="end" tools:text="Sample entry title" - android:textColor="?headlineExcerptTextColor" + android:textColor="?colorPrimary" android:textSize="18sp" android:layout_span="2" /> @@ -60,7 +61,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." - android:textColor="?headlineExcerptTextColor" + android:textColor="?colorSecondary" android:textSize="13sp" android:layout_span="2" android:paddingTop="4dp" /> @@ -80,7 +81,7 @@ android:singleLine="true" tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" android:textAlignment="viewStart" - android:textColor="?headlineSecondaryTextColor" + android:textColor="?colorSecondary" android:textSize="12sp" android:layout_weight="0.5" android:paddingTop="4dp" /> @@ -105,22 +106,20 @@ android:ellipsize="none" android:layout_weight="1" tools:text="Jan 01" - android:textColor="?headlineSecondaryTextColor" + android:textColor="?colorPrimary" android:textSize="12sp" /> - <ImageView + <com.google.android.material.button.MaterialButton android:id="@+id/marked" - android:background="@drawable/ripple" - android:layout_width="24dp" + style="?attr/materialIconButtonStyle" + android:layout_width="wrap_content" android:layout_gravity="bottom|end" - android:layout_height="24dp" + android:layout_height="wrap_content" android:layout_weight="0" android:clickable="true" - android:src="?ic_star_outline" /> - - + app:icon="?ic_star_outline" /> </LinearLayout> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected.xml index 2e449dbb..6030df54 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected.xml @@ -2,12 +2,14 @@ <LinearLayout xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/headlines_row" android:padding="@dimen/activity_horizontal_margin" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:background="?headlineSelectedBackground" + android:background="?colorTertiaryContainer" + android:textColor="?colorOnTertiaryContainer" tools:ignore="HardcodedText" > <FrameLayout @@ -49,7 +51,6 @@ android:maxLines="2" android:ellipsize="end" tools:text="Sample entry title" - android:textColor="?headlineSelectedTextColor" android:textSize="18sp" android:layout_span="2" /> @@ -61,7 +62,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." - android:textColor="?headlineSelectedExcerptTextColor" android:textSize="13sp" android:layout_span="2" android:paddingTop="4dp" /> @@ -81,7 +81,6 @@ android:singleLine="true" tools:text="Example Feed" android:textAlignment="viewStart" - android:textColor="?headlineSelectedSecondaryTextColor" android:textSize="12sp" android:layout_weight="0.5" android:paddingTop="4dp" /> @@ -106,23 +105,20 @@ android:ellipsize="none" android:layout_weight="1" tools:text="Jan 01" - android:textColor="?headlineSelectedSecondaryTextColor" + android:textColor="?colorSecondary" android:textSize="12sp" /> - <ImageView + <com.google.android.material.button.MaterialButton android:id="@+id/marked" - android:tint="?headlineFooterColor" - android:background="@drawable/ripple" - android:layout_width="24dp" + style="?attr/materialIconButtonStyle" + android:layout_width="wrap_content" android:layout_gravity="bottom|end" - android:layout_height="24dp" + android:layout_height="wrap_content" android:layout_weight="0" android:clickable="true" - android:src="?ic_star_outline" /> - - + app:icon="?ic_star_outline" /> </LinearLayout> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected_unread.xml index 024eb7cf..0d8d930d 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected_unread.xml @@ -2,12 +2,13 @@ <LinearLayout xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/headlines_row" android:padding="@dimen/activity_horizontal_margin" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:background="?headlineSelectedBackground" + android:background="?colorTertiaryContainer" tools:ignore="HardcodedText" > <FrameLayout @@ -47,7 +48,6 @@ android:maxLines="2" android:ellipsize="end" tools:text="Sample entry title" - android:textColor="?headlineSelectedTextColor" android:textStyle="bold" android:textSize="18sp" android:layout_span="2" /> @@ -60,7 +60,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." - android:textColor="?headlineSelectedExcerptTextColor" android:textSize="13sp" android:layout_span="2" android:paddingTop="4dp" /> @@ -80,7 +79,6 @@ android:singleLine="true" tools:text="Example Feed" android:textAlignment="viewStart" - android:textColor="?headlineSelectedSecondaryTextColor" android:textSize="12sp" android:layout_weight="0.5" android:paddingTop="4dp" /> @@ -105,23 +103,17 @@ android:ellipsize="none" android:layout_weight="1" tools:text="Jan 01" - android:textColor="?headlineSelectedSecondaryTextColor" - android:textSize="12sp" - /> + android:textColor="?colorSecondary" + android:textSize="12sp" /> - - <ImageView + <com.google.android.material.button.MaterialButton android:id="@+id/marked" - android:background="@drawable/ripple" - android:tint="?headlineFooterColor" - android:layout_width="24dp" + style="?attr/materialIconButtonStyle" + android:layout_width="wrap_content" android:layout_gravity="bottom|end" - android:layout_height="24dp" + android:layout_height="wrap_content" android:layout_weight="0" - android:clickable="true" - android:src="?ic_star_outline" /> - - + app:icon="?ic_star_outline" /> </LinearLayout> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_unread.xml index e440188f..222d19d1 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_unread.xml @@ -2,12 +2,13 @@ <LinearLayout xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/headlines_row" android:padding="@dimen/activity_horizontal_margin" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:background="?headlineUnreadBackground" + android:background="?colorSurfaceContainerLowest" tools:ignore="HardcodedText" > <FrameLayout @@ -49,7 +50,6 @@ android:maxLines="2" android:ellipsize="end" tools:text="Sample entry title" - android:textColor="?headlineUnreadTextColor" android:textStyle="bold" android:textSize="18sp" android:layout_span="2" /> @@ -62,7 +62,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." - android:textColor="?headlineExcerptTextColor" android:textSize="13sp" android:layout_span="2" android:paddingTop="4dp" /> @@ -82,7 +81,6 @@ android:singleLine="true" tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" android:textAlignment="viewStart" - android:textColor="?headlineSecondaryTextColor" android:textSize="12sp" android:layout_weight="0.5" android:paddingTop="4dp" /> @@ -103,38 +101,22 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="sans-serif-light" + android:textColor="?colorSecondary" android:singleLine="true" android:ellipsize="none" android:layout_weight="1" tools:text="Jan 01" - android:textColor="?headlineSecondaryTextColor" - android:textSize="12sp" - /> + android:textSize="12sp" /> - - <ImageView + <com.google.android.material.button.MaterialButton android:id="@+id/marked" - android:background="@drawable/ripple" - android:layout_width="24dp" + style="?attr/materialIconButtonStyle" + android:layout_width="wrap_content" android:layout_gravity="bottom|end" - android:layout_height="24dp" + android:layout_height="wrap_content" android:layout_weight="0" - android:clickable="true" - android:src="?ic_star_outline" /> - - + app:icon="?ic_star_outline" /> </LinearLayout> - <!-- <ImageView - android:id="@+id/article_menu_button" - android:layout_gravity="center" - android:layout_width="wrap_content" - android:layout_height="16dp" - android:layout_weight="0" - android:paddingLeft="4dp" - android:paddingRight="4dp" - android:src="@drawable/ic_action_overflow" /> --> - - </LinearLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_loadmore.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_loadmore.xml index 6444bfa5..43e9d8c8 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_loadmore.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_loadmore.xml @@ -19,7 +19,7 @@ android:id="@+id/loadmore_label" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="?headlineExcerptTextColor" + android:textColor="?colorSecondary" android:text="@string/loading_message" /> </LinearLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml index ba70bb89..4b20d9cb 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml @@ -1,10 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> -<FrameLayout 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" + xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/headlines_row" + app:cardBackgroundColor="?colorSurfaceContainerLowest" + android:layout_marginStart="8dp" + android:layout_marginEnd="8dp" + android:layout_marginTop="8dp" + app:strokeWidth="0dp" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="?headlineUnreadBackground"> + android:layout_height="wrap_content"> <TableLayout android:layout_width="fill_parent" @@ -17,157 +22,131 @@ android:layout_width="fill_parent" android:layout_height="wrap_content"> - <FrameLayout - android:id="@+id/flavorImageHolder" + <RelativeLayout + android:id="@+id/headline_header" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_span="2"> + android:clickable="true" + android:layout_span="2" + android:padding="16dp"> - <RelativeLayout + <TextView + android:id="@+id/title" android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:ellipsize="end" + android:maxLines="3" + android:paddingBottom="8dp" + android:singleLine="false" + android:textColor="?colorOnSurface" + android:textSize="18sp" + android:textStyle="bold" + tools:text="Sample entry title which is overwhelmingly long blah blah blah" /> - <ProgressBar - android:id="@+id/flavorImageLoadingBar" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:visibility="visible" - style="?android:attr/progressBarStyleHorizontal" - android:layout_alignParentTop="false" - android:layout_alignParentRight="false" - android:layout_alignParentEnd="true" - android:max="100" - android:indeterminate="false" - android:layout_toRightOf="@+id/flavor_video" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" /> + <LinearLayout + android:id="@+id/linearLayout2" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@+id/title" + android:orientation="horizontal"> - <ImageView - android:id="@+id/flavor_image" - android:foreground="@drawable/ripple" - android:layout_width="match_parent" + <TextView + android:id="@+id/feed_title" + android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_gravity="center" - android:adjustViewBounds="true" - android:background="@android:color/transparent" - android:cropToPadding="true" - android:scaleType="fitCenter" - android:visibility="visible" /> + android:layout_weight="0.5" + android:ellipsize="middle" + android:fontFamily="sans-serif-light" + android:singleLine="true" + android:textAlignment="viewStart" + android:textColor="?colorSecondary" + android:textSize="12sp" + tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" /> - <TextureView - android:id="@+id/flavor_video" - android:foreground="@null" - android:layout_width="match_parent" + <TextView + android:id="@+id/date" + android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_gravity="center" - android:adjustViewBounds="true" - android:background="@null" - android:cropToPadding="true" - android:src="@drawable/drawer_header" - android:scaleType="fitCenter" - android:visibility="gone" - android:layout_alignBottom="@+id/flavor_image" - android:layout_alignTop="@+id/flavor_image" /> + android:layout_weight="0.5" + android:ellipsize="none" + android:fontFamily="sans-serif-light" + android:singleLine="true" + android:textAlignment="viewEnd" + android:textColor="?colorSecondary" + android:textSize="12sp" + tools:text="Jan 01, 12:00, 1970" /> - <RelativeLayout - android:id="@+id/headline_header" - android:clickable="true" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="?headlineHeaderBackground" - android:padding="16dp"> + </LinearLayout> - <TextView - android:id="@+id/title" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_span="2" - android:background="@drawable/ripple" - android:ellipsize="end" - android:gravity="center_vertical" - android:maxLines="3" - android:paddingBottom="8dp" - android:singleLine="false" - android:textAlignment="viewStart" - android:textColor="?headlineUnreadTextColor" - android:textSize="18sp" - android:textStyle="bold" - tools:text="Sample entry title" /> + </RelativeLayout> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_below="@+id/title" - android:orientation="horizontal" - android:id="@+id/linearLayout2"> + </TableRow> - <TextView - android:id="@+id/feed_title" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="0.5" - android:ellipsize="middle" - android:fontFamily="sans-serif-light" - android:gravity="center_vertical" - android:textAlignment="viewStart" - android:singleLine="true" - tools:text="Example Feed" - android:textColor="?headlineSecondaryTextColor" - android:textSize="12sp" /> + <TableRow + android:layout_width="match_parent" + android:layout_height="match_parent" > - <TextView - android:id="@+id/date" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="0.5" - android:ellipsize="none" - android:fontFamily="sans-serif-light" - android:gravity="center_vertical" - android:textAlignment="viewEnd" - android:singleLine="true" - tools:text="Jan 01, 12:00, 1970" - android:textColor="?headlineSecondaryTextColor" - android:textSize="12sp" /> + <FrameLayout + android:id="@+id/flavorImageHolder" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_span="2"> - </LinearLayout> + <ProgressBar + android:id="@+id/flavorImageLoadingBar" + style="?android:attr/progressBarStyleHorizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:indeterminate="false" + android:max="100" + android:visibility="visible" /> - </RelativeLayout> + <ImageView + android:id="@+id/flavor_image" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:adjustViewBounds="true" + android:background="@android:color/transparent" + android:cropToPadding="true" + android:scaleType="centerCrop" + tools:src="@drawable/ic_launcher_background" + android:visibility="visible" /> - </RelativeLayout> + <TextureView + android:id="@+id/flavor_video" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:adjustViewBounds="true" + android:background="@null" + android:cropToPadding="true" + android:foreground="@null" + android:scaleType="fitCenter" + android:visibility="gone" /> <ImageView android:id="@+id/flavor_video_kind" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom|start" + android:layout_gravity="start|bottom" + android:layout_marginStart="8dp" + android:layout_marginBottom="10dp" android:scaleType="fitXY" - android:src="@drawable/ic_play_circle" + android:src="@drawable/baseline_play_circle_24" android:visibility="visible" - android:layout_below="@+id/headline_header" - android:layout_alignParentRight="true" - android:layout_alignParentEnd="true" - android:tint="?colorAccent" - android:layout_marginStart="8dp" - android:layout_marginBottom="8dp" /> + app:tint="?colorTertiary" /> - <ImageView + <com.google.android.material.button.MaterialButton android:id="@+id/gallery_overflow" - android:clickable="true" + style="?attr/materialIconButtonStyle" android:layout_width="wrap_content" - android:layout_height="24dp" - android:layout_weight="0" - android:background="@drawable/ripple" - android:paddingLeft="4dp" - android:paddingRight="4dp" - android:src="@drawable/ic_dots_vertical_circle" + android:layout_height="wrap_content" android:layout_gravity="bottom|end" - android:elevation="4dp" - android:tint="?colorAccent" - android:layout_marginBottom="10dp" - tools:targetApi="lollipop" /> + android:layout_marginEnd="-8dp" + app:icon="@drawable/baseline_more_vert_24" + app:iconTint="?colorTertiary"/> </FrameLayout> </TableRow> @@ -187,7 +166,6 @@ android:maxLines="5" android:padding="16dp" tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." - android:textColor="?headlineExcerptTextColor" android:textSize="13sp" /> </TableRow> @@ -204,7 +182,7 @@ android:paddingBottom="8dp" android:paddingLeft="8dp"> - <CheckBox + <com.google.android.material.checkbox.MaterialCheckBox android:id="@+id/selected" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -222,65 +200,60 @@ android:singleLine="true" tools:text="by Author" android:textAlignment="viewStart" - android:textColor="?headlineSecondaryTextColor" + android:textColor="?colorSecondary" android:textSize="12sp" android:textStyle="italic" /> - <ImageView + <com.google.android.material.button.MaterialButton + style="?attr/materialIconButtonStyle" android:id="@+id/score" android:layout_width="wrap_content" - android:layout_height="24dp" + android:layout_height="wrap_content" android:layout_weight="0" - android:background="@drawable/ripple" - android:clickable="true" android:paddingLeft="4dp" android:paddingRight="4dp" - android:src="?ic_action_trending_flat" /> + app:icon="?ic_action_trending_flat" /> - <ImageView + <com.google.android.material.button.MaterialButton + style="?attr/materialIconButtonStyle" android:id="@+id/attachments" android:layout_width="wrap_content" - android:layout_height="24dp" + android:layout_height="wrap_content" android:layout_weight="0" - android:background="@drawable/ripple" - android:clickable="true" android:paddingLeft="4dp" android:paddingRight="4dp" - android:src="?ic_attachment" /> + app:icon="?ic_attachment" /> - <ImageView + <com.google.android.material.button.MaterialButton + style="?attr/materialIconButtonStyle" android:id="@+id/marked" android:layout_width="wrap_content" - android:layout_height="24dp" + android:layout_height="wrap_content" android:layout_weight="0" - android:background="@drawable/ripple" - android:clickable="true" android:paddingLeft="4dp" android:paddingRight="4dp" - android:src="?ic_star_outline" /> + app:icon="?ic_star_outline" /> - <ImageView + <com.google.android.material.button.MaterialButton + style="?attr/materialIconButtonStyle" android:id="@+id/published" android:layout_width="wrap_content" - android:layout_height="24dp" + android:layout_height="wrap_content" android:layout_weight="0" - android:background="@drawable/ripple" - android:clickable="true" android:paddingLeft="4dp" android:paddingRight="4dp" - android:src="?ic_rss_box" /> + app:icon="?ic_rss_box" /> - <ImageView + <com.google.android.material.button.MaterialButton + style="?attr/materialIconButtonStyle" android:id="@+id/article_menu_button" android:layout_width="wrap_content" - android:layout_height="24dp" + android:layout_height="wrap_content" android:layout_weight="0" - android:background="@drawable/ripple" android:paddingLeft="4dp" android:paddingRight="4dp" - android:src="?ic_dots_vertical" /> + app:icon="?ic_dots_vertical" /> </LinearLayout> </TableRow> </TableLayout> - -</FrameLayout>
\ No newline at end of file +</com.google.android.material.card.MaterialCardView>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/layout_detail_phone.xml b/org.fox.ttrss/src/main/res/layout/layout_detail_phone.xml new file mode 100644 index 00000000..429b27c0 --- /dev/null +++ b/org.fox.ttrss/src/main/res/layout/layout_detail_phone.xml @@ -0,0 +1,39 @@ +<androidx.coordinatorlayout.widget.CoordinatorLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/detail_fab" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="end|bottom" + android:visibility="gone" + android:src="@drawable/baseline_open_in_browser_24" + android:layout_margin="16dp" /> + + <com.google.android.material.appbar.AppBarLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <include layout="@layout/toolbar" android:id="@+id/toolbar" /> + + </com.google.android.material.appbar.AppBarLayout> + + <FrameLayout + android:id="@+id/article_fragment" + app:layout_behavior=".util.DetailActivityScrollingViewBehavior" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + </FrameLayout> + + <FrameLayout + android:id="@+id/headlines_fragment" + android:visibility="gone" + android:layout_height="0dp" + android:layout_width="0dp"> + </FrameLayout> + +</androidx.coordinatorlayout.widget.CoordinatorLayout> + diff --git a/org.fox.ttrss/src/main/res/layout/layout_master_phone.xml b/org.fox.ttrss/src/main/res/layout/layout_master_phone.xml new file mode 100644 index 00000000..b4cb6b59 --- /dev/null +++ b/org.fox.ttrss/src/main/res/layout/layout_master_phone.xml @@ -0,0 +1,53 @@ +<androidx.drawerlayout.widget.DrawerLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/headlines_drawer" + android:layout_width="fill_parent" + android:layout_height="fill_parent"> + + <androidx.coordinatorlayout.widget.CoordinatorLayout + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/headlines_coordinator" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/master_fab" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="end|bottom" + android:visibility="gone" + android:src="@drawable/baseline_refresh_24" + android:layout_margin="16dp" /> + + <com.google.android.material.appbar.AppBarLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <include layout="@layout/toolbar" android:id="@+id/toolbar" /> + + </com.google.android.material.appbar.AppBarLayout> + + <FrameLayout + android:id="@+id/headlines_fragment" + app:layout_behavior=".util.FabAwareScrollingViewBehavior" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + + </androidx.coordinatorlayout.widget.CoordinatorLayout> + + <com.google.android.material.navigation.NavigationView + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/modal_navigation_view" + android:layout_width="300dp" + android:layout_height="match_parent" + android:layout_gravity="start"> + + <FrameLayout + android:id="@+id/feeds_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" > + </FrameLayout> + + </com.google.android.material.navigation.NavigationView> + +</androidx.drawerlayout.widget.DrawerLayout> diff --git a/org.fox.ttrss/src/main/res/layout/preference_material_switch.xml b/org.fox.ttrss/src/main/res/layout/preference_material_switch.xml new file mode 100644 index 00000000..94d654f0 --- /dev/null +++ b/org.fox.ttrss/src/main/res/layout/preference_material_switch.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Derived from https://github.com/androidx/androidx/blob/8cb282cc/preference/preference/res/layout/preference_widget_switch_compat.xml --> +<com.google.android.material.materialswitch.MaterialSwitch xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/switchWidget" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@null" + android:clickable="false" + android:focusable="false" />
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/toolbar.xml b/org.fox.ttrss/src/main/res/layout/toolbar.xml index f5fb7654..989292b2 100755 --- a/org.fox.ttrss/src/main/res/layout/toolbar.xml +++ b/org.fox.ttrss/src/main/res/layout/toolbar.xml @@ -1,13 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> -<androidx.appcompat.widget.Toolbar +<com.google.android.material.appbar.MaterialToolbar xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/toolbar" - android:elevation="4dp" app:layout_scrollFlags="scroll|enterAlways" - android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" - app:popupTheme="@style/ThemeOverlay.AppCompat.Light" + app:titleTextAppearance="?attr/textAppearanceTitleMedium" android:layout_height="wrap_content" android:layout_width="match_parent" - android:minHeight="?attr/actionBarSize" - android:background="?attr/colorPrimary" />
\ No newline at end of file + android:minHeight="?attr/actionBarSize"/> |