fix conflicts, logout text chnage style to bodyLarge

Niranjan-Dorage · Jul 14, 2023 · 6dddd6e · 6dddd6e
1 parent 6983fc7
commit 6dddd6e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 23 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream/develop
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
@@ -10,19 +6,15 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:overlay_support/overlay_support.dart';
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream/develop
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:flex_color_scheme/flex_color_scheme.dart';
-import 'package:thunder/core/auth/bloc/auth_bloc.dart';
 
 // Internal Packages
 import 'package:thunder/routes.dart';
 import 'package:thunder/core/enums/theme_type.dart';
 import 'package:thunder/core/singletons/database.dart';
 import 'package:thunder/core/theme/bloc/theme_bloc.dart';
+import 'package:thunder/core/auth/bloc/auth_bloc.dart';
 
 void main() async {
   WidgetsBinding widgetsBinding = WidgetsFlutterBinding.ensureInitialized();
@@ -61,17 +53,12 @@ class ThunderApp extends StatelessWidget {
           }
           return DynamicColorBuilder(
             builder: (lightColorScheme, darkColorScheme) {
-<<<<<<< HEAD
               ThemeData theme = FlexThemeData.light(
                   useMaterial3: true, scheme: FlexScheme.deepBlue);
               ThemeData darkTheme = FlexThemeData.dark(
                   useMaterial3: true,
                   scheme: FlexScheme.deepBlue,
-                  darkIsTrueBlack: state.useBlackTheme);
-=======
-              ThemeData theme = FlexThemeData.light(useMaterial3: true, scheme: FlexScheme.deepBlue);
-              ThemeData darkTheme = FlexThemeData.dark(useMaterial3: true, scheme: FlexScheme.deepBlue, darkIsTrueBlack: state.themeType == ThemeType.pureBlack);
->>>>>>> upstream/develop
+                  darkIsTrueBlack: state.themeType == ThemeType.pureBlack);
 
               // Enable Material You theme
               if (state.useMaterialYouTheme == true) {
@@ -98,13 +85,11 @@ class ThunderApp extends StatelessWidget {
                 child: MaterialApp.router(
                   title: 'Thunder',
                   routerConfig: router,
-<<<<<<< HEAD
-                  themeMode: state.useSystemTheme
+                  themeMode: state.themeType == ThemeType.system
                       ? ThemeMode.system
-                      : (state.useDarkTheme ? ThemeMode.dark : ThemeMode.light),
-=======
-                  themeMode: state.themeType == ThemeType.system ? ThemeMode.system : (state.themeType == ThemeType.light ? ThemeMode.light : ThemeMode.dark),
->>>>>>> upstream/develop
+                      : (state.themeType == ThemeType.light
+                          ? ThemeMode.light
+                          : ThemeMode.dark),
                   theme: theme,
                   darkTheme: darkTheme,
                   debugShowCheckedModeBanner: false,

diff --git a/lib/user/pages/user_page.dart b/lib/user/pages/user_page.dart
@@ -37,7 +37,7 @@ class _UserPageState extends State<UserPage> {
                               title: Text(
                                 'Are you sure you want to log out?',
                                 style:
-                                    Theme.of(context).textTheme.headlineSmall,
+                                    Theme.of(context).textTheme.bodyLarge,
                               ),
                               actions: [
                                 TextButton(

diff --git a/macos/Podfile.lock b/macos/Podfile.lock
@@ -3,6 +3,8 @@ PODS:
     - FlutterMacOS
   - dynamic_color (0.0.2):
     - FlutterMacOS
+  - file_selector_macos (0.0.1):
+    - FlutterMacOS
   - FlutterMacOS (1.0.0)
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
@@ -26,6 +28,7 @@ PODS:
 DEPENDENCIES:
   - device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`)
   - dynamic_color (from `Flutter/ephemeral/.symlinks/plugins/dynamic_color/macos`)
+  - file_selector_macos (from `Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos`)
   - FlutterMacOS (from `Flutter/ephemeral`)
   - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`)
   - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`)
@@ -43,6 +46,8 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos
   dynamic_color:
     :path: Flutter/ephemeral/.symlinks/plugins/dynamic_color/macos
+  file_selector_macos:
+    :path: Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos
   FlutterMacOS:
     :path: Flutter/ephemeral
   package_info_plus:
@@ -61,6 +66,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f
   dynamic_color: 2eaa27267de1ca20d879fbd6e01259773fb1670f
+  file_selector_macos: 468fb6b81fac7c0e88d71317f3eec34c3b008ff9
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce
@@ -72,4 +78,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.12.0