Merge branch 'release/2024-summer' into feature/separatingCameraScreen

blueberry-team · Aug 17, 2024 · 59cf52c · 59cf52c
2 parents deac0c3 + 0b07daf
commit 59cf52c
Show file tree

Hide file tree

Showing 24 changed files with 253 additions and 122 deletions.
diff --git a/lib/core/TopScreen.dart b/lib/core/TopScreen.dart
@@ -1,10 +1,8 @@
-import 'package:blueberry_flutter_template/feature/post/PostScreen.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:go_router/go_router.dart';
 
-import '../feature/admin/AdminUserListPage.dart';
-import '../feature/login/LoginScreen.dart';
-import '../feature/match/MatchScreen.dart';
+import '../utils/AppStringEnglish.dart';
 
 /// TopScreen.dart
 ///
@@ -15,26 +13,25 @@ import '../feature/match/MatchScreen.dart';
 
 final selectedIndexProvider = StateProvider<int>((ref) => 0);
 
+final List<String> routes = [
+  '/post',
+  '/match',
+  '/mypage',
+  '/admin',
+];
+
 class TopScreen extends ConsumerWidget {
-  static const String name = '/TopScreen';
+  static const String name = 'TopScreen';
+  final Widget child;
 
-  const TopScreen({super.key});
+  const TopScreen({super.key, required this.child});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final selectedIndex = ref.watch(selectedIndexProvider);
 
-    final List<Widget> pages = [
-      const PostScreen(),
-      const MatchScreen(),
-      const LoginScreen(),
-      const AdminUserListPage()
-    ];
-
     return Scaffold(
-      body: Center(
-        child: pages[selectedIndex],
-      ),
+      body: child,
       bottomNavigationBar: BottomNavigationBar(
         type: BottomNavigationBarType.fixed,
         selectedIconTheme: const IconThemeData(color: Colors.black),
@@ -44,24 +41,26 @@ class TopScreen extends ConsumerWidget {
         items: const <BottomNavigationBarItem>[
           BottomNavigationBarItem(
             icon: Icon(Icons.podcasts),
-            label: 'Post',
+            label: AppStringEnglish.postScreenLabel,
           ),
           BottomNavigationBarItem(
             icon: Icon(Icons.pets),
-            label: 'match',
+            label: AppStringEnglish.matchScreenLabel,
           ),
           BottomNavigationBarItem(
             icon: Icon(Icons.account_circle),
-            label: 'MyPage',
+            label: AppStringEnglish.myPageScreenLabel,
           ),
           BottomNavigationBarItem(
             icon: Icon(Icons.admin_panel_settings),
-            label: 'Admin',
+            label: AppStringEnglish.adminScreenLabel,
           ),
         ],
         currentIndex: selectedIndex,
-        onTap: (index) =>
-            ref.read(selectedIndexProvider.notifier).state = index,
+        onTap: (index) {
+          ref.read(selectedIndexProvider.notifier).state = index;
+          context.go(routes[index]);
+        },
       ),
     );
   }

diff --git a/lib/core/widget/SocialCompanyText.dart b/lib/core/widget/SocialCompanyText.dart
@@ -0,0 +1,22 @@
+import 'package:blueberry_flutter_template/feature/mypage/provider/MyPageSocialLoginCompany,dart.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../../utils/AppStrings.dart';
+
+class SocialCompanyTextWidget extends ConsumerWidget {
+  const SocialCompanyTextWidget({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final socialCompany = ref.watch(myPageSocialLoginCompanyProvider);
+    return socialCompany.when(
+      data: (name) => Text(
+        name,
+        style: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
+      ),
+      loading: () => const Text(''),
+      error: (e, s) => const Text(AppStrings.nickNameTextWidgetError),
+    );
+  }
+}
diff --git a/lib/feature/login/LoginScreen.dart b/lib/feature/login/LoginScreen.dart
@@ -5,7 +5,7 @@ import 'package:go_router/go_router.dart';
 
 import '../../core/widget/SquareTitleWidget.dart';
 import '../../services/FirebaseAuthServiceProvider.dart';
-import '../../services/SocialAuthService.dart';
+import '../../services/socialauth/SocialAuthService.dart';
 import '../../utils/AppStrings.dart';
 import '../camera/CameraGalleryScreen.dart';
 import '../camera/provider/PageProvider.dart';

diff --git a/lib/feature/login/provider/UserInfoProvider.dart b/lib/feature/login/provider/UserInfoProvider.dart
@@ -1,4 +1,5 @@
 import 'package:blueberry_flutter_template/model/UserDataModel.dart';
+import 'package:blueberry_flutter_template/utils/AppStrings.dart';
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -64,6 +65,8 @@ final userInfoNotifierProvider =
           mbti: 'NULL',
           profileImageUrl: '',
           isMemberShip: false,
+          socialLogin: false,
+          socialCompany: AppStrings.usingEmailLogin,
           createdAt: DateTime.now(),
           userClass: 'user',
           likeGivens: [""])));

diff --git a/lib/feature/match/MatchScreen.dart b/lib/feature/match/MatchScreen.dart
@@ -9,6 +9,7 @@ import 'widget/MatchProfileListWidget.dart';
 ///  - SwipeButtonWidget: 수동으로 좌/우 스와이프를 할 수 있는 버튼
 
 class MatchScreen extends StatelessWidget {
+  static const String name = 'MatchScreen';
   const MatchScreen({super.key});
 
   @override

diff --git a/lib/feature/mypage/MyPageScreen.dart b/lib/feature/mypage/MyPageScreen.dart
@@ -1,4 +1,5 @@
 import 'dart:io';
+import 'package:blueberry_flutter_template/core/widget/SocialCompanyText.dart';
 import 'package:blueberry_flutter_template/feature/mypage/provider/ProfileImageProvider.dart';
 import 'package:cloud_functions/cloud_functions.dart';
 import 'package:easy_engine/easy_engine.dart';
@@ -42,7 +43,7 @@ class MyPageScreen extends ConsumerWidget {
                     mainAxisAlignment: MainAxisAlignment.start,
                     children: [
                       NickNameTextWidget(),
-                      Text("Google 로그인을 사용 중 입니다.")
+                      SocialCompanyTextWidget(),
                     ],
                   ),
                 )

diff --git a/lib/feature/mypage/provider/MyPageNameProvider.dart b/lib/feature/mypage/provider/MyPageNameProvider.dart
@@ -7,6 +7,6 @@ final myPageNicknameProvider = StreamProvider<String>((ref) {
   final userId = FirebaseAuth.instance.currentUser!.uid;
 
   return firestore.collection('users').doc(userId).snapshots().map((snapshot) {
-    return snapshot['name'] as String;
+    return snapshot['nickName'] as String;
   });
 });
diff --git a/lib/feature/mypage/provider/MyPageSocialLoginCompany,dart.dart b/lib/feature/mypage/provider/MyPageSocialLoginCompany,dart.dart
@@ -0,0 +1,12 @@
+import 'package:cloud_firestore/cloud_firestore.dart';
+import 'package:firebase_auth/firebase_auth.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+final myPageSocialLoginCompanyProvider = StreamProvider<String>((ref) {
+  final firestore = FirebaseFirestore.instance;
+  final userId = FirebaseAuth.instance.currentUser!.uid;
+
+  return firestore.collection('users').doc(userId).snapshots().map((snapshot) {
+    return snapshot['socialCompany'] as String;
+  });
+});
diff --git a/lib/feature/phoneauth/ConfirmationPage.dart b/lib/feature/phoneauth/ConfirmationPage.dart
@@ -64,6 +64,8 @@ class ConfirmationPage extends ConsumerWidget {
                 // 오류 뱉어내는거 하나 만들어야함 ex ) ID or Password 형식에 문제가 있다라고 쏴야할듯 ?
                 await firebaseService.upDateUserDB(email, name);
                 FirebaseAnalytics.instance.logSignUp(signUpMethod: 'email');
+                ref.invalidate(emailProvider);
+                ref.invalidate(passwordConfirmProvider);
                 if (context.mounted) {
                   context.goNamed(TopScreen.name);
                 }

diff --git a/lib/feature/post/PostScreen.dart b/lib/feature/post/PostScreen.dart
@@ -15,6 +15,7 @@ import '../chat/ChatRoomScreen.dart';
 import 'PostingScreen.dart';
 
 class PostScreen extends StatelessWidget {
+  static const String name = 'PostScreen';
   const PostScreen({super.key});
 
   @override

diff --git a/lib/feature/rank/provider/UserRankProvider.dart b/lib/feature/rank/provider/UserRankProvider.dart
@@ -83,6 +83,8 @@ Future<List<UserModel>> _fetchUsersFromFirestore() async {
           isMemberShip: data['isMemberShip'] as bool,
           profileImageUrl: data['profilePicture'] as String?,
           createdAt: DateTime.parse(data['createdAt'] as String),
+          socialLogin: data['socialLogin'] as bool,
+          socialCompany: data['socialCompany'] as String,
           mbti: data['mbti'] as String,
           fcmToken: data['fcmToken'] as String?,
           likeGivens: data["likeGivens"] as List<String>,

diff --git a/lib/feature/signup/SignUpScreen.dart b/lib/feature/signup/SignUpScreen.dart
@@ -28,8 +28,6 @@ class SignUpScreen extends ConsumerStatefulWidget {
 class _SignUpScreenState extends ConsumerState<SignUpScreen> {
   @override
   Widget build(BuildContext context) {
-    ref.watch(emailProvider);
-    ref.watch(passwordConfirmProvider);
     return Scaffold(
       appBar: AppBar(
         leading: IconButton(

diff --git a/lib/feature/signup/provider/SignUpDataProviders.dart b/lib/feature/signup/provider/SignUpDataProviders.dart
@@ -1,7 +1,7 @@
 // 이메일 인증 ( 아이디 )
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-final emailProvider = StateProvider.autoDispose<String>((ref) => '');
+final emailProvider = StateProvider<String>((ref) => '');
 final emailVerificationCodeProvider = StateProvider<String>((ref) => '');
 
 // 이름, 닉네임 생성
@@ -10,7 +10,7 @@ final nicknameProvider = StateProvider.autoDispose<String>((ref) => '');
 
 // 비밀번호 생성
 final passwordProvider = StateProvider.autoDispose<String>((ref) => '');
-final passwordConfirmProvider = StateProvider.autoDispose<String>((ref) => '');
+final passwordConfirmProvider = StateProvider<String>((ref) => '');
 
 // 휴대폰 번호 인증 ( 구매할 때 휴대폰 인증 ) ( 따로 만들기 )
 final residentRegistrationNumberProvider =

diff --git a/lib/feature/signup/provider/SignUpEmailDuplicationProvider.dart b/lib/feature/signup/provider/SignUpEmailDuplicationProvider.dart
@@ -1,8 +1,8 @@
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-final emailDuplicateProvider =
-    StateNotifierProvider<EmailDuplicateNotifier, EmailDuplicateState>((ref) {
+final emailDuplicateProvider = StateNotifierProvider.autoDispose<
+    EmailDuplicateNotifier, EmailDuplicateState>((ref) {
   return EmailDuplicateNotifier();
 });
 

diff --git a/lib/gen/assets.gen.dart b/lib/gen/assets.gen.dart
diff --git a/lib/main.dart b/lib/main.dart
@@ -14,6 +14,7 @@ import 'core/provider/ThemeProvider.dart';
 import 'firebase_options.dart';
 import 'utils/AppTheme.dart';
 import 'utils/Talker.dart';
+import 'package:url_strategy/url_strategy.dart';
 
 Future<void> main() async {
   runZonedGuarded(() async {
@@ -34,6 +35,8 @@ Future<void> main() async {
       FirebaseCrashlytics.instance.setCrashlyticsCollectionEnabled(true);
     }
 
+    setPathUrlStrategy(); // Hash URL(#)을 제거하고 Path URL을 사용하도록 설정
+
     runApp(const ProviderScope(
       child: MyApp(),
     ));

diff --git a/lib/model/UserModel.dart b/lib/model/UserModel.dart
@@ -6,19 +6,20 @@ part 'generated/UserModel.g.dart';
 
 @freezed
 class UserModel with _$UserModel {
-  const factory UserModel({
-    required String userClass,
-    required String userId,
-    required String name,
-    required String email,
-    required int age,
-    required bool isMemberShip,
-    required String mbti,
-    required DateTime createdAt,
-    required List<String> likeGivens,
-    String? profileImageUrl,
-    String? fcmToken,
-  }) = _UserModel;
+  const factory UserModel(
+      {required String userClass,
+      required String userId,
+      required String name,
+      required String email,
+      required int age,
+      required bool isMemberShip,
+      required String mbti,
+      required DateTime createdAt,
+      required List<String> likeGivens,
+      String? profileImageUrl,
+      String? fcmToken,
+      required bool socialLogin,
+      required String socialCompany}) = _UserModel;
 
   factory UserModel.fromJson(Map<String, dynamic> json) =>
       _$UserModelFromJson(json);