fix(sheets): set default overlay theme for sheets, remove bottom radius clipping

Author: jagandeepbrar

ios/Podfile

@@ -1,5 +1,5 @@
 platform :ios, '11.0'
-$FirebaseSDKVersion = '9.4.0'
+$FirebaseSDKVersion = '9.5.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

ios/Podfile.lock

@@ -1,6 +1,6 @@
 PODS:
-  - cloud_firestore (3.4.6):
-    - Firebase/Firestore (= 9.4.0)
+  - cloud_firestore (3.4.8):
+    - Firebase/Firestore (= 9.5.0)
     - firebase_core
     - Flutter
   - DKImagePickerController/Core (4.3.4):
@@ -37,43 +37,43 @@ PODS:
   - file_picker (0.0.1):
     - DKImagePickerController/PhotoGallery
     - Flutter
-  - Firebase/Auth (9.4.0):
+  - Firebase/Auth (9.5.0):
     - Firebase/CoreOnly
-    - FirebaseAuth (~> 9.4.0)
-  - Firebase/CoreOnly (9.4.0):
-    - FirebaseCore (= 9.4.0)
-  - Firebase/Firestore (9.4.0):
+    - FirebaseAuth (~> 9.5.0)
+  - Firebase/CoreOnly (9.5.0):
+    - FirebaseCore (= 9.5.0)
+  - Firebase/Firestore (9.5.0):
     - Firebase/CoreOnly
-    - FirebaseFirestore (~> 9.4.0)
-  - Firebase/Messaging (9.4.0):
+    - FirebaseFirestore (~> 9.5.0)
+  - Firebase/Messaging (9.5.0):
     - Firebase/CoreOnly
-    - FirebaseMessaging (~> 9.4.0)
-  - Firebase/Storage (9.4.0):
+    - FirebaseMessaging (~> 9.5.0)
+  - Firebase/Storage (9.5.0):
     - Firebase/CoreOnly
-    - FirebaseStorage (~> 9.4.0)
-  - firebase_auth (3.7.0):
-    - Firebase/Auth (= 9.4.0)
+    - FirebaseStorage (~> 9.5.0)
+  - firebase_auth (3.9.0):
+    - Firebase/Auth (= 9.5.0)
     - firebase_core
     - Flutter
-  - firebase_core (1.21.1):
-    - Firebase/CoreOnly (= 9.4.0)
+  - firebase_core (1.22.0):
+    - Firebase/CoreOnly (= 9.5.0)
     - Flutter
-  - firebase_messaging (12.0.3):
-    - Firebase/Messaging (= 9.4.0)
+  - firebase_messaging (13.0.2):
+    - Firebase/Messaging (= 9.5.0)
     - firebase_core
     - Flutter
-  - firebase_storage (10.3.7):
-    - Firebase/Storage (= 9.4.0)
+  - firebase_storage (10.3.8):
+    - Firebase/Storage (= 9.5.0)
     - firebase_core
     - Flutter
   - FirebaseAppCheckInterop (9.6.0)
-  - FirebaseAuth (9.4.0):
+  - FirebaseAuth (9.5.0):
     - FirebaseCore (~> 9.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 7.7)
     - GoogleUtilities/Environment (~> 7.7)
     - GTMSessionFetcher/Core (< 3.0, >= 1.7)
   - FirebaseAuthInterop (9.6.0)
-  - FirebaseCore (9.4.0):
+  - FirebaseCore (9.5.0):
     - FirebaseCoreDiagnostics (~> 9.0)
     - FirebaseCoreInternal (~> 9.0)
     - GoogleUtilities/Environment (~> 7.7)
@@ -87,20 +87,20 @@ PODS:
     - FirebaseCore (~> 9.0)
   - FirebaseCoreInternal (9.6.0):
     - "GoogleUtilities/NSData+zlib (~> 7.7)"
-  - FirebaseFirestore (9.4.0):
-    - FirebaseFirestore/AutodetectLeveldb (= 9.4.0)
-  - FirebaseFirestore/AutodetectLeveldb (9.4.0):
+  - FirebaseFirestore (9.5.0):
+    - FirebaseFirestore/AutodetectLeveldb (= 9.5.0)
+  - FirebaseFirestore/AutodetectLeveldb (9.5.0):
     - FirebaseFirestore/Base
     - FirebaseFirestore/WithLeveldb
-  - FirebaseFirestore/Base (9.4.0)
-  - FirebaseFirestore/WithLeveldb (9.4.0):
+  - FirebaseFirestore/Base (9.5.0)
+  - FirebaseFirestore/WithLeveldb (9.5.0):
     - FirebaseFirestore/Base
   - FirebaseInstallations (9.6.0):
     - FirebaseCore (~> 9.0)
     - GoogleUtilities/Environment (~> 7.7)
     - GoogleUtilities/UserDefaults (~> 7.7)
     - PromisesObjC (~> 2.1)
-  - FirebaseMessaging (9.4.0):
+  - FirebaseMessaging (9.5.0):
     - FirebaseCore (~> 9.0)
     - FirebaseInstallations (~> 9.0)
     - GoogleDataTransport (< 10.0.0, >= 9.1.4)
@@ -109,7 +109,7 @@ PODS:
     - GoogleUtilities/Reachability (~> 7.7)
     - GoogleUtilities/UserDefaults (~> 7.7)
     - nanopb (< 2.30910.0, >= 2.30908.0)
-  - FirebaseStorage (9.4.0):
+  - FirebaseStorage (9.5.0):
     - FirebaseAppCheckInterop (~> 9.0)
     - FirebaseAuthInterop (~> 9.0)
     - FirebaseCore (~> 9.0)
@@ -189,7 +189,7 @@ DEPENDENCIES:
   - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
   - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
   - firebase_storage (from `.symlinks/plugins/firebase_storage/ios`)
-  - FirebaseFirestore (from `https://github.com/invertase/firestore-ios-sdk-frameworks.git`, tag `9.4.0`)
+  - FirebaseFirestore (from `https://github.com/invertase/firestore-ios-sdk-frameworks.git`, tag `9.5.0`)
   - Flutter (from `Flutter`)
   - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
   - in_app_purchase_storekit (from `.symlinks/plugins/in_app_purchase_storekit/ios`)
@@ -243,7 +243,7 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/firebase_storage/ios"
   FirebaseFirestore:
     :git: https://github.com/invertase/firestore-ios-sdk-frameworks.git
-    :tag: 9.4.0
+    :tag: 9.5.0
   Flutter:
     :path: Flutter
   flutter_native_splash:
@@ -270,29 +270,29 @@ EXTERNAL SOURCES:
 CHECKOUT OPTIONS:
   FirebaseFirestore:
     :git: https://github.com/invertase/firestore-ios-sdk-frameworks.git
-    :tag: 9.4.0
+    :tag: 9.5.0
 
 SPEC CHECKSUMS:
-  cloud_firestore: 6448075c9bac372319e7f025fdfa6f1d382644d7
+  cloud_firestore: 7e123d5034b068e9a1fb32b2ad98a814c7f3e45d
   DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
   DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
   file_picker: 817ab1d8cd2da9d2da412a417162deee3500fc95
-  Firebase: 7703fc4022824b6d6db1bf7bea58d13b8e17ec46
-  firebase_auth: 74cfbf7be1e3e7fdaac9e7f117cefd89155251a9
-  firebase_core: 8e500850dd138c269d197c8dfca3ae886fa3b6f2
-  firebase_messaging: b65dacd4de1b469893dea0d754b1947f45ef4f7a
-  firebase_storage: 846832b7f2d22238678dc9abc513f2151f102462
+  Firebase: 800f16f07af493d98d017446a315c27af0552f41
+  firebase_auth: c070c7e5b66037cddb73a68ca4bf4728b063680b
+  firebase_core: 31872a49ffe0bf6f834e7044c7334e433536735a
+  firebase_messaging: 0950bacaf29e1f50e3f0502aa1c29a3a5814925e
+  firebase_storage: e81dc988f10c31c4ec1b1c79719ad679795b531d
   FirebaseAppCheckInterop: d5ecda0c09f8069406643d6e0fa12c09d1b736e3
-  FirebaseAuth: ae5d4402e1516497357d909162b091b3ca2a2e9c
+  FirebaseAuth: 741918f1fa62ed23246a509279f91d42d79a713f
   FirebaseAuthInterop: b6cf02117f13a8400c8c8b4421e12c6e850bcaf3
-  FirebaseCore: 9a2b10270a854731c4d4d8a97d0aa8380ec3458d
+  FirebaseCore: 25c0400b670fd1e2f2104349cd3b5dcce8d9418f
   FirebaseCoreDiagnostics: 99a495094b10a57eeb3ae8efa1665700ad0bdaa6
   FirebaseCoreExtension: e83465d1236b166d1d445bbf0e82b65acb30b73b
   FirebaseCoreInternal: bca76517fe1ed381e989f5e7d8abb0da8d85bed3
-  FirebaseFirestore: 11ab4a20524e5e7a36c65f0467a45ad403532665
+  FirebaseFirestore: cbb150095370d64f1f021e3a7eecd2b543356ae3
   FirebaseInstallations: 0a115432c4e223c5ab20b0dbbe4cbefa793a0e8e
-  FirebaseMessaging: 4e220eddd356181469ba2ec5f7d5fafbc2312841
-  FirebaseStorage: 160ba975dd3452d9c59a3bf5ea9bf70ff96bd3c2
+  FirebaseMessaging: 732623518591384f61c287e3d8f65294beb7ffb3
+  FirebaseStorage: a806d9f9eededf6fb1d906e79221b83ada1dbb4f
   FirebaseStorageInternal: 81d8a597324ccd06c41a43c5700bc1185a2fc328
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
@@ -315,6 +315,6 @@ SPEC CHECKSUMS:
   SwiftyGif: 6c3eafd0ce693cad58bb63d2b2fb9bacb8552780
   url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
 
-PODFILE CHECKSUM: b770541d6ad51c600743bc3608f688c979d24796
+PODFILE CHECKSUM: 4998bdd481d1c989b0fc39ba5d95ea3bed976109
 
 COCOAPODS: 1.11.3

lib/widgets/ui.dart

@@ -113,8 +113,6 @@ class LunaUI {
   }
 
   static ShapeBorder get shapeBorder {
-    return shouldUseBorder
-        ? LunaShapeBorder.roundedWithBorder()
-        : LunaShapeBorder.rounded();
+    return LunaShapeBorder(useBorder: shouldUseBorder);
   }
 }

lib/widgets/ui/bottom_modal_sheet.dart

@@ -13,10 +13,14 @@ class LunaBottomModalSheet<T> {
       expand: false,
       backgroundColor:
           LunaTheme.isAMOLEDTheme ? Colors.black : LunaColours.secondary,
-      shape: LunaUI.shapeBorder,
+      shape: LunaShapeBorder(
+        topOnly: true,
+        useBorder: LunaUI.shouldUseBorder,
+      ),
       builder: builder ?? this.builder as Widget Function(BuildContext),
       closeProgressThreshold: 0.90,
       elevation: LunaUI.ELEVATION,
+      overlayStyle: LunaTheme().overlayStyle,
     );
   }
 

lib/widgets/ui/button.dart

@@ -52,9 +52,8 @@ class LunaButton extends Card {
               : Theme.of(LunaState.context)
                   .canvasColor
                   .withOpacity(LunaUI.OPACITY_DIMMED),
-          shape: backgroundColor != null
-              ? LunaShapeBorder.rounded()
-              : LunaUI.shapeBorder,
+          shape:
+              backgroundColor != null ? LunaShapeBorder() : LunaUI.shapeBorder,
           elevation: LunaUI.ELEVATION,
           clipBehavior: Clip.antiAlias,
         );

lib/widgets/ui/list_tile/list_tile.dart

@@ -73,7 +73,7 @@ class LunaListTile extends Card {
           ),
           margin: margin,
           elevation: LunaUI.ELEVATION,
-          shape: drawBorder ? LunaUI.shapeBorder : LunaShapeBorder.rounded(),
+          shape: drawBorder ? LunaUI.shapeBorder : LunaShapeBorder(),
           color: color ?? Theme.of(context).primaryColor,
         );
 }

lib/widgets/ui/shape.dart

@@ -2,16 +2,22 @@ import 'package:flutter/material.dart';
 import 'package:lunasea/core.dart';
 
 class LunaShapeBorder extends RoundedRectangleBorder {
-  LunaShapeBorder._internal({
+  LunaShapeBorder({
     bool useBorder = false,
+    bool topOnly = false,
   }) : super(
-          borderRadius: BorderRadius.circular(LunaUI.BORDER_RADIUS),
+          borderRadius: BorderRadius.only(
+            topLeft: const Radius.circular(LunaUI.BORDER_RADIUS),
+            topRight: const Radius.circular(LunaUI.BORDER_RADIUS),
+            bottomLeft: topOnly
+                ? Radius.zero
+                : const Radius.circular(LunaUI.BORDER_RADIUS),
+            bottomRight: topOnly
+                ? Radius.zero
+                : const Radius.circular(LunaUI.BORDER_RADIUS),
+          ),
           side: useBorder
               ? const BorderSide(color: LunaColours.white10)
               : BorderSide.none,
         );
-
-  factory LunaShapeBorder.rounded() => LunaShapeBorder._internal();
-  factory LunaShapeBorder.roundedWithBorder() =>
-      LunaShapeBorder._internal(useBorder: true);
 }

lib/widgets/ui/theme.dart

@@ -6,18 +6,7 @@ class LunaTheme {
   /// Initialize the theme by setting the system navigation and system colours.
   void initialize() {
     //Set system UI overlay style (navbar, statusbar)
-    SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
-      systemNavigationBarColor: LunaSeaDatabase.THEME_AMOLED.read()
-          ? Colors.black
-          : LunaColours.secondary,
-      systemNavigationBarDividerColor: LunaSeaDatabase.THEME_AMOLED.read()
-          ? Colors.black
-          : LunaColours.secondary,
-      statusBarColor: Colors.transparent,
-      systemNavigationBarIconBrightness: Brightness.light,
-      statusBarIconBrightness: Brightness.light,
-      statusBarBrightness: Brightness.dark,
-    ));
+    SystemChrome.setSystemUIOverlayStyle(overlayStyle);
   }
 
   /// Returns the active [ThemeData] by checking the theme database value.
@@ -97,6 +86,21 @@ class LunaTheme {
     );
   }
 
+  SystemUiOverlayStyle get overlayStyle {
+    return SystemUiOverlayStyle(
+      systemNavigationBarColor: LunaSeaDatabase.THEME_AMOLED.read()
+          ? Colors.black
+          : LunaColours.secondary,
+      systemNavigationBarDividerColor: LunaSeaDatabase.THEME_AMOLED.read()
+          ? Colors.black
+          : LunaColours.secondary,
+      statusBarColor: Colors.transparent,
+      systemNavigationBarIconBrightness: Brightness.light,
+      statusBarIconBrightness: Brightness.light,
+      statusBarBrightness: Brightness.dark,
+    );
+  }
+
   TextTheme get _sharedTextTheme {
     const textStyle = TextStyle(color: Colors.white);
     return const TextTheme(

macos/Podfile

@@ -1,5 +1,5 @@
 platform :osx, '10.14'
-$FirebaseSDKVersion = '9.4.0'
+$FirebaseSDKVersion = '9.5.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'