diff --git a/.idea/misc.xml b/.idea/misc.xml index 4e024a8..a8cce1b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -25,5 +25,5 @@ - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2aa2370..0ada430 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,24 +27,24 @@ android { dependencies { - implementation 'com.android.support:recyclerview-v7:28.0.0-beta01' + implementation 'com.android.support:recyclerview-v7:28.0.0-rc01' implementation fileTree(include: ['*.jar'], dir: 'libs') androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - implementation 'com.android.support:appcompat-v7:28.0.0-beta01' - implementation 'com.android.support:preference-v7:28.0.0-beta01' - implementation 'com.android.support:design:28.0.0-beta01' + implementation 'com.android.support:appcompat-v7:28.0.0-rc01' + implementation 'com.android.support:preference-v7:28.0.0-rc01' + implementation 'com.android.support:design:28.0.0-rc01' implementation 'com.android.support.constraint:constraint-layout:1.1.2' implementation 'com.android.volley:volley:1.0.0' //noinspection GradleDependency implementation 'com.google.android.gms:play-services-auth:15.0.0' - implementation 'com.android.support:support-v4:28.0.0-beta01' + implementation 'com.android.support:support-v4:28.0.0-rc01' testImplementation 'junit:junit:4.12' implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.android.support:appcompat-v7:28.0.0-beta01' + implementation 'com.android.support:appcompat-v7:28.0.0-rc01' implementation 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2' - implementation 'com.android.support:support-v4:28.0.0-beta01' + implementation 'com.android.support:support-v4:28.0.0-rc01' implementation 'org.jetbrains:annotations-java5:15.0' //implementation 'com.github.quivr:android-week-view:2.0.2'//com.github.alamkanak:android-week-view:1.2.6 implementation 'com.ms-square:expandableTextView:0.1.4' 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 66d2b7b..8a43ba5 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/LoginFragment.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/LoginFragment.java @@ -121,7 +121,7 @@ public class LoginFragment extends Fragment { + " must implement OnLoginFragmentInteractionListener"); } if (context instanceof MainAcitivityListener) - ((MainAcitivityListener) context).onTitleTextChange(R.string.courses); + ((MainAcitivityListener) context).onTitleTextChange(R.string.log_in); else throw new RuntimeException(context.toString() + "must implement MainActivityListener"); } 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 720f7d5..3cda9a1 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java @@ -172,6 +172,7 @@ public class ScheduleFragment extends Fragment implements MonthLoader.MonthChang } } mWeekView.goToDate(firstVisibleDay); + onFirstVisibleDayChanged(firstVisibleDay, mWeekView.getLastVisibleDay()); } @Override diff --git a/app/src/main/res/values-de/arrays.xml b/app/src/main/res/values-de/arrays.xml index ff2f87d..44b5afe 100644 --- a/app/src/main/res/values-de/arrays.xml +++ b/app/src/main/res/values-de/arrays.xml @@ -6,10 +6,4 @@ Angestellter Andere - - all - student - employee - other - \ 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 648efa6..79b57c3 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -43,7 +43,7 @@ Schließen Datenschutzrichtlinie Öffne die Datenschutzrichtlinie nach DSGVO - alle Kantinenpreisgruppe - Preisgruppenauswahl + Zeige nur Preise einer Gruppe + Preisgruppe \ No newline at end of file diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 747e97b..23ee157 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -6,7 +6,7 @@ Employee Other - + all student employee diff --git a/app/src/main/res/values/preferences.xml b/app/src/main/res/values/preferences.xml index e8305a6..3045e4b 100644 --- a/app/src/main/res/values/preferences.xml +++ b/app/src/main/res/values/preferences.xml @@ -1,9 +1,9 @@ - + @string/pref_price_group @string/pref_price_group_default - pref_price_group - all + pref_price_group + all \ No newline at end of file diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 1bddf83..7fe6ece 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -13,6 +13,6 @@ android:title="@string/open_data_policy" android:summary="@string/open_data_policy_summary"> + android:data="https://gogs.sebse.de/Caesar2011/FUPlanner/src/master/datenschutz.md" /> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 9293058..2b5406d 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.3' + classpath 'com.android.tools.build:gradle:3.1.4' classpath 'com.google.gms:google-services:4.0.0' // NOTE: Do not place your application dependencies here; they belong