From 9907d083e97de4c93e742de522a7da42731b6535 Mon Sep 17 00:00:00 2001
From: Seil0 <seil0@mosad.xyz>
Date: Thu, 28 Nov 2019 16:38:25 +0100
Subject: [PATCH] added a Mensa shortcut

* added a Mensa shortcut, to directly display the Mensa-Screen
* kotlin 1.3.60 -> 1.3.61
---
 app/src/main/AndroidManifest.xml                  |  3 +++
 .../org/mosad/seil0/projectlaogai/MainActivity.kt |  8 ++++++++
 .../main/res/layouts/activities/xml/shortcuts.xml | 15 +++++++++++++++
 app/src/main/res/values-de-rDE/strings.xml        |  3 +++
 app/src/main/res/values/strings.xml               |  5 +++++
 build.gradle                                      |  2 +-
 6 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/layouts/activities/xml/shortcuts.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2693fae..93c91fa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,6 +23,9 @@
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
+
+            <meta-data android:name="android.app.shortcuts"
+                    android:resource="@xml/shortcuts" />
         </activity>
 
         <activity
diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt
index 1ef92a1..ae7cb6f 100644
--- a/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt
+++ b/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt
@@ -85,9 +85,17 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
 
         nav_view.setNavigationItemSelectedListener(this)
 
+        // TODO use a switch expression
         // if we get an NFC read intent while the app is closed call readBalance
         if (NfcAdapter.ACTION_TECH_DISCOVERED == intent.action)
             NFCMensaCard.readBalance(intent, this)
+        if ("org.mosad.seil0.projectlaogai.fragments.MensaFragment" == intent.action) {
+            println("starting mensa screen")
+            // TODO find a way to use only one FragmentTransaction
+            val fragmentTransaction2: FragmentTransaction = supportFragmentManager.beginTransaction()
+            fragmentTransaction2.replace(R.id.fragment_container, MensaFragment())
+            fragmentTransaction2.commit()
+        }
     }
 
     override fun onNewIntent(intent: Intent) {
diff --git a/app/src/main/res/layouts/activities/xml/shortcuts.xml b/app/src/main/res/layouts/activities/xml/shortcuts.xml
new file mode 100644
index 0000000..beb28c2
--- /dev/null
+++ b/app/src/main/res/layouts/activities/xml/shortcuts.xml
@@ -0,0 +1,15 @@
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <shortcut
+            android:shortcutId="mensa"
+            android:enabled="true"
+            android:icon="@drawable/ic_local_dining_black_24dp"
+            android:shortcutShortLabel="@string/shortcut_mensa_short"
+            android:shortcutLongLabel="@string/shortcut_mensa_long"
+            android:shortcutDisabledMessage="@string/shortcut_mensa_disabled">
+        <intent
+                android:action="org.mosad.seil0.projectlaogai.fragments.MensaFragment"
+                android:targetPackage="org.mosad.seil0.projectlaogai"
+                android:targetClass="org.mosad.seil0.projectlaogai.MainActivity" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+</shortcuts>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 64a267b..692dc9b 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -46,5 +46,8 @@
     <!-- errors -->
     <string name="error">Fehler</string>
     <string name="timetable_error">Stundenplan konnte nicht geladen werden!</string>
+    <string name="shortcut_mensa_disabled">Mensa deaktiviert</string>
+    <string name="shortcut_mensa_long">Mensa</string>
+    <string name="shortcut_mensa_short">Mensa</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 17d7bf3..6261791 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -59,6 +59,11 @@
     <string name="error">Error</string>
     <string name="timetable_error">Could not load timetable!"</string>
 
+    <!-- shortcuts -->
+    <string name="shortcut_mensa_short">Mensa</string>
+    <string name="shortcut_mensa_long">Mensa</string>
+    <string name="shortcut_mensa_disabled">Mensa disabled</string>
+
     <!-- save keys -->
     <string name="preference_file_key" translatable="false">org.mosad.seil0.projectlaogai_preferences</string>
     <string name="save_key_course" translatable="false">org.mosad.seil0.projectlaogai.course</string>
diff --git a/build.gradle b/build.gradle
index dc25159..a75be3a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.60'
+    ext.kotlin_version = '1.3.61'
     repositories {
         google()
         jcenter()