옮기기전 마지막수정! (#58)

* add lint * fix gitignore * ignore * fix ignore * rename
jwson-automation · Jul 21, 2024 · 7ce5e58 · 7ce5e58
1 parent 5782c89
commit 7ce5e58
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 27 deletions.
diff --git a/.gitignore b/.gitignore
@@ -67,7 +67,10 @@ lib/firebase_options.dart
 .metadata
 
 # freezed generated files
-lib/models/generated/*.dart
+/lib/model/generated/
+
+# flutter gen generated files
+/lib/gen/
 
 # vscode
 .vscode/launch.json
diff --git a/lib/screens/SettingPage.dart → lib/screens/SettingScreen.dart b/lib/screens/SettingPage.dart → lib/screens/SettingScreen.dart
@@ -4,8 +4,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import '../providers/NotificationProvider.dart';
 import '../providers/ThemeProvider.dart';
 
-class SettingPage extends ConsumerWidget {
-  const SettingPage({super.key});
+class SettingScreen extends ConsumerWidget {
+  const SettingScreen({super.key});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {

diff --git a/lib/screens/match/MatchScreen.dart b/lib/screens/match/MatchScreen.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_card_swiper/flutter_card_swiper.dart';
 
 import '../../model/DogProfileModel.dart';
-import '../../widgets/match/SwiperCard.dart';
+import '../../widgets/match/SwiperCardWidget.dart';
 import 'ProfileScreen.dart';
 
 ///  MatchPage - 프로필 스와이프 매칭 화면
@@ -48,7 +48,7 @@ class MatchScreen extends StatefulWidget {
 
 class _MatchScreenState extends State<MatchScreen> {
   final CardSwiperController controller = CardSwiperController();
-  final cards = dogProfiles.map(SwiperCard.new).toList();
+  final cards = dogProfiles.map(SwiperCardWidget.new).toList();
 
   @override
   void dispose() {

diff --git a/lib/screens/mypage/LoginScreen.dart b/lib/screens/mypage/LoginScreen.dart
@@ -6,7 +6,7 @@ import '../../providers/user/FirebaseAuthServiceProvider.dart';
 import '../../providers/user/UserInfoProvider.dart';
 import '../../services/SocialAuthService.dart';
 import '../../utils/AppStrings.dart';
-import '../../widgets/square_title.dart';
+import '../../widgets/SquareTitleWidget.dart';
 import 'MyPageScreen.dart';
 import 'SignUpScreen.dart';
 import 'camera/ProfileCameraPage.dart';
@@ -178,21 +178,21 @@ Widget _buildLogin(BuildContext context, WidgetRef ref) {
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
               //Google button
-              SquareTile(
+              SquareTileWidget(
                   onTap: () => AuthService().signInWithGoogle(),
                   imagePath: 'assets/login_page_images/google.png'),
               const SizedBox(
                 width: 10,
               ),
               //Apple button
-              SquareTile(
+              SquareTileWidget(
                   onTap: () => AuthService().signInWithApple(),
                   imagePath: 'assets/login_page_images/apple.png'),
               const SizedBox(
                 width: 10,
               ),
               //github button
-              SquareTile(
+              SquareTileWidget(
                   onTap: () => AuthService().signInWithGithub(),
                   imagePath: 'assets/login_page_images/github.png'),
             ],

diff --git a/lib/screens/mypage/MyPageScreen.dart b/lib/screens/mypage/MyPageScreen.dart
@@ -14,8 +14,8 @@ import '../../providers/camera/FirebaseStoreServiceProvider.dart';
 import '../../providers/camera/fireStorageServiceProvider.dart';
 import '../../providers/user/FirebaseAuthServiceProvider.dart';
 import '../../providers/user/ProfileImageProvider.dart';
-import '../../widgets/CustomDivider.dart';
-import '../SettingPage.dart';
+import '../../widgets/CustomDividerWidget.dart';
+import '../SettingScreen.dart';
 import 'camera/SettingsBottomSheet.dart';
 
 class MyPageScreen extends ConsumerWidget {
@@ -55,7 +55,7 @@ class MyPageScreen extends ConsumerWidget {
             const SizedBox(
               height: 40,
             ),
-            const CustomDivider(),
+            const CustomDividerWidget(),
             GestureDetector(
               onTap: () {
                 Navigator.of(context).push(MaterialPageRoute(
@@ -70,7 +70,7 @@ class MyPageScreen extends ConsumerWidget {
                 ),
               ),
             ),
-            const CustomDivider(),
+            const CustomDividerWidget(),
             GestureDetector(
               onTap: () {},
               child: const ListTile(
@@ -81,7 +81,7 @@ class MyPageScreen extends ConsumerWidget {
                 ),
               ),
             ),
-            const CustomDivider(),
+            const CustomDividerWidget(),
             GestureDetector(
               onTap: () {},
               child: const ListTile(
@@ -92,7 +92,7 @@ class MyPageScreen extends ConsumerWidget {
                 ),
               ),
             ),
-            const CustomDivider(),
+            const CustomDividerWidget(),
             GestureDetector(
               onTap: () {},
               child: const ListTile(
@@ -103,7 +103,7 @@ class MyPageScreen extends ConsumerWidget {
                 ),
               ),
             ),
-            const CustomDivider(),
+            const CustomDividerWidget(),
             GestureDetector(
               onTap: () {},
               child: const ListTile(
@@ -114,7 +114,7 @@ class MyPageScreen extends ConsumerWidget {
                 ),
               ),
             ),
-            const CustomDivider(),
+            const CustomDividerWidget(),
             GestureDetector(
               onTap: () {
                 Navigator.of(context).push(MaterialPageRoute(
@@ -132,11 +132,11 @@ class MyPageScreen extends ConsumerWidget {
             const SizedBox(
               height: 30,
             ),
-            const CustomDivider(),
+            const CustomDividerWidget(),
             GestureDetector(
               onTap: () {
                 Navigator.push(context, MaterialPageRoute(builder: (context) {
-                  return const SettingPage();
+                  return const SettingScreen();
                 }));
               },
               child: const ListTile(
@@ -147,7 +147,7 @@ class MyPageScreen extends ConsumerWidget {
                 ),
               ),
             ),
-            const CustomDivider(),
+            const CustomDividerWidget(),
 
             //Logout button
             GestureDetector(

diff --git a/lib/screens/mypage/camera/setting_inside_account_manager.dart b/lib/screens/mypage/camera/setting_inside_account_manager.dart
@@ -1,4 +1,4 @@
-import 'package:blueberry_flutter_template/widgets/MiniAvatar.dart';
+import 'package:blueberry_flutter_template/widgets/MiniAvatarWidget.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 

diff --git a/lib/widgets/CustomDivider.dart → lib/widgets/CustomDividerWidget.dart b/lib/widgets/CustomDivider.dart → lib/widgets/CustomDividerWidget.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
-class CustomDivider extends StatelessWidget {
-  const CustomDivider({super.key});
+class CustomDividerWidget extends StatelessWidget {
+  const CustomDividerWidget({super.key});
 
   @override
   Widget build(BuildContext context) {

diff --git a/lib/widgets/MiniAvatar.dart → lib/widgets/MiniAvatarWidget.dart b/lib/widgets/MiniAvatar.dart → lib/widgets/MiniAvatarWidget.dart
diff --git a/lib/widgets/square_title.dart → lib/widgets/SquareTitleWidget.dart b/lib/widgets/square_title.dart → lib/widgets/SquareTitleWidget.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 
-class SquareTile extends StatelessWidget {
+class SquareTileWidget extends StatelessWidget {
   final String imagePath;
   final Function()? onTap;
-  const SquareTile({super.key, required this.imagePath, required this.onTap});
+  const SquareTileWidget({super.key, required this.imagePath, required this.onTap});
 
   @override
   Widget build(BuildContext context) {

diff --git a/lib/widgets/match/SwiperCard.dart → lib/widgets/match/SwiperCardWidget.dart b/lib/widgets/match/SwiperCard.dart → lib/widgets/match/SwiperCardWidget.dart
@@ -2,10 +2,10 @@ import 'package:flutter/material.dart';
 
 import '../../model/DogProfileModel.dart';
 
-class SwiperCard extends StatelessWidget {
+class SwiperCardWidget extends StatelessWidget {
   final DogProfileModel dogProfiles;
 
-  const SwiperCard(
+  const SwiperCardWidget(
     this.dogProfiles, {
     super.key,
   });