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/values | |
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/values')
-rw-r--r-- | app/src/main/res/values/strings_pref_behaviour.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values/styles.xml | 4 |
2 files changed, 6 insertions, 0 deletions
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"> |