frank/wirevpn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 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
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/wireguard/android/ConfigActivity.java
+26 -27
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;
switch (tag) {
case TAG_DETAIL:
if (detailFragment == null)
detailFragment = new ConfigDetailFragment();
configFragment = detailFragment;
break;
case TAG_EDIT:
if (editFragment == null)
editFragment = new ConfigEditFragment();
configFragment = editFragment;
break;
case TAG_LIST:
if (listFragment == null)
listFragment = new ConfigListFragment();
configFragment = listFragment;
break;
default:
throw new IllegalArgumentException();
}
if (configFragment.getCurrentConfig() != getCurrentConfig())
configFragment.setCurrentConfig(getCurrentConfig());
fragment = 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();
fragment = detailFragment;
break;
case TAG_EDIT:
if (editFragment == null)
editFragment = new ConfigEditFragment();
fragment = editFragment;
break;
case TAG_LIST:
if (listFragment == null)
listFragment = new ConfigListFragment();
fragment = listFragment;
break;
default:
throw new IllegalArgumentException();
}
if (fragment.getCurrentConfig() != getCurrentConfig())
fragment.setCurrentConfig(getCurrentConfig());
if (fm.findFragmentById(container) != fragment) {
final FragmentTransaction transaction = fm.beginTransaction();
if (push) {
app/src/main/java/com/wireguard/android/PlaceholderFragment.java
-19
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);
}
}