From f4f8164cce4943aaa0b18070d57b065bf632e96d Mon Sep 17 00:00:00 2001 From: Pablo Galve Date: Sun, 7 Nov 2021 15:23:23 +0100 Subject: [PATCH 1/5] [Survey] Display again the mock beta-testing survey --- Space_Mapper/lib/ui/web_view.dart | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/Space_Mapper/lib/ui/web_view.dart b/Space_Mapper/lib/ui/web_view.dart index 0667d40f..af41efad 100644 --- a/Space_Mapper/lib/ui/web_view.dart +++ b/Space_Mapper/lib/ui/web_view.dart @@ -3,6 +3,20 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:webview_flutter/webview_flutter.dart'; +const kAndroidUserAgent = + 'Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.94 Mobile Safari/537.36'; +const String selectedUrl = 'https://ee.kobotoolbox.org/single/asCwpCjZ'; +const String userUUID_element = '/asRrkkAw4mUtpTDkjdzZzt/group_survey/userUUID'; +const String userUUID_label = userUUID_element + ':label'; + +final Set jsChannels = [ + JavascriptChannel( + name: 'Print', + onMessageReceived: (JavascriptMessage message) { + print(message.message); + }), +].toSet(); + class MyWebView extends StatefulWidget { @override _MyWebViewState createState() => _MyWebViewState(); @@ -32,9 +46,7 @@ class _MyWebViewState extends State { // to allow calling Scaffold.of(context) so we can show a snackbar. body: Builder(builder: (BuildContext context) { return WebView( - //initialUrl: 'https://ee.kobotoolbox.org/single/asCwpCjZ', //Original form for beta-testing - initialUrl: - 'https://ee.kobotoolbox.org/x/8528dfMs', //Form to upload a json file + initialUrl: selectedUrl, javascriptMode: JavascriptMode.unrestricted, onWebViewCreated: (WebViewController webViewController) { _controller.complete(webViewController); From a969c2eff4910aa249cd41a9eb88ec27fb054def Mon Sep 17 00:00:00 2001 From: Pablo Galve Date: Mon, 8 Nov 2021 17:56:35 +0100 Subject: [PATCH 2/5] Configure gitignore + build.gradle for codemagic --- .gitignore | 7 ++----- Space_Mapper/android/.gitignore | 2 -- Space_Mapper/android/build.gradle | 2 +- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index cb437481..c7931647 100644 --- a/.gitignore +++ b/.gitignore @@ -57,11 +57,8 @@ unlinked.ds unlinked_spec.ds # Android related -**/android/**/gradle-wrapper.jar -.gradle/ **/android/captures/ -**/android/gradlew -**/android/gradlew.bat +!gradle-wrapper.jar **/android/local.properties **/android/**/GeneratedPluginRegistrant.java **/android/key.properties @@ -112,4 +109,4 @@ app.*.symbols !**/ios/**/default.pbxuser !**/ios/**/default.perspectivev3 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages -!/dev/ci/**/Gemfile.lock +!/dev/ci/**/Gemfile.lock \ No newline at end of file diff --git a/Space_Mapper/android/.gitignore b/Space_Mapper/android/.gitignore index bc2100d8..d5574093 100644 --- a/Space_Mapper/android/.gitignore +++ b/Space_Mapper/android/.gitignore @@ -1,7 +1,5 @@ gradle-wrapper.jar /.gradle /captures/ -/gradlew -/gradlew.bat /local.properties GeneratedPluginRegistrant.java diff --git a/Space_Mapper/android/build.gradle b/Space_Mapper/android/build.gradle index ebc6651c..7e10e3de 100644 --- a/Space_Mapper/android/build.gradle +++ b/Space_Mapper/android/build.gradle @@ -12,7 +12,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.6.3' + classpath 'com.android.tools.build:gradle:4.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/Space_Mapper/android/gradle/wrapper/gradle-wrapper.properties b/Space_Mapper/android/gradle/wrapper/gradle-wrapper.properties index bc24dcf0..939efa29 100644 --- a/Space_Mapper/android/gradle/wrapper/gradle-wrapper.properties +++ b/Space_Mapper/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-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip From 1fce2f274431bc1187b9e8fcb5b268942504e196 Mon Sep 17 00:00:00 2001 From: Pablo Galve Date: Thu, 11 Nov 2021 14:32:14 +0100 Subject: [PATCH 3/5] Revert "Configure gitignore + build.gradle for codemagic" This reverts commit a969c2eff4910aa249cd41a9eb88ec27fb054def. --- .gitignore | 7 +++++-- Space_Mapper/android/.gitignore | 2 ++ Space_Mapper/android/build.gradle | 2 +- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c7931647..cb437481 100644 --- a/.gitignore +++ b/.gitignore @@ -57,8 +57,11 @@ unlinked.ds unlinked_spec.ds # Android related +**/android/**/gradle-wrapper.jar +.gradle/ **/android/captures/ -!gradle-wrapper.jar +**/android/gradlew +**/android/gradlew.bat **/android/local.properties **/android/**/GeneratedPluginRegistrant.java **/android/key.properties @@ -109,4 +112,4 @@ app.*.symbols !**/ios/**/default.pbxuser !**/ios/**/default.perspectivev3 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages -!/dev/ci/**/Gemfile.lock \ No newline at end of file +!/dev/ci/**/Gemfile.lock diff --git a/Space_Mapper/android/.gitignore b/Space_Mapper/android/.gitignore index d5574093..bc2100d8 100644 --- a/Space_Mapper/android/.gitignore +++ b/Space_Mapper/android/.gitignore @@ -1,5 +1,7 @@ gradle-wrapper.jar /.gradle /captures/ +/gradlew +/gradlew.bat /local.properties GeneratedPluginRegistrant.java diff --git a/Space_Mapper/android/build.gradle b/Space_Mapper/android/build.gradle index 7e10e3de..ebc6651c 100644 --- a/Space_Mapper/android/build.gradle +++ b/Space_Mapper/android/build.gradle @@ -12,7 +12,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.2.0' + classpath 'com.android.tools.build:gradle:3.6.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/Space_Mapper/android/gradle/wrapper/gradle-wrapper.properties b/Space_Mapper/android/gradle/wrapper/gradle-wrapper.properties index 939efa29..bc24dcf0 100644 --- a/Space_Mapper/android/gradle/wrapper/gradle-wrapper.properties +++ b/Space_Mapper/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-5.6.4-all.zip From f71e55fa75b234999f90f962d54d93fe1e9b7810 Mon Sep 17 00:00:00 2001 From: Pablo Galve Date: Thu, 11 Nov 2021 14:35:13 +0100 Subject: [PATCH 4/5] Gradle upgrade --- Space_Mapper/android/build.gradle | 2 +- Space_Mapper/android/gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Space_Mapper/android/build.gradle b/Space_Mapper/android/build.gradle index ebc6651c..7e10e3de 100644 --- a/Space_Mapper/android/build.gradle +++ b/Space_Mapper/android/build.gradle @@ -12,7 +12,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.6.3' + classpath 'com.android.tools.build:gradle:4.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/Space_Mapper/android/gradle/wrapper/gradle-wrapper.properties b/Space_Mapper/android/gradle/wrapper/gradle-wrapper.properties index bc24dcf0..939efa29 100644 --- a/Space_Mapper/android/gradle/wrapper/gradle-wrapper.properties +++ b/Space_Mapper/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-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip From a5c24fefcefd87afcd7b7b9e0c67a56130174691 Mon Sep 17 00:00:00 2001 From: Pablo Galve Date: Thu, 11 Nov 2021 14:51:52 +0100 Subject: [PATCH 5/5] Add CD-deploy-github-releases workflow --- .../workflows/CD-deploy-github-releases.yml | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 .github/workflows/CD-deploy-github-releases.yml diff --git a/.github/workflows/CD-deploy-github-releases.yml b/.github/workflows/CD-deploy-github-releases.yml new file mode 100644 index 00000000..4c2478e8 --- /dev/null +++ b/.github/workflows/CD-deploy-github-releases.yml @@ -0,0 +1,48 @@ +name: Deploy App (Android) Release to Github Releases + +on: + push: + tags: + - '*' + +jobs: + + build: + if: github.event.base_ref == 'refs/heads/master' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - uses: actions/setup-java@v1 + with: + java-version: '12.x' + - uses: subosito/flutter-action@v1 + with: + channel: 'stable' + + - name: Get flutter dependencies + run: flutter pub get + working-directory: Space_Mapper + + - name: Statically analyze the Dart code for any errors. + run: flutter analyze + working-directory: Space_Mapper + + - name: Run widget tests for our flutter project. + run: flutter test + working-directory: Space_Mapper + + - name: Build apk + run: flutter build apk --debug + working-directory: Space_Mapper + + - name: Build appbundle + run: flutter build appbundle --debug + working-directory: Space_Mapper + + - name: Create a Release in GitHub + uses: ncipollo/release-action@v1 + with: + artifacts: "././Space_Mapper/build/app/outputs/flutter-apk/app-debug.apk,././Space_Mapper/build/app/outputs/bundle/debug/app-debug.aab" + token: ${{ secrets.GH_TOKEN }} + tag: ${{ steps.version.outputs.content }} + commit: ${{ github.sha }} \ No newline at end of file