themeをダークに変更。

あと以下の対応ログイン時の挙動を修正 #1 選択している機能のアイコンの色を変える機能追加 #5
t-kawauchiya · Mar 24, 2021 · 96fa091 · 96fa091
1 parent af2ad82
commit 96fa091
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 17 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -8,7 +8,7 @@ if (localPropertiesFile.exists()) {
 
 def flutterRoot = localProperties.getProperty('flutter.sdk')
 if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
+    throw new FileNotFoundException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
@@ -29,7 +29,7 @@ android {
     compileSdkVersion 30
 
     sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+        main.java.srcDirs += 'src/presentation.main/kotlin'
     }
 
     defaultConfig {

diff --git a/lib/history.dart → lib/domain/history.dart b/lib/history.dart → lib/domain/history.dart
diff --git a/lib/presentation/app_page.dart b/lib/presentation/app_page.dart
@@ -41,39 +41,39 @@ class _AppPageState extends State<AppPage> {
     return Scaffold(
       body: _pageList[_currentIndex],
       bottomNavigationBar: BottomNavigationBar(
-        items: const <BottomNavigationBarItem>[
+        currentIndex: _currentIndex,
+        fixedColor: Colors.blue,
+        backgroundColor: Colors.amber,
+        unselectedItemColor: Colors.white,
+        elevation: 15,
+        items: <BottomNavigationBarItem>[
           BottomNavigationBarItem(
             icon: Icon(
               Icons.account_box,
-              color: Colors.black54,
             ),
             label: 'Home',
           ),
           BottomNavigationBarItem(
             icon: Icon(
               Icons.access_time,
-              color: Colors.black54,
             ),
             label: 'Business',
           ),
           BottomNavigationBarItem(
             icon: Icon(
               Icons.add_outlined,
-              color: Colors.black54,
             ),
             label: 'Business',
           ),
           BottomNavigationBarItem(
             icon: Icon(
               Icons.business,
-              color: Colors.black54,
             ),
             label: 'Business',
           ),
           BottomNavigationBarItem(
             icon: Icon(
               Icons.business,
-              color: Colors.black54,
             ),
             label: 'Business',
           ),

diff --git a/lib/presentation/main/main.dart b/lib/presentation/main/main.dart
@@ -20,6 +20,7 @@ class MyApp extends StatelessWidget {
     final passwordController = TextEditingController();
     return MaterialApp(
       title: 'Flutter Demo',
+      theme: ThemeData.dark(),
       home: ChangeNotifierProvider<SignInModel>(
         create: (_) => SignInModel(),
         child: Scaffold(
@@ -56,8 +57,8 @@ class MyApp extends StatelessWidget {
                       onPressed: () async {
                         try {
                           String uid = await model.loginAndReturnUid();
-                          _showDialog(context, 'ログインしました');
-                          Navigator.push(
+                          //await _showDialog(context, 'ログインしました');
+                          await Navigator.pushReplacement(
                             context,
                             MaterialPageRoute(
                                 builder: (context) => AppPage(uid)),

diff --git a/pubspec.lock b/pubspec.lock
@@ -37,7 +37,7 @@ packages:
     source: hosted
     version: "1.1.0"
   cloud_firestore:
-    dependency: "direct main"
+    dependency: "direct presentation.main"
     description:
       name: cloud_firestore
       url: "https://pub.dartlang.org"
@@ -65,7 +65,7 @@ packages:
     source: hosted
     version: "1.15.0"
   cupertino_icons:
-    dependency: "direct main"
+    dependency: "direct presentation.main"
     description:
       name: cupertino_icons
       url: "https://pub.dartlang.org"
@@ -79,7 +79,7 @@ packages:
     source: hosted
     version: "1.2.0"
   firebase_auth:
-    dependency: "direct main"
+    dependency: "direct presentation.main"
     description:
       name: firebase_auth
       url: "https://pub.dartlang.org"
@@ -100,7 +100,7 @@ packages:
     source: hosted
     version: "1.0.2"
   firebase_core:
-    dependency: "direct main"
+    dependency: "direct presentation.main"
     description:
       name: firebase_core
       url: "https://pub.dartlang.org"
@@ -121,7 +121,7 @@ packages:
     source: hosted
     version: "1.0.1"
   flutter:
-    dependency: "direct main"
+    dependency: "direct presentation.main"
     description: flutter
     source: sdk
     version: "0.0.0"
@@ -192,7 +192,7 @@ packages:
     source: hosted
     version: "2.0.0"
   provider:
-    dependency: "direct main"
+    dependency: "direct presentation.main"
     description:
       name: provider
       url: "https://pub.dartlang.org"
@@ -246,7 +246,7 @@ packages:
     source: hosted
     version: "0.2.19"
   timeago:
-    dependency: "direct main"
+    dependency: "direct presentation.main"
     description:
       name: timeago
       url: "https://pub.dartlang.org"