diff options
author | Allan Wang <me@allanwang.ca> | 2019-08-04 23:00:22 -0700 |
---|---|---|
committer | Allan Wang <me@allanwang.ca> | 2019-08-04 23:00:22 -0700 |
commit | 8142d99f3b757c856d1ec692ffd2dac5e8e4a8e0 (patch) | |
tree | 11fbadaf1e72ffd44f6136a13a646f1488e24410 /app/src/main/res | |
parent | ba4b15a7ff47ac48008247f4abd36b3025cab66c (diff) | |
parent | 2eacc8cb77b561eb1da11acb6ec8f620195fd24f (diff) | |
download | frost-8142d99f3b757c856d1ec692ffd2dac5e8e4a8e0.tar.gz frost-8142d99f3b757c856d1ec692ffd2dac5e8e4a8e0.tar.bz2 frost-8142d99f3b757c856d1ec692ffd2dac5e8e4a8e0.zip |
Merge branch 'dev' into theme
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/layout/intro_analytics.xml | 52 | ||||
-rw-r--r-- | app/src/main/res/layout/intro_end.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values/strings_pref_behaviour.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values/styles.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/xml/frost_changelog.xml | 9 |
5 files changed, 68 insertions, 1 deletions
diff --git a/app/src/main/res/layout/intro_analytics.xml b/app/src/main/res/layout/intro_analytics.xml new file mode 100644 index 00000000..a62a0b0f --- /dev/null +++ b/app/src/main/res/layout/intro_analytics.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/intro_analytics_container" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <TextView + android:id="@id/intro_title" + style="@style/IntroTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/analytics" + app:layout_constraintBottom_toTopOf="@id/intro_image" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_chainStyle="spread" /> + + <ImageView + android:id="@id/intro_image" + android:layout_width="120dp" + android:layout_height="120dp" + android:scaleType="fitCenter" + app:layout_constraintBottom_toTopOf="@id/intro_switch" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/intro_title" + tools:layout_editor_absoluteX="112dp" /> + + <Switch + android:id="@+id/intro_switch" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:layout_constraintBottom_toTopOf="@id/intro_desc" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/intro_image" /> + + <TextView + android:id="@id/intro_desc" + style="@style/IntroSubTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/analytics_desc" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/intro_switch" /> + +</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/intro_end.xml b/app/src/main/res/layout/intro_end.xml index 501cf1a9..fbaa2042 100644 --- a/app/src/main/res/layout/intro_end.xml +++ b/app/src/main/res/layout/intro_end.xml @@ -2,8 +2,8 @@ <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" android:id="@+id/intro_end_container" + android:layout_width="match_parent" android:layout_height="match_parent"> <TextView diff --git a/app/src/main/res/values/strings_pref_behaviour.xml b/app/src/main/res/values/strings_pref_behaviour.xml index 77c35c1c..32188698 100644 --- a/app/src/main/res/values/strings_pref_behaviour.xml +++ b/app/src/main/res/values/strings_pref_behaviour.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <resources> + <string name="auto_refresh_feed">Auto Refresh Feed</string> + <string name="auto_refresh_feed_desc">Refresh the feed after 30 minutes of inactivity</string> <string name="fancy_animations">Fancy Animations</string> <string name="fancy_animations_desc">Reveal webviews using ripples and animate transitions</string> <string name="overlay_swipe">Enable Overlays</string> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 33f36174..90978724 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -86,11 +86,15 @@ <style name="IntroTitle" parent="TextAppearance.AppCompat.Title"> <item name="android:textSize">20sp</item> <item name="android:textAlignment">center</item> + <item name="android:paddingStart">@dimen/kau_activity_horizontal_margin</item> + <item name="android:paddingEnd">@dimen/kau_activity_horizontal_margin</item> </style> <style name="IntroSubTitle" parent="TextAppearance.AppCompat.Subhead"> <item name="android:textSize">18sp</item> <item name="android:textAlignment">center</item> + <item name="android:paddingStart">@dimen/kau_activity_horizontal_margin</item> + <item name="android:paddingEnd">@dimen/kau_activity_horizontal_margin</item> </style> <style name="IntroButton" parent="TextAppearance.AppCompat.Button"> diff --git a/app/src/main/res/xml/frost_changelog.xml b/app/src/main/res/xml/frost_changelog.xml index a7048756..09bb9d2e 100644 --- a/app/src/main/res/xml/frost_changelog.xml +++ b/app/src/main/res/xml/frost_changelog.xml @@ -6,6 +6,15 @@ <item text="" /> --> + + <version title="v2.3.2" /> + <item text="Disable auto feed refresh by default and add setting to re-enable it" /> + <item text="Update theme" /> + <item text="Disable bugsnag completely when opting out of analytics" /> + <item text="" /> + <item text="" /> + <item text="" /> + <version title="v2.3.1" /> <item text="Hide all story panels if enabled" /> <item text="Prevent swipe to refresh if not at the very top" /> |