tomasz
/
urban-explorer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "First attempts to make better layout for tablets (for big tablets - home page layout changed partially)." 

This reverts commit 12621d5067.
master
Tomasz Półgrabia 2016-10-26 20:29:35 +02:00
parent 12621d5067
commit e64d40a74d
6 changed files with 18 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/pl/tpolgrabia/urbanexplorer/MainActivity.java
View File

@ -123,11 +123,8 @@ public class MainActivity extends ActionBarActivity {
boolean copySavedConfiguration = savedConfiguration = boolean copySavedConfiguration = savedConfiguration =
savedInstanceState != null && savedInstanceState.getBoolean(AppConstants.SAVED_CONFIG_KEY); savedInstanceState != null && savedInstanceState.getBoolean(AppConstants.SAVED_CONFIG_KEY);
String deviceType = getResources().getString(R.string.device_type); switchFragment();
if ("Plain".equals(deviceType)) { updateSwipeHandler();
switchFragment();
updateSwipeHandler();
}
if (!copySavedConfiguration && HelperUtils.checkForLocalicatonEnabled(this)) return; if (!copySavedConfiguration && HelperUtils.checkForLocalicatonEnabled(this)) return;
} }

31
app/src/main/res/layout-sw720dp/activity_main.xml → app/src/main/res/layout/activity_main_three_frag.xml
View File

@ -2,7 +2,6 @@
<pl.tpolgrabia.urbanexplorer.views.SwipeFrameLayout <pl.tpolgrabia.urbanexplorer.views.SwipeFrameLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/fragments"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingLeft="@dimen/activity_horizontal_margin"
@ -14,26 +13,26 @@
<LinearLayout android:layout_width="match_parent" <LinearLayout android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<fragment android:name="pl.tpolgrabia.urbanexplorer.fragments.PlacesFragment" <FrameLayout android:id="@+id/frag_container1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"> android:layout_weight="1">
</fragment> </FrameLayout>
<fragment android:name="pl.tpolgrabia.urbanexplorer.fragments.WikiLocationsFragment" <FrameLayout android:id="@+id/frag_container2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"> android:layout_weight="1">
</fragment> </FrameLayout>
<fragment android:name="pl.tpolgrabia.urbanexplorer.fragments.HomeFragment" <FrameLayout android:id="@+id/frag_container3"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"> android:layout_weight="1">
</fragment> </FrameLayout>
</LinearLayout> </LinearLayout>

1
app/src/main/res/layout-sw600dp/activity_main.xml → app/src/main/res/layout/activity_main_two_frag.xml
View File

@ -2,7 +2,6 @@
<pl.tpolgrabia.urbanexplorer.views.SwipeFrameLayout <pl.tpolgrabia.urbanexplorer.views.SwipeFrameLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/fragments"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingLeft="@dimen/activity_horizontal_margin"

4
app/src/main/res/values-sw600dp/tech.xml
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="device_type">600</string>
</resources>

4
app/src/main/res/values-sw720dp/tech.xml
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="device_type">720</string>
</resources>

4
app/src/main/res/values/tech.xml
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="device_type">Plain</string>
</resources>