Merge pull request #56 from Caeli-technologies/dev

From Dev

.dccache

@@ -0,0 +1 @@
+{"/Users/talrub/rotary/rotary_nl_rye/web/index.html":[3705,1650963650963.4424,"b2ac83858bbd4bdc9cbc6a82ca7a3bf5a41709124ce9db3aade8a2b312a6b89a"],"/Users/talrub/rotary/rotary_nl_rye/ios/Runner/AppDelegate.swift":[583,1654453496707.3093,"b7521c2d70dfa951933a293260aa8f67e2452e940c6903efce9a48fc1c2ca07e"],"/Users/talrub/rotary/rotary_nl_rye/ios/Runner/Runner-Bridging-Header.h":[38,1650963650933.3184,"1a8d11d01d1cc92c650c9c9ed35299240052d4683a15a719a2315ef44185e074"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/debug/AndroidManifest.xml":[333,1650963650854.6165,"e2f194e9999af270c007e8708182d5038607e0bfaf661cf01335dced5d47eab7"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/AndroidManifest.xml":[4773,1664639716249.3142,"12f48db6170735afea7ba3621d60a3fe70e6da8b660c097207b94131c1255257"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/profile/AndroidManifest.xml":[333,1650963650864.5076,"e2f194e9999af270c007e8708182d5038607e0bfaf661cf01335dced5d47eab7"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/res/drawable/launch_background.xml":[319,1664699212763.1885,"8065ccfb0fb675646763888aa3ecc9e701223774cbb4263cedc0214a061169a0"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/res/drawable-anydpi/home.xml":[361,1650963650855.9844,"059f6c29f0f6894e69d941576fb3f35eaf6afb20507186da2233fdfe446f9052"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/res/drawable-night/launch_background.xml":[319,1664699212763.959,"8065ccfb0fb675646763888aa3ecc9e701223774cbb4263cedc0214a061169a0"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/res/drawable-night-v21/launch_background.xml":[319,1664699212765.2368,"8065ccfb0fb675646763888aa3ecc9e701223774cbb4263cedc0214a061169a0"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/res/drawable-v21/launch_background.xml":[319,1664699212764.6663,"8065ccfb0fb675646763888aa3ecc9e701223774cbb4263cedc0214a061169a0"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/res/values/styles.xml":[1238,1664699212770.794,"3cc1fadaa4995c174272af75c8d699dfacddf582b46e680ad6abfb59e5a086b9"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/res/values-night/styles.xml":[1190,1664699212771.8809,"0bbcf838e3af2bc6b1ef8d7a971f835520429c0e9007eb013c293c0074cb3067"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/res/values-v31/styles.xml":[985,1664699212768.9136,"0900ae2ca7e7e09125541ec9d65285ecc8a44c0145bc9e20570f4b4ca9afa9d4"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/kotlin/com/example/rotary_nl_rye/Application.kt":[552,1652982898958.404,"c7c4bc8a16184651c5be2aae6bf8252c9d152c382bee0dcccc82d8de97aab6c5"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/kotlin/com/example/rotary_nl_rye/MainActivity.kt":[130,1650963650855.6948,"5473d58de65ecdfef006ccda1ef37c401e918190515dab3fff1e178cb7c9c209"]}

.gitignore

@@ -51,4 +51,5 @@ app.*.map.json
 
 
 # api keys
-assets/keys/deepl.json
+assets/keys/deepl.json
+.dccache

android/app/build.gradle

@@ -36,7 +36,7 @@ apply plugin: 'com.google.firebase.crashlytics'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

android/app/src/main/AndroidManifest.xml

@@ -1,88 +1,109 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.rotary_nl_rye">
-
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission
+        android:name="android.permission.INTERNET"/>
     <queries>
-  <!-- If your app opens https URLs -->
-  <intent>
-    <action android:name="android.intent.action.VIEW" />
-    <data android:scheme="https" />
-  </intent>
-  <!-- If your app makes calls -->
-  <intent>
-    <action android:name="android.intent.action.DIAL" />
-    <data android:scheme="tel" />
-  </intent>
-  <!-- If your app emails -->
-  <intent>
-    <action android:name="android.intent.action.SEND" />
-    <data android:mimeType="*/*" />
-  </intent>
-</queries>
-   <application
+        <!-- If your app opens https URLs -->
+        <intent>
+            <action
+                android:name="android.intent.action.VIEW"/>
+            <data
+                android:scheme="https"/>
+        </intent>
+        <!-- If your app makes calls -->
+        <intent>
+            <action
+                android:name="android.intent.action.DIAL"/>
+            <data
+                android:scheme="tel"/>
+        </intent>
+        <!-- If your app emails -->
+        <intent>
+            <action
+                android:name="android.intent.action.SEND"/>
+            <data
+                android:mimeType="*/*"/>
+        </intent>
+        <!-- If your app checks for SMS support -->
+        <intent>
+            <action
+                android:name="android.intent.action.VIEW"/>
+            <data
+                android:scheme="sms"/>
+        </intent>
+        <!-- If your app checks for call support -->
+        <intent>
+            <action
+                android:name="android.intent.action.VIEW"/>
+            <data
+                android:scheme="tel"/>
+        </intent>
+    </queries>
+    <application
         android:label="Rotary Youth Exchange NL"
         android:name=".Application"
-        android:icon="@mipmap/ic_launcher">                 
-<!-- Add custom icon to the notifications -->
-<meta-data
-android:name="com.google.firebase.messaging.default_notification_icon"
-android:resource="@drawable/ic_stat_rotary_logo_icon" />
-<!-- Change the color of the icon -->
-<meta-data
-android:name="com.google.firebase.messaging.default_notification_color"
-android:resource="@color/colorPrimary" />
+        android:icon="@mipmap/ic_launcher">
+        <!-- Add custom icon to the notifications -->
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/ic_stat_rotary_logo_icon"/>
+        <!-- Change the color of the icon -->
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_color"
+            android:resource="@color/colorPrimary"/>
         <activity
             android:name=".MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
-            android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
                  to determine the Window background behind the Flutter UI. -->
             <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
+                android:name="io.flutter.embedding.android.NormalTheme"
+                android:resource="@style/NormalTheme"/>
             <!-- Displays an Android View that continues showing the launch screen
                  Drawable until Flutter paints its first frame, then this splash
                  screen fades out. A splash screen is useful to avoid any visual
                  gap between the end of Android's launch screen and the painting of
                  Flutter's first frame. -->
-
             <meta-data
-              android:name="io.flutter.embedding.android.SplashScreenDrawable"
-              android:resource="@drawable/launch_background"
-              />
+                android:name="io.flutter.embedding.android.SplashScreenDrawable"
+                android:resource="@drawable/launch_background"/>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="FLUTTER_NOTIFICATION_CLICK" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action
+                    android:name="FLUTTER_NOTIFICATION_CLICK"/>
+                <category
+                    android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
+                <action
+                    android:name="android.intent.action.VIEW"/>
+                <category
+                    android:name="android.intent.category.DEFAULT"/>
+                <category
+                    android:name="android.intent.category.BROWSABLE"/>
                 <!-- Accepts URIs that begin with YOUR_SCHEME://YOUR_HOST -->
                 <data
                     android:scheme="https"
-                    android:host="rotarynl.page.link" />
+                    android:host="rotarynl.page.link"/>
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
         <meta-data
             android:name="flutterEmbedding"
-            android:value="2" />
-            <meta-data
-  android:name="com.google.firebase.messaging.default_notification_channel_id"
-  android:value="high_importance_channel" />
+            android:value="2"/>
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_channel_id"
+            android:value="high_importance_channel"/>
     </application>
-</manifest>
+</manifest>

android/app/src/main/res/drawable-night-v21/launch_background.xml

@@ -4,6 +4,6 @@
         <bitmap android:gravity="fill" android:src="@drawable/background"/>
     </item>
     <item>
-        <bitmap android:gravity="center_horizontal" android:src="@drawable/splash"/>
+        <bitmap android:gravity="center" android:src="@drawable/splash"/>
     </item>
-</layer-list>
+</layer-list>

android/app/src/main/res/drawable-night/launch_background.xml

@@ -4,6 +4,6 @@
         <bitmap android:gravity="fill" android:src="@drawable/background"/>
     </item>
     <item>
-        <bitmap android:gravity="center_horizontal" android:src="@drawable/splash"/>
+        <bitmap android:gravity="center" android:src="@drawable/splash"/>
     </item>
-</layer-list>
+</layer-list>

android/app/src/main/res/drawable-v21/launch_background.xml

@@ -4,6 +4,6 @@
         <bitmap android:gravity="fill" android:src="@drawable/background"/>
     </item>
     <item>
-        <bitmap android:gravity="center_horizontal" android:src="@drawable/splash"/>
+        <bitmap android:gravity="center" android:src="@drawable/splash"/>
     </item>
-</layer-list>
+</layer-list>

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

@@ -4,6 +4,6 @@
         <bitmap android:gravity="fill" android:src="@drawable/background"/>
     </item>
     <item>
-        <bitmap android:gravity="center_horizontal" android:src="@drawable/splash"/>
+        <bitmap android:gravity="center" android:src="@drawable/splash"/>
     </item>
-</layer-list>
+</layer-list>

android/app/src/main/res/values-night/styles.xml

@@ -5,7 +5,9 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              Flutter draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
@@ -16,4 +18,4 @@
     <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
-</resources>
+</resources>

android/app/src/main/res/values-v31/styles.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+         
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>

android/app/src/main/res/values/styles.xml

@@ -6,7 +6,9 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              Flutter draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
@@ -17,4 +19,4 @@
     <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
-</resources>
+</resources>

android/build.gradle

@@ -1,24 +1,24 @@
 buildscript {
-    ext.kotlin_version = '1.6.0'
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
         // jcenter()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.3.10'
+        classpath 'com.google.gms:google-services:4.3.13'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
     }
 }
 
 allprojects {
     repositories {
         google()
-        // jcenter()
         mavenCentral()
+        jcenter()
     }
     tasks.withType(JavaCompile) {
         options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"

assets/lang/de.json

@@ -1,6 +1,6 @@
 {
   "questionTitle": "Questions",
-  "settingsTitle": "Settings",
+  "settingsTitle": "Additional",
   "account": "Account",
   "social": "Social",
   "language": "Language",

assets/lang/en.json

@@ -1,6 +1,6 @@
 {
   "questionTitle": "Questions",
-  "settingsTitle": "Settings",
+  "settingsTitle": "Additional",
   "account": "Account",
   "social": "Social",
   "language": "Language",

assets/lang/nl.json

@@ -1,6 +1,6 @@
 {
   "questionTitle": "Vragen",
-  "settingsTitle": "Instellingen",
+  "settingsTitle": "Overig",
   "account": "Account",
   "social": "Social",
   "language": "Taal",