diff --git a/app/src/main/java/de/sebse/fuplanner/MainActivity.java b/app/src/main/java/de/sebse/fuplanner/MainActivity.java index 83ec9ab..992a1e9 100644 --- a/app/src/main/java/de/sebse/fuplanner/MainActivity.java +++ b/app/src/main/java/de/sebse/fuplanner/MainActivity.java @@ -55,10 +55,10 @@ public class MainActivity extends AppCompatActivity private static final String ARG_FRAGMENT_PAGE = "fragment_page"; private static final String ARG_FRAGMENT_STATUS = "fragment_status"; - FragmentManager mFragmentManager; + private FragmentManager mFragmentManager; private GoogleAuth mGoogleAuth; private KVV mKVV; - private Logger log = new Logger(this); + private final Logger log = new Logger(this); private NavigationView mNavigationView; private int fragmentPage = FRAGMENT_NONE; @@ -289,20 +289,28 @@ public class MainActivity extends AppCompatActivity private void changeFragment(int newFragment, String newData) { onTitleTextChange(R.string.courses); Fragment fragment; - if (newFragment == FRAGMENT_MODULES) { - fragment = ModulesFragment.newInstance(); - } else if (newFragment == FRAGMENT_MODULES_DETAILS) { - fragment = ModDetailFragment.newInstance(newData); - } else if (newFragment == FRAGMENT_LOGIN) { - fragment = LoginFragment.newInstance(); - } else if (newFragment == FRAGMENT_SCHEDULE) { - fragment = ScheduleFragment.newInstance(); - } else if (newFragment == FRAGMENT_CANTEENS) { - fragment = CanteensFragment.newInstance(); - } else if (newFragment == FRAGMENT_CANTEENS_DETAILS) { - fragment = DaySwitcherFragment.newInstance(Integer.parseInt(newData)); - } else { // FRAGMENT_STARTUP - fragment = StartupFragment.newInstance(); + switch (newFragment) { + case FRAGMENT_MODULES: + fragment = ModulesFragment.newInstance(); + break; + case FRAGMENT_MODULES_DETAILS: + fragment = ModDetailFragment.newInstance(newData); + break; + case FRAGMENT_LOGIN: + fragment = LoginFragment.newInstance(); + break; + case FRAGMENT_SCHEDULE: + fragment = ScheduleFragment.newInstance(); + break; + case FRAGMENT_CANTEENS: + fragment = CanteensFragment.newInstance(); + break; + case FRAGMENT_CANTEENS_DETAILS: + fragment = DaySwitcherFragment.newInstance(Integer.parseInt(newData)); + break; + default: // FRAGMENT_STARTUP + fragment = StartupFragment.newInstance(); + break; } FragmentTransaction fragmentTransaction = mFragmentManager.beginTransaction(); diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/CanteensAdapter.java b/app/src/main/java/de/sebse/fuplanner/fragments/CanteensAdapter.java index 341a353..223b594 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/CanteensAdapter.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/CanteensAdapter.java @@ -17,7 +17,7 @@ import de.sebse.fuplanner.tools.ui.ItemViewHolder; * {@link RecyclerView.Adapter} that can display a {@link Modules.Module} and makes a call to the * specified {@link OnCanteensFragmentInteractionListener}. */ -public class CanteensAdapter extends RecyclerView.Adapter { +class CanteensAdapter extends RecyclerView.Adapter { private Canteens mValues; private final OnCanteensFragmentInteractionListener mListener; diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/CanteensFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/CanteensFragment.java index 2314b8e..efb5813 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/CanteensFragment.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/CanteensFragment.java @@ -25,7 +25,7 @@ import de.sebse.fuplanner.tools.logging.Logger; */ public class CanteensFragment extends Fragment { private OnCanteensFragmentInteractionListener mListener; - private Logger log = new Logger(this); + private final Logger log = new Logger(this); private CanteensAdapter adapter; private SwipeRefreshLayout swipeLayout; @@ -43,11 +43,6 @@ public class CanteensFragment extends Fragment { return fragment; } - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - } - @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/LoginFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/LoginFragment.java index 267c162..66d2b7b 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/LoginFragment.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/LoginFragment.java @@ -32,7 +32,7 @@ import de.sebse.fuplanner.tools.logging.Logger; */ public class LoginFragment extends Fragment { private OnLoginFragmentInteractionListener mListener; - private Logger log = new Logger(this); + private final Logger log = new Logger(this); public LoginFragment() { // Required empty public constructor @@ -51,11 +51,6 @@ public class LoginFragment extends Fragment { return fragment; } - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - } - @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/ModulesAdapter.java b/app/src/main/java/de/sebse/fuplanner/fragments/ModulesAdapter.java index 7d81b3a..140e4e8 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/ModulesAdapter.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/ModulesAdapter.java @@ -15,7 +15,7 @@ import de.sebse.fuplanner.tools.ui.ItemViewHolder; * {@link RecyclerView.Adapter} that can display a {@link Modules.Module} and makes a call to the * specified {@link OnModulesFragmentInteractionListener}. */ -public class ModulesAdapter extends RecyclerView.Adapter { +class ModulesAdapter extends RecyclerView.Adapter { private Modules mValues; private final OnModulesFragmentInteractionListener mListener; diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/ModulesFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/ModulesFragment.java index 79b4ee8..e0a3ae0 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/ModulesFragment.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/ModulesFragment.java @@ -25,7 +25,7 @@ import de.sebse.fuplanner.tools.logging.Logger; */ public class ModulesFragment extends Fragment { private OnModulesFragmentInteractionListener mListener; - private Logger log = new Logger(this); + private final Logger log = new Logger(this); private ModulesAdapter adapter; private SwipeRefreshLayout swipeLayout; @@ -43,11 +43,6 @@ public class ModulesFragment extends Fragment { return fragment; } - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - } - @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java index c42b245..aba56fe 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java @@ -37,7 +37,7 @@ import de.sebse.fuplanner.tools.ui.weekview.WeekViewEvent; public class ScheduleFragment extends Fragment implements MonthLoader.MonthChangeListener, WeekView.ScrollListener, WeekView.DoubleTapListener { private MainAcitivityListener mListener; private WeekView mWeekView; - private Logger log = new Logger(this); + private final Logger log = new Logger(this); private Modules mModules = null; public ScheduleFragment() { @@ -78,9 +78,9 @@ public class ScheduleFragment extends Fragment implements MonthLoader.MonthChang mWeekView.notifyDatasetChanged(); } } - }, error1 -> log.e(error1), forceRefresh); + }, log::e, forceRefresh); } - }, error -> log.e(error), forceRefresh); + }, log::e, forceRefresh); } } diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/StartupFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/StartupFragment.java index 9c76a1d..27ffdcc 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/StartupFragment.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/StartupFragment.java @@ -33,11 +33,6 @@ public class StartupFragment extends Fragment { return fragment; } - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - } - @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherAdapter.java b/app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherAdapter.java index b8a54e1..5b0f492 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherAdapter.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherAdapter.java @@ -1,13 +1,11 @@ package de.sebse.fuplanner.fragments.canteen; -import android.content.Context; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentStatePagerAdapter; import de.sebse.fuplanner.services.Canteen.types.Canteen; import de.sebse.fuplanner.tools.DateUtils; -import de.sebse.fuplanner.tools.logging.Logger; class DaySwitcherAdapter extends FragmentStatePagerAdapter { private Canteen mCanteen = null; diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherFragment.java index 96b076a..a855b50 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherFragment.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherFragment.java @@ -33,7 +33,7 @@ public class DaySwitcherFragment extends Fragment implements DaySwitcherListener private int mCanteenId; private MainAcitivityListener mListener; - private Logger log = new Logger(this); + private final Logger log = new Logger(this); private ViewPager mViewPager; private DaySwitcherAdapter adapterViewPager; diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherListener.java b/app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherListener.java index c80eb83..8fdc87d 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherListener.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherListener.java @@ -4,6 +4,6 @@ import de.sebse.fuplanner.services.Canteen.types.Canteen; import de.sebse.fuplanner.tools.network.NetworkCallback; import de.sebse.fuplanner.tools.network.NetworkErrorCallback; -public interface DaySwitcherListener { +interface DaySwitcherListener { void onChildRefresh(NetworkCallback callback, NetworkErrorCallback errorCallback); } diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealAdapter.java b/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealAdapter.java index bde18b2..b40c05e 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealAdapter.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealAdapter.java @@ -9,16 +9,13 @@ import android.widget.BaseExpandableListAdapter; 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.KVV.types.Assignment; -import de.sebse.fuplanner.services.KVV.types.Modules; -import de.sebse.fuplanner.tools.DateUtils; import de.sebse.fuplanner.tools.ui.ItemViewHolder; import de.sebse.fuplanner.tools.ui.StringViewHolder; -public class MealAdapter extends BaseExpandableListAdapter { +class MealAdapter extends BaseExpandableListAdapter { private Day mDay = null; - private Context mContext; + private final Context mContext; public MealAdapter(Context context) { mContext = context; diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealFragment.java index 4bd3971..bc80061 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealFragment.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealFragment.java @@ -29,7 +29,7 @@ public class MealFragment extends Fragment { private int mCanteenId; private int mDayPosition; - private Logger log = new Logger(this); + private final Logger log = new Logger(this); private MealAdapter adapter; private SwipeRefreshLayout swipeLayout; private DaySwitcherListener mListener; @@ -78,9 +78,7 @@ public class MealFragment extends Fragment { // Getting SwipeContainerLayout swipeLayout = view.findViewById(R.id.swipe_container); // Adding Listener - swipeLayout.setOnRefreshListener(() -> { - mListener.onChildRefresh(callback -> refresh(true), error -> refresh(true)); - }); + swipeLayout.setOnRefreshListener(() -> mListener.onChildRefresh(callback -> refresh(true), error -> refresh(true))); refresh(false); return view; 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 4aa5e14..af98fb6 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 @@ -12,7 +12,7 @@ import de.sebse.fuplanner.tools.DateUtils; import de.sebse.fuplanner.tools.ui.ItemViewHolder; import de.sebse.fuplanner.tools.ui.StringViewHolder; -public class ModDetailAnnounceAdapter extends BaseExpandableListAdapter { +class ModDetailAnnounceAdapter extends BaseExpandableListAdapter { private Modules.Module mModule = null; 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 4979416..f6a6a17 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 @@ -25,7 +25,7 @@ public class ModDetailAnnounceFragment extends Fragment { private static final String ARG_POSITION = "itemPosition"; private String mItemPos; - private Logger log = new Logger(this); + private final Logger log = new Logger(this); private ModDetailAnnounceAdapter adapter; private SwipeRefreshLayout swipeLayout; 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 39247b8..cdafdad 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 @@ -12,7 +12,7 @@ import de.sebse.fuplanner.tools.DateUtils; import de.sebse.fuplanner.tools.ui.ItemViewHolder; import de.sebse.fuplanner.tools.ui.StringViewHolder; -public class ModDetailAssignmentAdapter extends BaseExpandableListAdapter { +class ModDetailAssignmentAdapter extends BaseExpandableListAdapter { private Modules.Module mModule = null; 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 5e723af..966fad7 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 @@ -25,7 +25,7 @@ public class ModDetailAssignmentFragment extends Fragment { private static final String ARG_POSITION = "itemPosition"; private String mItemPos; - private Logger log = new Logger(this); + private final Logger log = new Logger(this); private ModDetailAssignmentAdapter adapter; private SwipeRefreshLayout swipeLayout; diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailEventAdapter.java b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailEventAdapter.java index 6882cfd..e7d6390 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailEventAdapter.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailEventAdapter.java @@ -17,7 +17,7 @@ import de.sebse.fuplanner.tools.DateUtils; import de.sebse.fuplanner.tools.ui.CustomViewHolder; import de.sebse.fuplanner.tools.ui.ItemViewHolder; -public class ModDetailEventAdapter extends RecyclerView.Adapter { +class ModDetailEventAdapter extends RecyclerView.Adapter { private static final int TYPE_HEADER = 0; private static final int TYPE_ITEM = 1; @@ -153,7 +153,7 @@ public class ModDetailEventAdapter extends RecyclerView.Adapter { +class ModDetailGradebookAdapter extends RecyclerView.Adapter { private static final int TYPE_TOTAL = 0; private static final int TYPE_GRADE = 1; @@ -76,6 +77,7 @@ public class ModDetailGradebookAdapter extends RecyclerView.Adapter mPositionalData.size()) @@ -84,8 +86,7 @@ public class ModDetailGradebookAdapter extends RecyclerView.Adapter { +class ModDetailOverviewAdapter extends RecyclerView.Adapter { private static final int MAX_ITEMS_PER_PREVIEW = 2; private static final int TYPE_HEADER = 0; @@ -221,7 +221,7 @@ public class ModDetailOverviewAdapter extends RecyclerView.Adapter { private final int canteenId; private final Calendar calendar; - private boolean isClosed; + private final boolean isClosed; private SortedListMeal list = new SortedListMeal(); Day(Canteen canteen, Calendar calendar, boolean isClosed) { diff --git a/app/src/main/java/de/sebse/fuplanner/services/GoogleAuth/RequestCode.java b/app/src/main/java/de/sebse/fuplanner/services/GoogleAuth/RequestCode.java index 3211a8e..150a5b4 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/GoogleAuth/RequestCode.java +++ b/app/src/main/java/de/sebse/fuplanner/services/GoogleAuth/RequestCode.java @@ -4,7 +4,7 @@ package de.sebse.fuplanner.services.GoogleAuth; * Created by sebastian on 07.11.17. */ -public class RequestCode { +class RequestCode { public static final int RC_SAVE = 1; public static final int RC_HINT = 2; public static final int RC_READ = 3; 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 e807088..a70e9b3 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 @@ -19,12 +19,12 @@ import de.sebse.fuplanner.tools.network.NetworkErrorCallback; */ public class KVV { - private Context context; + private final Context context; private LoginToken lastToken; private boolean isLoginPending = true; - private ArrayList updatingList; - private HashMap addons = new HashMap<>(); - private MainAcitivityListener mListener; + private final ArrayList updatingList; + private final HashMap addons = new HashMap<>(); + private final MainAcitivityListener mListener; public KVV(Context context) { mListener = (MainAcitivityListener) context; diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVLogin.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVLogin.java index 56fe0ac..7048841 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVLogin.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVLogin.java @@ -85,9 +85,7 @@ class KVVLogin extends HTTPService { String ident_idp_session = success11112.get("_idp_session"); getSAMLResponse(identJSESSIONID, ident_idp_authn_lc_key, identROUTEID, ident_idp_session, success1111 -> loginKVV(success1111.get("RelayState"), success1111.get("SAMLResponse"), kvvJSESSIONID, success111112 -> { LoginToken token = new LoginToken(username, success111112.get("shibsessionKey"), success111112.get("shibsessionName"), kvvJSESSIONID); - finishKVVlogin(token, success11111 -> { - callback.onResponse(token); - }, error); + finishKVVlogin(token, success11111 -> callback.onResponse(token), error); }, error), error); }, error), error); }, error), error); @@ -105,7 +103,6 @@ class KVVLogin extends HTTPService { callback.onResponse(loginToken); } catch (JSONException e) { errorCallback.onError(new NetworkError(100201, 403, "Cannot parse profile!")); - return; } }, error -> errorCallback.onError(new NetworkError(100200, error.networkResponse.statusCode, "Testing login failed!"))); } diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java index 8410956..e64a80b 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java @@ -36,10 +36,10 @@ import de.sebse.fuplanner.tools.network.NetworkErrorCallback; * Created by sebastian on 29.10.17. */ -public class KVVModuleList extends HTTPService { +class KVVModuleList extends HTTPService { private final LoginToken token; private Modules moduleList; - private AsyncQueue queueModuleDetails = new AsyncQueue(); + private final AsyncQueue queueModuleDetails = new AsyncQueue(); KVVModuleList(Context context, LoginToken token) { super(context); @@ -443,7 +443,6 @@ public class KVVModuleList extends HTTPService { callback.onResponse(loginToken); } catch (JSONException e) { errorCallback.onError(new NetworkError(100201, 403, "Cannot parse profile!")); - return; } }, error -> errorCallback.onError(new NetworkError(100200, error.networkResponse.statusCode, "Testing login failed!"))); } diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Event.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Event.java index 1405fcd..ae171ee 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Event.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Event.java @@ -6,7 +6,6 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import de.sebse.fuplanner.tools.ColorRGB; -import de.sebse.fuplanner.tools.logging.Logger; public class Event implements Serializable { private final String id; @@ -14,7 +13,7 @@ public class Event implements Serializable { private final String title; private final long duration; private final long firstTime; - private String siteId; + private final String siteId; public Event(String id, String type, String title, long duration, long firstTime, String siteId) { this.id = id; @@ -46,7 +45,7 @@ public class Event implements Serializable { } public ColorRGB getColor() { - MessageDigest digest = null; + MessageDigest digest; try { digest = MessageDigest.getInstance("SHA-256"); } catch (NoSuchAlgorithmException e) { @@ -61,20 +60,20 @@ public class Event implements Serializable { } int h = (0xff & encodedHash[0]) + (0xff & encodedHash[1]) * 255; h = h * 360 / 0xffff; - int s = 0xff & encodedHash[2]; - s = s * 100 / 0xffff; - int v = 0xff & encodedHash[3]; - v = v * 100 / 0xffff; + //int s = 0xff & encodedHash[2]; + //s = s * 100 / 0xffff; + //int v = 0xff & encodedHash[3]; + //v = v * 100 / 0xffff; // range for more beautiful colors h = h / 30 * 30; - s = 100; - v = 50; + int s = 100; + int v = 50; return hsvToRgb(h/360.0, s/100.0, v/100.0); } - public static ColorRGB hsvToRgb(double hue, double saturation, double value) { + private static ColorRGB hsvToRgb(double hue, double saturation, double value) { int h = (int)(hue * 6); double f = hue * 6 - h; double p = value * (1 - saturation); diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/types/LoginToken.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/LoginToken.java index 4f1a090..179ea06 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/types/LoginToken.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/LoginToken.java @@ -22,7 +22,7 @@ public class LoginToken implements Serializable { private final String username; private final String shibsessionKey; private final String shibsessionName; - private String JSESSIONID; + private final String JSESSIONID; private String fullname; private String email; private long saveDate = 0; diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Modules.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Modules.java index c9ca741..4e1ffd7 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Modules.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Modules.java @@ -20,7 +20,7 @@ import java.util.Iterator; public class Modules implements Iterable, Serializable { private SortedListModule list; - private LoginToken token; + private final LoginToken token; //private transient Logger log = new Logger(this); private static final String FILE_NAME = "ModuleListSaving"; diff --git a/app/src/main/java/de/sebse/fuplanner/services/MensaPlan.java b/app/src/main/java/de/sebse/fuplanner/services/MensaPlan.java deleted file mode 100644 index 9ad343e..0000000 --- a/app/src/main/java/de/sebse/fuplanner/services/MensaPlan.java +++ /dev/null @@ -1,64 +0,0 @@ -package de.sebse.fuplanner.services; - -import android.content.Context; -import android.util.Log; - -import com.android.volley.AuthFailureError; -import com.android.volley.Request; -import com.android.volley.RequestQueue; -import com.android.volley.VolleyLog; -import com.android.volley.toolbox.StringRequest; -import com.android.volley.toolbox.Volley; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.UnsupportedEncodingException; -import java.util.Date; - -/** - * Created by sebastian on 12.10.17. - */ - -public class MensaPlan { - - private final RequestQueue requestQueue; - public MensaPlan(Context context) { - requestQueue = Volley.newRequestQueue(context); - } - - public void request(int MensaID, Date date) throws JSONException { - JSONObject post = new JSONObject(); - post.put("resources_id", 528); - post.put("date", "2017-10-13"); - final String requestBody = post.toString(); - - StringRequest request = new StringRequest(Request.Method.POST, "https://www.stw.berlin/xhr/speiseplan-wochentag.html", response -> Log.d("MensaPlan DDDD", response), error -> Log.d("MensaPlan EEEE", error.getMessage())) { - @Override - public String getBodyContentType() { - return "application/json; charset=utf-8"; - } - - @Override - public byte[] getBody() throws AuthFailureError { - try { - return requestBody == null ? null : requestBody.getBytes("utf-8"); - } catch (UnsupportedEncodingException uee) { - VolleyLog.wtf("Unsupported Encoding while trying to get the bytes of %s using %s", requestBody, "utf-8"); - return null; - } - } - - /*@Override - protected Response parseNetworkResponse(NetworkResponse response) { - String responseString = ""; - responseString = String.valueOf(response.statusCode); - // can get more details such as response.headers - - return Response.success(responseString, HttpHeaderParser.parseCacheHeaders(response)); - }*/ - }; - requestQueue.add(request); - } - -} diff --git a/app/src/main/java/de/sebse/fuplanner/tools/AsyncQueue.java b/app/src/main/java/de/sebse/fuplanner/tools/AsyncQueue.java index 2bc56c6..1e608ad 100644 --- a/app/src/main/java/de/sebse/fuplanner/tools/AsyncQueue.java +++ b/app/src/main/java/de/sebse/fuplanner/tools/AsyncQueue.java @@ -7,8 +7,8 @@ import de.sebse.fuplanner.tools.network.NetworkCallback; import de.sebse.fuplanner.tools.network.NetworkErrorCallback; public class AsyncQueue { - private HashMap> mQueues = new HashMap<>(); - private HashMap mRunnings = new HashMap<>(); + private final HashMap> mQueues = new HashMap<>(); + private final HashMap mRunnings = new HashMap<>(); public void add(String hash, AsyncQueueCallback callback) { if (isRunning(hash)) diff --git a/app/src/main/java/de/sebse/fuplanner/tools/Compare.java b/app/src/main/java/de/sebse/fuplanner/tools/Compare.java deleted file mode 100644 index c46e0c0..0000000 --- a/app/src/main/java/de/sebse/fuplanner/tools/Compare.java +++ /dev/null @@ -1,7 +0,0 @@ -package de.sebse.fuplanner.tools; - -public enum Compare { - SMALLER, - EQUAL, - LARGER -} diff --git a/app/src/main/java/de/sebse/fuplanner/tools/DateSortedList.java b/app/src/main/java/de/sebse/fuplanner/tools/DateSortedList.java index 8871d9d..b670905 100644 --- a/app/src/main/java/de/sebse/fuplanner/tools/DateSortedList.java +++ b/app/src/main/java/de/sebse/fuplanner/tools/DateSortedList.java @@ -97,9 +97,9 @@ public abstract class DateSortedList extends ArrayList { }; } - public boolean reversed() { + protected boolean reversed() { return false; } - public abstract long getDateByItem(T item); + protected abstract long getDateByItem(T item); } diff --git a/app/src/main/java/de/sebse/fuplanner/tools/DateUtils.java b/app/src/main/java/de/sebse/fuplanner/tools/DateUtils.java index bd755b7..9161625 100644 --- a/app/src/main/java/de/sebse/fuplanner/tools/DateUtils.java +++ b/app/src/main/java/de/sebse/fuplanner/tools/DateUtils.java @@ -60,7 +60,7 @@ public class DateUtils { } @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2) - public static String getDateFormat(Locale locale, String skeleton) { + private static String getDateFormat(Locale locale, String skeleton) { return DateFormat.getBestDateTimePattern(locale, skeleton); } diff --git a/app/src/main/java/de/sebse/fuplanner/tools/EventEmitter.java b/app/src/main/java/de/sebse/fuplanner/tools/EventEmitter.java deleted file mode 100644 index d3ce34c..0000000 --- a/app/src/main/java/de/sebse/fuplanner/tools/EventEmitter.java +++ /dev/null @@ -1,41 +0,0 @@ -package de.sebse.fuplanner.tools; - - -import java.util.HashSet; - -public class EventEmitter { - private T lastValue = null; - private HashSet> list = new HashSet<>(); - - public EventEmitter() { - this(null); - } - - protected EventEmitter(T value) { - this.lastValue = value; - } - - public boolean emitterAdd(EventListener listener) { - return list.add(listener); - } - - public boolean emitterAddEmit(EventListener listener) { - listener.onResponse(this.lastValue); - return list.add(listener); - } - - public boolean emitterRemove(EventListener listener) { - return list.remove(listener); - } - - protected void emit(T value) { - this.lastValue = value; - for (EventListener emitter: list) { - emitter.onResponse(value); - } - } - - public interface EventListener { - void onResponse(T value); - } -} diff --git a/app/src/main/java/de/sebse/fuplanner/tools/MainAcitivityListener.java b/app/src/main/java/de/sebse/fuplanner/tools/MainAcitivityListener.java index 9bdb11f..114d984 100644 --- a/app/src/main/java/de/sebse/fuplanner/tools/MainAcitivityListener.java +++ b/app/src/main/java/de/sebse/fuplanner/tools/MainAcitivityListener.java @@ -2,7 +2,6 @@ package de.sebse.fuplanner.tools; import android.support.annotation.StringRes; -import de.sebse.fuplanner.fragments.canteen.DaySwitcherFragment; import de.sebse.fuplanner.services.Canteen.CanteenBrowser; import de.sebse.fuplanner.services.GoogleAuth.GoogleAuth; import de.sebse.fuplanner.services.KVV.KVV; diff --git a/app/src/main/java/de/sebse/fuplanner/tools/SortedList.java b/app/src/main/java/de/sebse/fuplanner/tools/SortedList.java index 6137cf1..48e66ff 100644 --- a/app/src/main/java/de/sebse/fuplanner/tools/SortedList.java +++ b/app/src/main/java/de/sebse/fuplanner/tools/SortedList.java @@ -10,7 +10,7 @@ import java.util.Iterator; public abstract class SortedList implements Iterable, Serializable { - private ArrayList internalList = new ArrayList<>(); + private final ArrayList internalList = new ArrayList<>(); public void add(T e) { internalList.add(e); @@ -21,11 +21,11 @@ public abstract class SortedList implements Iterable, Serializable { this.internalList.remove(index); } - public abstract int compare(T o1, T o2); + protected abstract int compare(T o1, T o2); - public abstract boolean hasIdentifier(T o1, I id); + protected abstract boolean hasIdentifier(T o1, I id); - public abstract boolean hasFilter(T o1, F filter); + protected abstract boolean hasFilter(T o1, F filter); @Nullable public T get(int i) { diff --git a/app/src/main/java/de/sebse/fuplanner/tools/Triplet.java b/app/src/main/java/de/sebse/fuplanner/tools/Triplet.java deleted file mode 100644 index 81d2d85..0000000 --- a/app/src/main/java/de/sebse/fuplanner/tools/Triplet.java +++ /dev/null @@ -1,18 +0,0 @@ -package de.sebse.fuplanner.tools; - -public class Triplet { - - private final T first; - private final U second; - private final V third; - - public Triplet(T first, U second, V third) { - this.first = first; - this.second = second; - this.third = third; - } - - public T getFirst() { return first; } - public U getSecond() { return second; } - public V getThird() { return third; } -} \ No newline at end of file diff --git a/app/src/main/java/de/sebse/fuplanner/tools/network/BetterHurlStack.java b/app/src/main/java/de/sebse/fuplanner/tools/network/BetterHurlStack.java index 6e798d4..3979805 100644 --- a/app/src/main/java/de/sebse/fuplanner/tools/network/BetterHurlStack.java +++ b/app/src/main/java/de/sebse/fuplanner/tools/network/BetterHurlStack.java @@ -38,7 +38,7 @@ public class BetterHurlStack extends HurlStack { private final UrlRewriter mUrlRewriter; private final SSLSocketFactory mSslSocketFactory; @SuppressWarnings({"unused", "FieldCanBeLocal"}) - private boolean followRedirects; // TODO auto-redirect + private final boolean followRedirects; // TODO auto-redirect BetterHurlStack() { this(true); diff --git a/app/src/main/java/de/sebse/fuplanner/tools/network/HTTPService.java b/app/src/main/java/de/sebse/fuplanner/tools/network/HTTPService.java index f3ffddd..59a7811 100644 --- a/app/src/main/java/de/sebse/fuplanner/tools/network/HTTPService.java +++ b/app/src/main/java/de/sebse/fuplanner/tools/network/HTTPService.java @@ -24,14 +24,14 @@ import de.sebse.fuplanner.tools.logging.Logger; */ public class HTTPService { - private RequestQueue requestQueue; + private final RequestQueue requestQueue; protected Logger log = new Logger(this); - public HTTPService(Context context) { + protected HTTPService(Context context) { this(context, false); } - public HTTPService(Context context, boolean followRedirects) { + protected HTTPService(Context context, boolean followRedirects) { requestQueue = Volley.newRequestQueue(context, new BetterHurlStack(followRedirects)); } diff --git a/app/src/main/java/de/sebse/fuplanner/tools/network/HttpRequest.java b/app/src/main/java/de/sebse/fuplanner/tools/network/HttpRequest.java index 3e53f97..646633a 100644 --- a/app/src/main/java/de/sebse/fuplanner/tools/network/HttpRequest.java +++ b/app/src/main/java/de/sebse/fuplanner/tools/network/HttpRequest.java @@ -12,7 +12,7 @@ import java.io.UnsupportedEncodingException; * Created by sebastian on 24.10.17. */ -public class HttpRequest extends Request { +class HttpRequest extends Request { private static final int MY_SOCKET_TIMEOUT_MS = 15000; private final Response.Listener mListener; diff --git a/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/DateTimeInterpreter.java b/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/DateTimeInterpreter.java index 4eae577..5f0bec9 100644 --- a/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/DateTimeInterpreter.java +++ b/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/DateTimeInterpreter.java @@ -6,7 +6,7 @@ import java.util.Calendar; * Created by Raquib on 1/6/2015. */ public interface DateTimeInterpreter { - public String interpretDate(Calendar date); + String interpretDate(Calendar date); - public String interpretTime(int hour, int minutes); + String interpretTime(int hour, int minutes); } diff --git a/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekViewEvent.java b/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekViewEvent.java index bc75e15..df08053 100644 --- a/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekViewEvent.java +++ b/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekViewEvent.java @@ -25,10 +25,6 @@ public class WeekViewEvent { private boolean mAllDay; private Shader mShader; - public WeekViewEvent() { - - } - /** * Initializes the event for week view. * @@ -65,27 +61,6 @@ public class WeekViewEvent { this.mName = name; } - /** - * Initializes the event for week view. - * - * @param id The id of the event. - * @param name Name of the event. - * @param startYear Year when the event starts. - * @param startMonth Month when the event starts. - * @param startDay Day when the event starts. - * @param startHour Hour (in 24-hour format) when the event starts. - * @param startMinute Minute when the event starts. - * @param endYear Year when the event ends. - * @param endMonth Month when the event ends. - * @param endDay Day when the event ends. - * @param endHour Hour (in 24-hour format) when the event ends. - * @param endMinute Minute when the event ends. - */ - @Deprecated - public WeekViewEvent(long id, String name, int startYear, int startMonth, int startDay, int startHour, int startMinute, int endYear, int endMonth, int endDay, int endHour, int endMinute) { - this(String.valueOf(id), name, startYear, startMonth, startDay, startHour, startMinute, endYear, endMonth, endDay, endHour, endMinute); - } - /** * Initializes the event for week view. * @@ -107,22 +82,6 @@ public class WeekViewEvent { this.mShader = shader; } - /** - * Initializes the event for week view. - * - * @param id The id of the event. - * @param name Name of the event. - * @param location The location of the event. - * @param startTime The time when the event starts. - * @param endTime The time when the event ends. - * @param allDay Is the event an all day event. - * @param shader the Shader of the event rectangle - */ - @Deprecated - public WeekViewEvent(long id, String name, String location, Calendar startTime, Calendar endTime, boolean allDay, Shader shader) { - this(String.valueOf(id), name, location, startTime, endTime, allDay, shader); - } - /** * Initializes the event for week view. * @@ -137,21 +96,6 @@ public class WeekViewEvent { this(id, name, location, startTime, endTime, allDay, null); } - /** - * Initializes the event for week view. - * - * @param id The id of the event. - * @param name Name of the event. - * @param location The location of the event. - * @param startTime The time when the event starts. - * @param endTime The time when the event ends. - * @param allDay Is the event an all day event - */ - @Deprecated - public WeekViewEvent(long id, String name, String location, Calendar startTime, Calendar endTime, boolean allDay) { - this(id, name, location, startTime, endTime, allDay, null); - } - /** * Initializes the event for week view. * @@ -165,45 +109,6 @@ public class WeekViewEvent { this(id, name, location, startTime, endTime, false); } - /** - * Initializes the event for week view. - * - * @param id The id of the event. - * @param name Name of the event. - * @param location The location of the event. - * @param startTime The time when the event starts. - * @param endTime The time when the event ends. - */ - @Deprecated - public WeekViewEvent(long id, String name, String location, Calendar startTime, Calendar endTime) { - this(id, name, location, startTime, endTime, false); - } - - /** - * Initializes the event for week view. - * - * @param id The id of the event specified as String. - * @param name Name of the event. - * @param startTime The time when the event starts. - * @param endTime The time when the event ends. - */ - public WeekViewEvent(String id, String name, Calendar startTime, Calendar endTime) { - this(id, name, null, startTime, endTime); - } - - /** - * Initializes the event for week view. - * - * @param id The id of the event. - * @param name Name of the event. - * @param startTime The time when the event starts. - * @param endTime The time when the event ends. - */ - @Deprecated - public WeekViewEvent(long id, String name, Calendar startTime, Calendar endTime) { - this(id, name, null, startTime, endTime); - } - public Calendar getStartTime() { return mStartTime; } @@ -295,7 +200,7 @@ public class WeekViewEvent { public List splitWeekViewEvents() { //This function splits the WeekViewEvent in WeekViewEvents by day - List events = new ArrayList(); + List events = new ArrayList<>(); // The first millisecond of the next day is still the same day. (no need to split events for this). Calendar endTime = (Calendar) this.getEndTime().clone(); endTime.add(Calendar.MILLISECOND, -1); diff --git a/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekViewUtil.java b/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekViewUtil.java index e05c7ca..47a22da 100644 --- a/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekViewUtil.java +++ b/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekViewUtil.java @@ -48,10 +48,7 @@ public class WeekViewUtil { */ public static boolean isSameDayAndHour(Calendar dateOne, Calendar dateTwo) { - if (dateTwo != null) { - return isSameDay(dateOne, dateTwo) && dateOne.get(Calendar.HOUR_OF_DAY) == dateTwo.get(Calendar.HOUR_OF_DAY); - } - return false; + return dateTwo != null && isSameDay(dateOne, dateTwo) && dateOne.get(Calendar.HOUR_OF_DAY) == dateTwo.get(Calendar.HOUR_OF_DAY); } /** @@ -78,8 +75,8 @@ public class WeekViewUtil { /** * Returns the amount of minutes in the given hours and minutes * - * @param hour - * @param minute + * @param hour Amount of hours + * @param minute Amount of minutes * @return amount of minutes in the given hours and minutes */ public static int getPassedMinutesInDay(int hour, int minute) { diff --git a/app/src/main/res/layout/list_all_show_more.xml b/app/src/main/res/layout/list_all_show_more.xml index 90a243a..562a428 100644 --- a/app/src/main/res/layout/list_all_show_more.xml +++ b/app/src/main/res/layout/list_all_show_more.xml @@ -1,6 +1,5 @@ diff --git a/app/src/main/res/layout/list_modetails_gradebook.xml b/app/src/main/res/layout/list_modetails_gradebook.xml index e095565..79a2e16 100644 --- a/app/src/main/res/layout/list_modetails_gradebook.xml +++ b/app/src/main/res/layout/list_modetails_gradebook.xml @@ -38,7 +38,7 @@ android:layout_below="@id/title" android:textColor="#343434" android:textSize="30sp" - android:text="/" + android:text="@string/grade_separator" android:layout_toLeftOf="@id/grade_max" android:layout_toStartOf="@id/grade_max" android:layout_alignTop="@id/title" /> diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png index f338cd2..2371972 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png index ac605e6..4e59520 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png index 1d086c6..67ac8ba 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png index 526f3b5..801bb0a 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png index 87ca296..80e0117 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 9beebeb..a6d345e 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -31,11 +31,12 @@ Vergangene Veranstaltungen Veranstaltungen Noten - Aktuelle Prozentzahl + Aktuelle Prozentzahl: %1$.2f \%% Offline-Modus Aktualisieren fehlgeschlagen… Hey, schau\' dir die neue KVV App an: %1$s "Aktualisieren" Heute Kantinen + / \ No newline at end of file diff --git a/app/src/main/res/values-ldrtl/strings.xml b/app/src/main/res/values-ldrtl/strings.xml new file mode 100644 index 0000000..d70d91f --- /dev/null +++ b/app/src/main/res/values-ldrtl/strings.xml @@ -0,0 +1,4 @@ + + + / + \ No newline at end of file diff --git a/app/src/main/res/values/drawables.xml b/app/src/main/res/values/drawables.xml index 52c6a6c..9036d27 100644 --- a/app/src/main/res/values/drawables.xml +++ b/app/src/main/res/values/drawables.xml @@ -1,4 +1,4 @@ - + @android:drawable/ic_menu_camera @android:drawable/ic_menu_gallery @android:drawable/ic_menu_slideshow diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d48387a..a2c5d9b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,15 +1,11 @@ - + FU Planner - Open navigation drawer Close navigation drawer - Settings - - Overview Announcements - Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. + Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Description Announcements (%1$d) App Icon @@ -31,13 +27,13 @@ %1$s - %2$s Open Close - Hello blank fragment + Hello blank fragment Enter Offline Mode (%1$s) No items available! Past Events Events Gradebook - Current Percentage + Current Percentage: %1$.2f \%% Offline Mode Refresh failed… Hey, check out the new KVV app: %1$s @@ -47,4 +43,5 @@ Canteens %1$.2f€ / %2$.2f€ / %3$.2f€ %1$.2f€ + / diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index bd904cc..605d3a5 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,10 +1,10 @@ - + - -