Skip to content

Commit

Permalink
modify screenOrientation. and refactor matrial app
Browse files Browse the repository at this point in the history
  • Loading branch information
MAHMOUDELSAYED7 committed Jul 19, 2024
1 parent 4bb8ab9 commit e72f101
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 39 deletions.
3 changes: 2 additions & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true"
android:windowSoftInputMode="adjustResize">
android:windowSoftInputMode="adjustResize"
android:screenOrientation="portrait">
<!-- Specifies an Android theme to apply to this Activity as soon as
the Android process has started. This theme is visible to the user
while the Flutter UI initializes. After that, this theme continues
Expand Down
38 changes: 38 additions & 0 deletions lib/app.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:calculator/view/calculator_view.dart';

import 'utils/themes/app_theme.dart';
import 'viewmodel/theme_provider.dart';

class MyApp extends ConsumerWidget {
const MyApp({super.key});

@override
Widget build(BuildContext context, WidgetRef ref) {
final theme = ref.watch(themeProvider);

return ScreenUtilInit(
designSize: const Size(360, 690),
minTextAdapt: true,
splitScreenMode: true,
builder: (_, child) => MaterialApp(
builder: (context, widget) {
final mediaQueryData = MediaQuery.of(context);
final scaledMediaQueryData = mediaQueryData.copyWith(
textScaler: TextScaler.noScaling,
);
return MediaQuery(
data: scaledMediaQueryData,
child: widget!,
);
},
theme:
theme == ThemeEnum.dark ? AppTheme.lightTheme : AppTheme.darkTheme,
debugShowCheckedModeBanner: false,
home: const CalculatorView(),
),
);
}
}
38 changes: 1 addition & 37 deletions lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,47 +1,11 @@
import 'dart:async';

import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:calculator/cache/cache.dart';
import 'package:calculator/view/calculator_view.dart';

import 'utils/themes/app_theme.dart';
import 'viewmodel/theme_provider.dart';
import 'app.dart';

Future<void> main() async {
WidgetsFlutterBinding.ensureInitialized();
await CacheData.cacheDataInit();
runApp(const ProviderScope(child: MyApp()));
}

class MyApp extends ConsumerWidget {
const MyApp({super.key});

@override
Widget build(BuildContext context, WidgetRef ref) {
final theme = ref.watch(themeProvider);

return ScreenUtilInit(
designSize: const Size(360, 690),
minTextAdapt: true,
splitScreenMode: true,
builder: (_, child) => MaterialApp(
builder: (context, widget) {
final mediaQueryData = MediaQuery.of(context);
final scaledMediaQueryData = mediaQueryData.copyWith(
textScaler: TextScaler.noScaling,
);
return MediaQuery(
data: scaledMediaQueryData,
child: widget!,
);
},
theme:
theme == ThemeEnum.dark ? AppTheme.lightTheme : AppTheme.darkTheme,
debugShowCheckedModeBanner: false,
home: const CalculatorView(),
),
);
}
}
2 changes: 1 addition & 1 deletion test/widget_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
// gestures. You can also use WidgetTester to find child widgets in the widget
// tree, read text, and verify that the values of widget properties are correct.

import 'package:calculator/app.dart';
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:calculator/main.dart';

void main() {
testWidgets('Counter increments smoke test', (WidgetTester tester) async {
Expand Down

0 comments on commit e72f101

Please sign in to comment.