summaryrefslogtreecommitdiff
path: root/org.fox.ttrss/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'org.fox.ttrss/src/main/res')
-rw-r--r--org.fox.ttrss/src/main/res/drawable/ic_launcher_background_variant.xml42
-rw-r--r--org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_detail.xml2
-rw-r--r--org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml2
-rwxr-xr-xorg.fox.ttrss/src/main/res/layout/fragment_headlines.xml1
-rwxr-xr-xorg.fox.ttrss/src/main/res/layout/headlines_row_compact_active.xml1
-rw-r--r--org.fox.ttrss/src/main/res/layout/layout_detail_phone.xml2
-rw-r--r--org.fox.ttrss/src/main/res/layout/layout_master_phone.xml2
-rw-r--r--org.fox.ttrss/src/main/res/mipmap-anydpi-v26/ic_launcher_variant.xml5
-rwxr-xr-xorg.fox.ttrss/src/main/res/values/strings.xml1
-rwxr-xr-xorg.fox.ttrss/src/main/res/xml/preferences.xml3
10 files changed, 54 insertions, 7 deletions
diff --git a/org.fox.ttrss/src/main/res/drawable/ic_launcher_background_variant.xml b/org.fox.ttrss/src/main/res/drawable/ic_launcher_background_variant.xml
new file mode 100644
index 00000000..749ffa26
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable/ic_launcher_background_variant.xml
@@ -0,0 +1,42 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="108dp"
+ android:height="108dp"
+ android:viewportWidth="51.06383"
+ android:viewportHeight="51.06383">
+ <group android:translateX="-10.468085"
+ android:translateY="-10.468085">
+ <path
+ android:pathData="M-9.8995,-7.7102h94.3666v92.4381h-94.3666z"
+ android:fillColor="#5c5c5c"
+ android:strokeColor="#00000000"
+ android:fillAlpha="1"/>
+ <path
+ android:pathData="M5.668,58.0128a8.3196,8.3198 0,1 0,16.6393 0a8.3196,8.3198 0,1 0,-16.6393 0z"
+ android:strokeAlpha="1"
+ android:strokeWidth="0.69765961"
+ android:fillColor="#808080"
+ android:strokeColor="#00000000"
+ android:fillAlpha="1"/>
+ <path
+ android:pathData="m45.8796,66.3326 l-11.7862,0A28.4254,28.426 0,0 0,5.668 37.9066l0,-11.7864A40.2116,40.2124 0,0 1,45.8796 66.3326Z"
+ android:strokeAlpha="1"
+ android:strokeWidth="0.69765961"
+ android:fillColor="#808080"
+ android:strokeColor="#00000000"
+ android:fillAlpha="1"/>
+ <path
+ android:pathData="M54.1992,66.3326A48.5312,48.5322 0,0 0,5.668 17.8004l0,-12.1331a60.6653,60.6641 90,0 1,60.6641 60.6653z"
+ android:strokeAlpha="1"
+ android:strokeWidth="2.01254654"
+ android:fillColor="#808080"
+ android:strokeColor="#00000000"
+ android:fillAlpha="1"/>
+ <path
+ android:pathData="M54.1992,66.3326A48.5312,48.5322 0,0 0,5.668 17.8004l0,-12.1331a60.6653,60.6641 90,0 1,60.6641 60.6653z"
+ android:strokeAlpha="1"
+ android:strokeWidth="2.01254654"
+ android:fillColor="#808080"
+ android:strokeColor="#00000000"
+ android:fillAlpha="1"/>
+ </group>
+</vector>
diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_detail.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_detail.xml
index 59c1b086..823afb9b 100644
--- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_detail.xml
+++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_detail.xml
@@ -54,7 +54,7 @@
<FrameLayout
android:layout_width="match_parent"
android:id="@+id/article_fragment"
- app:layout_behavior=".util.DetailActivityScrollingViewBehavior"
+ app:layout_behavior="org.fox.ttrss.util.DetailActivityScrollingViewBehavior"
android:layout_height="match_parent"/>
<com.google.android.material.bottomappbar.BottomAppBar
diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml
index b6a6f19d..63b8c3e2 100644
--- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml
+++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml
@@ -61,7 +61,7 @@
android:id="@+id/headlines_fragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:layout_behavior=".util.FabAwareScrollingViewBehavior" />
+ app:layout_behavior="org.fox.ttrss.util.FabAwareScrollingViewBehavior" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/master_fab"
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 2783a1e4..647c3ae9 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml
@@ -12,7 +12,6 @@
<org.fox.ttrss.util.ContextMenuRecyclerView
android:id="@+id/headlines_list"
android:background="?colorSurfaceContainer"
- android:drawSelectorOnTop="true"
android:scrollbars="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent" />
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_compact_active.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_active.xml
index 5721dcb8..f6483350 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_compact_active.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_active.xml
@@ -101,6 +101,7 @@
style="?attr/materialIconButtonStyle"
android:layout_width="wrap_content"
android:paddingEnd="0dp"
+ android:layout_gravity="end"
android:layout_height="24dp"
android:layout_weight="0.5"
app:icon="?ic_star_outline" />
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
index 55a6ba77..4e75d44b 100644
--- a/org.fox.ttrss/src/main/res/layout/layout_detail_phone.xml
+++ b/org.fox.ttrss/src/main/res/layout/layout_detail_phone.xml
@@ -14,7 +14,7 @@
<FrameLayout
android:id="@+id/article_fragment"
- app:layout_behavior=".util.DetailActivityScrollingViewBehavior"
+ app:layout_behavior="org.fox.ttrss.util.DetailActivityScrollingViewBehavior"
android:layout_width="match_parent"
android:layout_height="match_parent">
</FrameLayout>
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
index b4cb6b59..e32d5fbe 100644
--- a/org.fox.ttrss/src/main/res/layout/layout_master_phone.xml
+++ b/org.fox.ttrss/src/main/res/layout/layout_master_phone.xml
@@ -29,7 +29,7 @@
<FrameLayout
android:id="@+id/headlines_fragment"
- app:layout_behavior=".util.FabAwareScrollingViewBehavior"
+ app:layout_behavior="org.fox.ttrss.util.FabAwareScrollingViewBehavior"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
diff --git a/org.fox.ttrss/src/main/res/mipmap-anydpi-v26/ic_launcher_variant.xml b/org.fox.ttrss/src/main/res/mipmap-anydpi-v26/ic_launcher_variant.xml
new file mode 100644
index 00000000..d49922f9
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/mipmap-anydpi-v26/ic_launcher_variant.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+ <background android:drawable="@drawable/ic_launcher_background_variant"/>
+ <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon> \ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml
index 6a67013a..fb7e6309 100755
--- a/org.fox.ttrss/src/main/res/values/strings.xml
+++ b/org.fox.ttrss/src/main/res/values/strings.xml
@@ -303,4 +303,5 @@
<string name="check_for_updates">Check for updates</string>
<string name="dont_open_anything">Nothing</string>
<string name="open_on_startup">Open on startup</string>
+ <string name="error_success">Operation completed successfully</string>
</resources>
diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml
index 81fbd5f1..8d064587 100755
--- a/org.fox.ttrss/src/main/res/xml/preferences.xml
+++ b/org.fox.ttrss/src/main/res/xml/preferences.xml
@@ -44,7 +44,7 @@
android:title="@string/sort_feeds_by_unread" />
<SwitchPreferenceCompat
- android:defaultValue="false"
+ android:defaultValue="true"
android:key="enable_cats"
android:title="@string/enable_cats" />
@@ -108,7 +108,6 @@
<SwitchPreferenceCompat
android:defaultValue="true"
- android:dependency="headlines_mark_read_scroll"
android:key="headlines_swipe_to_dismiss"
android:summary="@string/pref_headlines_swipe_to_dismiss_long"
android:title="@string/pref_headlines_swipe_to_dismiss" />