From e64d40a74d666c498ab2f86f917545c706085fcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20P=C3=B3=C5=82grabia?= <tomasz.polgrabia@gmail.com>
Date: Wed, 26 Oct 2016 20:29:35 +0200
Subject: [PATCH] Revert "First attempts to make better layout for tablets (for
 big tablets - home page layout changed partially)."

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