diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-sw600dp/activity_main.xml | 3 | ||||
-rw-r--r-- | res/layout-sw600dp/activity_view_comic.xml | 6 | ||||
-rw-r--r-- | res/layout-sw600dp/fragment_comics_list.xml | 3 | ||||
-rw-r--r-- | res/layout/activity_main.xml | 3 | ||||
-rw-r--r-- | res/layout/dialog_location.xml | 4 | ||||
-rw-r--r-- | res/layout/dialog_location_compat.xml | 7 | ||||
-rw-r--r-- | res/layout/fragment_comics_list.xml | 19 | ||||
-rw-r--r-- | res/values/attrs.xml | 1 | ||||
-rw-r--r-- | res/values/strings.xml | 4 | ||||
-rw-r--r-- | res/values/style.xml | 15 | ||||
-rw-r--r-- | res/values/styles.xml | 9 |
11 files changed, 48 insertions, 26 deletions
diff --git a/res/layout-sw600dp/activity_main.xml b/res/layout-sw600dp/activity_main.xml index 3e0dc88..81b302b 100644 --- a/res/layout-sw600dp/activity_main.xml +++ b/res/layout-sw600dp/activity_main.xml @@ -3,7 +3,8 @@ android:id="@+id/FrameLayout1"
android:layout_width="match_parent"
android:layout_height="match_parent" >
-
+ +
<FrameLayout
android:id="@+id/comics_list"
android:layout_width="match_parent"
diff --git a/res/layout-sw600dp/activity_view_comic.xml b/res/layout-sw600dp/activity_view_comic.xml index b32c9d7..e6479f6 100644 --- a/res/layout-sw600dp/activity_view_comic.xml +++ b/res/layout-sw600dp/activity_view_comic.xml @@ -3,14 +3,16 @@ android:id="@+id/FrameLayout2"
android:layout_width="match_parent"
android:layout_height="match_parent" >
-
+ +
<FrameLayout
android:id="@+id/comics_pager_container"
android:layout_width="match_parent"
android:layout_height="match_parent" >
</FrameLayout>
-
+ +
<TextView
android:id="@+id/tablet_layout_hack"
android:layout_width="wrap_content"
diff --git a/res/layout-sw600dp/fragment_comics_list.xml b/res/layout-sw600dp/fragment_comics_list.xml index e4999c8..eaf8c90 100644 --- a/res/layout-sw600dp/fragment_comics_list.xml +++ b/res/layout-sw600dp/fragment_comics_list.xml @@ -3,7 +3,8 @@ android:id="@+id/FrameLayout4"
android:layout_width="fill_parent"
android:layout_height="fill_parent" >
-
+ +
<GridView
android:id="@+id/comics_grid"
android:layout_width="match_parent"
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml index 3f686f0..790857f 100644 --- a/res/layout/activity_main.xml +++ b/res/layout/activity_main.xml @@ -3,7 +3,8 @@ android:id="@+id/FrameLayout1"
android:layout_width="match_parent"
android:layout_height="match_parent" >
-
+ +
<FrameLayout
android:id="@+id/comics_list"
android:layout_width="match_parent"
diff --git a/res/layout/dialog_location.xml b/res/layout/dialog_location.xml index 1ae24ce..cabbf9a 100644 --- a/res/layout/dialog_location.xml +++ b/res/layout/dialog_location.xml @@ -3,7 +3,9 @@ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
-
+ + +
<NumberPicker
android:id="@+id/number_picker"
android:layout_width="match_parent"
diff --git a/res/layout/dialog_location_compat.xml b/res/layout/dialog_location_compat.xml index 3e2467e..385b8d5 100644 --- a/res/layout/dialog_location_compat.xml +++ b/res/layout/dialog_location_compat.xml @@ -3,13 +3,16 @@ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
-
+ +
<SeekBar
android:id="@+id/number_seeker"
android:layout_weight="1"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
-
+ + +
<TextView
android:id="@+id/page_number"
android:layout_width="wrap_content"
diff --git a/res/layout/fragment_comics_list.xml b/res/layout/fragment_comics_list.xml index cdef287..2461c15 100644 --- a/res/layout/fragment_comics_list.xml +++ b/res/layout/fragment_comics_list.xml @@ -4,18 +4,24 @@ android:layout_width="fill_parent"
android:layout_height="fill_parent" >
- <ListView
- android:id="@+id/comics_list"
- android:layoutAnimation="@anim/layout_comics"
+ <android.support.v4.widget.SwipeRefreshLayout
+ android:id="@+id/comics_swipe_container"
android:layout_width="match_parent"
- android:layout_height="wrap_content" >
- </ListView>
+ android:layout_height="match_parent" >
+
+ <ListView
+ android:id="@+id/comics_list"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layoutAnimation="@anim/layout_comics" >
+ </ListView>
+ </android.support.v4.widget.SwipeRefreshLayout>
<LinearLayout
android:id="@+id/no_comics"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_gravity="center"
+ android:layout_gravity="center"
android:orientation="vertical"
android:padding="4dp" >
@@ -25,7 +31,6 @@ android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/error_no_comic_arhives_found_" />
-
</LinearLayout>
</FrameLayout>
\ No newline at end of file diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 75347d8..9a693d4 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?>
<resources>
<attr name="viewComicsBackground" format="reference|color" />
+ <attr name="statusBarHintColor" format="reference|color" />
</resources>
\ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 3d5cac4..7ef7de2 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4,7 +4,7 @@ <string name="hello_world">Hello world!</string>
<string name="menu_settings">Settings</string>
<string name="menu_go_location">Go to</string>
- <string name="title_activity_main">Pow! Comics Reader</string>
+ <string name="title_activity_main">Comics Reader</string>
<string name="title_activity_preferences">Settings</string>
<string name="prefs_comics_directory">Comics directory</string>
<string name="prefs_general">General</string>
@@ -63,5 +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>
+ <string name="prefs_prevent_screen_sleep">Keep screen awake</string>
</resources>
\ No newline at end of file diff --git a/res/values/style.xml b/res/values/style.xml new file mode 100644 index 0000000..a62c354 --- /dev/null +++ b/res/values/style.xml @@ -0,0 +1,15 @@ +<resources>
+
+ <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+
+ </style>
+
+ <style name="ViewLightTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+ <item name="viewComicsBackground">@android:color/transparent</item>
+ </style>
+
+ <style name="ViewDarkTheme" parent="Theme.AppCompat">
+ <item name="viewComicsBackground">@android:color/black</item>
+ </style>
+
+</resources>
\ No newline at end of file diff --git a/res/values/styles.xml b/res/values/styles.xml deleted file mode 100644 index 4b718f3..0000000 --- a/res/values/styles.xml +++ /dev/null @@ -1,9 +0,0 @@ -<resources>
- <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
- <item name="viewComicsBackground">@android:color/transparent</item>
- </style>
-
- <style name="DarkTheme" parent="Theme.AppCompat">
- <item name="viewComicsBackground">@android:color/black</item>
- </style>
-</resources> |