From 12621d50674c35657e3bae95624d043ba4f7c9af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20P=C3=B3=C5=82grabia?= <tomasz.polgrabia@gmail.com>
Date: Sun, 23 Oct 2016 18:16:06 +0200
Subject: [PATCH] First attempts to make better layout for tablets (for big
 tablets - home page layout changed partially).

---
 .../urbanexplorer/MainActivity.java           |  7 ++--
 .../activity_main.xml}                        |  1 +
 .../activity_main.xml}                        | 33 ++++++++++---------
 app/src/main/res/values-sw600dp/tech.xml      |  4 +++
 app/src/main/res/values-sw720dp/tech.xml      |  4 +++
 app/src/main/res/values/tech.xml              |  4 +++
 6 files changed, 35 insertions(+), 18 deletions(-)
 rename app/src/main/res/{layout/activity_main_two_frag.xml => layout-sw600dp/activity_main.xml} (97%)
 rename app/src/main/res/{layout/activity_main_three_frag.xml => layout-sw720dp/activity_main.xml} (50%)
 create mode 100644 app/src/main/res/values-sw600dp/tech.xml
 create mode 100644 app/src/main/res/values-sw720dp/tech.xml
 create mode 100644 app/src/main/res/values/tech.xml

diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/MainActivity.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/MainActivity.java
index f3faf93..9dae7d1 100644
--- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/MainActivity.java
+++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/MainActivity.java
@@ -123,8 +123,11 @@ public class MainActivity extends ActionBarActivity {
         boolean copySavedConfiguration = savedConfiguration =
             savedInstanceState != null && savedInstanceState.getBoolean(AppConstants.SAVED_CONFIG_KEY);
 
-        switchFragment();
-        updateSwipeHandler();
+        String deviceType = getResources().getString(R.string.device_type);
+        if ("Plain".equals(deviceType)) {
+            switchFragment();
+            updateSwipeHandler();
+        }
         if (!copySavedConfiguration && HelperUtils.checkForLocalicatonEnabled(this)) return;
     }
 
diff --git a/app/src/main/res/layout/activity_main_two_frag.xml b/app/src/main/res/layout-sw600dp/activity_main.xml
similarity index 97%
rename from app/src/main/res/layout/activity_main_two_frag.xml
rename to app/src/main/res/layout-sw600dp/activity_main.xml
index 8b38205..a9d4684 100644
--- a/app/src/main/res/layout/activity_main_two_frag.xml
+++ b/app/src/main/res/layout-sw600dp/activity_main.xml
@@ -2,6 +2,7 @@
 <pl.tpolgrabia.urbanexplorer.views.SwipeFrameLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/fragments"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:paddingLeft="@dimen/activity_horizontal_margin"
diff --git a/app/src/main/res/layout/activity_main_three_frag.xml b/app/src/main/res/layout-sw720dp/activity_main.xml
similarity index 50%
rename from app/src/main/res/layout/activity_main_three_frag.xml
rename to app/src/main/res/layout-sw720dp/activity_main.xml
index 57b4bb3..8f09865 100644
--- a/app/src/main/res/layout/activity_main_three_frag.xml
+++ b/app/src/main/res/layout-sw720dp/activity_main.xml
@@ -2,6 +2,7 @@
 <pl.tpolgrabia.urbanexplorer.views.SwipeFrameLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/fragments"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:paddingLeft="@dimen/activity_horizontal_margin"
@@ -13,26 +14,26 @@
     <LinearLayout android:layout_width="match_parent"
                   android:layout_height="match_parent">
 
-        <FrameLayout android:id="@+id/frag_container1"
-                     android:layout_width="match_parent"
-                     android:layout_height="match_parent"
-                     android:layout_weight="1">
+        <fragment android:name="pl.tpolgrabia.urbanexplorer.fragments.PlacesFragment"
+                  android:layout_width="match_parent"
+                  android:layout_height="match_parent"
+                  android:layout_weight="1">
 
-        </FrameLayout>
+        </fragment>
 
-        <FrameLayout android:id="@+id/frag_container2"
-                     android:layout_width="match_parent"
-                     android:layout_height="match_parent"
-                     android:layout_weight="1">
+        <fragment android:name="pl.tpolgrabia.urbanexplorer.fragments.WikiLocationsFragment"
+                  android:layout_width="match_parent"
+                  android:layout_height="match_parent"
+                  android:layout_weight="1">
 
-        </FrameLayout>
+        </fragment>
+        
+        <fragment android:name="pl.tpolgrabia.urbanexplorer.fragments.HomeFragment"
+                  android:layout_width="match_parent"
+                  android:layout_height="match_parent"
+                  android:layout_weight="1">
 
-        <FrameLayout android:id="@+id/frag_container3"
-                     android:layout_width="match_parent"
-                     android:layout_height="match_parent"
-                     android:layout_weight="1">
-
-        </FrameLayout>
+        </fragment>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/values-sw600dp/tech.xml b/app/src/main/res/values-sw600dp/tech.xml
new file mode 100644
index 0000000..34a6baa
--- /dev/null
+++ b/app/src/main/res/values-sw600dp/tech.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="device_type">600</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw720dp/tech.xml b/app/src/main/res/values-sw720dp/tech.xml
new file mode 100644
index 0000000..eb42eca
--- /dev/null
+++ b/app/src/main/res/values-sw720dp/tech.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="device_type">720</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/tech.xml b/app/src/main/res/values/tech.xml
new file mode 100644
index 0000000..3f92b7e
--- /dev/null
+++ b/app/src/main/res/values/tech.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="device_type">Plain</string>
+</resources>
\ No newline at end of file