diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index bdec3c95..da9c5538 100644 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="283" + android:versionName="1.75" > 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 new file mode 100644 index 00000000..63ff030b --- /dev/null +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml index 6a66b3ad..a51ee13d 100644 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml @@ -150,7 +150,7 @@ android:gravity="center_vertical" android:singleLine="true" android:text="by Author" - android:textColor="?headlineSecondaryTextColor" + android:textColor="?headlineSelectedSecondaryTextColor" android:textSize="12sp" android:textStyle="italic" /> 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_selected_compact.xml new file mode 100644 index 00000000..d6823d37 --- /dev/null +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml index 38538734..0c2a4dc8 100644 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml @@ -151,7 +151,7 @@ android:gravity="center_vertical" android:singleLine="true" android:text="by Author" - android:textColor="?headlineSecondaryTextColor" + android:textColor="?headlineSelectedSecondaryTextColor" android:textSize="12sp" android:textStyle="italic" /> 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_selected_unread_compact.xml new file mode 100644 index 00000000..0a1bf830 --- /dev/null +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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_unread_compact.xml new file mode 100644 index 00000000..ac9b2b81 --- /dev/null +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values/arrays.xml b/org.fox.ttrss/src/main/res/values/arrays.xml index 9069466a..2dddaea8 100644 --- a/org.fox.ttrss/src/main/res/values/arrays.xml +++ b/org.fox.ttrss/src/main/res/values/arrays.xml @@ -11,6 +11,16 @@ THEME_SEPIA THEME_AMBER + + @string/headline_display_mode_default + @string/headline_display_mode_no_images + @string/headline_display_mode_compact + + + HL_DEFAULT + HL_NOIMAGES + HL_COMPACT + 150 250 diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml index 970f479d..f5353153 100644 --- a/org.fox.ttrss/src/main/res/values/strings.xml +++ b/org.fox.ttrss/src/main/res/values/strings.xml @@ -254,5 +254,9 @@ Enable FAB Show floating action button when reading Open Fresh articles on startup - + Headline display mode + Cards, cards with images, or compact mode + Default + No images + Compact diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml index d4b7dc23..ba419927 100644 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -7,7 +7,7 @@ #909090 #f0f0f0 @android:color/white - ?colorAccent + #88b0f0 @android:color/white #f5f5f5 ?colorPrimaryDark @@ -17,7 +17,7 @@ #ffffff @android:color/secondary_text_light #909090 - #606060 + ?headlineSelectedExcerptTextColor @android:color/secondary_text_light #008000 ?colorPrimary @@ -92,8 +92,8 @@ #909090 #00FF00 @android:color/secondary_text_dark - #a0a0a0 - ?colorPrimary + ?headlineSelectedExcerptTextColor + #88b0f0 #383c42 ?colorPrimary @android:color/black diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml index ac67647b..fbaec0d2 100644 --- a/org.fox.ttrss/src/main/res/xml/preferences.xml +++ b/org.fox.ttrss/src/main/res/xml/preferences.xml @@ -85,10 +85,10 @@ android:summary="@string/pref_headlines_show_content_long" android:title="@string/pref_headlines_show_content" /> - + android:title="@string/prefs_headlines_show_flavor_image" /> -->