From 6daa41cbcdb1c8d92a51ea1f99d2463ffb6f8f32 Mon Sep 17 00:00:00 2001 From: Caesar2011 Date: Tue, 13 Nov 2018 00:44:25 +0100 Subject: [PATCH] Massive Renaming and Name Shorting --- .../java/de/sebse/fuplanner/MainActivity.java | 24 +++--- .../moddetails/ModDetailAnnounceAdapter.java | 2 +- .../moddetails/ModDetailAnnounceFragment.java | 2 +- .../ModDetailAssignmentAdapter.java | 2 +- .../ModDetailAssignmentFragment.java | 2 +- .../moddetails/ModDetailResourceFragment.java | 2 +- .../de/sebse/fuplanner/services/KVV/KVV.java | 8 +- .../fuplanner/services/KVV/KVVListener.java | 8 +- .../fuplanner/services/KVV/KVVModules.java | 81 ------------------- .../KVV/{KVVLogin.java => Login.java} | 8 +- .../sebse/fuplanner/services/KVV/Modules.java | 81 +++++++++++++++++++ ...cements.java => ModulesAnnouncements.java} | 4 +- ...signments.java => ModulesAssignments.java} | 4 +- ...odulesDetails.java => ModulesDetails.java} | 6 +- ...VModulesEvents.java => ModulesEvents.java} | 4 +- ...esGradebook.java => ModulesGradebook.java} | 4 +- .../{KVVModulesList.java => ModulesList.java} | 10 +-- .../fuplanner/services/KVV/ModulesPart.java | 2 +- ...esResources.java => ModulesResources.java} | 4 +- .../de/sebse/fuplanner/services/KVV/Part.java | 6 +- .../services/KVV/{ => ui}/Download.java | 2 +- .../fuplanner/tools/MainActivityListener.java | 1 + 22 files changed, 129 insertions(+), 138 deletions(-) delete mode 100644 app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModules.java rename app/src/main/java/de/sebse/fuplanner/services/KVV/{KVVLogin.java => Login.java} (98%) create mode 100644 app/src/main/java/de/sebse/fuplanner/services/KVV/Modules.java rename app/src/main/java/de/sebse/fuplanner/services/KVV/{KVVModulesAnnouncements.java => ModulesAnnouncements.java} (95%) rename app/src/main/java/de/sebse/fuplanner/services/KVV/{KVVModulesAssignments.java => ModulesAssignments.java} (96%) rename app/src/main/java/de/sebse/fuplanner/services/KVV/{KVVModulesDetails.java => ModulesDetails.java} (88%) rename app/src/main/java/de/sebse/fuplanner/services/KVV/{KVVModulesEvents.java => ModulesEvents.java} (96%) rename app/src/main/java/de/sebse/fuplanner/services/KVV/{KVVModulesGradebook.java => ModulesGradebook.java} (95%) rename app/src/main/java/de/sebse/fuplanner/services/KVV/{KVVModulesList.java => ModulesList.java} (97%) rename app/src/main/java/de/sebse/fuplanner/services/KVV/{KVVModulesResources.java => ModulesResources.java} (98%) rename app/src/main/java/de/sebse/fuplanner/services/KVV/{ => ui}/Download.java (99%) diff --git a/app/src/main/java/de/sebse/fuplanner/MainActivity.java b/app/src/main/java/de/sebse/fuplanner/MainActivity.java index 52d61a7..a9aedd3 100644 --- a/app/src/main/java/de/sebse/fuplanner/MainActivity.java +++ b/app/src/main/java/de/sebse/fuplanner/MainActivity.java @@ -39,6 +39,7 @@ import de.sebse.fuplanner.services.GoogleAuth.GoogleAuth; 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.tools.MainActivityListener; import de.sebse.fuplanner.tools.RequestPermissionsResultListener; import de.sebse.fuplanner.tools.logging.Logger; @@ -273,7 +274,7 @@ public class MainActivity extends AppCompatActivity changeFragment(FRAGMENT_LOGIN); } - private void toLoginState(String fullName, String email, int newFragment, String newData, boolean onlineMode) { + private void toLoginState(String fullName, String email, int newFragment, boolean onlineMode) { setOfflineBanner(!onlineMode); updateNavigation(); @@ -281,7 +282,7 @@ public class MainActivity extends AppCompatActivity ((TextView) header.findViewById(R.id.login_name)).setText(fullName); ((TextView) header.findViewById(R.id.login_mail)).setText(email); - changeFragment(newFragment, newData); + changeFragment(newFragment); } private void changeFragment(int newFragment) { @@ -425,8 +426,8 @@ public class MainActivity extends AppCompatActivity if (isLoggedIn) { getKVV().modules().list().recv(success -> { int i = 0; - for (Iterator it = success.latestSemesterIterator(); it.hasNext(); ) { - de.sebse.fuplanner.services.KVV.types.Modules.Module module = it.next(); + for (Iterator it = success.latestSemesterIterator(); it.hasNext(); ) { + Modules.Module module = it.next(); MenuItem menuItem = mNavigationView.getMenu().add(Menu.NONE, Menu.NONE, 101 + i, module.title); menuItem.setOnMenuItemClickListener(item -> { onModulesFragmentInteraction(module.getID()); @@ -535,12 +536,12 @@ public class MainActivity extends AppCompatActivity } @Override - public void handleLogin(LoginToken token, boolean enteringOnlineMode) { - toLoginState(token.getUsername(), token.getEmail(), getDefaultFragmentAfterLogin(), "", enteringOnlineMode); + public void onLogin(LoginToken token, boolean enteringOnlineMode) { + toLoginState(token.getUsername(), token.getEmail(), getDefaultFragmentAfterLogin(), enteringOnlineMode); } @Override - public void handleLogout() { + public void onLogout() { toLogoutState(); } @@ -550,12 +551,7 @@ public class MainActivity extends AppCompatActivity } @Override - public void onNetworkError(NetworkResponse networkResponse) { - setRefreshFailedBanner(true); - } - - @Override - public void onNetworkSuccess() { - setRefreshFailedBanner(false); + public void onNetworkResponse(NetworkResponse error) { + setRefreshFailedBanner(error != null); } } diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAnnounceAdapter.java b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAnnounceAdapter.java index e616571..b5a37f0 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAnnounceAdapter.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAnnounceAdapter.java @@ -16,7 +16,7 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; import de.sebse.fuplanner.R; -import de.sebse.fuplanner.services.KVV.Download; +import de.sebse.fuplanner.services.KVV.ui.Download; import de.sebse.fuplanner.services.KVV.types.Announcement; import de.sebse.fuplanner.services.KVV.types.Modules; import de.sebse.fuplanner.tools.Regex; diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAnnounceFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAnnounceFragment.java index fb38cdf..9a203b8 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAnnounceFragment.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAnnounceFragment.java @@ -14,7 +14,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.KVV.Download; +import de.sebse.fuplanner.services.KVV.ui.Download; import de.sebse.fuplanner.services.KVV.types.Modules; import de.sebse.fuplanner.tools.MainActivityListener; import de.sebse.fuplanner.tools.logging.Logger; diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAssignmentAdapter.java b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAssignmentAdapter.java index f3f74e2..34c49fd 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAssignmentAdapter.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAssignmentAdapter.java @@ -16,7 +16,7 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; import de.sebse.fuplanner.R; -import de.sebse.fuplanner.services.KVV.Download; +import de.sebse.fuplanner.services.KVV.ui.Download; import de.sebse.fuplanner.services.KVV.types.Assignment; import de.sebse.fuplanner.services.KVV.types.Modules; import de.sebse.fuplanner.tools.Regex; diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAssignmentFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAssignmentFragment.java index 39fb185..8706804 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAssignmentFragment.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAssignmentFragment.java @@ -14,7 +14,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.KVV.Download; +import de.sebse.fuplanner.services.KVV.ui.Download; import de.sebse.fuplanner.services.KVV.types.Modules; import de.sebse.fuplanner.tools.MainActivityListener; import de.sebse.fuplanner.tools.logging.Logger; diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailResourceFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailResourceFragment.java index 50bf28e..ed73214 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailResourceFragment.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailResourceFragment.java @@ -18,7 +18,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.KVV.Download; +import de.sebse.fuplanner.services.KVV.ui.Download; import de.sebse.fuplanner.services.KVV.types.Modules; import de.sebse.fuplanner.services.KVV.types.Resource; import de.sebse.fuplanner.tools.MainActivityListener; diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVV.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVV.java index ae279d5..076947f 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVV.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVV.java @@ -17,13 +17,13 @@ public class KVV { } @NotNull - public KVVLogin account() { - return (KVVLogin) addAndGet("account", () -> new KVVLogin(mListener, mContext)); + public Login account() { + return (Login) addAndGet("account", () -> new Login(mListener, mContext)); } @NotNull - public KVVModules modules() { - return (KVVModules) addAndGet("module", () -> new KVVModules(account(), mListener, mContext)); + public Modules modules() { + return (Modules) addAndGet("module", () -> new Modules(account(), mListener, mContext)); } diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVListener.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVListener.java index df3b43f..72ffbce 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVListener.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVListener.java @@ -10,13 +10,11 @@ import de.sebse.fuplanner.tools.network.NetworkErrorCallback; public interface KVVListener { void getCredentials(NetworkCallback callback, NetworkErrorCallback error); - void handleLogin(LoginToken token, boolean enteringOnlineMode); + void onLogin(LoginToken token, boolean enteringOnlineMode); - void handleLogout(); + void onLogout(); void onModuleListChange(); - void onNetworkError(NetworkResponse networkResponse); - - void onNetworkSuccess(); + void onNetworkResponse(NetworkResponse error); } diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModules.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModules.java deleted file mode 100644 index 52d0a52..0000000 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModules.java +++ /dev/null @@ -1,81 +0,0 @@ -package de.sebse.fuplanner.services.KVV; - -import android.content.Context; - -import org.jetbrains.annotations.NotNull; - -import java.util.HashMap; - -public class KVVModules { - private final HashMap mAddons = new HashMap<>(); - private KVVModulesList mList = null; - private final KVVLogin mLogin; - private KVVListener mListener; - private final Context context; - - KVVModules(KVVLogin login, KVVListener listener, Context context) { - this.mLogin = login; - this.mListener = listener; - this.context = context; - } - - @NotNull - public KVVModulesDetails details() { - return (KVVModulesDetails) addAndGet("details", () -> { - ModulesPart[] parts = {announcements(), assignments(), events(), gradebook(), resources()}; - return new KVVModulesDetails(mLogin, list(), context, parts); - }); - } - - @NotNull - public KVVModulesAnnouncements announcements() { - return (KVVModulesAnnouncements) addAndGet("announcements", () -> new KVVModulesAnnouncements(mLogin, list(), context)); - } - - @NotNull - public KVVModulesAssignments assignments() { - return (KVVModulesAssignments) addAndGet("assignments", () -> new KVVModulesAssignments(mLogin, list(), context)); - } - - @NotNull - public KVVModulesEvents events() { - return (KVVModulesEvents) addAndGet("events", () -> new KVVModulesEvents(mLogin, list(), context)); - } - - @NotNull - public KVVModulesGradebook gradebook() { - return (KVVModulesGradebook) addAndGet("gradebook", () -> new KVVModulesGradebook(mLogin, list(), context)); - } - - @NotNull - public KVVModulesResources resources() { - return (KVVModulesResources) addAndGet("resources", () -> new KVVModulesResources(mLogin, list(), context)); - } - - @NotNull - public KVVModulesList list() { - if (mList == null) { - mList = new KVVModulesList(mLogin, mListener, context); - mList.addErrorListener("KVVModules", error -> mListener.onNetworkError(error.networkResponse)); - mList.addSuccessListener("KVVModules", success -> mListener.onNetworkSuccess()); - } - return mList; - } - - - @NotNull - private Part addAndGet(@NotNull String addon, @NotNull ModuleCreatorInterface creatorInterface) { - Part o = mAddons.get(addon); - if (o == null) { - o = creatorInterface.create(); - o.addErrorListener("KVVModules", error -> mListener.onNetworkError(error.networkResponse)); - o.addSuccessListener("KVVModules", success -> mListener.onNetworkSuccess()); - mAddons.put(addon, o); - } - return o; - } - - private interface ModuleCreatorInterface { - @NotNull Part create(); - } -} diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVLogin.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/Login.java similarity index 98% rename from app/src/main/java/de/sebse/fuplanner/services/KVV/KVVLogin.java rename to app/src/main/java/de/sebse/fuplanner/services/KVV/Login.java index 945bf50..b10473e 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVLogin.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/Login.java @@ -20,13 +20,13 @@ import de.sebse.fuplanner.tools.network.NetworkCallback; import de.sebse.fuplanner.tools.network.NetworkError; import de.sebse.fuplanner.tools.network.NetworkErrorCallback; -public class KVVLogin extends HTTPService { +public class Login extends HTTPService { private KVVListener mListener; @Nullable private LoginToken mToken; private boolean mLoginPending = false; private boolean mOnlineMode = false; - KVVLogin(KVVListener listener, Context context) { + Login(KVVListener listener, Context context) { super(context); this.mListener = listener; } @@ -160,10 +160,10 @@ public class KVVLogin extends HTTPService { private boolean handleCallbacks() { if (mToken != null) { - mListener.handleLogin(mToken, mOnlineMode); + mListener.onLogin(mToken, mOnlineMode); return true; } else { - mListener.handleLogout(); + mListener.onLogout(); return false; } } diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/Modules.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/Modules.java new file mode 100644 index 0000000..50d67ba --- /dev/null +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/Modules.java @@ -0,0 +1,81 @@ +package de.sebse.fuplanner.services.KVV; + +import android.content.Context; + +import org.jetbrains.annotations.NotNull; + +import java.util.HashMap; + +public class Modules { + private final HashMap mAddons = new HashMap<>(); + private ModulesList mList = null; + private final Login mLogin; + private KVVListener mListener; + private final Context context; + + Modules(Login login, KVVListener listener, Context context) { + this.mLogin = login; + this.mListener = listener; + this.context = context; + } + + @NotNull + public ModulesDetails details() { + return (ModulesDetails) addAndGet("details", () -> { + ModulesPart[] parts = {announcements(), assignments(), events(), gradebook(), resources()}; + return new ModulesDetails(mLogin, list(), context, parts); + }); + } + + @NotNull + public ModulesAnnouncements announcements() { + return (ModulesAnnouncements) addAndGet("announcements", () -> new ModulesAnnouncements(mLogin, list(), context)); + } + + @NotNull + public ModulesAssignments assignments() { + return (ModulesAssignments) addAndGet("assignments", () -> new ModulesAssignments(mLogin, list(), context)); + } + + @NotNull + public ModulesEvents events() { + return (ModulesEvents) addAndGet("events", () -> new ModulesEvents(mLogin, list(), context)); + } + + @NotNull + public ModulesGradebook gradebook() { + return (ModulesGradebook) addAndGet("gradebook", () -> new ModulesGradebook(mLogin, list(), context)); + } + + @NotNull + public ModulesResources resources() { + return (ModulesResources) addAndGet("resources", () -> new ModulesResources(mLogin, list(), context)); + } + + @NotNull + public ModulesList list() { + if (mList == null) { + mList = new ModulesList(mLogin, mListener, context); + mList.addErrorListener("Modules", error -> mListener.onNetworkResponse(error.networkResponse)); + mList.addSuccessListener("Modules", success -> mListener.onNetworkResponse(null)); + } + return mList; + } + + + @NotNull + private Part addAndGet(@NotNull String addon, @NotNull ModuleCreatorInterface creatorInterface) { + Part o = mAddons.get(addon); + if (o == null) { + o = creatorInterface.create(); + o.addErrorListener("Modules", error -> mListener.onNetworkResponse(error.networkResponse)); + o.addSuccessListener("Modules", success -> mListener.onNetworkResponse(null)); + mAddons.put(addon, o); + } + return o; + } + + private interface ModuleCreatorInterface { + @NotNull Part create(); + } +} diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModulesAnnouncements.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesAnnouncements.java similarity index 95% rename from app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModulesAnnouncements.java rename to app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesAnnouncements.java index 60a6368..72adc75 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModulesAnnouncements.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesAnnouncements.java @@ -14,9 +14,9 @@ import de.sebse.fuplanner.tools.network.NetworkCallback; import de.sebse.fuplanner.tools.network.NetworkError; import de.sebse.fuplanner.tools.network.NetworkErrorCallback; -public class KVVModulesAnnouncements extends ModulesPart> { +public class ModulesAnnouncements extends ModulesPart> { - KVVModulesAnnouncements(KVVLogin login, KVVModulesList list, Context context) { + ModulesAnnouncements(Login login, ModulesList list, Context context) { super(login, list, context); } diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModulesAssignments.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesAssignments.java similarity index 96% rename from app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModulesAssignments.java rename to app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesAssignments.java index 0db727c..93d3aa2 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModulesAssignments.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesAssignments.java @@ -15,9 +15,9 @@ import de.sebse.fuplanner.tools.network.NetworkCallback; import de.sebse.fuplanner.tools.network.NetworkError; import de.sebse.fuplanner.tools.network.NetworkErrorCallback; -public class KVVModulesAssignments extends ModulesPart { +public class ModulesAssignments extends ModulesPart { - KVVModulesAssignments(KVVLogin login, KVVModulesList list, Context context) { + ModulesAssignments(Login login, ModulesList list, Context context) { super(login, list, context); } diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModulesDetails.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesDetails.java similarity index 88% rename from app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModulesDetails.java rename to app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesDetails.java index b110e86..9ae2559 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModulesDetails.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesDetails.java @@ -10,10 +10,10 @@ import de.sebse.fuplanner.tools.network.NetworkCallback; import de.sebse.fuplanner.tools.network.NetworkError; import de.sebse.fuplanner.tools.network.NetworkErrorCallback; -final public class KVVModulesDetails extends Part> { +final public class ModulesDetails extends Part> { private final ModulesPart[] parts; - KVVModulesDetails(KVVLogin login, KVVModulesList list, Context context, ModulesPart[] parts) { + ModulesDetails(Login login, ModulesList list, Context context, ModulesPart[] parts) { super(login, list, context); this.parts = parts; } @@ -40,7 +40,7 @@ final public class KVVModulesDetails extends Part> errorCallback.onError(lastError.get()); } }; - for (ModulesPart part: parts) { + for (ModulesPart part: parts) { part.recv(module, successCb, errorCb, forceRefresh, RETRY_COUNT); } } diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModulesEvents.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesEvents.java similarity index 96% rename from app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModulesEvents.java rename to app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesEvents.java index 0ff9376..50617f9 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModulesEvents.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesEvents.java @@ -13,9 +13,9 @@ import de.sebse.fuplanner.tools.network.NetworkCallback; import de.sebse.fuplanner.tools.network.NetworkError; import de.sebse.fuplanner.tools.network.NetworkErrorCallback; -public class KVVModulesEvents extends ModulesPart { +public class ModulesEvents extends ModulesPart { - KVVModulesEvents(KVVLogin login, KVVModulesList list, Context context) { + ModulesEvents(Login login, ModulesList list, Context context) { super(login, list, context); } diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModulesGradebook.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesGradebook.java similarity index 95% rename from app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModulesGradebook.java rename to app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesGradebook.java index b9137db..4784a91 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModulesGradebook.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesGradebook.java @@ -14,9 +14,9 @@ import de.sebse.fuplanner.tools.network.NetworkCallback; import de.sebse.fuplanner.tools.network.NetworkError; import de.sebse.fuplanner.tools.network.NetworkErrorCallback; -public class KVVModulesGradebook extends ModulesPart> { +public class ModulesGradebook extends ModulesPart> { - KVVModulesGradebook(KVVLogin login, KVVModulesList list, Context context) { + ModulesGradebook(Login login, ModulesList list, Context context) { super(login, list, context); } diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModulesList.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesList.java similarity index 97% rename from app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModulesList.java rename to app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesList.java index 50897da..ddc1e91 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModulesList.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesList.java @@ -23,23 +23,19 @@ import de.sebse.fuplanner.tools.network.NetworkErrorCallback; import static de.sebse.fuplanner.services.KVV.ModulesPart.RETRY_COUNT; -public class KVVModulesList extends HTTPService { - private final KVVLogin mLogin; +public class ModulesList extends HTTPService { + private final Login mLogin; private final KVVListener mListener; @Nullable private Modules mModules; private NewAsyncQueue mQueue = new NewAsyncQueue(); - KVVModulesList(KVVLogin login, KVVListener listener, Context context) { + ModulesList(Login login, KVVListener listener, Context context) { super(context); this.mLogin = login; this.mListener = listener; restore(); } - public boolean stored() { - return mModules != null; - } - @Nullable public String getUsername() { if (mModules != null) { diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesPart.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesPart.java index ac1d4ad..81f13c6 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesPart.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesPart.java @@ -13,7 +13,7 @@ import de.sebse.fuplanner.tools.network.NetworkErrorCallback; abstract class ModulesPart extends Part { private NewAsyncQueue mQueue = new NewAsyncQueue(); - ModulesPart(KVVLogin login, KVVModulesList list, Context context) { + ModulesPart(Login login, ModulesList list, Context context) { super(login, list, context); } diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModulesResources.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesResources.java similarity index 98% rename from app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModulesResources.java rename to app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesResources.java index 70bf58d..2c0545a 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModulesResources.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesResources.java @@ -18,9 +18,9 @@ import de.sebse.fuplanner.tools.network.NetworkCallback; import de.sebse.fuplanner.tools.network.NetworkError; import de.sebse.fuplanner.tools.network.NetworkErrorCallback; -public class KVVModulesResources extends ModulesPart> { +public class ModulesResources extends ModulesPart> { - KVVModulesResources(KVVLogin login, KVVModulesList list, Context context) { + ModulesResources(Login login, ModulesList list, Context context) { super(login, list, context); } diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/Part.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/Part.java index bb74ef5..686a484 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/Part.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/Part.java @@ -9,10 +9,10 @@ import de.sebse.fuplanner.tools.network.NetworkErrorCallback; public abstract class Part extends HTTPService { static final int RETRY_COUNT = 1; - protected final KVVLogin mLogin; - protected final KVVModulesList mList; + protected final Login mLogin; + protected final ModulesList mList; - Part(KVVLogin login, KVVModulesList list, Context context) { + Part(Login login, ModulesList list, Context context) { super(context); this.mLogin = login; this.mList = list; diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/Download.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/ui/Download.java similarity index 99% rename from app/src/main/java/de/sebse/fuplanner/services/KVV/Download.java rename to app/src/main/java/de/sebse/fuplanner/services/KVV/ui/Download.java index 98b21e0..8cd8ff8 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/Download.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/ui/Download.java @@ -1,4 +1,4 @@ -package de.sebse.fuplanner.services.KVV; +package de.sebse.fuplanner.services.KVV.ui; import android.Manifest; import android.app.AlertDialog; diff --git a/app/src/main/java/de/sebse/fuplanner/tools/MainActivityListener.java b/app/src/main/java/de/sebse/fuplanner/tools/MainActivityListener.java index 3cc12d9..5f6800c 100644 --- a/app/src/main/java/de/sebse/fuplanner/tools/MainActivityListener.java +++ b/app/src/main/java/de/sebse/fuplanner/tools/MainActivityListener.java @@ -21,6 +21,7 @@ public interface MainActivityListener { CanteenBrowser getCanteenBrowser(); + @Deprecated void onRefreshCompleted(boolean isFailed); void addRequestPermissionsResultListener(RequestPermissionsResultListener listener, String id);