From cc6d113b49bdd5f3dd7831613db84e9d5103c845 Mon Sep 17 00:00:00 2001 From: Frederik Feichtmeier Date: Fri, 27 Dec 2024 14:44:46 +0100 Subject: [PATCH] chore: change app ID for android release due to identify theft (#1104) --- .gitignore | 2 ++ android/app/build.gradle | 4 +-- .../org/feichtmeier/musicpod/MainActivity.kt | 2 +- lib/app/view/mobile_navigation_bar.dart | 3 +- lib/common/view/theme.dart | 2 +- lib/constants.dart | 4 +-- macos/Runner/AppDelegate.swift | 4 +++ pubspec.lock | 34 +++++++++---------- 8 files changed, 31 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 7024a0071..d783cde25 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related diff --git a/android/app/build.gradle b/android/app/build.gradle index a0f638e41..7f492c81e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -13,7 +13,7 @@ if (keystorePropertiesFile.exists()) { android { - namespace = "org.feichtmeier.musicpod" + namespace = "org.feichtmeier.apps.musicpod" compileSdk = flutter.compileSdkVersion ndkVersion "27.0.12077973" @@ -27,7 +27,7 @@ android { } defaultConfig { - applicationId = "org.feichtmeier.musicpod" + applicationId = "org.feichtmeier.apps.musicpod" minSdk = 23 targetSdk = flutter.targetSdkVersion versionCode = flutter.versionCode diff --git a/android/app/src/main/kotlin/org/feichtmeier/musicpod/MainActivity.kt b/android/app/src/main/kotlin/org/feichtmeier/musicpod/MainActivity.kt index a4341229a..31f0d473c 100644 --- a/android/app/src/main/kotlin/org/feichtmeier/musicpod/MainActivity.kt +++ b/android/app/src/main/kotlin/org/feichtmeier/musicpod/MainActivity.kt @@ -1,4 +1,4 @@ -package org.feichtmeier.musicpod +package org.feichtmeier.apps.musicpod import io.flutter.embedding.android.FlutterActivity diff --git a/lib/app/view/mobile_navigation_bar.dart b/lib/app/view/mobile_navigation_bar.dart index 1d6c28ee6..758201674 100644 --- a/lib/app/view/mobile_navigation_bar.dart +++ b/lib/app/view/mobile_navigation_bar.dart @@ -20,7 +20,8 @@ class MobileNavigationBar extends StatelessWidget with WatchItMixin { return SizedBox( height: navigationBarHeight, child: Padding( - padding: const EdgeInsets.only(top: kMediumSpace), + padding: + const EdgeInsets.only(bottom: kLargestSpace, top: kSmallestSpace), child: Row( mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [ diff --git a/lib/common/view/theme.dart b/lib/common/view/theme.dart index 51209c40c..0f27294e1 100644 --- a/lib/common/view/theme.dart +++ b/lib/common/view/theme.dart @@ -284,7 +284,7 @@ double get audioCardDimension => double get bottomPlayerDefaultHeight => isMobilePlatform ? 76.0 : 90.0; -double get navigationBarHeight => bottomPlayerDefaultHeight - 25; +double get navigationBarHeight => bottomPlayerDefaultHeight; double? get bottomPlayerPageGap => isMobilePlatform ? bottomPlayerDefaultHeight + navigationBarHeight + kLargestSpace diff --git a/lib/constants.dart b/lib/constants.dart index 3ffbe7379..ca2b2ca9f 100644 --- a/lib/constants.dart +++ b/lib/constants.dart @@ -2,10 +2,10 @@ const kAppName = 'musicpod'; const kAppTitle = 'MusicPod'; const kAppId = 'org.feichtmeier.Musicpod'; -const kAndroidAppId = 'org.feichtmeier.musicpod'; +const kAndroidAppId = 'org.feichtmeier.apps.musicpod'; const kDiscordApplicationId = '1235321910221602837'; const kLinuxDBusName = 'org.mpris.MediaPlayer2.musicpod'; -const kAndroidChannelId = 'org.feichtmeier.musicpod.channel.audio'; +const kAndroidChannelId = 'org.feichtmeier.apps.musicpod.channel.audio'; const kRepoUrl = 'http://github.com/ubuntu-flutter-community/musicpod'; const kSponsorLink = 'https://github.com/sponsors/Feichtmeier'; const kGitHubShortLink = 'ubuntu-flutter-community/musicpod'; diff --git a/macos/Runner/AppDelegate.swift b/macos/Runner/AppDelegate.swift index 8e02df288..b3c176141 100644 --- a/macos/Runner/AppDelegate.swift +++ b/macos/Runner/AppDelegate.swift @@ -6,4 +6,8 @@ class AppDelegate: FlutterAppDelegate { override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { return true } + + override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool { + return true + } } diff --git a/pubspec.lock b/pubspec.lock index 90703321d..7bafd7eac 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -363,10 +363,10 @@ packages: dependency: transitive description: name: dart_style - sha256: "64b717484993e85315d0c04081b6fca9ef8bac8c2cb794b2e15810250b335913" + sha256: "27eb0ae77836989a3bc541ce55595e8ceee0992807f14511552a898ddd0d88ac" url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.1" dbus: dependency: transitive description: @@ -451,10 +451,10 @@ packages: dependency: "direct main" description: name: file_picker - sha256: c2376a6aae82358a9f9ccdd7d1f4006d08faa39a2767cce01031d9f593a8bd3b + sha256: c904b4ab56d53385563c7c39d8e9fa9af086f91495dfc48717ad84a42c3cf204 url: "https://pub.dev" source: hosted - version: "8.1.6" + version: "8.1.7" file_selector: dependency: "direct main" description: @@ -823,10 +823,10 @@ packages: dependency: transitive description: name: lints - sha256: "4a16b3f03741e1252fda5de3ce712666d010ba2122f8e912c94f9f7b90e1a4c3" + sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 url: "https://pub.dev" source: hosted - version: "5.1.0" + version: "5.1.1" list_counter: dependency: transitive description: @@ -912,7 +912,7 @@ packages: description: path: media_kit ref: HEAD - resolved-ref: "652c49e02701bb6bb80953a6fdf650a5c8f002f9" + resolved-ref: "0b7b7e4d88a0bc574550a929835e0400c7c2d135" url: "https://github.com/media-kit/media-kit" source: git version: "1.1.11" @@ -953,7 +953,7 @@ packages: description: path: "libs/universal/media_kit_libs_video" ref: HEAD - resolved-ref: "652c49e02701bb6bb80953a6fdf650a5c8f002f9" + resolved-ref: "0b7b7e4d88a0bc574550a929835e0400c7c2d135" url: "https://github.com/media-kit/media-kit" source: git version: "1.0.5" @@ -970,7 +970,7 @@ packages: description: path: media_kit_video ref: HEAD - resolved-ref: "652c49e02701bb6bb80953a6fdf650a5c8f002f9" + resolved-ref: "0b7b7e4d88a0bc574550a929835e0400c7c2d135" url: "https://github.com/media-kit/media-kit" source: git version: "1.2.5" @@ -1251,10 +1251,10 @@ packages: dependency: transitive description: name: pubspec_parse - sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8 + sha256: "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" radio_browser_api: dependency: "direct main" description: @@ -1760,18 +1760,18 @@ packages: dependency: transitive description: name: wakelock_plus - sha256: bf4ee6f17a2fa373ed3753ad0e602b7603f8c75af006d5b9bdade263928c0484 + sha256: "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e" url: "https://pub.dev" source: hosted - version: "1.2.8" + version: "1.2.10" wakelock_plus_platform_interface: dependency: transitive description: name: wakelock_plus_platform_interface - sha256: "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16" + sha256: "70e780bc99796e1db82fe764b1e7dcb89a86f1e5b3afb1db354de50f2e41eb7a" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" watch_it: dependency: "direct main" description: @@ -1856,10 +1856,10 @@ packages: dependency: transitive description: name: yaml - sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.1.3" yaru: dependency: "direct main" description: