Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/misc.xml
#	app/build.gradle
#	app/src/main/java/de/sebse/fuplanner/fragments/LoginFragment.java
#	app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java
#	app/src/main/res/values-de/arrays.xml
#	app/src/main/res/values-de/strings.xml
#	app/src/main/res/values/arrays.xml
#	app/src/main/res/values/preferences.xml
#	app/src/main/res/xml/preferences.xml
#	build.gradle

.idea/misc.xml

@@ -25,5 +25,5 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8 (2)" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
 </project>

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:appcompat-v7:28.0.0-rc01'
-    implementation 'com.android.support:preference-v7:28.0.0-beta01'
+    implementation 'com.android.support:preference-v7:28.0.0-rc01'
-    implementation 'com.android.support:design:28.0.0-beta01'
+    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'

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

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

app/src/main/res/values-de/arrays.xml

@@ -6,10 +6,4 @@
         <item>Angestellter</item>
         <item>Andere</item>
     </string-array>
-    <string-array name="pref_price_group_values">
-        <item>all</item>
-        <item>student</item>
-        <item>employee</item>
-        <item>other</item>
-    </string-array>
 </resources>

app/src/main/res/values-de/strings.xml

@@ -43,7 +43,7 @@
     <string name="close">Schließen</string>
     <string name="open_data_policy">Datenschutzrichtlinie</string>
     <string name="open_data_policy_summary">Öffne die Datenschutzrichtlinie nach DSGVO</string>
-    <string name="pref_price_group_default">alle</string>
     <string name="pref_price_group_title">Kantinenpreisgruppe</string>
-    <string name="pref_price_group_dialog">Preisgruppenauswahl</string>
+    <string name="pref_price_group_summary">Zeige nur Preise einer Gruppe</string>
+    <string name="pref_price_group_dialog">Preisgruppe</string>
 </resources>

app/src/main/res/values/arrays.xml

@@ -6,7 +6,7 @@
         <item>Employee</item>
         <item>Other</item>
     </string-array>
-    <string-array name="pref_price_group_values">
+    <string-array name="pref_price_group_values" translatable="false">
         <item>all</item>
         <item>student</item>
         <item>employee</item>

app/src/main/res/values/preferences.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string-array name="pref_price_group">
+    <string-array name="pref_price_group" translatable="false">
         <item>@string/pref_price_group</item>
         <item>@string/pref_price_group_default</item>
     </string-array>
-    <string name="pref_price_group">pref_price_group</string>
+    <string name="pref_price_group" translatable="false">pref_price_group</string>
-    <string name="pref_price_group_default">all</string>
+    <string name="pref_price_group_default" translatable="false">all</string>
 </resources>

app/src/main/res/xml/preferences.xml

@@ -13,6 +13,6 @@
         android:title="@string/open_data_policy"
         android:summary="@string/open_data_policy_summary">
         <intent android:action="android.intent.action.VIEW"
-            android:data="http://www.android.com" />
+            android:data="https://gogs.sebse.de/Caesar2011/FUPlanner/src/master/datenschutz.md" />
     </PreferenceScreen>
 </PreferenceScreen>

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