Merge branch 'dev'

Author: github-actions[bot]

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "pub" # See documentation for possible values
+    directory: "/taletime" # Location of package manifests
+    schedule:
+      interval: "weekly"

.github/workflows/build.yaml

@@ -21,31 +21,51 @@ jobs:
     steps:
       - name: ⬇️ Checkout repository
         uses: actions/checkout@v3
+      - name: 📦 Setup Java
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: '17'
       - name: ⚙️ Setup Flutter
         uses: subosito/flutter-action@v2
         with:
             channel: 'stable'
             cache: true
+            cache-key: 'flutter-linux'
+      - name: 💵 Cache flutter build
+        id: cache-primes
+        uses: actions/cache@v3
+        with:
+           path: |
+            ./taletime/build
+             /opt/hostedtoolcache/flutter
+           key: ${{ runner.os }}-flutter-build
       - name: 📦 Get dependencies
         run: flutter pub get
         working-directory: ./taletime
-      - name: 🔑 Setup signing key
-        run: |
-          echo "${{ secrets.SIGNING_KEY_KEYSTORE }}" | base64 -d > taletime/android/app/keystore.jks
       - name: 🧪 Run tests
         run: flutter test
         working-directory: ./taletime
       - name: 📱 Build Android
         id: build_apk
-        env:
-          SIGNING_KEY_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_KEY_PASSWORD }}
-          SIGNING_KEY_STORE_PASSWORD: ${{ secrets.SIGNING_KEY_STORE_PASSWORD }}
         run: |
+          rm -f build/app/outputs/flutter-apk/*.apk
           VERSION=$(grep -oP '^version:\s+\K.+$' pubspec.yaml)
           flutter build apk --flavor staging --build-name $VERSION+$GITHUB_RUN_NUMBER
           echo "versionName=$VERSION+$GITHUB_RUN_NUMBER" >> $GITHUB_OUTPUT
-          cp build/app/outputs/flutter-apk/app-staging-release.apk build/app/outputs/flutter-apk/TaleTime-$VERSION+$GITHUB_RUN_NUMBER.apk
         working-directory: ./taletime
+      - name: 🔑 Sign app
+        uses: ilharp/sign-android-release@v1
+        id: sign_app
+        with:
+          releaseDir: taletime/build/app/outputs/flutter-apk
+          signingKey: ${{ secrets.SIGNING_KEY_KEYSTORE }}
+          keyAlias: "TaleTime-Key"
+          keyStorePassword: ${{ secrets.SIGNING_KEY_STORE_PASSWORD }}
+          keyPassword: ${{ secrets.SIGNING_KEY_KEY_PASSWORD }}
+          buildToolsVersion: 33.0.0
+      - name: 🏷 Rename APK file
+        run: cp ${{ steps.sign_app.outputs.signedFile }} taletime/build/app/outputs/flutter-apk/TaleTime-${{ steps.build_apk.outputs.versionName }}.apk
       - name: 📦 Upload artifact
         uses: actions/upload-artifact@v2
         with:

.vscode/launch.json

@@ -8,7 +8,8 @@
             "name": "taletime",
             "cwd": "taletime",
             "request": "launch",
-            "type": "dart"
+            "type": "dart",
+            "args": ["--flavor", "dev", ]
         },
         {
             "name": "taletime (profile mode)",

taletime/.gitignore

@@ -77,7 +77,6 @@ fastlane/readme.md
 .pub/
 build/
 # If you're building an application, you may want to check-in your pubspec.lock
-pubspec.lock
 
 # Directory created by dartdoc
 # If you don't generate documentation locally you can remove this line.
@@ -242,4 +241,7 @@ GoogleService-Info.plist
 google-services.json
 # Plugins (already resolved through pubspec.yaml)
 .flutter-plugins
-.flutter-plugins-dependencies
+.flutter-plugins-dependencies
+
+# Untranslated messages land in here
+untranslated.txt

taletime/android/app/build.gradle

@@ -7,6 +7,12 @@
 
 //apply plugin: 'com.google.gms.google-services'
 
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -15,11 +21,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new FileNotFoundException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -33,9 +34,6 @@ if (flutterVersionName == null) {
 
 
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
     compileSdkVersion 33
@@ -70,15 +68,6 @@ android {
         }
     }
 
-    signingConfigs {
-        release {
-            storeFile file("./keystore.jks")
-            storePassword System.getenv("SIGNING_KEY_STORE_PASSWORD")
-            keyAlias "TaleTime-Key"
-            keyPassword System.getenv("SIGNING_KEY_KEY_PASSWORD")
-        }
-    }
-
     flavorDimensions "environment"
 
     productFlavors {
@@ -94,13 +83,13 @@ android {
             dimension "environment"
             applicationIdSuffix ".stageing"
             resValue "string", "app_name", "[Staging] TaleTime"
-            signingConfig signingConfigs.release
+            signingConfig signingConfigs.debug
         }
 
         prod {
             dimension "environment"
             resValue "string", "app_name", "TaleTime"
-            signingConfig signingConfigs.release
+            signingConfig signingConfigs.debug
         }
     }
 
@@ -112,7 +101,6 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     //implementation platform('com.google.firebase:firebase-bom:30.1.0')
     implementation 'com.google.firebase:firebase-analytics'
     implementation 'com.android.support:multidex:1.0.3'

taletime/android/app/src/main/AndroidManifest.xml

@@ -1,13 +1,17 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.htwsaar.taletime">
+    package="de.htwsaar.taletime" xmlns:tools="http://schemas.android.com/tools">
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-   <application
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+
+
+    <application
         android:label="@string/app_name"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity
-            android:name=".MainActivity"
+            android:name="com.ryanheise.audioservice.AudioServiceActivity"
             android:enableOnBackInvokedCallback="true"
             android:exported="true"
             android:launchMode="singleTop"
@@ -33,5 +37,20 @@
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
+
+        <service android:name="com.ryanheise.audioservice.AudioService"
+            android:foregroundServiceType="mediaPlayback"
+            android:exported="true" tools:ignore="Instantiatable">
+            <intent-filter>
+                <action android:name="android.media.browse.MediaBrowserService" />
+            </intent-filter>
+        </service>
+
+        <receiver android:name="com.ryanheise.audioservice.MediaButtonReceiver"
+            android:exported="true" tools:ignore="Instantiatable">
+            <intent-filter>
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
+            </intent-filter>
+        </receiver>
     </application>
 </manifest>

taletime/android/build.gradle

@@ -1,16 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.7.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()

taletime/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-7.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip

taletime/android/settings.gradle

@@ -1,11 +1,26 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }
+    settings.ext.flutterSdkPath = flutterSdkPath()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "7.3.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.9.22" apply false
+}
+
+include ":app"