From a91ee596cbc88b9412b65f94a8ca499ebadcaac1 Mon Sep 17 00:00:00 2001 From: sainw Date: Tue, 23 Jan 2024 15:15:07 +0630 Subject: [PATCH] add app title --- lib/app.dart | 23 ++----- lib/main-dev.dart | 2 +- lib/main-local.dart | 2 +- lib/main-prod.dart | 2 +- lib/main.dart | 113 ---------------------------------- lib/pages/main/home_page.dart | 14 ++--- test/widget_test.dart | 30 --------- 7 files changed, 16 insertions(+), 170 deletions(-) delete mode 100644 lib/main.dart delete mode 100644 test/widget_test.dart diff --git a/lib/app.dart b/lib/app.dart index 7149625..0518ba7 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -33,7 +33,10 @@ import 'package:provider/provider.dart'; import 'pages/delivery/model/delivery_model.dart'; class App extends StatefulWidget { - @override + final String title; + + const App({super.key, required this.title}); + @override _AppState createState() => _AppState(); } @@ -136,22 +139,8 @@ class _AppState extends State { builder: (context, value, child) { return CupertinoApp( debugShowCheckedModeBanner: false, - title: 'FCS', - // theme: CupertinoThemeData( - // textTheme: CupertinoTextThemeData( - // navActionTextStyle: TextStyle(color: Colors.white), - // navTitleTextStyle: TextStyle( - // color: Colors.white, - // fontSize: value.isEng ? 20 : 18, - // fontWeight: FontWeight.w600), - // navLargeTitleTextStyle: TextStyle( - // color: Colors.white, - // fontSize: value.isEng ? 40 : 24, - // fontWeight: FontWeight.w600), - // primaryColor: primaryColor, - // textStyle: TextStyle(color: Colors.white), - // actionTextStyle: TextStyle(color: Colors.white), - // )), + theme: CupertinoThemeData(), + title: widget.title, routes: route(context), localizationsDelegates: [ _newLocaleDelegate, diff --git a/lib/main-dev.dart b/lib/main-dev.dart index 98c7d72..f1fd3bf 100644 --- a/lib/main-dev.dart +++ b/lib/main-dev.dart @@ -20,5 +20,5 @@ Future main() async { reportProjectID: "fcs-dev", bucketName: "gs://fcs-dev1-us", level: Level.ALL); - runApp(App()); + runApp(App(title:"FCS - Dev")); } diff --git a/lib/main-local.dart b/lib/main-local.dart index a46ddde..b52b95f 100644 --- a/lib/main-local.dart +++ b/lib/main-local.dart @@ -14,5 +14,5 @@ void main() { apiURL: "http://192.168.1.155:7777", bucketName: "gs://fcs-dev1-us", level: Level.ALL); - runApp(App()); + runApp(App(title: "FCS - Dev local",)); } diff --git a/lib/main-prod.dart b/lib/main-prod.dart index f4e5fdb..e80ce8c 100644 --- a/lib/main-prod.dart +++ b/lib/main-prod.dart @@ -14,5 +14,5 @@ void main() { reportProjectID: "fcs-prod", bucketName: "gs://fcs-prod1", level: Level.ALL); - runApp(App()); + runApp(App(title:"FCS")); } diff --git a/lib/main.dart b/lib/main.dart deleted file mode 100644 index b9bfc38..0000000 --- a/lib/main.dart +++ /dev/null @@ -1,113 +0,0 @@ -import 'package:flutter/material.dart'; - -void main() { - runApp(MyApp()); -} - -class MyApp extends StatelessWidget { - // This widget is the root of your application. - @override - Widget build(BuildContext context) { - return MaterialApp( - title: 'Flutter Demo', - theme: ThemeData( - // This is the theme of your application. - // - // Try running your application with "flutter run". You'll see the - // application has a blue toolbar. Then, without quitting the app, try - // changing the primarySwatch below to Colors.green and then invoke - // "hot reload" (press "r" in the console where you ran "flutter run", - // or simply save your changes to "hot reload" in a Flutter IDE). - // Notice that the counter didn't reset back to zero; the application - // is not restarted. - primarySwatch: Colors.blue, - ), - home: MyHomePage(title: 'Flutter Demo Home Page'), - ); - } -} - -class MyHomePage extends StatefulWidget { - MyHomePage({Key? key, required this.title}) : super(key: key); - - // This widget is the home page of your application. It is stateful, meaning - // that it has a State object (defined below) that contains fields that affect - // how it looks. - - // This class is the configuration for the state. It holds the values (in this - // case the title) provided by the parent (in this case the App widget) and - // used by the build method of the State. Fields in a Widget subclass are - // always marked "final". - - final String title; - - @override - _MyHomePageState createState() => _MyHomePageState(); -} - -class _MyHomePageState extends State { - int _counter = 0; - - void _incrementCounter() { - setState(() { - // This call to setState tells the Flutter framework that something has - // changed in this State, which causes it to rerun the build method below - // so that the display can reflect the updated values. If we changed - // _counter without calling setState(), then the build method would not be - // called again, and so nothing would appear to happen. - _counter++; - }); - } - - @override - Widget build(BuildContext context) { - // This method is rerun every time setState is called, for instance as done - // by the _incrementCounter method above. - // - // The Flutter framework has been optimized to make rerunning build methods - // fast, so that you can just rebuild anything that needs updating rather - // than having to individually change instances of widgets. - return Scaffold( - appBar: AppBar( - // Here we take the value from the MyHomePage object that was created by - // the App.build method, and use it to set our appbar title. - title: Text(widget.title), - ), - body: Center( - // Center is a layout widget. It takes a single child and positions it - // in the middle of the parent. - child: Column( - // Column is also a layout widget. It takes a list of children and - // arranges them vertically. By default, it sizes itself to fit its - // children horizontally, and tries to be as tall as its parent. - // - // Invoke "debug painting" (press "p" in the console, choose the - // "Toggle Debug Paint" action from the Flutter Inspector in Android - // Studio, or the "Toggle Debug Paint" command in Visual Studio Code) - // to see the wireframe for each widget. - // - // Column has various properties to control how it sizes itself and - // how it positions its children. Here we use mainAxisAlignment to - // center the children vertically; the main axis here is the vertical - // axis because Columns are vertical (the cross axis would be - // horizontal). - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - 'You have pushed the button this many times:', - ), - Text( - '$_counter', - style: Theme.of(context).textTheme.headline4, - ), - ], - ), - ), - floatingActionButton: FloatingActionButton( - onPressed: _incrementCounter, - tooltip: 'Increment', - child: Icon(Icons.add), - ), // This trailing comma makes auto-formatting nicer for build methods. - ); - } -} diff --git a/lib/pages/main/home_page.dart b/lib/pages/main/home_page.dart index b89b290..e67daa7 100644 --- a/lib/pages/main/home_page.dart +++ b/lib/pages/main/home_page.dart @@ -191,13 +191,13 @@ class _HomePageState extends State { // iOS: platformChannelSpecificsIos); // new Future.delayed(Duration.zero, () { - // _flutterLocalNotificationsPlugin.show( - // 0, - // pushTitle, - // pushText, - // platformChannelSpecifics, - // payload: 'No_Sound', - // ); + // _flutterLocalNotificationsPlugin.show( + // 0, + // pushTitle, + // pushText, + // platformChannelSpecifics, + // payload: 'No_Sound', + // ); // }); } diff --git a/test/widget_test.dart b/test/widget_test.dart deleted file mode 100644 index 6eea97d..0000000 --- a/test/widget_test.dart +++ /dev/null @@ -1,30 +0,0 @@ -// This is a basic Flutter widget test. -// -// To perform an interaction with a widget in your test, use the WidgetTester -// utility that Flutter provides. For example, you can send tap and scroll -// 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:flutter/material.dart'; -import 'package:flutter_test/flutter_test.dart'; - -import 'package:fcs/main.dart'; - -void main() { - testWidgets('Counter increments smoke test', (WidgetTester tester) async { - // Build our app and trigger a frame. - await tester.pumpWidget(MyApp()); - - // Verify that our counter starts at 0. - expect(find.text('0'), findsOneWidget); - expect(find.text('1'), findsNothing); - - // Tap the '+' icon and trigger a frame. - await tester.tap(find.byIcon(Icons.add)); - await tester.pump(); - - // Verify that our counter has incremented. - expect(find.text('0'), findsNothing); - expect(find.text('1'), findsOneWidget); - }); -}