diff --git a/app/app.iml b/app/app.iml index 8e6c3ac..d098939 100644 --- a/app/app.iml +++ b/app/app.iml @@ -4,8 +4,8 @@ diff --git a/app/src/main/java/de/sebse/fuplanner/MainActivity.java b/app/src/main/java/de/sebse/fuplanner/MainActivity.java index 0c0ea91..dc45048 100644 --- a/app/src/main/java/de/sebse/fuplanner/MainActivity.java +++ b/app/src/main/java/de/sebse/fuplanner/MainActivity.java @@ -2,11 +2,14 @@ package de.sebse.fuplanner; import android.accounts.Account; import android.accounts.AccountManager; +import android.content.ActivityNotFoundException; import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.ServiceConnection; +import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.os.IBinder; import android.text.TextUtils; @@ -378,6 +381,21 @@ public class MainActivity extends AppCompatActivity sendIntent.setType("text/plain"); startActivity(sendIntent); break; + case R.id.nav_rate: + Uri uri = Uri.parse("market://details?id=" + getApplicationContext().getPackageName()); + Intent viewIntent = new Intent(Intent.ACTION_VIEW, uri); + if (Build.VERSION.SDK_INT <= 21) + viewIntent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY | Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET | Intent.FLAG_ACTIVITY_MULTIPLE_TASK); + else + viewIntent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY | Intent.FLAG_ACTIVITY_NEW_DOCUMENT | Intent.FLAG_ACTIVITY_MULTIPLE_TASK); + try { + startActivity(viewIntent); + } catch (ActivityNotFoundException e) { + uri = Uri.parse("http://play.google.com/store/apps/details?id=" + getApplicationContext().getPackageName()); + viewIntent = new Intent(Intent.ACTION_VIEW, uri); + startActivity(viewIntent); + } + break; case R.id.nav_logout: getKVV(kvv -> { kvv.account().logout(true); 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 ad1e46b..d65d647 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 @@ -104,6 +104,10 @@ public class MealFragment extends Fragment { browser.getCanteens(canteens -> { Canteen canteen = canteens.getCanteen(mCanteenId); browser.getCanteen(canteen, success -> { + if (success.size() <= mDayPosition) { + swipeLayout.setRefreshing(false); + return; + } Day day = success.get(mDayPosition); adapter.setDay(day); browser.getDay(day, success1 -> { diff --git a/app/src/main/res/drawable/ic_rate_review.xml b/app/src/main/res/drawable/ic_rate_review.xml new file mode 100644 index 0000000..df82c52 --- /dev/null +++ b/app/src/main/res/drawable/ic_rate_review.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml index eb625ff..c1defa4 100644 --- a/app/src/main/res/menu/activity_main_drawer.xml +++ b/app/src/main/res/menu/activity_main_drawer.xml @@ -22,6 +22,11 @@ android:icon="@drawable/ic_menu_share" android:title="@string/share" android:orderInCategory="700"/> + diff --git a/app/src/main/res/menu/activity_main_drawer_login.xml b/app/src/main/res/menu/activity_main_drawer_login.xml index 9245bf9..9ce6653 100644 --- a/app/src/main/res/menu/activity_main_drawer_login.xml +++ b/app/src/main/res/menu/activity_main_drawer_login.xml @@ -42,6 +42,11 @@ android:icon="@drawable/ic_menu_share" android:title="@string/share" android:orderInCategory="700"/> + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index a99b1ee..eb872e9 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -114,4 +114,5 @@ Ressource entfernt: %1$s Ein Netzwerkfehler ist aufgetreten! Ein Netzwerkfehler ist aufgetreten: %s! + App bewerten! \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f7d387c..29fdcff 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -122,4 +122,5 @@ Resource removed: %1$s A network error occurred! A network error occurred: %s! + Rate the App! diff --git a/build.gradle b/build.gradle index 127b789..f4264ed 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:3.5.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/fuplanner.iml b/fuplanner.iml deleted file mode 100644 index 357f9cd..0000000 --- a/fuplanner.iml +++ /dev/null @@ -1,19 +0,0 @@ -?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - - - - - \ No newline at end of file