diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 69587cd7ac..6102c5400f 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -46,13 +46,13 @@ android:name=".ExportSettingsActivity" android:exported="true" android:launchMode="singleTop" - android:theme="@style/LaunchTheme" + android:theme="@style/ExportSettingsTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize"> + android:resource="@style/ExportSettingsTheme"/> diff --git a/android/app/src/main/kotlin/app/revanced/manager/flutter/ExportSettingsActivity.kt b/android/app/src/main/kotlin/app/revanced/manager/flutter/ExportSettingsActivity.kt index b9e8e5aa2e..6b9df40111 100644 --- a/android/app/src/main/kotlin/app/revanced/manager/flutter/ExportSettingsActivity.kt +++ b/android/app/src/main/kotlin/app/revanced/manager/flutter/ExportSettingsActivity.kt @@ -3,6 +3,7 @@ package app.revanced.manager.flutter import android.app.Activity import android.content.Intent import io.flutter.embedding.android.FlutterActivity +import io.flutter.embedding.android.TransparencyMode import io.flutter.embedding.engine.FlutterEngine import io.flutter.plugin.common.MethodChannel import java.io.Serializable @@ -37,4 +38,8 @@ class ExportSettingsActivity : FlutterActivity() { override fun getDartEntrypointFunctionName(): String { return "mainExportSettings" } + + override fun getTransparencyMode(): TransparencyMode { + return TransparencyMode.transparent + } } diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index cb1ef88056..ae451e0a67 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -15,4 +15,10 @@ + + diff --git a/assets/i18n/en_US.json b/assets/i18n/en_US.json index cc398cb997..e1c1f84876 100644 --- a/assets/i18n/en_US.json +++ b/assets/i18n/en_US.json @@ -306,9 +306,9 @@ "managerContributors": "Manager contributors" }, "exportSettingsView": { - "widgetTitle": "Export settings", - "description": "Would you like to export your settings to the latest version of ReVanced Manager?", - "exportButton": "Export", + "widgetTitle": "Import settings", + "description": "Would you like to import your settings to the previous version of ReVanced Manager?", + "exportButton": "Import", "dismissButton": "No thanks" } } diff --git a/lib/ui/views/export_settings/export_settings_view.dart b/lib/ui/views/export_settings/export_settings_view.dart index 631ee655d5..44e195be77 100644 --- a/lib/ui/views/export_settings/export_settings_view.dart +++ b/lib/ui/views/export_settings/export_settings_view.dart @@ -10,26 +10,23 @@ class ExportSettingsView extends StatelessWidget { @override Widget build(BuildContext context) { - _exportSettingsViewModel.init(context); - return Material( - child: AlertDialog( - title: I18nText('exportSettingsView.widgetTitle'), - content: I18nText('exportSettingsView.description'), - icon: const Icon(Icons.update), - actions: [ - CustomMaterialButton( - isFilled: false, - label: I18nText('exportSettingsView.dismissButton'), - onPressed: _exportSettingsViewModel.deny, - ), - CustomMaterialButton( - label: I18nText('exportSettingsView.exportButton'), - onPressed: () async { - await _exportSettingsViewModel.accept(); - }, - ), - ], + return AlertDialog( + title: I18nText('exportSettingsView.widgetTitle'), + content: I18nText('exportSettingsView.description'), + icon: const Icon(Icons.update), + actions: [ + CustomMaterialButton( + isFilled: false, + label: I18nText('exportSettingsView.dismissButton'), + onPressed: _exportSettingsViewModel.deny, ), + CustomMaterialButton( + label: I18nText('exportSettingsView.exportButton'), + onPressed: () async { + await _exportSettingsViewModel.accept(); + }, + ), + ], ); } } diff --git a/lib/ui/views/export_settings/export_settings_viewmodel.dart b/lib/ui/views/export_settings/export_settings_viewmodel.dart index 84999b663d..0aee70fdf6 100644 --- a/lib/ui/views/export_settings/export_settings_viewmodel.dart +++ b/lib/ui/views/export_settings/export_settings_viewmodel.dart @@ -15,19 +15,6 @@ class ExportSettingsViewModel extends BaseViewModel { final _channel = const MethodChannel('app.revanced.manager.flutter/settings'); final ManagerAPI _managerAPI = locator(); - void init(BuildContext context) { - SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge); - SystemChrome.setSystemUIOverlayStyle( - SystemUiOverlayStyle( - systemNavigationBarColor: Colors.transparent, - systemNavigationBarIconBrightness: - DynamicTheme.of(context)!.theme.brightness == Brightness.light - ? Brightness.dark - : Brightness.light, - ), - ); - } - Future accept() async { final externalDir = await getExternalStorageDirectory();