Update the app to work with flutter 3.13.0

app/android/app/build_production

@@ -57,10 +57,10 @@ android {
 
 		signingConfigs {
         release {
-            // keyAlias localProperties.getProperty('keyAlias')
-            // keyPassword localProperties.getProperty('keyPassword')
-            // storeFile file(localProperties.getProperty('storeFile'))
-            // storePassword localProperties.getProperty('storePassword')
+            keyAlias localProperties.getProperty('keyAlias')
+            keyPassword localProperties.getProperty('keyPassword')
+            storeFile file(localProperties.getProperty('storeFile'))
+            storePassword localProperties.getProperty('storePassword')
         }
         debug {
 
@@ -91,4 +91,4 @@ dependencies {
 		implementation "com.github.shuftipro:ShuftiPro_SDK:0.6.0"
 		implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
 		implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
-}
+}

app/android/gradle.properties

@@ -1,6 +1,12 @@
 org.gradle.parallel=true
 org.gradle.daemon=true
 org.gradle.configureondemand=true
-org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=2048m -XX:+UseParallelGC -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+# org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=2048m -XX:+UseParallelGC -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 android.useAndroidX=true
-android.enableJetifier=true
+android.enableJetifier=true
+org.gradle.jvmargs=-Xmx1536M \
+--add-exports=java.base/sun.nio.ch=ALL-UNNAMED \
+--add-opens=java.base/java.lang=ALL-UNNAMED \
+--add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
+--add-opens=java.base/java.io=ALL-UNNAMED \
+--add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED

app/android/gradle/wrapper/gradle-wrapper.properties

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

app/build.sh

@@ -60,8 +60,8 @@ msgTelegramAndUploadToAppServer () {
 
     scp "build/app/outputs/apk/release/$current_time-TF-Connect-$1-$githash.apk" jimber@192.168.3.10:/opt/apps/threefold/$1/
 
-    curl --http1.1 -s -X POST "https://api.telegram.org/bot868129294:AAEd-UDDSru9zGeGklzWL6mPO33NovuXYqo/sendMessage" -d parse_mode=markdown -d chat_id=-1001186043363 -d parse_mode=markdown -d text="Type: *$1* %0AGit user: *$gituser* %0AGit branch: *$gitbranch* %0AGit hash: *$githash* %0ATime: *$logcurrent_time* %0AMessage: *$2* %0AURL: *https://apps.staging.jimber.io/threefold/$1/*"
-#    curl --http1.1 -s -X POST "https://api.telegram.org/bot868129294:AAEd-UDDSru9zGeGklzWL6mPO33NovuXYqo/sendDocument" -F chat_id=-1001186043363 -F document="@build/app/outputs/apk/release/$githash-TF-Connect-$1-$current_time.apk"
+    # curl --http1.1 -s -X POST "https://api.telegram.org/bot868129294:AAEd-UDDSru9zGeGklzWL6mPO33NovuXYqo/sendMessage" -d parse_mode=markdown -d chat_id=-1001186043363 -d parse_mode=markdown -d text="Type: *$1* %0AGit user: *$gituser* %0AGit branch: *$gitbranch* %0AGit hash: *$githash* %0ATime: *$logcurrent_time* %0AMessage: *$2* %0AURL: *https://apps.staging.jimber.io/threefold/$1/*"
+    # curl --http1.1 -s -X POST "https://api.telegram.org/bot868129294:AAEd-UDDSru9zGeGklzWL6mPO33NovuXYqo/sendDocument" -F chat_id=-1001186043363 -F document="@build/app/outputs/apk/release/$githash-TF-Connect-$1-$current_time.apk"
 
     paplay /usr/share/sounds/gnome/default/alerts/glass.ogg
 }

app/lib/helpers/flags.dart

@@ -68,9 +68,11 @@ class Flags {
     String? doubleName = await getDoubleName();
     if (doubleName != null) {
       Identity user = Identity(identifier: doubleName);
-      return (await client.hasFeatureFlag(name, user: user));
+      return (await client.hasFeatureFlag(name, user: user) &&
+          await client.isFeatureFlagEnabled(name, user: user));
     }
-    return (await client.hasFeatureFlag(name));
+    return (await client.hasFeatureFlag(name) &&
+        await client.isFeatureFlagEnabled(name));
   }
 
   Future<String?> getFlagValueByFeatureName(String name) async {

app/lib/screens/sign_screen.dart

@@ -390,7 +390,6 @@ class _SignScreenState extends State<SignScreen> with BlockAndRunMixin {
 
   Widget jsonDataView() {
     return RawScrollbar(
-      isAlwaysShown: true,
       thumbColor: Theme.of(context).primaryColor,
       thickness: 3,
       child: Container(

app/lib/widgets/preference_dialog.dart

@@ -140,7 +140,6 @@ class _PreferenceDialogState extends State<PreferenceDialog> {
       ),
       child: widget.scope != null
           ? RawScrollbar(
-              isAlwaysShown: true,
               thumbColor: Theme.of(context).primaryColor,
               thickness: 3,
               child: ListView.builder(

app/pubspec.yaml

@@ -3,7 +3,7 @@ description: A decentralized login application
 
 publish_to: "none"
 
-version: 3.7.3+172
+version: 3.8.0+173
 
 environment:
   sdk: ">=2.12.0<3.0.0"