sebse/android-fuplanner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed Last_Fragment

Browse Source
This commit is contained in:
Caesar2011
2018-10-15 17:13:07 +02:00
parent e1de122001
commit 1fa442dbd9
2 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/de/sebse/fuplanner/MainActivity.java
View File

@@ -54,13 +54,8 @@ public class MainActivity extends AppCompatActivity
private static final int FRAGMENT_CANTEENS_DETAILS = 6; private static final int FRAGMENT_CANTEENS_DETAILS = 6;
private static final int FRAGMENT_PREFERENCES = 7; private static final int FRAGMENT_PREFERENCES = 7;
//zum Speichern des angezeigten Fragments bei einem erneuten login (z.B. Cookies abgelaufen)
private int last_Fragment = FRAGMENT_NONE;
private String last_Fragment_id = "";
private static final String ARG_FRAGMENT_PAGE = "fragment_page"; private static final String ARG_FRAGMENT_PAGE = "fragment_page";
private static final String ARG_FRAGMENT_STATUS = "fragment_status"; private static final String ARG_FRAGMENT_STATUS = "fragment_status";
private static final String ARG_LOGIN_STATUS = "login_status";
private FragmentManager mFragmentManager; private FragmentManager mFragmentManager;
private GoogleAuth mGoogleAuth; private GoogleAuth mGoogleAuth;
@@ -98,7 +93,6 @@ public class MainActivity extends AppCompatActivity
mFragmentManager = getSupportFragmentManager(); mFragmentManager = getSupportFragmentManager();
LoginToken loginToken = getKVV().easyLogin(); LoginToken loginToken = getKVV().easyLogin();
log.d(loginToken, last_Fragment, last_Fragment_id, newFragmentPage, newFragmentData);
if (loginToken == null) { if (loginToken == null) {
checkAndDoLogin(); checkAndDoLogin();
} else { } else {
@@ -245,17 +239,15 @@ public class MainActivity extends AppCompatActivity
private int getDefaultFragmentAfterLogin(String[] id) { private int getDefaultFragmentAfterLogin(String[] id) {
//log.d("Cookies last_Fragment", last_Fragment); //log.d("Cookies last_Fragment", last_Fragment);
if (last_Fragment == FRAGMENT_NONE){ if (fragmentPage == FRAGMENT_NONE){
id[0]=""; id[0] = "";
return FRAGMENT_MODULES; return FRAGMENT_MODULES;
} }
else { else {
//log.d("changeFragment last_Fragment_id gesetzt", last_Fragment_id); //log.d("changeFragment last_Fragment_id gesetzt", last_Fragment_id);
id[0] = last_Fragment_id; id[0] = fragmentData;
return last_Fragment; return fragmentPage;
} }
} }
private void toLogoutState() { private void toLogoutState() {
@@ -311,39 +303,27 @@ public class MainActivity extends AppCompatActivity
switch (newFragment) { switch (newFragment) {
case FRAGMENT_MODULES: case FRAGMENT_MODULES:
fragment = ModulesFragment.newInstance(); fragment = ModulesFragment.newInstance();
last_Fragment = FRAGMENT_MODULES;
last_Fragment_id = "";
break; break;
case FRAGMENT_MODULES_DETAILS: case FRAGMENT_MODULES_DETAILS:
fragment = ModDetailFragment.newInstance(newData); fragment = ModDetailFragment.newInstance(newData);
last_Fragment = FRAGMENT_MODULES_DETAILS;
last_Fragment_id = newData;
break; break;
case FRAGMENT_LOGIN: case FRAGMENT_LOGIN:
fragment = LoginFragment.newInstance(); fragment = LoginFragment.newInstance();
break; break;
case FRAGMENT_SCHEDULE: case FRAGMENT_SCHEDULE:
fragment = ScheduleFragment.newInstance(); fragment = ScheduleFragment.newInstance();
last_Fragment = FRAGMENT_SCHEDULE;
last_Fragment_id = "";
break; break;
case FRAGMENT_CANTEENS: case FRAGMENT_CANTEENS:
fragment = CanteensFragment.newInstance(); fragment = CanteensFragment.newInstance();
last_Fragment = FRAGMENT_CANTEENS;
last_Fragment_id = "";
break; break;
case FRAGMENT_CANTEENS_DETAILS: case FRAGMENT_CANTEENS_DETAILS:
fragment = DaySwitcherFragment.newInstance(Integer.parseInt(newData)); fragment = DaySwitcherFragment.newInstance(Integer.parseInt(newData));
last_Fragment = FRAGMENT_NONE;
last_Fragment_id = newData;
break; break;
case FRAGMENT_PREFERENCES: case FRAGMENT_PREFERENCES:
fragment = PrefsFragment.newInstance(); fragment = PrefsFragment.newInstance();
//last_Fragment = FRAGMENT_NONE;
break; break;
default: // FRAGMENT_STARTUP default: // FRAGMENT_STARTUP
fragment = StartupFragment.newInstance(); fragment = StartupFragment.newInstance();
//last_Fragment = FRAGMENT_NONE;
break; break;
} }

5
app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailFragment.java
View File

@@ -31,6 +31,7 @@ public class ModDetailFragment extends Fragment implements ModDetailListener {
private MainAcitivityListener mListener; private MainAcitivityListener mListener;
private final Logger log = new Logger(this); private final Logger log = new Logger(this);
private ViewPager mViewPager; private ViewPager mViewPager;
private String mPageRestoreRequest = null;
public ModDetailFragment() { public ModDetailFragment() {
// Required empty public constructor // Required empty public constructor
@@ -46,7 +47,7 @@ public class ModDetailFragment extends Fragment implements ModDetailListener {
public static Fragment newInstance(String itemPosition) { public static Fragment newInstance(String itemPosition) {
ModDetailFragment fragment = new ModDetailFragment(); ModDetailFragment fragment = new ModDetailFragment();
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putString(ARG_POSITION, itemPosition); args.putString(ARG_POSITION, itemPosition);//+"."+0);
fragment.setArguments(args); fragment.setArguments(args);
return fragment; return fragment;
} }
@@ -54,8 +55,10 @@ public class ModDetailFragment extends Fragment implements ModDetailListener {
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
log.d("load instance");
if (getArguments() != null) { if (getArguments() != null) {
mItemPos = getArguments().getString(ARG_POSITION); mItemPos = getArguments().getString(ARG_POSITION);
} }
if (mListener != null) { if (mListener != null) {
mListener.onTitleTextChange(R.string.courses); mListener.onTitleTextChange(R.string.courses);