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

Changed Canteen Listener

Browse Source
This commit is contained in:
Caesar2011
2018-11-21 22:56:19 +01:00
parent 6bd99c59a8
commit 8791d65d96
4 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,7 @@ 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.GoogleAuth.Credentials; import de.sebse.fuplanner.services.GoogleAuth.Credentials;
import de.sebse.fuplanner.services.GoogleAuth.GoogleAuth; import de.sebse.fuplanner.services.GoogleAuth.GoogleAuth;
import de.sebse.fuplanner.services.KVV.KVV; import de.sebse.fuplanner.services.KVV.KVV;
@@ -57,7 +58,7 @@ import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
import de.sebse.fuplanner.tools.types.News; import de.sebse.fuplanner.tools.types.News;
public class MainActivity extends AppCompatActivity public class MainActivity extends AppCompatActivity
implements MainActivityListener, KVVListener, implements MainActivityListener, KVVListener, CanteenListener,
NavigationView.OnNavigationItemSelectedListener, NavigationView.OnNavigationItemSelectedListener,
ModulesFragment.OnModulesFragmentInteractionListener, ModulesFragment.OnModulesFragmentInteractionListener,
CanteensFragment.OnCanteensFragmentInteractionListener { CanteensFragment.OnCanteensFragmentInteractionListener {
@@ -582,7 +583,7 @@ public class MainActivity extends AppCompatActivity
} }
@Override @Override
public void onRefreshCompleted(boolean isFailed) { public void onCanteenRefreshCompleted(boolean isFailed) {
setRefreshFailedBanner(isFailed); setRefreshFailedBanner(isFailed);
} }

15
app/src/main/java/de/sebse/fuplanner/services/Canteen/CanteenBrowser.java
View File

@@ -8,12 +8,11 @@ import org.json.JSONObject;
import java.io.IOException; import java.io.IOException;
import de.sebse.fuplanner.MainActivity;
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.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.MainActivityListener;
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;
import de.sebse.fuplanner.tools.network.NetworkError; import de.sebse.fuplanner.tools.network.NetworkError;
@@ -23,15 +22,15 @@ public class CanteenBrowser extends HTTPService {
private Canteens canteens; private Canteens canteens;
private final AsyncQueue queue = new AsyncQueue(); private final AsyncQueue queue = new AsyncQueue();
private final Context context; private final Context context;
private MainActivityListener mListener; private CanteenListener mListener;
public CanteenBrowser(Context context) { public CanteenBrowser(Context context) {
super(context); super(context);
this.context = context; this.context = context;
if (context instanceof MainActivityListener) if (context instanceof CanteenListener)
mListener = (MainActivity) context; mListener = (CanteenListener) context;
else else
throw new RuntimeException(context.toString() + " must implement MainActivityListener"); throw new RuntimeException(context.toString() + " must implement CanteenListener");
try { try {
this.canteens = Canteens.load(context); this.canteens = Canteens.load(context);
} catch (IOException e) { } catch (IOException e) {
@@ -224,14 +223,14 @@ public class CanteenBrowser extends HTTPService {
private<T> NetworkCallback<T> saveOnCallback(NetworkCallback<T> callback, boolean forceRefresh){ private<T> NetworkCallback<T> saveOnCallback(NetworkCallback<T> callback, boolean forceRefresh){
return (success -> { return (success -> {
if (forceRefresh) if (forceRefresh)
mListener.onRefreshCompleted(false); mListener.onCanteenRefreshCompleted(false);
callback.onResponse(success); callback.onResponse(success);
}); });
} }
private NetworkErrorCallback errorOnCallback(NetworkErrorCallback errorCallback){ private NetworkErrorCallback errorOnCallback(NetworkErrorCallback errorCallback){
return (error -> { return (error -> {
mListener.onRefreshCompleted(true); mListener.onCanteenRefreshCompleted(true);
errorCallback.onError(error); errorCallback.onError(error);
}); });
} }

5
app/src/main/java/de/sebse/fuplanner/services/Canteen/types/CanteenListener.java Normal file
View File

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

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

@@ -24,9 +24,6 @@ public interface MainActivityListener {
NewsManager getNewsManager(); NewsManager getNewsManager();
@Deprecated
void onRefreshCompleted(boolean isFailed);
void addRequestPermissionsResultListener(RequestPermissionsResultListener listener, String id); void addRequestPermissionsResultListener(RequestPermissionsResultListener listener, String id);
void removeRequestPermissionsResultListener(String id); void removeRequestPermissionsResultListener(String id);