pato05
/
freezer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync changes

This commit is contained in:
Pato05 2024-01-17 20:41:28 +01:00
parent 77d6a5a51d
commit 8fd84c3929
No known key found for this signature in database
GPG Key ID: F53CA394104BA0CB
5 changed files with 65 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/build.gradle
View File

@ -60,7 +60,7 @@ android {
buildTypes { buildTypes {
release { release {
signingConfig signingConfigs.release signingConfig signingConfigs.release
shrinkResources false shrinkResources true
minifyEnabled true minifyEnabled true
} }
debug { debug {

116
android/app/src/main/AndroidManifest.xml
View File

@ -5,32 +5,32 @@
package="f.f.freezer" package="f.f.freezer"
> >
<!-- <!--
io.flutter.app.FlutterApplication is an android.app.Application that io.flutter.app.FlutterApplication is an android.app.Application that
calls FlutterMain.startInitialization(this); in its onCreate method. calls FlutterMain.startInitialization(this); in its onCreate method.
In most cases you can leave this as-is, but you if you want to provide In most cases you can leave this as-is, but you if you want to provide
additional functionality it is fine to subclass or reimplement additional functionality it is fine to subclass or reimplement
FlutterApplication and put your custom class here. FlutterApplication and put your custom class here.
--> -->
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" /> <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<uses-feature <uses-feature
android:name="android.software.LEANBACK" android:name="android.software.LEANBACK"
android:required="true" android:required="true"
/> />
<application <application
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="Freezer" android:label="Freezer"
android:requestLegacyExternalStorage="true" android:requestLegacyExternalStorage="true"
android:usesCleartextTraffic="true" android:usesCleartextTraffic="true"
> >
<service <service
android:name=".DownloadService" android:name=".DownloadService"
android:enabled="true" android:enabled="true"
android:exported="true" android:exported="true"
@ -38,7 +38,7 @@
android:process=":FreezerDownloadService" android:process=":FreezerDownloadService"
/> />
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true" android:hardwareAccelerated="true"
@ -51,94 +51,92 @@
android:exported="true" android:exported="true"
> >
<!-- <!--
Specifies an Android theme to apply to this Activity as soon as Specifies an Android theme to apply to this Activity as soon as
the Android process has started. This theme is visible to the user the Android process has started. This theme is visible to the user
while the Flutter UI initializes. After that, this theme continues while the Flutter UI initializes. After that, this theme continues
to determine the Window background behind the Flutter UI. to determine the Window background behind the Flutter UI.
--> -->
<meta-data <meta-data
android:name="io.flutter.embedding.android.NormalTheme" android:name="io.flutter.embedding.android.NormalTheme"
android:resource="@style/NormalTheme" android:resource="@style/NormalTheme"
/> />
<!-- <!--
Displays an Android View that continues showing the launch screen Displays an Android View that continues showing the launch screen
Drawable until Flutter paints its first frame, then this splash Drawable until Flutter paints its first frame, then this splash
screen fades out. A splash screen is useful to avoid any visual screen fades out. A splash screen is useful to avoid any visual
gap between the end of Android's launch screen and the painting of gap between the end of Android's launch screen and the painting of
Flutter's first frame. Flutter's first frame.
--> -->
<meta-data <meta-data
android:name="io.flutter.embedding.android.SplashScreenDrawable" android:name="io.flutter.embedding.android.SplashScreenDrawable"
android:resource="@drawable/launch_background" android:resource="@drawable/launch_background"
/> />
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
<!-- App links --> <!-- App links -->
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="https" android:host="www.deezer.com" /> <data android:scheme="https" android:host="www.deezer.com" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="https" android:host="deezer.com" /> <data android:scheme="https" android:host="deezer.com" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="https" android:host="deezer.page.link" /> <data android:scheme="https" android:host="deezer.page.link" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
android:name="android.intent.category.LEANBACK_LAUNCHER" </intent-filter>
/> </activity>
</intent-filter> <!--
</activity>
<!--
Don't delete the meta-data below. Don't delete the meta-data below.
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java This is used by the Flutter tool to generate GeneratedPluginRegistrant.java
--> -->
<meta-data android:name="flutterEmbedding" android:value="2" /> <meta-data android:name="flutterEmbedding" android:value="2" />
<service <service
android:name="com.ryanheise.audioservice.AudioService" android:name="com.ryanheise.audioservice.AudioService"
android:foregroundServiceType="mediaPlayback" android:foregroundServiceType="mediaPlayback"
android:exported="true" android:exported="true"
tools:ignore="Instantiatable" tools:ignore="Instantiatable"
> >
<intent-filter> <intent-filter>
<action android:name="android.media.browse.MediaBrowserService" /> <action android:name="android.media.browse.MediaBrowserService" />
</intent-filter> </intent-filter>
</service> </service>
<receiver <receiver
android:name="com.ryanheise.audioservice.MediaButtonReceiver" android:name="com.ryanheise.audioservice.MediaButtonReceiver"
android:exported="true" android:exported="true"
tools:ignore="Instantiatable" tools:ignore="Instantiatable"
> >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MEDIA_BUTTON" /> <action android:name="android.intent.action.MEDIA_BUTTON" />
</intent-filter> </intent-filter>
</receiver> </receiver>
<meta-data <meta-data
android:name="com.google.android.gms.car.application" android:name="com.google.android.gms.car.application"
android:resource="@xml/automotive_app_desc" android:resource="@xml/automotive_app_desc"
/> />
</application> </application>
</manifest> </manifest>

6
android/app/src/main/res/raw/keep.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<!-- keep assets (notification, playback icons, ...) -->
<resources
xmlns:tools="http://schemas.android.com/tools"
tools:keep="@drawable/*"
/>

1
lib/api/deezer.dart
View File

@ -144,6 +144,7 @@ class DeezerAPI {
'hash': hash 'hash': hash
}, },
options: Options(responseType: ResponseType.json)); options: Options(responseType: ResponseType.json));
print(res.data);
final accessToken = res.data['access_token'] as String?; final accessToken = res.data['access_token'] as String?;
if (accessToken == null) { if (accessToken == null) {
throw Exception('login failed, access token is null'); throw Exception('login failed, access token is null');

3
lib/api/download_manager/download_manager.dart
View File

@ -12,11 +12,8 @@ import 'package:freezer/api/paths.dart';
import 'package:freezer/main.dart'; import 'package:freezer/main.dart';
import 'package:freezer/settings.dart'; import 'package:freezer/settings.dart';
import 'package:freezer/translations.i18n.dart'; import 'package:freezer/translations.i18n.dart';
<<<<<<< Updated upstream
=======
import 'package:isar/isar.dart'; import 'package:isar/isar.dart';
import '../download.dart' as dl; import '../download.dart' as dl;
>>>>>>> Stashed changes
class DownloadManager { class DownloadManager {
//implements dl.DownloadManager { //implements dl.DownloadManager {