Merge pull request #33 from famoser/maintenance

Maintenance
famoser · Mar 22, 2022 · 9d1f0b3 · 9d1f0b3
2 parents ff9534f + aef1ad9
commit 9d1f0b3
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 26 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,18 +7,19 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 31
     defaultConfig {
         applicationId "ch.famoser.mensa"
         minSdkVersion 21
-        targetSdkVersion 29
-        versionCode 16
-        versionName "1.5.6"
+        targetSdkVersion 31
+        versionCode 17
+        versionName "1.5.7"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
-    packagingOptions  {
-        exclude("META-INF/*.kotlin_module")
+    packagingOptions {
+        resources {
+            excludes += ['META-INF/*.kotlin_module']
+        }
     }
     buildTypes {
         release {
@@ -31,11 +32,11 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.core:core-ktx:1.3.2'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.core:core-ktx:1.7.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'com.google.android.material:material:1.5.0'
     implementation "androidx.cardview:cardview:1.0.0"
     implementation 'com.squareup.moshi:moshi:1.9.2' // json deserialize
     kapt "com.squareup.moshi:moshi-kotlin-codegen:1.9.2" // generate json adapters
@@ -45,6 +46,6 @@ dependencies {
     implementation 'org.jsoup:jsoup:1.13.1' // html parser
     testImplementation 'junit:junit:4.13'
     testImplementation 'com.google.truth:truth:1.0.1' // assertion library
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test:runner:1.4.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -13,6 +13,7 @@
             android:theme="@style/AppTheme">
         <activity
                 android:name=".activities.MainActivity"
+                android:exported="true"     
                 android:label="@string/app_name"
                 android:theme="@style/AppTheme.Launcher">
             <intent-filter>

diff --git a/app/src/main/assets/eth/locations.json b/app/src/main/assets/eth/locations.json
@@ -13,7 +13,7 @@
       {
         "id": "cc422893-0cd5-4250-9cca-3d23044083ac",
         "title": "Dozentenfoyer",
-        "mealTime": "11:30-13:45",
+        "mealTime": "11:30-13:30",
         "idSlug": 6,
         "timeSlug": "lunch",
         "infoUrlSlug": "zentrum/dozentenfoyer"
@@ -45,7 +45,7 @@
       {
         "id": "24e3a71a-ff05-4d20-a8c3-fa24f342c1dc",
         "title": "Mensa Polyterrasse",
-        "mealTime": "11:15-14:15",
+        "mealTime": "11:15-14:00",
         "idSlug": 12,
         "timeSlug": "lunch",
         "infoUrlSlug": "zentrum/mensa-polyterrasse"
@@ -61,15 +61,15 @@
       {
         "id": "f7058f19-1c57-4dd4-9e3c-d3a80bcc8b35",
         "title": "Polysnack",
-        "mealTime": "11:00-14:00",
+        "mealTime": "11:00-13:30",
         "idSlug": 13,
         "timeSlug": "lunch",
         "infoUrlSlug": "zentrum/polysnack"
       },
       {
         "id": "490c3c0d-3ff2-45ca-b89a-c2062724dfbe",
         "title": "Tannenbar",
-        "mealTime": "11:00-13:30",
+        "mealTime": "11:30-13:30",
         "idSlug": 14,
         "timeSlug": "lunch",
         "infoUrlSlug": "zentrum/tannenbar"
@@ -82,11 +82,19 @@
       {
         "id": "0414ece7-d352-4495-99ec-51e9494c5d39",
         "title": "Alumni quattro Lounge",
-        "mealTime": "11:30-19:30",
+        "mealTime": "11:00-16:00",
         "idSlug": 15,
         "timeSlug": "lunch",
         "infoUrlSlug": "hoenggerberg/alumni-quattro-lounge"
       },
+      {
+        "id": "0414ece7-d352-4495-29ec-51e9814c5d39",
+        "title": "Alumni quattro Lounge - Abendessen",
+        "mealTime": "16:00-20:00",
+        "idSlug": 15,
+        "timeSlug": "dinner",
+        "infoUrlSlug": "hoenggerberg/alumni-quattro-lounge"
+      },
       {
         "id": "c4e2a6fd-5c72-4f1c-8dcd-7d87f662f5f2",
         "title": "food market - green day",
@@ -130,7 +138,7 @@
       {
         "id": "e01cded9-53ea-47c0-9a25-2b5c85909e23",
         "title": "Rice Up!",
-        "mealTime": "11:00-14:00",
+        "mealTime": "10:30-14:30",
         "idSlug": 27,
         "timeSlug": "lunch",
         "infoUrlSlug": "hoenggerberg/rice-up"

diff --git a/app/src/main/assets/uzh/locations_rss.json b/app/src/main/assets/uzh/locations_rss.json
@@ -5,7 +5,7 @@
       {
         "id": "25588906-4759-4b54-9c0e-bf7b4fd158a4",
         "title": "Untere Mensa",
-        "mealTime": "11:00-14:30",
+        "mealTime": "11:00-14:00",
         "apiUrlSlug": "zentrum-mercato",
         "idSlugDe": 147,
         "idSlugEn": 505,
@@ -14,7 +14,7 @@
       {
         "id": "7a05967f-9d99-40ca-9b4b-064a81261644",
         "title": "Untere Mensa - Abendessen",
-        "mealTime": "17:00-19:30",
+        "mealTime": "17:00-19:00",
         "apiUrlSlug": "zentrum-mercato-abend",
         "idSlugDe": 149,
         "idSlugEn": 506,
@@ -23,7 +23,7 @@
       {
         "id": "2e02c699-d208-4845-8b3c-519bde6b9574",
         "title": "Obere Mensa",
-        "mealTime": "11:00-14:30",
+        "mealTime": "11:00-14:00",
         "apiUrlSlug": "zentrum-mensa",
         "idSlugDe": 148,
         "idSlugEn": 507,
@@ -141,7 +141,7 @@
       {
         "id": "1200e7c2-e898-4e5b-917c-c98d4a239671",
         "title": "Cafeteria Plattenstrasse",
-        "mealTime": "07:00-16:30",
+        "mealTime": "09:00-14:30",
         "apiUrlSlug": "cafeteria-uzh-plattenstrasse",
         "idSlugDe": 143,
         "idSlugEn": 520,

diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.4.20'
+    ext.kotlin_version = '1.4.32'
     ext.anko_version = '0.10.8'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
+        classpath 'com.android.tools.build:gradle:7.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/fastlane/metadata/android/de-DE/changelogs/17.txt b/fastlane/metadata/android/de-DE/changelogs/17.txt
@@ -0,0 +1 @@
+- Öffnungszeiten ETH Mensas angepasst
diff --git a/fastlane/metadata/android/en-US/changelogs/17.txt b/fastlane/metadata/android/en-US/changelogs/17.txt
@@ -0,0 +1 @@
+- new opening times for ETH mensas
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip