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

renamed packages

Browse Source
This commit is contained in:
Sebastian Seedorf
2019-01-03 10:01:47 +01:00
parent 4db38ba4fb
commit 22f7cf3e96
19 changed files with 32 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,14 +36,14 @@ import de.sebse.fuplanner.fragments.ScheduleFragment;
import de.sebse.fuplanner.fragments.StartupFragment; import de.sebse.fuplanner.fragments.StartupFragment;
import de.sebse.fuplanner.fragments.canteen.DaySwitcherFragment; import de.sebse.fuplanner.fragments.canteen.DaySwitcherFragment;
import de.sebse.fuplanner.fragments.moddetails.ModDetailFragment; import de.sebse.fuplanner.fragments.moddetails.ModDetailFragment;
import de.sebse.fuplanner.services.Canteen.CanteenBrowser; import de.sebse.fuplanner.services.canteen.CanteenBrowser;
import de.sebse.fuplanner.services.Canteen.types.Canteen; import de.sebse.fuplanner.services.canteen.types.Canteen;
import de.sebse.fuplanner.services.Canteen.types.CanteenListener; import de.sebse.fuplanner.services.canteen.types.CanteenListener;
import de.sebse.fuplanner.services.kvv.KVV; import de.sebse.fuplanner.services.kvv.KVV;
import de.sebse.fuplanner.services.kvv.KVVListener; import de.sebse.fuplanner.services.kvv.KVVListener;
import de.sebse.fuplanner.services.kvv.types.LoginToken; import de.sebse.fuplanner.services.kvv.types.LoginToken;
import de.sebse.fuplanner.services.kvv.types.Modules; 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.services.fulogin.AccountGeneral;
import de.sebse.fuplanner.tools.CustomAccountManager; import de.sebse.fuplanner.tools.CustomAccountManager;
import de.sebse.fuplanner.tools.MainActivityListener; import de.sebse.fuplanner.tools.MainActivityListener;
@@ -144,16 +144,13 @@ public class MainActivity extends AppCompatActivity
super.onPause(); super.onPause();
isPaused = true; isPaused = true;
isLoggedInBeforePause = getKVV().account().isLoggedIn(); isLoggedInBeforePause = getKVV().account().isLoggedIn();
log.d("onPause", isPaused, isLoggedInBeforePause);
} }
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
log.d("onResume", isPaused, isLoggedInBeforePause);
if (isPaused) { if (isPaused) {
getKVV().account().restoreOnlineLogin(isRestored -> { getKVV().account().restoreOnlineLogin(isRestored -> {
log.d("onResume", isRestored);
updateNavigation(); updateNavigation();
if (isRestored && !isLoggedInBeforePause) if (isRestored && !isLoggedInBeforePause)
changeFragment(getDefaultFragmentAfterLogin()); changeFragment(getDefaultFragmentAfterLogin());

4
app/src/main/java/de/sebse/fuplanner/fragments/CanteensAdapter.java
View File

@@ -8,8 +8,8 @@ import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import de.sebse.fuplanner.R; import de.sebse.fuplanner.R;
import de.sebse.fuplanner.fragments.CanteensFragment.OnCanteensFragmentInteractionListener; import de.sebse.fuplanner.fragments.CanteensFragment.OnCanteensFragmentInteractionListener;
import de.sebse.fuplanner.services.Canteen.types.Canteen; import de.sebse.fuplanner.services.canteen.types.Canteen;
import de.sebse.fuplanner.services.Canteen.types.Canteens; import de.sebse.fuplanner.services.canteen.types.Canteens;
import de.sebse.fuplanner.tools.ui.ItemViewHolder; import de.sebse.fuplanner.tools.ui.ItemViewHolder;
/** /**

2
app/src/main/java/de/sebse/fuplanner/fragments/CanteensFragment.java
View File

@@ -13,7 +13,7 @@ import androidx.recyclerview.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import de.sebse.fuplanner.MainActivity; import de.sebse.fuplanner.MainActivity;
import de.sebse.fuplanner.R; 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.MainActivityListener;
import de.sebse.fuplanner.tools.logging.Logger; import de.sebse.fuplanner.tools.logging.Logger;

2
app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherAdapter.java
View File

@@ -4,7 +4,7 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentStatePagerAdapter; 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; import de.sebse.fuplanner.tools.UtilsDate;
class DaySwitcherAdapter extends FragmentStatePagerAdapter { class DaySwitcherAdapter extends FragmentStatePagerAdapter {

4
app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherFragment.java
View File

@@ -11,8 +11,8 @@ import androidx.fragment.app.Fragment;
import androidx.viewpager.widget.ViewPager; import androidx.viewpager.widget.ViewPager;
import de.sebse.fuplanner.MainActivity; import de.sebse.fuplanner.MainActivity;
import de.sebse.fuplanner.R; import de.sebse.fuplanner.R;
import de.sebse.fuplanner.services.Canteen.CanteenBrowser; import de.sebse.fuplanner.services.canteen.CanteenBrowser;
import de.sebse.fuplanner.services.Canteen.types.Canteen; import de.sebse.fuplanner.services.canteen.types.Canteen;
import de.sebse.fuplanner.tools.MainActivityListener; import de.sebse.fuplanner.tools.MainActivityListener;
import de.sebse.fuplanner.tools.logging.Logger; import de.sebse.fuplanner.tools.logging.Logger;
import de.sebse.fuplanner.tools.network.NetworkCallback; import de.sebse.fuplanner.tools.network.NetworkCallback;

2
app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherListener.java
View File

@@ -1,6 +1,6 @@
package de.sebse.fuplanner.fragments.canteen; 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.NetworkCallback;
import de.sebse.fuplanner.tools.network.NetworkErrorCallback; import de.sebse.fuplanner.tools.network.NetworkErrorCallback;

4
app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealAdapter.java
View File

@@ -13,8 +13,8 @@ import androidx.annotation.NonNull;
import androidx.annotation.StringRes; import androidx.annotation.StringRes;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import de.sebse.fuplanner.R; import de.sebse.fuplanner.R;
import de.sebse.fuplanner.services.Canteen.types.Day; import de.sebse.fuplanner.services.canteen.types.Day;
import de.sebse.fuplanner.services.Canteen.types.Meal; import de.sebse.fuplanner.services.canteen.types.Meal;
import de.sebse.fuplanner.tools.Preferences; import de.sebse.fuplanner.tools.Preferences;
import de.sebse.fuplanner.tools.ui.MealViewHolder; import de.sebse.fuplanner.tools.ui.MealViewHolder;
import de.sebse.fuplanner.tools.ui.StringViewHolder; import de.sebse.fuplanner.tools.ui.StringViewHolder;

6
app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealFragment.java
View File

@@ -13,9 +13,9 @@ import androidx.recyclerview.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import de.sebse.fuplanner.MainActivity; import de.sebse.fuplanner.MainActivity;
import de.sebse.fuplanner.R; import de.sebse.fuplanner.R;
import de.sebse.fuplanner.services.Canteen.CanteenBrowser; import de.sebse.fuplanner.services.canteen.CanteenBrowser;
import de.sebse.fuplanner.services.Canteen.types.Canteen; import de.sebse.fuplanner.services.canteen.types.Canteen;
import de.sebse.fuplanner.services.Canteen.types.Day; import de.sebse.fuplanner.services.canteen.types.Day;
import de.sebse.fuplanner.tools.logging.Logger; import de.sebse.fuplanner.tools.logging.Logger;
/** /**

10
app/src/main/java/de/sebse/fuplanner/services/Canteen/CanteenBrowser.java → app/src/main/java/de/sebse/fuplanner/services/canteen/CanteenBrowser.java
View File

@@ -1,4 +1,4 @@
package de.sebse.fuplanner.services.Canteen; package de.sebse.fuplanner.services.canteen;
import android.content.Context; import android.content.Context;
@@ -8,10 +8,10 @@ import org.json.JSONObject;
import java.io.IOException; import java.io.IOException;
import de.sebse.fuplanner.services.Canteen.types.Canteen; import de.sebse.fuplanner.services.canteen.types.Canteen;
import de.sebse.fuplanner.services.Canteen.types.CanteenListener; import de.sebse.fuplanner.services.canteen.types.CanteenListener;
import de.sebse.fuplanner.services.Canteen.types.Canteens; import de.sebse.fuplanner.services.canteen.types.Canteens;
import de.sebse.fuplanner.services.Canteen.types.Day; import de.sebse.fuplanner.services.canteen.types.Day;
import de.sebse.fuplanner.tools.AsyncQueue; import de.sebse.fuplanner.tools.AsyncQueue;
import de.sebse.fuplanner.tools.network.HTTPService; import de.sebse.fuplanner.tools.network.HTTPService;
import de.sebse.fuplanner.tools.network.NetworkCallback; import de.sebse.fuplanner.tools.network.NetworkCallback;

2
app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Canteen.java → app/src/main/java/de/sebse/fuplanner/services/canteen/types/Canteen.java
View File

@@ -1,4 +1,4 @@
package de.sebse.fuplanner.services.Canteen.types; package de.sebse.fuplanner.services.canteen.types;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;

2
app/src/main/java/de/sebse/fuplanner/services/Canteen/types/CanteenListener.java → app/src/main/java/de/sebse/fuplanner/services/canteen/types/CanteenListener.java
View File

@@ -1,4 +1,4 @@
package de.sebse.fuplanner.services.Canteen.types; package de.sebse.fuplanner.services.canteen.types;
public interface CanteenListener { public interface CanteenListener {
void onCanteenRefreshCompleted(boolean b); void onCanteenRefreshCompleted(boolean b);

2
app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Canteens.java → app/src/main/java/de/sebse/fuplanner/services/canteen/types/Canteens.java
View File

@@ -1,4 +1,4 @@
package de.sebse.fuplanner.services.Canteen.types; package de.sebse.fuplanner.services.canteen.types;
import android.content.Context; import android.content.Context;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;

2
app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Day.java → app/src/main/java/de/sebse/fuplanner/services/canteen/types/Day.java
View File

@@ -1,4 +1,4 @@
package de.sebse.fuplanner.services.Canteen.types; package de.sebse.fuplanner.services.canteen.types;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;

2
app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Meal.java → app/src/main/java/de/sebse/fuplanner/services/canteen/types/Meal.java
View File

@@ -1,4 +1,4 @@
package de.sebse.fuplanner.services.Canteen.types; package de.sebse.fuplanner.services.canteen.types;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;

2
app/src/main/java/de/sebse/fuplanner/services/Canteen/types/SortedListCanteen.java → app/src/main/java/de/sebse/fuplanner/services/canteen/types/SortedListCanteen.java
View File

@@ -1,4 +1,4 @@
package de.sebse.fuplanner.services.Canteen.types; package de.sebse.fuplanner.services.canteen.types;
import de.sebse.fuplanner.tools.SortedList; import de.sebse.fuplanner.tools.SortedList;

2
app/src/main/java/de/sebse/fuplanner/services/Canteen/types/SortedListDay.java → app/src/main/java/de/sebse/fuplanner/services/canteen/types/SortedListDay.java
View File

@@ -1,4 +1,4 @@
package de.sebse.fuplanner.services.Canteen.types; package de.sebse.fuplanner.services.canteen.types;
import java.util.Calendar; import java.util.Calendar;

2
app/src/main/java/de/sebse/fuplanner/services/Canteen/types/SortedListMeal.java → app/src/main/java/de/sebse/fuplanner/services/canteen/types/SortedListMeal.java
View File

@@ -1,4 +1,4 @@
package de.sebse.fuplanner.services.Canteen.types; package de.sebse.fuplanner.services.canteen.types;
import de.sebse.fuplanner.tools.SortedList; import de.sebse.fuplanner.tools.SortedList;

2
app/src/main/java/de/sebse/fuplanner/services/News/NewsManager.java → app/src/main/java/de/sebse/fuplanner/services/news/NewsManager.java
View File

@@ -1,4 +1,4 @@
package de.sebse.fuplanner.services.News; package de.sebse.fuplanner.services.news;
import android.content.Context; import android.content.Context;

4
app/src/main/java/de/sebse/fuplanner/tools/MainActivityListener.java
View File

@@ -2,9 +2,9 @@ package de.sebse.fuplanner.tools;
import androidx.annotation.StringRes; 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.kvv.KVV;
import de.sebse.fuplanner.services.News.NewsManager; import de.sebse.fuplanner.services.news.NewsManager;
public interface MainActivityListener { public interface MainActivityListener {
void onTitleTextChange(String newTitle); void onTitleTextChange(String newTitle);