diff options
Diffstat (limited to 'org.fox.ttcomics/src/main/res')
7 files changed, 22 insertions, 170 deletions
diff --git a/org.fox.ttcomics/src/main/res/layout-sw600dp/comics_grid_row.xml b/org.fox.ttcomics/src/main/res/layout-sw600dp/comics_grid_row.xml deleted file mode 100644 index 8392a17..0000000 --- a/org.fox.ttcomics/src/main/res/layout-sw600dp/comics_grid_row.xml +++ /dev/null @@ -1,73 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/comics_list_row"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:gravity="center_vertical"
- android:orientation="vertical"
- android:padding="4dp" >
-
- <FrameLayout
- android:id="@+id/imageholder"
- android:layout_width="160dp"
- android:layout_height="160dp"
- android:layout_gravity="center_horizontal"
- android:layout_weight="0"
- android:background="@drawable/comic_tile"
- android:padding="6dp" >
-
- <ImageView
- android:id="@+id/thumbnail"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:padding="4dp"
- android:scaleType="centerInside"
- android:src="@drawable/ic_launcher" />
-
- <ImageView
- android:id="@+id/comic_overflow"
- android:layout_gravity="bottom|right"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:paddingBottom="4dp"
- android:src="@drawable/ic_action_overflow" />
-
- </FrameLayout>
-
- <LinearLayout
- android:id="@+id/linearLayout4"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:gravity="center_horizontal"
- android:orientation="vertical" >
-
- <TextView
- android:id="@+id/file_name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:ellipsize="middle"
- android:singleLine="true"
- android:text="Comic_1980.cbz" />
-
- <ProgressBar
- android:id="@+id/file_progress_bar"
- style="?android:attr/progressBarStyleHorizontal"
- android:layout_width="128dp"
- android:layout_height="wrap_content"
- android:layout_weight="1" />
-
- <TextView
- android:id="@+id/file_progress_info"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:gravity="right"
- android:text="12 of 325"
- android:textSize="12dp" />
- </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file diff --git a/org.fox.ttcomics/src/main/res/layout-sw600dp/fragment_comics_list.xml b/org.fox.ttcomics/src/main/res/layout-sw600dp/fragment_comics_list.xml index a05af25..2112a18 100644 --- a/org.fox.ttcomics/src/main/res/layout-sw600dp/fragment_comics_list.xml +++ b/org.fox.ttcomics/src/main/res/layout-sw600dp/fragment_comics_list.xml @@ -13,7 +13,7 @@ android:id="@+id/comics_grid"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:numColumns="3" >
+ android:numColumns="4" >
</GridView>
</android.support.v4.widget.SwipeRefreshLayout>
@@ -24,9 +24,6 @@ android:layout_gravity="center"
android:orientation="vertical" >
-
-
-
<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
diff --git a/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml b/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml index f021a3f..0b7871f 100644 --- a/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml +++ b/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml @@ -1,8 +1,18 @@ <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v7.widget.CardView
+ xmlns:card_view="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/comics_list_row"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ card_view:cardElevation="2dp"
+ tools:ignore="HardcodedText" >
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_vertical"
android:orientation="vertical"
@@ -14,7 +24,6 @@ android:layout_height="160dp"
android:layout_gravity="center_horizontal"
android:layout_weight="0"
- android:background="@drawable/comic_tile"
android:padding="6dp" >
<ImageView
@@ -70,4 +79,5 @@ android:textSize="8dp" />
</LinearLayout>
-</LinearLayout>
\ No newline at end of file +</LinearLayout>
+ </android.support.v7.widget.CardView>
\ No newline at end of file diff --git a/org.fox.ttcomics/src/main/res/layout/comics_list_row.xml b/org.fox.ttcomics/src/main/res/layout/comics_list_row.xml deleted file mode 100644 index 5d529f8..0000000 --- a/org.fox.ttcomics/src/main/res/layout/comics_list_row.xml +++ /dev/null @@ -1,73 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/comics_list_row"
- android:layout_width="match_parent"
- android:layout_height="?android:attr/listPreferredItemHeight"
- android:gravity="center_vertical"
- android:orientation="horizontal"
- android:padding="4dp" >
-
- <FrameLayout
- android:id="@+id/imageholder"
- android:layout_width="48dp"
- android:layout_height="48dp"
- android:layout_weight="0"
- android:background="@drawable/comic_tile"
- android:padding="2dp" >
-
- <ImageView
- android:id="@+id/thumbnail"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@android:color/white"
- android:padding="2dp"
- android:scaleType="centerInside"
- android:src="@drawable/ic_launcher" />
- </FrameLayout>
-
- <LinearLayout
- android:id="@+id/linearLayout5"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:orientation="vertical"
- android:paddingLeft="4dp" >
-
- <LinearLayout
- android:id="@+id/linearLayout4"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" >
-
- <TextView
- android:id="@+id/file_name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:ellipsize="middle"
- android:singleLine="true"
- android:text="Comic_1980.cbz" />
-
- <TextView
- android:id="@+id/file_progress_info"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:gravity="right"
- android:text="12 of 325" />
- </LinearLayout>
-
- <ProgressBar
- android:id="@+id/file_progress_bar"
- style="?android:attr/progressBarStyleHorizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
- </LinearLayout>
-
- <ImageView
- android:id="@+id/comic_overflow"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:src="@drawable/ic_action_overflow" />
-
-</LinearLayout>
\ No newline at end of file diff --git a/org.fox.ttcomics/src/main/res/layout/fragment_comics_list.xml b/org.fox.ttcomics/src/main/res/layout/fragment_comics_list.xml index 2461c15..7830de1 100644 --- a/org.fox.ttcomics/src/main/res/layout/fragment_comics_list.xml +++ b/org.fox.ttcomics/src/main/res/layout/fragment_comics_list.xml @@ -8,13 +8,12 @@ android:id="@+id/comics_swipe_container"
android:layout_width="match_parent"
android:layout_height="match_parent" >
-
- <ListView
- android:id="@+id/comics_list"
+ <GridView
+ android:id="@+id/comics_grid"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layoutAnimation="@anim/layout_comics" >
- </ListView>
+ android:layout_height="match_parent"
+ android:numColumns="2" >
+ </GridView>
</android.support.v4.widget.SwipeRefreshLayout>
<LinearLayout
@@ -22,8 +21,7 @@ android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
- android:orientation="vertical"
- android:padding="4dp" >
+ android:orientation="vertical" >
<TextView
android:id="@+id/textView1"
diff --git a/org.fox.ttcomics/src/main/res/values/strings.xml b/org.fox.ttcomics/src/main/res/values/strings.xml index ca0ca6d..6f0a32c 100644 --- a/org.fox.ttcomics/src/main/res/values/strings.xml +++ b/org.fox.ttcomics/src/main/res/values/strings.xml @@ -52,8 +52,6 @@ <string name="prefs_clear_sync_data">Clear sync data</string>
<string name="prefs_clear_sync_data_summary">Removes all remotely stored sync data.</string>
<string name="open_parent">Open parent</string>
- <string name="prefs_enable_rar_archives">Enable RAR archives</string>
- <string name="prefs_enable_rar_summary">Using RAR (CBR) files is not recommended because of underlying RAR library issues. If you experience crashes, disable this option, and repack your archives as ZIP.</string>
<string name="file_unread">Unread (%1$d pages)</string>
<string name="file_finished">Finished</string>
<string name="menu_toggle_orientation_lock">(Un)lock orientation</string>
@@ -69,4 +67,6 @@ <string name="trial_expired">Trial expired</string>
<string name="trial_expired_message">To continue using Pow! Comics Reader please unlock the full version by purchasing the key.</string>
<string name="error_other_error">Error: unknown error (see log)</string>
+ <string name="list_type_directory">Directory</string>
+ <string name="list_type_unknown">Unknown</string>
</resources>
\ No newline at end of file diff --git a/org.fox.ttcomics/src/main/res/xml/preferences.xml b/org.fox.ttcomics/src/main/res/xml/preferences.xml index ce3b8dd..b877d0b 100644 --- a/org.fox.ttcomics/src/main/res/xml/preferences.xml +++ b/org.fox.ttcomics/src/main/res/xml/preferences.xml @@ -8,13 +8,6 @@ android:summary="@string/prefs_comics_directory_summary"
android:title="@string/prefs_comics_directory" >
</Preference>
-
- <CheckBoxPreference
- android:defaultValue="false"
- android:key="enable_rar"
- android:title="@string/prefs_enable_rar_archives"
- android:summary="@string/prefs_enable_rar_summary" />
-
</PreferenceCategory>
<PreferenceCategory android:title="@string/prefs_sync" >
<CheckBoxPreference
|