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

Cleaned up and optimized

Browse Source
This commit is contained in:
Caesar2011
2018-10-19 19:09:50 +02:00
parent 4f2cb4be8c
commit 6e45f1f660
10 changed files with 51 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/de/sebse/fuplanner/fragments/LoginFragment.java
View File

@@ -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);
});
}

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

@@ -22,7 +22,7 @@ import de.sebse.fuplanner.tools.ui.StringViewHolder;
class MealAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
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<Object> matchings = new ArrayList<>();

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

@@ -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 "";
}

24
app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailResourceFragment.java
View File

@@ -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;
}

1
app/src/main/res/layout/fragment_expandable_list_view.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/swipe_container"
android:layout_width="match_parent"

8
app/src/main/res/layout/fragment_login.xml
View File

@@ -30,7 +30,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textEmailAddress"
android:hint="@string/username" />
android:hint="@string/username"
android:autofillHints="username"
tools:targetApi="o" />
</com.google.android.material.textfield.TextInputLayout>
<!-- Password Label -->
@@ -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"/>
</com.google.android.material.textfield.TextInputLayout>
<androidx.appcompat.widget.AppCompatButton

5
app/src/main/res/layout/item_dir.xml
View File

@@ -2,6 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
xmlns:tools="http://schemas.android.com/tools">
<ImageView
@@ -20,5 +21,7 @@
android:drawablePadding="10dp"
android:gravity="center_vertical"
tools:text="@string/app_name"
android:textSize="18sp" />
android:textSize="18sp"
android:drawableStart="@drawable/ic_folder_light_blue_700_24dp"
android:layout_marginStart="5dp" />
</LinearLayout>

27
app/src/main/res/layout/item_file.xml
View File

@@ -1,16 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:tools="http://schemas.android.com/tools">
<TextView
android:id="@+id/tv_name"
android:layout_marginLeft="23dp"
android:drawableLeft="@drawable/ic_insert_drive_file_light_blue_700_24dp"
android:drawablePadding="10dp"
android:gravity="center_vertical"
tools:text="@string/app_name"
android:textSize="18sp"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="wrap_content"
android:layout_margin="5dp"
xmlns:tools="http://schemas.android.com/tools">
<TextView
android:id="@+id/tv_name"
android:layout_marginLeft="23dp"
android:drawableLeft="@drawable/ic_insert_drive_file_light_blue_700_24dp"
android:drawablePadding="10dp"
android:gravity="center_vertical"
tools:text="@string/app_name"
android:textSize="18sp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:drawableStart="@drawable/ic_insert_drive_file_light_blue_700_24dp"
android:layout_marginStart="23dp" />
</LinearLayout>

5
app/src/main/res/values-de/strings.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="navigation_drawer_open">Navigationsmenü öffnen</string>
<string name="action_settings">Einstellungen</string>
<string name="navigation_drawer_close">Navigationsmenü schließen</string>
<string name="overview">Übersicht</string>
<string name="announcements">Ankündigungen</string>
@@ -50,11 +49,11 @@
<string name="special_meals">Spezial Gerichte</string>
<string name="side_dishes">Beilagen</string>
<string name="desserts">Nachtisch</string>
<string name="salats">Salate</string>
<string name="salads">Salate</string>
<string name="soups">Suppen</string>
<string name="starters">Vorspeisen</string>
<string name="others">Sonstiges</string>
<string name="resourcen">Ressourcen</string>
<string name="resources">Ressourcen</string>
<string name="creator_name">Erstellt von: %1$s</string>
<string name="last_modified_on">Letzte Änderung: %1$s</string>
<string name="download">Download</string>

5
app/src/main/res/values/strings.xml
View File

@@ -2,7 +2,6 @@
<string name="app_name" translatable="false">FU Planner</string>
<string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Close navigation drawer</string>
<string name="action_settings">Settings</string>
<string name="overview">Overview</string>
<string name="announcements">Announcements</string>
<string name="lorem_ipsum_100" translatable="false" tools:keep="@string/lorem_ipsum_100">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.</string>
@@ -57,11 +56,11 @@
<string name="special_meals">Special meals</string>
<string name="side_dishes">Side Dishes</string>
<string name="desserts">Desserts</string>
<string name="salats">Salats</string>
<string name="salads">Salads</string>
<string name="soups">Soups</string>
<string name="starters">Starters</string>
<string name="others">Others</string>
<string name="resourcen">Resourcen</string>
<string name="resources">Resources</string>
<string name="creator_name">Created by: %1$s</string>
<string name="last_modified_on">Last Modified: %1$s</string>
<string name="download">Download</string>