renamed packages
This commit is contained in:
@@ -36,14 +36,14 @@ import de.sebse.fuplanner.fragments.ScheduleFragment;
|
||||
import de.sebse.fuplanner.fragments.StartupFragment;
|
||||
import de.sebse.fuplanner.fragments.canteen.DaySwitcherFragment;
|
||||
import de.sebse.fuplanner.fragments.moddetails.ModDetailFragment;
|
||||
import de.sebse.fuplanner.services.Canteen.CanteenBrowser;
|
||||
import de.sebse.fuplanner.services.Canteen.types.Canteen;
|
||||
import de.sebse.fuplanner.services.Canteen.types.CanteenListener;
|
||||
import de.sebse.fuplanner.services.canteen.CanteenBrowser;
|
||||
import de.sebse.fuplanner.services.canteen.types.Canteen;
|
||||
import de.sebse.fuplanner.services.canteen.types.CanteenListener;
|
||||
import de.sebse.fuplanner.services.kvv.KVV;
|
||||
import de.sebse.fuplanner.services.kvv.KVVListener;
|
||||
import de.sebse.fuplanner.services.kvv.types.LoginToken;
|
||||
import de.sebse.fuplanner.services.kvv.types.Modules;
|
||||
import de.sebse.fuplanner.services.News.NewsManager;
|
||||
import de.sebse.fuplanner.services.news.NewsManager;
|
||||
import de.sebse.fuplanner.services.fulogin.AccountGeneral;
|
||||
import de.sebse.fuplanner.tools.CustomAccountManager;
|
||||
import de.sebse.fuplanner.tools.MainActivityListener;
|
||||
@@ -144,16 +144,13 @@ public class MainActivity extends AppCompatActivity
|
||||
super.onPause();
|
||||
isPaused = true;
|
||||
isLoggedInBeforePause = getKVV().account().isLoggedIn();
|
||||
log.d("onPause", isPaused, isLoggedInBeforePause);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onResume() {
|
||||
super.onResume();
|
||||
log.d("onResume", isPaused, isLoggedInBeforePause);
|
||||
if (isPaused) {
|
||||
getKVV().account().restoreOnlineLogin(isRestored -> {
|
||||
log.d("onResume", isRestored);
|
||||
updateNavigation();
|
||||
if (isRestored && !isLoggedInBeforePause)
|
||||
changeFragment(getDefaultFragmentAfterLogin());
|
||||
|
||||
@@ -8,8 +8,8 @@ import androidx.annotation.NonNull;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
import de.sebse.fuplanner.R;
|
||||
import de.sebse.fuplanner.fragments.CanteensFragment.OnCanteensFragmentInteractionListener;
|
||||
import de.sebse.fuplanner.services.Canteen.types.Canteen;
|
||||
import de.sebse.fuplanner.services.Canteen.types.Canteens;
|
||||
import de.sebse.fuplanner.services.canteen.types.Canteen;
|
||||
import de.sebse.fuplanner.services.canteen.types.Canteens;
|
||||
import de.sebse.fuplanner.tools.ui.ItemViewHolder;
|
||||
|
||||
/**
|
||||
|
||||
@@ -13,7 +13,7 @@ import androidx.recyclerview.widget.RecyclerView;
|
||||
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
|
||||
import de.sebse.fuplanner.MainActivity;
|
||||
import de.sebse.fuplanner.R;
|
||||
import de.sebse.fuplanner.services.Canteen.CanteenBrowser;
|
||||
import de.sebse.fuplanner.services.canteen.CanteenBrowser;
|
||||
import de.sebse.fuplanner.tools.MainActivityListener;
|
||||
import de.sebse.fuplanner.tools.logging.Logger;
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ import androidx.fragment.app.Fragment;
|
||||
import androidx.fragment.app.FragmentManager;
|
||||
import androidx.fragment.app.FragmentStatePagerAdapter;
|
||||
|
||||
import de.sebse.fuplanner.services.Canteen.types.Canteen;
|
||||
import de.sebse.fuplanner.services.canteen.types.Canteen;
|
||||
import de.sebse.fuplanner.tools.UtilsDate;
|
||||
|
||||
class DaySwitcherAdapter extends FragmentStatePagerAdapter {
|
||||
|
||||
@@ -11,8 +11,8 @@ import androidx.fragment.app.Fragment;
|
||||
import androidx.viewpager.widget.ViewPager;
|
||||
import de.sebse.fuplanner.MainActivity;
|
||||
import de.sebse.fuplanner.R;
|
||||
import de.sebse.fuplanner.services.Canteen.CanteenBrowser;
|
||||
import de.sebse.fuplanner.services.Canteen.types.Canteen;
|
||||
import de.sebse.fuplanner.services.canteen.CanteenBrowser;
|
||||
import de.sebse.fuplanner.services.canteen.types.Canteen;
|
||||
import de.sebse.fuplanner.tools.MainActivityListener;
|
||||
import de.sebse.fuplanner.tools.logging.Logger;
|
||||
import de.sebse.fuplanner.tools.network.NetworkCallback;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package de.sebse.fuplanner.fragments.canteen;
|
||||
|
||||
import de.sebse.fuplanner.services.Canteen.types.Canteen;
|
||||
import de.sebse.fuplanner.services.canteen.types.Canteen;
|
||||
import de.sebse.fuplanner.tools.network.NetworkCallback;
|
||||
import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
|
||||
|
||||
|
||||
@@ -13,8 +13,8 @@ import androidx.annotation.NonNull;
|
||||
import androidx.annotation.StringRes;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
import de.sebse.fuplanner.R;
|
||||
import de.sebse.fuplanner.services.Canteen.types.Day;
|
||||
import de.sebse.fuplanner.services.Canteen.types.Meal;
|
||||
import de.sebse.fuplanner.services.canteen.types.Day;
|
||||
import de.sebse.fuplanner.services.canteen.types.Meal;
|
||||
import de.sebse.fuplanner.tools.Preferences;
|
||||
import de.sebse.fuplanner.tools.ui.MealViewHolder;
|
||||
import de.sebse.fuplanner.tools.ui.StringViewHolder;
|
||||
|
||||
@@ -13,9 +13,9 @@ import androidx.recyclerview.widget.RecyclerView;
|
||||
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
|
||||
import de.sebse.fuplanner.MainActivity;
|
||||
import de.sebse.fuplanner.R;
|
||||
import de.sebse.fuplanner.services.Canteen.CanteenBrowser;
|
||||
import de.sebse.fuplanner.services.Canteen.types.Canteen;
|
||||
import de.sebse.fuplanner.services.Canteen.types.Day;
|
||||
import de.sebse.fuplanner.services.canteen.CanteenBrowser;
|
||||
import de.sebse.fuplanner.services.canteen.types.Canteen;
|
||||
import de.sebse.fuplanner.services.canteen.types.Day;
|
||||
import de.sebse.fuplanner.tools.logging.Logger;
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package de.sebse.fuplanner.services.Canteen;
|
||||
package de.sebse.fuplanner.services.canteen;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
@@ -8,10 +8,10 @@ import org.json.JSONObject;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import de.sebse.fuplanner.services.Canteen.types.Canteen;
|
||||
import de.sebse.fuplanner.services.Canteen.types.CanteenListener;
|
||||
import de.sebse.fuplanner.services.Canteen.types.Canteens;
|
||||
import de.sebse.fuplanner.services.Canteen.types.Day;
|
||||
import de.sebse.fuplanner.services.canteen.types.Canteen;
|
||||
import de.sebse.fuplanner.services.canteen.types.CanteenListener;
|
||||
import de.sebse.fuplanner.services.canteen.types.Canteens;
|
||||
import de.sebse.fuplanner.services.canteen.types.Day;
|
||||
import de.sebse.fuplanner.tools.AsyncQueue;
|
||||
import de.sebse.fuplanner.tools.network.HTTPService;
|
||||
import de.sebse.fuplanner.tools.network.NetworkCallback;
|
||||
@@ -1,4 +1,4 @@
|
||||
package de.sebse.fuplanner.services.Canteen.types;
|
||||
package de.sebse.fuplanner.services.canteen.types;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package de.sebse.fuplanner.services.Canteen.types;
|
||||
package de.sebse.fuplanner.services.canteen.types;
|
||||
|
||||
public interface CanteenListener {
|
||||
void onCanteenRefreshCompleted(boolean b);
|
||||
@@ -1,4 +1,4 @@
|
||||
package de.sebse.fuplanner.services.Canteen.types;
|
||||
package de.sebse.fuplanner.services.canteen.types;
|
||||
|
||||
import android.content.Context;
|
||||
import androidx.annotation.NonNull;
|
||||
@@ -1,4 +1,4 @@
|
||||
package de.sebse.fuplanner.services.Canteen.types;
|
||||
package de.sebse.fuplanner.services.canteen.types;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package de.sebse.fuplanner.services.Canteen.types;
|
||||
package de.sebse.fuplanner.services.canteen.types;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.ArrayList;
|
||||
@@ -1,4 +1,4 @@
|
||||
package de.sebse.fuplanner.services.Canteen.types;
|
||||
package de.sebse.fuplanner.services.canteen.types;
|
||||
|
||||
import de.sebse.fuplanner.tools.SortedList;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package de.sebse.fuplanner.services.Canteen.types;
|
||||
package de.sebse.fuplanner.services.canteen.types;
|
||||
|
||||
import java.util.Calendar;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package de.sebse.fuplanner.services.Canteen.types;
|
||||
package de.sebse.fuplanner.services.canteen.types;
|
||||
|
||||
import de.sebse.fuplanner.tools.SortedList;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package de.sebse.fuplanner.services.News;
|
||||
package de.sebse.fuplanner.services.news;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
@@ -2,9 +2,9 @@ package de.sebse.fuplanner.tools;
|
||||
|
||||
import androidx.annotation.StringRes;
|
||||
|
||||
import de.sebse.fuplanner.services.Canteen.CanteenBrowser;
|
||||
import de.sebse.fuplanner.services.canteen.CanteenBrowser;
|
||||
import de.sebse.fuplanner.services.kvv.KVV;
|
||||
import de.sebse.fuplanner.services.News.NewsManager;
|
||||
import de.sebse.fuplanner.services.news.NewsManager;
|
||||
|
||||
public interface MainActivityListener {
|
||||
void onTitleTextChange(String newTitle);
|
||||
|
||||
Reference in New Issue
Block a user