Skip to content

Commit

Permalink
Wip: 작업 진행중...
Browse files Browse the repository at this point in the history
  • Loading branch information
@Yellowtoast
Yellowtoast committed Feb 14, 2024
1 parent abfe6e0 commit bed8067
Show file tree
Hide file tree
Showing 20 changed files with 386 additions and 23 deletions.
8 changes: 8 additions & 0 deletions android/app/google-services.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@
"certificate_hash": "1c575dfabec64a99466b5f1ddb60018e1c41fdf9"
}
},
{
"client_id": "231574029969-c7hhgbk0ek9nmqb7raa7altguk0skgtu.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "co.yellowtoast.pets_next_door_flutter.dev",
"certificate_hash": "55528df627e83bc7126601995ef79f67f11f2a8d"
}
},
{
"client_id": "231574029969-hjvfj85727ar4jpbt4iemi0i6nf545bj.apps.googleusercontent.com",
"client_type": 3
Expand Down
26 changes: 25 additions & 1 deletion android/app/src/development/google-services.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,31 @@
},
"oauth_client": [
{
"client_id": "231574029969-5chgj3uaqlh2fg9pr9qpc0diuhdhbook.apps.googleusercontent.com",
"client_id": "231574029969-17e6o5jt8pkcjvbudocmqt1pj01804a2.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "co.yellowtoast.pets_next_door_flutter.dev",
"certificate_hash": "d8d5bd779560ccae8f343662db21ac302aa8cdad"
}
},
{
"client_id": "231574029969-9oaog3g1361tvs2mj0pj22n8ijgp4tr4.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "co.yellowtoast.pets_next_door_flutter.dev",
"certificate_hash": "1c575dfabec64a99466b5f1ddb60018e1c41fdf9"
}
},
{
"client_id": "231574029969-c7hhgbk0ek9nmqb7raa7altguk0skgtu.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "co.yellowtoast.pets_next_door_flutter.dev",
"certificate_hash": "55528df627e83bc7126601995ef79f67f11f2a8d"
}
},
{
"client_id": "231574029969-hjvfj85727ar4jpbt4iemi0i6nf545bj.apps.googleusercontent.com",
"client_type": 3
}
],
Expand Down
43 changes: 35 additions & 8 deletions ios/Runner.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -445,8 +445,10 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = KVC7U6W6Z2;
DEVELOPMENT_TEAM = 36XAF3AY63;
ENABLE_BITCODE = NO;
FLAVOR_APP_NAME = "Pets Next Door Flutter";
GOOGLE_SCHEME = "com.googleusercontent.apps.424678055013-lqikhot4d87ifooit42092ukp8uo1e4g";
Expand All @@ -459,6 +461,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "co.yellowtoast.pets-next-door-flutter";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
Expand Down Expand Up @@ -580,6 +583,8 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = KVC7U6W6Z2;
ENABLE_BITCODE = NO;
Expand All @@ -594,6 +599,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "co.yellowtoast.pets-next-door-flutter";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
Expand All @@ -607,8 +613,10 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = KVC7U6W6Z2;
DEVELOPMENT_TEAM = 36XAF3AY63;
ENABLE_BITCODE = NO;
FLAVOR_APP_NAME = "Pets Next Door Flutter";
GOOGLE_SCHEME = "com.googleusercontent.apps.424678055013-lqikhot4d87ifooit42092ukp8uo1e4g";
Expand All @@ -621,6 +629,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "co.yellowtoast.pets-next-door-flutter";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
Expand Down Expand Up @@ -689,8 +698,10 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-dev";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = KVC7U6W6Z2;
DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
FLAVOR_APP_NAME = "[DEV] Pets Next Door Flutter";
GOOGLE_SCHEME = "com.googleusercontent.apps.231574029969-6g4o5a6ec3o3n073i57b225m1ibh6107";
Expand All @@ -703,6 +714,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "co.yellowtoast.pets-next-door-flutter.dev";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -769,8 +781,10 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-dev";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = KVC7U6W6Z2;
DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
FLAVOR_APP_NAME = "[DEV] Pets Next Door Flutter";
GOOGLE_SCHEME = "com.googleusercontent.apps.231574029969-6g4o5a6ec3o3n073i57b225m1ibh6107";
Expand All @@ -783,6 +797,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "co.yellowtoast.pets-next-door-flutter.dev";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
Expand Down Expand Up @@ -846,8 +861,10 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-dev";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = KVC7U6W6Z2;
DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
FLAVOR_APP_NAME = "[DEV] Pets Next Door Flutter";
GOOGLE_SCHEME = "com.googleusercontent.apps.231574029969-6g4o5a6ec3o3n073i57b225m1ibh6107";
Expand All @@ -860,6 +877,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "co.yellowtoast.pets-next-door-flutter.dev";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
Expand Down Expand Up @@ -928,8 +946,10 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-stg";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = KVC7U6W6Z2;
DEVELOPMENT_TEAM = 36XAF3AY63;
ENABLE_BITCODE = NO;
FLAVOR_APP_NAME = "[STG] Pets Next Door Flutter";
GOOGLE_SCHEME = "com.googleusercontent.apps.424678055013-lqikhot4d87ifooit42092ukp8uo1e4g";
Expand All @@ -942,6 +962,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "co.yellowtoast.pets-next-door-flutter.stg";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -1008,8 +1029,10 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-stg";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = KVC7U6W6Z2;
DEVELOPMENT_TEAM = 36XAF3AY63;
ENABLE_BITCODE = NO;
FLAVOR_APP_NAME = "[STG] Pets Next Door Flutter";
GOOGLE_SCHEME = "com.googleusercontent.apps.424678055013-lqikhot4d87ifooit42092ukp8uo1e4g";
Expand All @@ -1022,6 +1045,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "co.yellowtoast.pets-next-door-flutter.stg";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
Expand Down Expand Up @@ -1085,8 +1109,10 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-stg";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = KVC7U6W6Z2;
DEVELOPMENT_TEAM = 36XAF3AY63;
ENABLE_BITCODE = NO;
FLAVOR_APP_NAME = "[STG] Pets Next Door Flutter";
GOOGLE_SCHEME = "com.googleusercontent.apps.424678055013-lqikhot4d87ifooit42092ukp8uo1e4g";
Expand All @@ -1099,6 +1125,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "co.yellowtoast.pets-next-door-flutter.stg";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
Expand Down
13 changes: 12 additions & 1 deletion lib/app/router/app_router.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import 'package:pets_next_door_flutter/presentation/pages/my_info/profile_view.d
import 'package:pets_next_door_flutter/presentation/pages/pet/register_pet_page.dart';
import 'package:pets_next_door_flutter/presentation/pages/sign_in/sign_in_page.dart';
import 'package:pets_next_door_flutter/presentation/pages/sign_up/sign_up_page.dart';
import 'package:pets_next_door_flutter/presentation/pages/sos/detail/sos_post_detail_view.dart';
import 'package:pets_next_door_flutter/presentation/pages/splash/splash_page.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';

Expand All @@ -30,11 +31,13 @@ enum AppRoute {
chat,
myInfo,
profile,
registerPet;
registerPet,
sosPostDetail;

const AppRoute();

String get path => '/${this.name}';
String get childPath => '${this.name}';
}

@riverpod
Expand Down Expand Up @@ -72,6 +75,14 @@ GoRouter goRouter(GoRouterRef ref) {
child: SignUpPage(),
),
),
GoRoute(
path: AppRoute.sosPostDetail.path,
name: AppRoute.sosPostDetail.name,
pageBuilder: (context, state) => NoTransitionPage(
key: state.pageKey,
child: const SosPostDetailView(),
),
),
GoRoute(
path: AppRoute.registerPet.path,
name: AppRoute.registerPet.name,
Expand Down
2 changes: 1 addition & 1 deletion lib/app/router/app_router.g.dart
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/presentation/pages/home/home_event.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'package:pets_next_door_flutter/presentation/pages/home/home_view.dart';
import 'package:pets_next_door_flutter/presentation/pages/home/providers/current_tab_type_provider.dart';
import 'package:pets_next_door_flutter/presentation/pages/home/providers/show_search_bar_provider.dart';
import 'package:pets_next_door_flutter/presentation/pages/pet_mate/providers/pet_mate_filter_provider.dart';
import 'package:pets_next_door_flutter/presentation/pages/sos/providers/sos_post_filter_provider.dart';
import 'package:pets_next_door_flutter/presentation/pages/sos/list/providers/sos_post_filter_provider.dart';
import 'package:pets_next_door_flutter/presentation/widgets/toast/app_toast.dart';

abstract interface class _HomeEvent {
Expand Down
2 changes: 1 addition & 1 deletion lib/presentation/pages/home/home_view.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import 'package:pets_next_door_flutter/presentation/pages/home/home_event.dart';
import 'package:pets_next_door_flutter/presentation/pages/home/providers/current_tab_type_provider.dart';
import 'package:pets_next_door_flutter/presentation/pages/home/providers/show_search_bar_provider.dart';
import 'package:pets_next_door_flutter/presentation/pages/pet_mate/pet_mate_view.dart';
import 'package:pets_next_door_flutter/presentation/pages/sos/sos_post_view.dart';
import 'package:pets_next_door_flutter/presentation/pages/sos/list/sos_post_view.dart';
import 'package:pets_next_door_flutter/presentation/widgets/search_bar/animated_search_bar.dart';

part 'widgets/home_location_button.dart';
Expand Down
Loading

0 comments on commit bed8067

Please sign in to comment.