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 6471594..6457fd4 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/LoginFragment.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/LoginFragment.java @@ -105,12 +105,15 @@ public class LoginFragment extends Fragment { }, error -> { progressDialog.dismiss(); // Invalid password - if (error.getCode() == 100131 && mActivityListener != null) { - mActivityListener.showToast(R.string.invalid_credentials); - input_usr.setError(input_usr.getResources().getString(R.string.invalid_credentials)); - input_pwd.setError(input_pwd.getResources().getString(R.string.invalid_credentials)); - } else - mActivityListener.showToast(v.getResources().getString(R.string.error_occurred_code, error.getCode())); + if (mActivityListener != null) { + if (error.getCode() == 100131) { + mActivityListener.showToast(R.string.invalid_credentials); + input_usr.setError(input_usr.getResources().getString(R.string.invalid_credentials)); + input_pwd.setError(input_pwd.getResources().getString(R.string.invalid_credentials)); + } else { + mActivityListener.showToast(v.getResources().getString(R.string.error_occurred_code, error.getCode())); + } + } log.e("Error on KVV login!", error); }); } 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 c3ce176..1f5f787 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 @@ -22,7 +22,7 @@ import de.sebse.fuplanner.tools.ui.StringViewHolder; class MealAdapter extends RecyclerView.Adapter { private String[] CATEGORY_KEYS = new String[]{"Essen", "Aktionen", "Beilagen", "Desserts", "Salate", "Suppen", "Vorspeisen"}; @StringRes - private int[] CATEGORY_VALS = new int[]{R.string.meals, R.string.special_meals, R.string.side_dishes, R.string.desserts, R.string.salats, R.string.soups, R.string.starters}; + private int[] CATEGORY_VALS = new int[]{R.string.meals, R.string.special_meals, R.string.side_dishes, R.string.desserts, R.string.salads, R.string.soups, R.string.starters}; @StringRes private int CATEGORY_OTHER = R.string.others; private ArrayList matchings = new ArrayList<>(); diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAdapter.java b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAdapter.java index a8c22cc..cba575b 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAdapter.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAdapter.java @@ -60,7 +60,7 @@ class ModDetailAdapter extends FragmentStatePagerAdapter { case ModulePart.GRADEBOOK: return this.mContext.getResources().getString(R.string.gradebook); case ModulePart.RESOURCES: - return this.mContext.getResources().getString(R.string.resourcen); + return this.mContext.getResources().getString(R.string.resources); default: return ""; } 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 c8671d1..0f9e79a 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 @@ -98,11 +98,9 @@ public class ModDetailResourceFragment extends Fragment { @Override public boolean onClick(TreeNode node, RecyclerView.ViewHolder holder) { if (!node.isLeaf()) { - //Update and toggle the node. + // Update and toggle the node. onToggle(!node.isExpand(), holder); -// if (!node.isExpand()) -// adapter.collapseBrotherNode(node); - } else if(node.getContent() instanceof Resource.File) { + } else if(node.getContent() instanceof Resource.File) { // if leaf is file KVV kvv = ModDetailResourceFragment.this.context.getKVV(); kvv.getModule(mItemPos, (Modules.Module module) -> { AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(getContext()); @@ -114,16 +112,16 @@ public class ModDetailResourceFragment extends Fragment { .setTitle(file.getTitle()) .setMessage( getResources().getString(R.string.creator_name, file.getAuthor()) + "\n" + - getResources().getString(R.string.last_modified_on, UtilsDate.getModifiedDateTime(context, file.getModifiedDate())) + getResources().getString(R.string.last_modified_on, UtilsDate.getModifiedDateTime(context, file.getModifiedDate())) ) .setCancelable(true) - .setNeutralButton(R.string.close, (dialog, id) -> dialog.cancel()); - if (f.exists()) {//prüffen ob bereits herunter geladen + .setNeutralButton(R.string.close, (dialog, id) -> dialog.cancel()) + .setPositiveButton(R.string.download, (dialog, id) -> download(file, folderName, true)); + // if already doownloaded, show open button + if (f.exists()) { alertDialogBuilder .setNegativeButton(R.string.openFile, (dialog, id) -> download(file, folderName, false)); } - alertDialogBuilder - .setPositiveButton(R.string.download, (dialog, id) -> download(file, folderName, true)); AlertDialog alertDialog = alertDialogBuilder.create(); alertDialog.show(); @@ -137,8 +135,7 @@ public class ModDetailResourceFragment extends Fragment { DirectoryNodeBinder.ViewHolder dirViewHolder = (DirectoryNodeBinder.ViewHolder) holder; final ImageView ivArrow = dirViewHolder.getIvArrow(); int rotateDegree = isExpand ? 90 : -90; - ivArrow.animate().rotationBy(rotateDegree) - .start(); + ivArrow.animate().rotationBy(rotateDegree).start(); } }); @@ -173,7 +170,8 @@ public class ModDetailResourceFragment extends Fragment { KVV kvv = this.context.getKVV(); if(isExternalStorageWritable()){ kvv.getResourceFile(success1 -> { - if (success1.equals("")){//Datei wurde nicht heruntergeladen + // Downloading file failed + if (success1.equals("")){ showDownloadError(); }else { if (Regex.has("^http", success1)){ @@ -249,7 +247,7 @@ public class ModDetailResourceFragment extends Fragment { if (Environment.MEDIA_MOUNTED.equals(state)) { return true; } - log.e("Dateisystem: kein schreiben möglich"); + log.e("File system: Writing not possible"); return false; } diff --git a/app/src/main/res/layout/fragment_expandable_list_view.xml b/app/src/main/res/layout/fragment_expandable_list_view.xml index 61d6923..08d33b7 100644 --- a/app/src/main/res/layout/fragment_expandable_list_view.xml +++ b/app/src/main/res/layout/fragment_expandable_list_view.xml @@ -1,7 +1,6 @@ + android:hint="@string/username" + android:autofillHints="username" + tools:targetApi="o" /> @@ -43,7 +45,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="textPassword" - android:hint="@string/password"/> + android:hint="@string/password" + android:autofillHints="password" + tools:targetApi="o"/> + android:textSize="18sp" + android:drawableStart="@drawable/ic_folder_light_blue_700_24dp" + android:layout_marginStart="5dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_file.xml b/app/src/main/res/layout/item_file.xml index 35323aa..facb9d4 100644 --- a/app/src/main/res/layout/item_file.xml +++ b/app/src/main/res/layout/item_file.xml @@ -1,16 +1,19 @@ - + android:layout_height="wrap_content" + android:layout_margin="5dp" + xmlns:tools="http://schemas.android.com/tools"> + \ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1014709..5d9f4f1 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,7 +1,6 @@ Navigationsmenü öffnen - Einstellungen Navigationsmenü schließen Übersicht Ankündigungen @@ -50,11 +49,11 @@ Spezial Gerichte Beilagen Nachtisch - Salate + Salate Suppen Vorspeisen Sonstiges - Ressourcen + Ressourcen Erstellt von: %1$s Letzte Änderung: %1$s Download diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cb4f7b2..9e80dc8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,7 +2,6 @@ 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. @@ -57,11 +56,11 @@ Special meals Side Dishes Desserts - Salats + Salads Soups Starters Others - Resourcen + Resources Created by: %1$s Last Modified: %1$s Download