fish 3 months ago
parent
commit
098cc357ee

+ 7 - 0
android/app/src/main/AndroidManifest.xml

@@ -1,4 +1,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    
     <application android:label="putra_go" android:name="${applicationName}" android:icon="@mipmap/ic_launcher">
         <activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"

+ 12 - 2
lib/main.dart

@@ -1,17 +1,27 @@
 import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import 'package:putra_go/services/auth.dart';
 import 'models/user.dart';
-import 'screens/passenger/userMain.dart';
+import 'screens/passenger/home_page.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   await Firebase.initializeApp();
-  runApp(MyApp());
+  runApp(const MyApp());
+  SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
+    statusBarColor: Colors.transparent,
+    statusBarIconBrightness: Brightness.dark,
+    systemNavigationBarColor: Colors.transparent,
+    systemNavigationBarIconBrightness: Brightness.dark,
+  ));
 }
 
 class MyApp extends StatelessWidget {
+  const MyApp({Key? key}) : super(key: key);
+
+  @override
   Widget build(BuildContext context) {
     //add stream Provider
     return StreamProvider<User?>.value(

+ 1 - 1
lib/screens/driver/driverMain.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import '../passenger/userMain.dart';
+import '../passenger/home_page.dart';
 import 'driverLogin.dart';
 import 'driverRegister.dart';
 

+ 1 - 1
lib/screens/passenger/authenticate/userLogin.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import '../../../services/auth.dart';
 import '../userHome/userCustomizedOrder.dart';
-import '../userMain.dart';
+import '../home_page.dart';
 
 class userLogin extends StatefulWidget {
 

+ 2 - 0
lib/screens/passenger/authenticate/userRegisterSuccess.dart

@@ -2,6 +2,8 @@ import 'package:flutter/material.dart';
 import 'userLogin.dart';
 
 class userRegisterSuccess extends StatelessWidget {
+  const userRegisterSuccess({Key? key}) : super(key: key);
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(

+ 0 - 0
lib/screens/passenger/userMain.dart → lib/screens/passenger/home_page.dart


+ 1 - 1
lib/screens/passenger/userHome/userCustomizedOrder.dart

@@ -3,7 +3,7 @@ import 'package:intl/intl.dart';
 import 'package:putra_go/screens/passenger/userHome/userMatchingDriver.dart';
 
 import '../../../services/auth.dart';
-import '../userMain.dart';
+import '../home_page.dart';
 
 
 class userCustomizedOrder extends StatefulWidget {

+ 1 - 1
lib/screens/passenger/userHome/userOrderCancelled.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import '../userMain.dart';
+import '../home_page.dart';
 
 class userOrderCancelled extends StatelessWidget {
   const userOrderCancelled({Key? key}) : super(key: key);