From 53a6696a634f0b105669fdfe9f7433a91142ab04 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 8 Jun 2015 20:11:05 +0300
Subject: remove sw600dp layouts

---
 org.fox.ttcomics/src/main/AndroidManifest.xml      |  2 +-
 .../main/java/org/fox/ttcomics2/MainActivity.java  |  2 +-
 .../src/main/res/layout-sw600dp/activity_main.xml  | 31 ----------------------
 .../res/layout-sw600dp/activity_view_comic.xml     | 20 --------------
 .../src/main/res/layout/comics_grid_row.xml        |  1 +
 5 files changed, 3 insertions(+), 53 deletions(-)
 delete mode 100755 org.fox.ttcomics/src/main/res/layout-sw600dp/activity_main.xml
 delete mode 100644 org.fox.ttcomics/src/main/res/layout-sw600dp/activity_view_comic.xml

(limited to 'org.fox.ttcomics')

diff --git a/org.fox.ttcomics/src/main/AndroidManifest.xml b/org.fox.ttcomics/src/main/AndroidManifest.xml
index d3f4e0e..8837b8a 100755
--- a/org.fox.ttcomics/src/main/AndroidManifest.xml
+++ b/org.fox.ttcomics/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttcomics2"
-    android:versionCode="61"
+    android:versionCode="62"
     android:versionName="1.21" >
 
     <uses-sdk
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
index bae798a..d7ef543 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
@@ -34,7 +34,7 @@ public class MainActivity extends CommonActivity implements MaterialTabListener
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.activity_main);
-		setSupportActionBar((Toolbar) findViewById(R.id.actionbar_toolbar));;
+		setSupportActionBar((Toolbar) findViewById(R.id.actionbar_toolbar));
         setTitle(R.string.app_name);
 
         tabHost = (MaterialTabHost) this.findViewById(R.id.materialTabHost);
diff --git a/org.fox.ttcomics/src/main/res/layout-sw600dp/activity_main.xml b/org.fox.ttcomics/src/main/res/layout-sw600dp/activity_main.xml
deleted file mode 100755
index 68170c5..0000000
--- a/org.fox.ttcomics/src/main/res/layout-sw600dp/activity_main.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/FrameLayout1"
-    android:fitsSystemWindows="true"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_height="match_parent">
-
-    <it.neokree.materialtabs.MaterialTabHost
-        android:id="@+id/materialTabHost"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        app:textColor="#FFFFFF"
-        app:primaryColor="#FF6F00"
-        app:accentColor="#F8CE00" />
-
-    <FrameLayout
-        android:id="@+id/comics_list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" >
-
-    </FrameLayout>
-
-    <TextView
-        android:id="@+id/tablet_layout_hack"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        android:text="" />
-
-</LinearLayout>
diff --git a/org.fox.ttcomics/src/main/res/layout-sw600dp/activity_view_comic.xml b/org.fox.ttcomics/src/main/res/layout-sw600dp/activity_view_comic.xml
deleted file mode 100644
index 01f320b..0000000
--- a/org.fox.ttcomics/src/main/res/layout-sw600dp/activity_view_comic.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    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"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        android:text="" />
-
-</FrameLayout>
\ No newline at end of file
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 1f35b6d..ac1af32 100755
--- a/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml
+++ b/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml
@@ -23,6 +23,7 @@
             android:layout_height="200dp"
             android:id="@+id/thumbnail"
             android:scaleType="centerCrop"
+            android:layout_margin="4dp"
             android:src="@drawable/badimage" />
 
         <LinearLayout
-- 
cgit v1.2.3