From e34621a57440e027d9f8a5c38fc7357baf24fff2 Mon Sep 17 00:00:00 2001 From: Shareef Dweikat Date: Fri, 17 Jun 2022 17:35:28 +0300 Subject: [PATCH] Remove unused permissions (#133) --- android/app/build.gradle | 2 +- android/app/src/main/AndroidManifest.xml | 3 -- lib/constants/app_constants.dart | 8 +-- lib/views/desktop/send/widgets/DTErrorUI.dart | 45 +++++++---------- lib/views/mobile/receive/receive.dart | 2 +- lib/views/mobile/settings.dart | 3 +- lib/views/mobile/widgets/ErrorUI.dart | 50 +++++++------------ lib/views/shared/util.dart | 31 ++++++++---- 8 files changed, 64 insertions(+), 80 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 4456c0c2..67f29e0e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -36,7 +36,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.example.dart_wormhole_gui" minSdkVersion 16 - targetSdkVersion 29 + targetSdkVersion 30 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index cf2b70e7..d28fa28b 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -2,10 +2,7 @@ package="com.example.dart_wormhole_gui"> - - - (builder: (context, state, _) { return ErrorUI( errorTitle: state.errorTitle, - errorMessage: state.errorMessage, + errorMessage: state.errorMessage ?? "Unknown error", error: state.error, actionText: "Receive a file", onPressed: () { diff --git a/lib/views/mobile/settings.dart b/lib/views/mobile/settings.dart index 164ab9c1..292c7e5a 100644 --- a/lib/views/mobile/settings.dart +++ b/lib/views/mobile/settings.dart @@ -59,7 +59,8 @@ class _SettingsState extends SettingsShared { ButtonWithBackground( fontSize: 20.0.sp, title: SELECT_A_FOLDER, - handleClicked: handleSelectFile, + // handleClicked: handleSelectFile, + handleClicked: () {}, height: 60.0.h, width: 200.0.w, key: Key(SETTINGS_SCREEN_SELECT_A_FOLDER_BUTTON)), diff --git a/lib/views/mobile/widgets/ErrorUI.dart b/lib/views/mobile/widgets/ErrorUI.dart index 792a1f33..c7f6fedc 100644 --- a/lib/views/mobile/widgets/ErrorUI.dart +++ b/lib/views/mobile/widgets/ErrorUI.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import '../../../constants/asset_path.dart'; -import '../../widgets/Heading.dart'; +import '../../shared/util.dart'; import 'buttons/ButtonWithBackground.dart'; class ErrorUI extends StatelessWidget { @@ -21,40 +21,24 @@ class ErrorUI extends StatelessWidget { : super(key: key); @override Widget build(BuildContext context) { - return Column( - children: [ - Heading( - title: this.errorTitle, - textStyle: TextStyle( - fontSize: 14.0, - fontFamily: MONTSERRAT, - color: Theme.of(context).colorScheme.secondary, - ), - textAlign: TextAlign.left, - ), - Heading( - title: this.error, - textStyle: Theme.of(context).textTheme.headline6, - textAlign: TextAlign.left, - ), - Heading( - marginTop: 44.0, - title: errorMessage ?? "Unknown error", - textStyle: TextStyle( + return Column(children: [ + ...convertErrorMessageIntoParagraphs( + errorMessage, + TextStyle( fontSize: Theme.of(context).textTheme.headline6?.fontSize, - fontFamily: MONTSERRAT_LIGHT_ITALIC, + fontFamily: MONTSERRAT_LIGHT, color: Theme.of(context).colorScheme.secondary, ), - ), - ButtonWithBackground( - width: 200.0.w, - height: 60.0.h, - title: actionText, - handleClicked: () { - onPressed(); - }, - fontSize: 18.0.sp), - ], - ); + TextAlign.left, + context), + ButtonWithBackground( + width: 200.0.w, + height: 60.0.h, + title: actionText, + handleClicked: () { + onPressed(); + }, + fontSize: 18.0.sp), + ]); } } diff --git a/lib/views/shared/util.dart b/lib/views/shared/util.dart index 40493312..7c5e76ae 100644 --- a/lib/views/shared/util.dart +++ b/lib/views/shared/util.dart @@ -4,6 +4,8 @@ import 'dart:typed_data'; import 'package:device_info_plus/device_info_plus.dart'; import 'package:cross_file/cross_file.dart'; import 'package:dart_wormhole_william/client/file.dart' as f; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; import 'package:permission_handler/permission_handler.dart'; const int KB = 1000; @@ -58,19 +60,26 @@ String nonExistingPathFor(String path) { } } +List convertErrorMessageIntoParagraphs(String? errorMessage, + TextStyle? textStyle, TextAlign textAlign, BuildContext context) { + return errorMessage + ?.split("\n") + .map((txt) => Container( + width: MediaQuery.of(context).size.width, + margin: EdgeInsets.zero, + child: Text( + txt, + style: textStyle, + textAlign: textAlign, + ), + )) + .toList() ?? + []; +} + Future isAndroidStoragePermissionsGranted() async { - DeviceInfoPlugin deviceInfoPlugin = DeviceInfoPlugin(); - final androidInfo = await deviceInfoPlugin.androidInfo; - const int API_LEVEL_29 = 29; bool isGranted; - - if (androidInfo.version.sdkInt! <= API_LEVEL_29) { - isGranted = await Permission.storage.request() == PermissionStatus.granted; - } else { - isGranted = await Permission.manageExternalStorage.request() == - PermissionStatus.granted; - } - + isGranted = await Permission.storage.request() == PermissionStatus.granted; return isGranted; }