diff options
| -rwxr-xr-x | org.fox.ttrss/src/main/res/layout/fragment_article.xml | 24 | ||||
| -rw-r--r-- | org.fox.ttrss/src/main/res/values/style.xml | 9 | ||||
| -rw-r--r-- | org.fox.ttrss/src/main/res/values/themes.xml | 1 |
3 files changed, 22 insertions, 12 deletions
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 990ede49..a4fbc70c 100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml @@ -18,12 +18,18 @@ <com.google.android.material.appbar.AppBarLayout 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" + app:strokeWidth="0dp" + app:shapeAppearance="@style/shape_appearance_article_header" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <LinearLayout android:id="@+id/article_header" - android:background="?colorSurface" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> @@ -59,7 +65,7 @@ android:layout_weight="1" android:fontFamily="sans-serif-light" android:layout_marginTop="8dp" - android:textColor="?colorSecondary" + android:textColor="?colorPrimary" android:textSize="12sp" /> <TextView @@ -112,22 +118,15 @@ </LinearLayout> - <com.google.android.material.divider.MaterialDivider - android:layout_width="match_parent" - android:layout_height="wrap_content"/> - <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="?colorSurfaceContainer"> + android:layout_height="wrap_content"> <com.google.android.material.card.MaterialCardView android:id="@+id/note_container" android:layout_width="match_parent" app:cardBackgroundColor="?colorTertiaryContainer" - android:layout_marginTop="8dp" - android:layout_marginStart="8dp" - android:layout_marginEnd="8dp" + android:layout_margin="8dp" app:strokeWidth="0dp" android:layout_height="match_parent"> @@ -159,6 +158,7 @@ </LinearLayout> </LinearLayout> + </com.google.android.material.card.MaterialCardView> </com.google.android.material.appbar.AppBarLayout> diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml new file mode 100644 index 00000000..d97daff5 --- /dev/null +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -0,0 +1,9 @@ +<resources> + <style name="shape_appearance_article_header"> + <item name="cornerFamily">rounded</item> + <item name="cornerSizeTopLeft">0dp</item> + <item name="cornerSizeTopRight">0dp</item> + <item name="cornerSizeBottomLeft">16dp</item> + <item name="cornerSizeBottomRight">16dp</item> + </style> +</resources>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values/themes.xml b/org.fox.ttrss/src/main/res/values/themes.xml index 9a8e3121..56899235 100644 --- a/org.fox.ttrss/src/main/res/values/themes.xml +++ b/org.fox.ttrss/src/main/res/values/themes.xml @@ -1,4 +1,5 @@ <resources> + <style name="AppTheme" parent="Theme.Material3.Light.NoActionBar"> <item name="windowActionModeOverlay">true</item> |