summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2014-10-15 09:35:51 +0400
committerAndrew Dolgov <[email protected]>2014-10-15 09:35:51 +0400
commit179296966f8d7db0a31e32254ff0effd0a51bbea (patch)
tree7c48fe5bb51d55ab821ee413e69f3fadd7f11e93 /res
parent4384b802c88293568fa72e128b3b03725c6631cb (diff)
use solid black background in dark theme
add option to keep screen awake while reading add play store feature graphic bump version
Diffstat (limited to 'res')
-rw-r--r--res/layout/activity_view_comic.xml3
-rw-r--r--res/values/attrs.xml4
-rw-r--r--res/values/strings.xml3
-rw-r--r--res/values/styles.xml10
-rw-r--r--res/xml/preferences.xml5
5 files changed, 20 insertions, 5 deletions
diff --git a/res/layout/activity_view_comic.xml b/res/layout/activity_view_comic.xml
index 62a5e45..b20b86b 100644
--- a/res/layout/activity_view_comic.xml
+++ b/res/layout/activity_view_comic.xml
@@ -1,9 +1,10 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/FrameLayout2"
+ android:background="?attr/viewComicsBackground"
android:layout_width="match_parent"
android:layout_height="match_parent" >
-
+
<FrameLayout
android:id="@+id/comics_pager_container"
android:layout_width="match_parent"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
new file mode 100644
index 0000000..75347d8
--- /dev/null
+++ b/res/values/attrs.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <attr name="viewComicsBackground" format="reference|color" />
+</resources> \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b55145f..3d5cac4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -19,7 +19,7 @@
<string name="cancel">Cancel</string>
<string name="comics_directory_default">/mnt/sdcard/Comics</string>
<string name="prefs_reading">Reading</string>
- <string name="prefs_dark_theme">Use dark theme</string>
+ <string name="prefs_dark_theme">Dark theme</string>
<string name="dialog_open_location">Open location</string>
<string name="dialog_location_beginning">Beginning</string>
<string name="dialog_location_furthest">Furthest read location</string>
@@ -63,4 +63,5 @@
<string name="sync_running_in_test_mode">Sync running in test mode.</string>
<string name="reset_remove_synced_progress">Would you like to remove synced progress too?</string>
<string name="error_cant_open_file">Can\'t open file: %1$s</string>
+ <string name="prefs_prevent_screen_sleep">Keep screen awake</string>
</resources> \ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 84df662..3c19d3f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,6 +1,10 @@
<resources>
- <style name="AppTheme" parent="Theme.Sherlock.Light.DarkActionBar" />
- <style name="DarkTheme" parent="Theme.Sherlock" />
-
+ <style name="AppTheme" parent="Theme.Sherlock.Light.DarkActionBar">
+ <item name="viewComicsBackground">@android:color/transparent</item>
+ </style>
+
+ <style name="DarkTheme" parent="Theme.Sherlock">
+ <item name="viewComicsBackground">@android:color/black</item>
+ </style>
</resources> \ No newline at end of file
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 6552de4..ce3b8dd 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -54,5 +54,10 @@
android:key="fit_to_width"
android:title="@string/prefs_fit_to_width" />
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="prevent_screen_sleep"
+ android:title="@string/prefs_prevent_screen_sleep" />
+
</PreferenceCategory>
</PreferenceScreen> \ No newline at end of file