Merge pull request #114 from astarub/wp-instance

Backend and Wordpress Integration

.gitignore

@@ -47,5 +47,4 @@ app.*.map.json
 /android/app/release
 
 # exclude all .env files
-*.env
-#env.g.dart
+*.env

.vscode/settings.json

@@ -30,5 +30,7 @@
     },
 
     "dart.lineLength": 120,
-    "java.configuration.updateBuildConfiguration": "interactive"
+    "java.configuration.updateBuildConfiguration": "interactive",
+    "cmake.configureOnOpen": false,
+    "workbench.editor.enablePreview": false,
 }

README.md

@@ -7,7 +7,8 @@ This app is developed & maintained by the General Student Committee of the Ruhr
 The purpose of this app is to provide the students of the Ruhr University Bochum
 a tool that simplifies, improves and facilitates everyday students life.
 
-[![Better Uptime Badge](https://betteruptime.com/status-badges/v1/monitor/jqkz.svg)](https://asta-rub.betteruptime.com)
+Mensa Scraper: [![Mensa Scraper Status Badge](https://uptime.betterstack.com/status-badges/v1/monitor/u2xs.svg)](https://campus-app.betteruptime.com/)\
+Backend: [![Backend Status Badge](https://uptime.betterstack.com/status-badges/v1/monitor/u39n.svg)](https://campus-app.betteruptime.com/)
 
 <img src="https://user-images.githubusercontent.com/56138477/213162795-f00d1f4c-3978-4017-a974-b65b40e70908.png" height="14" width="14" > [Discord server](https://discord.gg/KHkQ8VFm6t)
 
@@ -34,7 +35,7 @@ Please keep in mind the following rules when it comes to contribution:
 
 ### No direct commits to the main/master branch
 
-We work with feature branches, which means whenever you work on a feature or bug you do that on the explicit branch. If the feature is ready, we **merge it with a pull-request** into the main/master branch.
+We work with feature branches, which means whenever you work on a feature or bug you do that on the explicit branch. If the feature is ready, we **merge it with a pull-request** into the main/master branch. In some cases, the app team can bypass that rule if deemed necessary. 
 
 ### No pull-request merge without another persons approval
 

analysis_options.yaml

@@ -107,13 +107,12 @@ linter:
     - hash_and_equals
     - implementation_imports
     - invariant_booleans
-    - iterable_contains_unrelated_type
+    - collection_methods_unrelated_type
     - join_return_with_assignment
     - leading_newlines_in_multiline_strings
     - library_names
     - library_prefixes
     - library_private_types_in_public_api
-    - list_remove_unrelated_type
     - literal_only_boolean_expressions
     - missing_whitespace_between_adjacent_strings
     - no_adjacent_strings_in_list

android/app/build.gradle

@@ -28,11 +28,14 @@ if (keystorePropertiesFile.exists()) {
 }
 
 apply plugin: 'com.android.application'
+// START: FlutterFire Configuration
+apply plugin: 'com.google.gms.google-services'
+// END: FlutterFire Configuration
 apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 33
+    compileSdk 34
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -50,8 +53,8 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "de.asta_bochum.campus_app"
-        minSdkVersion 21
-        targetSdkVersion 33
+        minSdkVersion 26
+        targetSdkVersion 34
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -70,6 +73,7 @@ android {
             signingConfig signingConfigs.release
         }
     }
+    namespace 'de.asta_bochum.campus_app'
 }
 
 flutter {
@@ -78,5 +82,6 @@ flutter {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation('androidx.appcompat:appcompat:1.6.1')
+    implementation("androidx.appcompat:appcompat-resources:1.6.1")
 }

android/app/google-services.json

@@ -29,6 +29,13 @@
             {
               "client_id": "330477020905-qgeoqm2agg3fumsksgiaimlmhobf8q1c.apps.googleusercontent.com",
               "client_type": 3
+            },
+            {
+              "client_id": "330477020905-ie1vqe43juhpr8tiid6tfhtn44k6s8s2.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "de.astaBochum.campusApp"
+              }
             }
           ]
         }

android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.asta_bochum.campus_app">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

android/app/src/main/AndroidManifest.xml

@@ -1,9 +1,9 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.asta_bochum.campus_app">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.NFC" />
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
 
     <!-- Provide required visibility configuration for API level 30 and above -->
     <queries>
@@ -20,7 +20,9 @@
     <application
         android:label="Campus App"
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher"
+        android:usesCleartextTraffic="true"
+        android:allowBackup="false">
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -45,13 +47,30 @@
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-
                 <data android:scheme="https" />
                 <data android:host="asta-bochum.de" />
 
                 <data android:pathPrefix="/termin/" />
                 <data android:pathPrefix="/termine/" />
             </intent-filter>
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="https" />
+                <data android:host="app.asta-bochum.de" />
+
+                <data android:pathPrefix="/termin/" />
+                <data android:pathPrefix="/termine/" />
+            </intent-filter>
+        </activity>
+        <activity android:name="com.linusu.flutter_web_auth_2.CallbackActivity" android:exported="true">
+            <intent-filter android:label="flutter_web_auth_2">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="appwrite-callback-campus_app" />
+            </intent-filter>
         </activity>
         <activity
             android:name=".PopupActivity"

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

@@ -4,8 +4,7 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/popupRoot"
 	android:layout_width="270dp"
-	android:layout_height="250dp"
-	android:gravity="center"
+	android:layout_height="wrap_content"
 	android:orientation="vertical"
 	tools:context=".PopupActivity">
 
@@ -16,7 +15,6 @@
 		android:layout_marginBottom="35sp"
 		android:background="?attr/colorPrimary"
 		android:elevation="0dp"
-		android:minHeight="?attr/actionBarSize"
 		app:titleTextColor="@android:color/white">
 
 		<RelativeLayout
@@ -54,15 +52,16 @@
 
 	<TextView
 		android:id="@+id/current"
-		android:layout_width="wrap_content"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginTop="10sp"
+		android:gravity="center"
 		android:text="Mensa Guthaben:"
 		android:textSize="16sp" />
 
 	<TextView
 		android:id="@+id/last"
-		android:layout_width="wrap_content"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginTop="18dp"
 		android:layout_marginBottom="87sp"

android/app/src/profile/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.asta_bochum.campus_app">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

android/build.gradle

@@ -1,12 +1,15 @@
 buildscript {
-    ext.kotlin_version = '1.9.0'
+    ext.kotlin_version = '1.9.20'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.2'
+        // START: FlutterFire Configuration
+        classpath 'com.google.gms:google-services:4.3.14'
+        // END: FlutterFire Configuration
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

android/gradle.properties

@@ -1,3 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
-android.enableJetifier=true
+android.enableJetifier=true