Merge remote-tracking branch 'origin/main' into feature/koinon-thesis

Author: jakobkoerber

README.md

@@ -11,9 +11,9 @@
 
 # Tum Campus App - An Unofficial Guide Through University Life
 
-The TUM Campus App (TCA) is an open source project, developed by volunteers. This repository is dedicated to the development and transition to Flutter and currently in Beta. <!-- and [available on the App Store](https://itunes.apple.com/app/id1217412716), [on the Play Store]() and as a [web app](https://web.tum.app). -->
+The TUM Campus App (TCA) is an open source project, developed by volunteers. This repository is dedicated to the development and transition to Flutter. 
 
-The application mostly targets phones, but can also be used on tablets, Macs and in your browser. We currently support iOS, iPadOS, macOS and Android.
+The application mostly targets phones, but can also be used on tablet and Macs. We currently support iOS, iPadOS, macOS and Android.
 
 ## Features
 
@@ -59,7 +59,7 @@ Please refer to the respective installation instructions:
 |------------------------------------------|------------------------------------------|----------------------------------------------|
 | `Flutter` (includes the `Dart` compiler) | SDK to develop this app                  | https://docs.flutter.dev/get-started/install |
 
-### Updating the `.proto` files of the
+### Updating the `.proto` files
 
 To update the generated stubs for the Campus, you need protoc installed, then activte it in dart and then you can generate the new client
 
@@ -70,14 +70,14 @@ curl -o protos/tumdev/campus_backend.proto https://raw.githubusercontent.com/TUM
 protoc --dart_out=grpc:lib/base/networking/apis -I./protos google/protobuf/timestamp.proto google/protobuf/empty.proto tumdev/campus_backend.proto 
 ```
 
-### Current needed Forks
+### Currently needed Forks
 
 To ensure that campus_flutter runs on every supported platform, we need to make some modifications to packages.
 
-| Package         | Reason                              | Link                                         |
-|-----------------|-------------------------------------|----------------------------------------------|
-| gRPC            | Caching                             | https://github.com/jakobkoerber/grpc-dart |
-| Xml2Json        | Fix Parsing of XML to JSON          | https://github.com/jakobkoerber/xml2json |
+| Package         | Reason                              | Link                                            |
+|-----------------|-------------------------------------|-------------------------------------------------|
+| gRPC            | Caching                             | https://github.com/jakobkoerber/grpc-dart       |
+| Xml2Json        | Fix Parsing of XML to JSON          | https://github.com/jakobkoerber/xml2json        |
 | flutter_linkify | Fix Selection Menu and Text Scaling | https://github.com/jakobkoerber/flutter_linkify |
 
 

android/.gitignore

@@ -5,6 +5,7 @@ gradle-wrapper.jar
 /gradlew.bat
 /local.properties
 GeneratedPluginRegistrant.java
+**/.cxx
 
 # Remember to never publicly share your keystore.
 # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app

android/app/src/main/AndroidManifest.xml

@@ -35,18 +35,31 @@
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:label="Campus">
+
         <receiver
-            android:name=".widgets.calendar.CalendarWidget"
-            android:exported="false">
+            android:name=".widgets.calendar.CalendarWidgetProvider"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
-
             <meta-data
                 android:name="android.appwidget.provider"
                 android:resource="@xml/calendar_widget_info" />
         </receiver>
 
+        <receiver
+            android:name="es.antonborri.home_widget.HomeWidgetBackgroundReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="es.antonborri.home_widget.action.BACKGROUND" />
+            </intent-filter>
+        </receiver>
+
+        <service
+            android:name="es.antonborri.home_widget.HomeWidgetBackgroundService"
+            android:exported="true"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
+
         <service
             android:name=".widgets.calendar.CalendarWidgetService"
             android:permission="android.permission.BIND_REMOTEVIEWS" />
@@ -74,6 +87,9 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="es.antonborri.home_widget.action.LAUNCH" />
+            </intent-filter>
         </activity>
         <!--
  Don't delete the meta-data below.

android/app/src/main/kotlin/de/tum/in/tumcampus/widgets/calendar/CalendarWidget.kt

@@ -0,0 +1,92 @@
+package de.tum.`in`.tumcampus.widgets.calendar
+
+import android.appwidget.AppWidgetManager
+import android.content.Context
+import android.content.Intent
+import android.content.SharedPreferences
+import android.view.View
+import android.widget.RemoteViews
+import de.tum.`in`.tumcampus.MainActivity
+import de.tum.`in`.tumcampus.R
+import de.tum.`in`.tumcampus.util.DateTimeSerializer
+import de.tum.`in`.tumcampus.util.timeAgo
+import es.antonborri.home_widget.HomeWidgetLaunchIntent
+import es.antonborri.home_widget.HomeWidgetProvider
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.Period
+import java.time.format.DateTimeFormatter
+import java.time.format.FormatStyle
+import java.time.format.TextStyle
+import java.util.Locale
+import androidx.core.net.toUri
+
+class CalendarWidgetProvider : HomeWidgetProvider() {
+    override fun onUpdate(
+        context: Context,
+        appWidgetManager: AppWidgetManager,
+        appWidgetIds: IntArray,
+        widgetData: SharedPreferences
+    ) {
+        // There may be multiple widgets active, so update all of them
+        for (appWidgetId in appWidgetIds) {
+            updateAppWidget(context, appWidgetManager, appWidgetId, widgetData)
+        }
+    }
+
+    private fun updateAppWidget(
+        context: Context,
+        appWidgetManager: AppWidgetManager,
+        appWidgetId: Int,
+        widgetData: SharedPreferences
+    ) {
+        // Instantiate the RemoteViews object for the app widget layout.
+        val remoteViews = RemoteViews(context.packageName, R.layout.calendar_widget)
+
+        // Set formatted date in the header
+        val localDate = LocalDate.now()
+        val dateFormatter =
+            DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM).withLocale(Locale.getDefault())
+        val date = localDate.format(dateFormatter)
+        val weekday = localDate.dayOfWeek.getDisplayName(TextStyle.FULL, Locale.getDefault())
+        remoteViews.setTextViewText(R.id.calendar_widget_date, "$weekday, $date")
+
+        // Set last saved date in the header
+        val lastSaved = widgetData.getString("calendar_save", null)
+        val lastSavedDate = DateTimeSerializer.deserializeStringToDate(lastSaved)
+        val lastSavedDateString = (lastSavedDate ?: LocalDateTime.now()).timeAgo(context)
+        remoteViews.setTextViewText(R.id.calendar_widget_updated_on, lastSavedDateString)
+
+        if (lastSavedDate != null && Period.between(
+                LocalDate.now(),
+                lastSavedDate.toLocalDate(),
+            ).days < 14
+        ) {
+            // Set up the intent that starts the calendarWidgetService
+            val intent = Intent(context, CalendarWidgetService::class.java)
+            intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId)
+            intent.data = intent.toUri(Intent.URI_INTENT_SCHEME).toUri()
+            remoteViews.setRemoteAdapter(R.id.calendar_widget_listview, intent)
+
+            // The empty view is displayed when the collection has no items.
+            // It should be in the same layout used to instantiate the RemoteViews
+            // object above.
+            remoteViews.setEmptyView(R.id.calendar_widget_listview, R.id.empty_list_item)
+            remoteViews.setViewVisibility(R.id.old_data_item, View.INVISIBLE)
+        } else {
+            remoteViews.setViewVisibility(R.id.old_data_item, View.VISIBLE)
+            remoteViews.setViewVisibility(R.id.calendar_widget_listview, View.INVISIBLE)
+        }
+
+        val pendingIntentWithData = HomeWidgetLaunchIntent.getActivity(
+            context,
+            MainActivity::class.java,
+            "tumCampusApp://message?homeWidget=calendar".toUri()
+        )
+        remoteViews.setOnClickPendingIntent(R.id.calendar_widget, pendingIntentWithData)
+
+        // Instruct the widget manager to update the widget
+        appWidgetManager.updateAppWidget(appWidgetId, remoteViews)
+        appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetId, R.id.calendar_widget_listview)
+    }
+}

android/app/src/main/kotlin/de/tum/in/tumcampus/widgets/calendar/CalendarWidgetProvider.kt

@@ -2,6 +2,8 @@ package de.tum.`in`.tumcampus.widgets.calendar
 
 import android.content.Context
 import android.content.Intent
+import android.content.res.ColorStateList
+import android.os.Build
 import android.widget.RemoteViews
 import android.widget.RemoteViewsService
 import de.tum.`in`.tumcampus.util.DateTimeUtils
@@ -94,11 +96,19 @@ class CalendarWidgetService : RemoteViewsService() {
             }
 
             // Setup event color
-            remoteViews.setInt(
-                R.id.calendar_widget_event,
-                "setBackgroundColor",
-                currentItem.getEventColor(applicationContext)
-            )
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                remoteViews.setColorStateList(
+                    R.id.calendar_widget_event,
+                    "setBackgroundTintList",
+                    ColorStateList.valueOf(currentItem.getEventColor(applicationContext))
+                )
+            } else {
+                remoteViews.setInt(
+                    R.id.calendar_widget_event,
+                    "setBackgroundColor",
+                    currentItem.getEventColor(applicationContext)
+                )
+            }
 
             // Setup event title
             remoteViews.setTextViewText(R.id.calendar_widget_event_title, currentItem.title)

android/app/src/main/kotlin/de/tum/in/tumcampus/widgets/calendar/CalendarWidgetService.kt

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="8dp" />
+</shape>

android/app/src/main/res/drawable/rounded_background.xml

@@ -53,9 +53,10 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/calendar_widget_date_month"
         android:layout_marginStart="30dp"
+        android:background="@drawable/rounded_background"
+        android:backgroundTint="@color/color_primary"
         android:orientation="vertical"
-        android:padding="@dimen/material_small_padding"
-        tools:background="@color/text_dark_gray">
+        android:padding="@dimen/material_small_padding">
 
         <TextView
             android:id="@+id/calendar_widget_event_title"

android/app/src/main/res/layout/calendar_widget_item.xml

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip

android/gradle/wrapper/gradle-wrapper.properties

@@ -18,11 +18,11 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version '8.8.0' apply false
+    id "com.android.application" version '8.9.0' apply false
     id "org.jetbrains.kotlin.android" version "1.9.20" apply false
     id "org.jetbrains.kotlin.plugin.serialization" version "2.0.21" apply false
     id "com.google.gms.google-services" version "4.4.2" apply false
-    id "com.google.firebase.crashlytics" version "3.0.2" apply false
+    id "com.google.firebase.crashlytics" version "3.0.3" apply false
 }
 
 include ":app"