Merge pull request #1473 from instructure/release/teacher-1.16.0-45

Release Teacher 1.16.0 (45)
instructure · Feb 4, 2022 · c22b161 · c22b161
2 parents df31076 + eee765e
commit c22b161
Show file tree

Hide file tree

Showing 475 changed files with 46,349 additions and 20,321 deletions.
diff --git a/apps/flutter_parent/android/app/build.gradle b/apps/flutter_parent/android/app/build.gradle
@@ -86,7 +86,7 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${Versions.KOTLIN}"
 
     testImplementation 'junit:junit:4.12'
 

diff --git a/apps/flutter_parent/android/app/src/main/AndroidManifest.xml b/apps/flutter_parent/android/app/src/main/AndroidManifest.xml
@@ -20,7 +20,6 @@
         android:allowBackup="false"
         android:fullBackupContent="false"
         android:requestLegacyExternalStorage="true">
-        android:usesCleartextTraffic="true"
 
         <meta-data
             android:name="flutterEmbedding"

diff --git a/...utter_parent/android/app/src/main/kotlin/com/instructure/parentapp/plugins/UrlLauncher.kt b/...utter_parent/android/app/src/main/kotlin/com/instructure/parentapp/plugins/UrlLauncher.kt
@@ -84,7 +84,7 @@ object UrlLauncher {
 
     private fun makeIntent(url: String, excludeInstructure: Boolean): Intent {
         var intent: Intent = Intent(Intent.ACTION_VIEW).setData(Uri.parse(url));
-        if (excludeInstructure && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+        if (excludeInstructure) {
             intent = Intent.createChooser(intent, null).apply {
                 putExtra(Intent.EXTRA_EXCLUDE_COMPONENTS, excludeComponents)
             }

diff --git a/apps/flutter_parent/android/build.gradle b/apps/flutter_parent/android/build.gradle
@@ -1,5 +1,4 @@
 buildscript {
-    ext.kotlin_version = '1.2.71'
     repositories {
         google()
         mavenCentral()
@@ -26,15 +25,6 @@ subprojects {
 }
 subprojects {
     project.evaluationDependsOn(':app')
-    //TODO revisit this when the firebase_remote_config is finally updated (https://github.com/FirebaseExtended/flutterfire/issues/3847)
-    project.configurations.all {
-        resolutionStrategy.eachDependency { details ->
-            if (details.requested.group == 'com.google.protobuf'
-                    && details.requested.name.contains('protobuf-javalite') ) {
-                details.useTarget group: details.requested.group, name: 'protobuf-lite', version:'3.0.1'
-            }
-        }
-    }
 }
 
 task clean(type: Delete) {

diff --git a/apps/flutter_parent/lib/l10n/app_localizations.dart b/apps/flutter_parent/lib/l10n/app_localizations.dart
@@ -1651,4 +1651,13 @@ class AppLocalizations {
 
   String get qrCodeNoCameraError =>
       Intl.message('QR scanning requires camera access', desc: 'placeholder for camera error for QR code scan');
+
+  String get lockedForUserError =>
+      Intl.message('The linked item is no longer available', desc: 'error message when the alert could no be opened');
+
+  String get lockedForUserTitle =>
+      Intl.message('Locked', desc: 'title for locked alerts');
+
+  String get messageSent =>
+      Intl.message('Message sent', desc: 'confirmation message on the screen when the user succesfully sends a message');
 }
diff --git a/apps/flutter_parent/lib/l10n/res/intl_ca.arb b/apps/flutter_parent/lib/l10n/res/intl_ca.arb