Merge branch 'master' into renovate/gradle-8.x

timoknapp · Aug 1, 2023 · 5f3b435 · 5f3b435
2 parents 0d54f2e + 6f6308d
commit 5f3b435
Show file tree

Hide file tree

Showing 26 changed files with 718 additions and 576 deletions.
diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml
@@ -51,7 +51,7 @@ jobs:
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.0.3'
+          flutter-version: '3.10.6'
           channel: "stable" # or: 'dev' or 'beta'
 
       - name: Prepare & Build

diff --git a/.github/workflows/release_trigger.yml b/.github/workflows/release_trigger.yml
@@ -57,7 +57,7 @@ jobs:
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.0.3'
+          flutter-version: '3.10.6'
           channel: "stable" # or: 'dev' or 'beta'
 
       - name: Prepare & Build

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,14 @@
-## 1.3.9 (2023-01-05)
+## 1.3.10 (2023-07-29)
+
+#### 🐞 Bug Fixes
+
+* **deps:** update dependency shimmer to v3 (#75) (2043f760)
+* **deps:** update dependency audioplayers to v3 (#71) (95841693)
+* **deps:** update dependency audioplayers to v2 (#68) (023b2025)
 
 #### 🚧 Chores
 
-* update GitHub Actions versions (#67) (83efa8d6)
-* update job outputs to new schema (#66) (6a70e43b)
+* **deps:** update dependency gradle to v7.6.2 (#77) (e61a0c9f)
+* **deps:** update dependency gradle to v7.6.1 (#73) (c0c761dd)
+* **deps:** update dependency gradle to v7.6 (#69) (d9de4401)
 
diff --git a/android/app/.project b/android/app/.project
@@ -20,4 +20,15 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1690353651704</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -32,7 +32,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -89,3 +89,13 @@ dependencies {
 //    implementation 'com.github.javiersantos:AppUpdater:2.7'
     implementation 'com.github.MurtadhaS:AppUpdater:2.9'
 }
+
+configurations.all {
+    resolutionStrategy {
+        eachDependency {
+            if ((requested.group == "org.jetbrains.kotlin") && (requested.name.startsWith("kotlin-stdlib"))) {
+                useVersion("1.8.0")
+            }
+        }
+    }
+}
diff --git a/android/build.gradle b/android/build.gradle
@@ -29,6 +29,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/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-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
diff --git a/app-update-changelog.json b/app-update-changelog.json
@@ -1,7 +1,7 @@
 {
-    "latestVersion": "v1.3.9",
-    "latestVersionCode": 164,
-    "url": "https://github.com/timoknapp/sound-on-fire/releases/download/v1.3.9%2B164/SoundOnFire-v1.3.9+164-release.apk",
+    "latestVersion": "v1.3.10",
+    "latestVersionCode": 180,
+    "url": "https://github.com/timoknapp/sound-on-fire/releases/download/v1.3.10%2B180/SoundOnFire-v1.3.10+180-release.apk",
     "releaseNotes": [
         "- feel free to update - its free :)"
     ]

diff --git a/lib/components/autocomplete_item.dart b/lib/components/autocomplete_item.dart
@@ -3,9 +3,9 @@ import 'package:sound_on_fire/util/constants.dart';
 
 class AutocompleteItem extends StatelessWidget {
   final String text;
-  final Function onClick;
+  final void Function() onClick;
 
-  const AutocompleteItem({Key key, this.text, this.onClick}) : super(key: key);
+  const AutocompleteItem({required Key key, required this.text, required this.onClick}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {

diff --git a/lib/components/bottom_bar.dart b/lib/components/bottom_bar.dart
@@ -5,22 +5,22 @@ import 'package:sound_on_fire/models/Track.dart';
 import 'package:sound_on_fire/util/constants.dart';
 
 class BottomBar extends StatelessWidget {
-  final Function playPause;
-  final Function backward;
-  final Function forward;
-  final Function stop;
+  final void Function() playPause;
+  final void Function() backward;
+  final void Function() forward;
+  final void Function() stop;
   final Track track;
   final AudioPlayer audioPlayer;
   final Duration currentAudioPosition;
 
   BottomBar({
-    this.playPause,
-    this.backward,
-    this.forward,
-    this.stop,
-    this.track,
-    this.audioPlayer,
-    this.currentAudioPosition,
+    required this.playPause,
+    required this.backward,
+    required this.forward,
+    required this.stop,
+    required this.track,
+    required this.audioPlayer,
+    required this.currentAudioPosition,
   });
 
   String printDuration() {
@@ -55,7 +55,7 @@ class BottomBar extends StatelessWidget {
                     child: SmallButton(
                       autoFocus: false,
                       icon: Icon(Icons.fast_rewind),
-                      onClick: track != null ? backward : null,
+                      onClick: track.isNull() ? () {} : backward,
                     ),
                   ),
                   Expanded(
@@ -64,14 +64,14 @@ class BottomBar extends StatelessWidget {
                       icon: Icon(audioPlayer.state != PlayerState.playing
                           ? Icons.play_arrow
                           : Icons.pause),
-                      onClick: track != null ? playPause : null,
+                      onClick: track.isNull() ? () {} : playPause,
                     ),
                   ),
                   Expanded(
                     child: SmallButton(
                       autoFocus: false,
                       icon: Icon(Icons.fast_forward),
-                      onClick: track != null ? forward : null,
+                      onClick: track.isNull() ? () {} : forward,
                     ),
                   ),
                   Expanded(
@@ -95,15 +95,15 @@ class BottomBar extends StatelessWidget {
                     flex: 2,
                     child: Container(
                       // padding: EdgeInsets.symmetric(horizontal: 5),
-                      child: Text(track != null && currentAudioPosition != null
+                      child: Text(track.isNull() == false && currentAudioPosition != Duration.zero
                           ? printDuration()
                           : ""),
                     ),
                   ),
                   Expanded(
                     flex: 12,
                     child: Container(
-                      child: track != null && currentAudioPosition != null
+                      child: track.isNull() == false && currentAudioPosition != Duration.zero
                           ? Slider(
                               value: currentAudioPosition.inSeconds.toDouble(),
                               min: 0.0,
@@ -125,7 +125,7 @@ class BottomBar extends StatelessWidget {
                             ),
                     ),
                   ),
-                  track != null
+                  track.isNull() == false
                       ? Expanded(
                           flex: 2,
                           child: Container(
@@ -146,10 +146,10 @@ class BottomBar extends StatelessWidget {
                 children: <Widget>[
                   Expanded(
                     flex: 3,
-                    child: track != null
+                    child: track.isNull() == false
                         ? Container(
                             child: track.artwork != null
-                                ? Image.network(track.artwork)
+                                ? Image.network(track.artwork!)
                                 : FlutterLogo(),
                           )
                         : Text(""),
@@ -160,7 +160,7 @@ class BottomBar extends StatelessWidget {
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: <Widget>[
                         Text(
-                          track != null ? track.title : "",
+                          track.isNull() == false ? track.title : "",
                           maxLines: 2,
                           overflow: TextOverflow.ellipsis,
                           style: const TextStyle(

diff --git a/lib/components/input_area.dart b/lib/components/input_area.dart
@@ -6,14 +6,14 @@ import 'package:sound_on_fire/util/constants.dart';
 
 class InputArea extends StatelessWidget {
   InputArea({
-    @required this.autocompleteItems,
-    @required this.onKeyboardAction,
-    @required this.isAlphabeticalKeyboard,
-    @required this.isLoading,
+    required this.autocompleteItems,
+    required this.onKeyboardAction,
+    required this.isAlphabeticalKeyboard,
+    required this.isLoading,
   });
 
   final List<AutocompleteItem> autocompleteItems;
-  final Function onKeyboardAction;
+  final Function(String) onKeyboardAction;
   final bool isAlphabeticalKeyboard;
   final bool isLoading;