fix: #218 UI Redesign - Mobile - My Files

android/app/src/main/AndroidManifest.xml

@@ -23,7 +23,7 @@
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
-            android:launchMode="singleTop"
+            android:launchMode="singleTask"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"

ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
 	<key>MinimumOSVersion</key>
-	<string>9.0</string>
+	<string>13.0</string>
 </dict>
 </plist>

ios/Podfile.lock

@@ -57,8 +57,6 @@ PODS:
     - Flutter
   - flutter_local_notifications (0.0.1):
     - Flutter
-  - flutter_qr_reader (0.0.1):
-    - Flutter
   - fluttertoast (0.0.2):
     - Flutter
     - Toast
@@ -123,7 +121,6 @@ DEPENDENCIES:
   - flutter_image_compress (from `.symlinks/plugins/flutter_image_compress/ios`)
   - flutter_keychain (from `.symlinks/plugins/flutter_keychain/ios`)
   - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
-  - flutter_qr_reader (from `.symlinks/plugins/flutter_qr_reader/ios`)
   - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
   - open_file (from `.symlinks/plugins/open_file/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
@@ -175,8 +172,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_keychain/ios"
   flutter_local_notifications:
     :path: ".symlinks/plugins/flutter_local_notifications/ios"
-  flutter_qr_reader:
-    :path: ".symlinks/plugins/flutter_qr_reader/ios"
   fluttertoast:
     :path: ".symlinks/plugins/fluttertoast/ios"
   open_file:
@@ -215,11 +210,10 @@ SPEC CHECKSUMS:
   DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
   emoji_picker_flutter: df19dac03a2b39ac667dc8d1da939ef3a9e21347
   file_picker: 817ab1d8cd2da9d2da412a417162deee3500fc95
-  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
+  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_image_compress: 5a5e9aee05b6553048b8df1c3bc456d0afaac433
   flutter_keychain: 01aabf894ffe8b01adfda1d9df21c210c1b4b452
   flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
-  flutter_qr_reader: d930dde3b2cfe2b3d0bb7d66e5ff3e514300a5e5
   fluttertoast: 16fbe6039d06a763f3533670197d01fc73459037
   libwebp: 98a37e597e40bfdb4c911fc98f2c53d0b12d05fc
   Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
@@ -241,6 +235,6 @@ SPEC CHECKSUMS:
   video_thumbnail: c4e2a3c539e247d4de13cd545344fd2d26ffafd1
   webview_flutter_wkwebview: b7e70ef1ddded7e69c796c7390ee74180182971f
 
-PODFILE CHECKSUM: db8a7794fb1b0bee1e3803fed876c7cf9577099b
+PODFILE CHECKSUM: db1b3d34103b9bca35e1d0bca266af8024bec0bc
 
 COCOAPODS: 1.11.3

ios/Runner.xcodeproj/project.pbxproj

@@ -415,7 +415,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = "Share Extension/Share Extension.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 49;
 				DEVELOPMENT_TEAM = 5XUSS6C2DF;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "Share Extension/Info.plist";
@@ -448,7 +448,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = "Share Extension/Share Extension.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 49;
 				DEVELOPMENT_TEAM = 5XUSS6C2DF;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "Share Extension/Info.plist";
@@ -478,7 +478,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = "Share Extension/Share Extension.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 49;
 				DEVELOPMENT_TEAM = 5XUSS6C2DF;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "Share Extension/Info.plist";
@@ -560,7 +560,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 49;
 				DEVELOPMENT_TEAM = 5XUSS6C2DF;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -708,7 +708,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 49;
 				DEVELOPMENT_TEAM = 5XUSS6C2DF;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -747,7 +747,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 49;
 				DEVELOPMENT_TEAM = 5XUSS6C2DF;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (

lib/app.dart

@@ -14,6 +14,7 @@ import 'package:atsign_atmosphere_pro/view_models/file_transfer_provider.dart';
 import 'package:atsign_atmosphere_pro/view_models/history_provider.dart';
 import 'dart:io';
 import 'routes/routes.dart';
+import 'utils/colors.dart';
 
 class MyApp extends StatefulWidget {
   MyApp({Key? key}) : super(key: key);
@@ -79,17 +80,26 @@ class _MyAppState extends State<MyApp> {
         initialRoute: initialRoute,
         navigatorKey: NavService.navKey,
         theme: ThemeData(
-            fontFamily: 'Inter',
-            scaffoldBackgroundColor: Colors.white,
-            primaryColor: Color.fromARGB(255, 240, 94, 62),
-            appBarTheme: AppBarTheme(
-              color: Colors.white,
-              elevation: 0,
-              iconTheme: IconThemeData(color: Colors.black),
-            ),
-            buttonBarTheme: ButtonBarThemeData(
-              alignment: MainAxisAlignment.center,
-            )),
+          fontFamily: 'Inter',
+          scaffoldBackgroundColor: Colors.white,
+          primaryColor: Color.fromARGB(255, 240, 94, 62),
+          appBarTheme: AppBarTheme(
+            color: Colors.white,
+            elevation: 0,
+            iconTheme: IconThemeData(color: Colors.black),
+          ),
+          buttonBarTheme: ButtonBarThemeData(
+            alignment: MainAxisAlignment.center,
+          ),
+          scrollbarTheme: ScrollbarThemeData(
+            minThumbLength: 330,
+            radius: Radius.circular(11),
+            thumbColor: MaterialStateProperty.all(ColorConstants.mildGrey),
+            trackColor: MaterialStateProperty.all(ColorConstants.textBoxBg),
+            mainAxisMargin: 18,
+            trackBorderColor: MaterialStateProperty.all(Colors.transparent),
+          ),
+        ),
         routes: routes,
       ),
     );

lib/desktop_screens/desktop_history/widgets/desktop_received_file_list_tile.dart

@@ -637,7 +637,13 @@ class _DesktopReceivedFilesListTileState
                                     ? ImageConstants.exelLogo
                                     : FileTypes.TEXT_TYPES.contains(extension)
                                         ? ImageConstants.txtLogo
-                                        : ImageConstants.unknownLogo,
+                                        : FileTypes.ARCHIVE_TYPES
+                                                .contains(extension)
+                                            ? ImageConstants.archiveLogo
+                                            : FileTypes.WEB_IMAGE_TYPES
+                                                    .contains(extension)
+                                                ? ImageConstants.svgLogo
+                                                : ImageConstants.otherFileLogo,
                     fit: BoxFit.cover,
                   ),
                 ),

lib/desktop_screens/desktop_history/widgets/desktop_sent_file_list_tile.dart

@@ -564,7 +564,13 @@ class _DesktopSentFilesListTileState extends State<DesktopSentFilesListTile> {
                                     ? ImageConstants.exelLogo
                                     : FileTypes.TEXT_TYPES.contains(extension)
                                         ? ImageConstants.txtLogo
-                                        : ImageConstants.unknownLogo,
+                                        : FileTypes.ARCHIVE_TYPES
+                                                .contains(extension)
+                                            ? ImageConstants.archiveLogo
+                                            : FileTypes.WEB_IMAGE_TYPES
+                                                    .contains(extension)
+                                                ? ImageConstants.svgLogo
+                                                : ImageConstants.otherFileLogo,
                     fit: BoxFit.cover,
                   ),
                 ),

lib/screens/common_widgets/add_contact.dart

@@ -48,7 +48,8 @@ class _AddContactState extends State<AddContact> {
             )
           ],
         ),
-        content: ConstrainedBox(
+        content: Container(
+          width: 495,
           constraints: BoxConstraints(
             maxHeight: (widget.name != null) ? 190.toHeight : 150.toHeight,
           ),
@@ -106,15 +107,18 @@ class _AddContactState extends State<AddContact> {
             height: 10.toHeight,
           ),
           isContactAdding
-              ? Center(
-                  child: CircularProgressIndicator(),
+              ? Container(
+                  padding: EdgeInsets.all(32),
+                  child: Center(
+                    child: CircularProgressIndicator(),
+                  ),
                 )
               : Container(
                   alignment: Alignment.center,
                   child: SizedBox(
                     width: (Platform.isAndroid || Platform.isIOS)
                         ? SizeConfig().screenWidth
-                        : 150.toWidth,
+                        : 150,
                     child: CustomButton(
                       buttonText: 'Yes',
                       fontColor: Colors.white,
@@ -144,7 +148,7 @@ class _AddContactState extends State<AddContact> {
                   child: SizedBox(
                       width: (Platform.isAndroid || Platform.isIOS)
                           ? SizeConfig().screenWidth
-                          : 150.toWidth,
+                          : 150,
                       child: CustomButton(
                         buttonColor: Colors.white,
                         buttonText: 'No',
@@ -153,6 +157,9 @@ class _AddContactState extends State<AddContact> {
                         },
                       )),
                 ),
+          SizedBox(
+            height: 10.toHeight,
+          ),
         ],
       ),
     );