Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ConfigActivity: Inline PlaceholderFragment into the layout

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Samuel Holland 2017-08-16 01:43:15 -05:00
parent 9e36e0d9c6
commit 645e263424
4 changed files with 35 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/com/wireguard/android/ConfigActivity.java
View File

@ -25,7 +25,6 @@ public class ConfigActivity extends BaseConfigActivity {
private boolean isStateSaved;
private ConfigListFragment listFragment;
private int mainContainer;
private final PlaceholderFragment placeholderFragment = new PlaceholderFragment();
private boolean wasUpdateSkipped;
@Override
@ -153,34 +152,34 @@ public class ConfigActivity extends BaseConfigActivity {
}
private void switchToFragment(final int container, final String tag, final boolean push) {
final Fragment fragment;
if (tag.equals(TAG_PLACEHOLDER)) {
fragment = placeholderFragment;
} else {
final BaseConfigFragment configFragment;
final Fragment oldFragment = fm.findFragmentById(container);
if (oldFragment != null)
fm.beginTransaction().remove(oldFragment).commit();
return;
}
final BaseConfigFragment fragment;
switch (tag) {
case TAG_DETAIL:
if (detailFragment == null)
detailFragment = new ConfigDetailFragment();
configFragment = detailFragment;
fragment = detailFragment;
break;
case TAG_EDIT:
if (editFragment == null)
editFragment = new ConfigEditFragment();
configFragment = editFragment;
fragment = editFragment;
break;
case TAG_LIST:
if (listFragment == null)
listFragment = new ConfigListFragment();
configFragment = listFragment;
fragment = listFragment;
break;
default:
throw new IllegalArgumentException();
}
if (configFragment.getCurrentConfig() != getCurrentConfig())
configFragment.setCurrentConfig(getCurrentConfig());
fragment = configFragment;
}
if (fragment.getCurrentConfig() != getCurrentConfig())
fragment.setCurrentConfig(getCurrentConfig());
if (fm.findFragmentById(container) != fragment) {
final FragmentTransaction transaction = fm.beginTransaction();
if (push) {

19
app/src/main/java/com/wireguard/android/PlaceholderFragment.java
View File

@ -1,19 +0,0 @@
package com.wireguard.android;
import android.app.Fragment;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
/**
* Fragment that shows a placeholder message.
*/
public class PlaceholderFragment extends Fragment {
@Override
public View onCreateView(final LayoutInflater inflater, final ViewGroup parent,
final Bundle savedInstanceState) {
return inflater.inflate(R.layout.placeholder_fragment, parent, false);
}
}

10
app/src/main/res/layout-land/config_activity.xml
View File

@ -20,5 +20,13 @@
android:background="?android:attr/colorPrimary"
android:paddingEnd="0dp"
android:paddingStart="4dp"
tools:ignore="InconsistentLayout" />
tools:ignore="InconsistentLayout">
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?android:attr/colorBackground"
android:gravity="center"
android:text="@string/placeholder_text" />
</FrameLayout>
</LinearLayout>

7
app/src/main/res/layout/placeholder_fragment.xml
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?android:attr/colorBackground"
android:gravity="center"
android:text="@string/placeholder_text" />