Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[feat/#197] 내 폴더 담기 프로세스 변경 #198

Merged
merged 3 commits into from
Oct 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 15 additions & 44 deletions ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,6 @@
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
9705A1C41CF9048500538489 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
AEE2471C28CF82200092F192 /* Embed App Extensions */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 12;
Expand Down Expand Up @@ -358,11 +348,10 @@
9740EEB61CF901F6004384FC /* Run Script */,
97C146EA1CF9000F007C117D /* Sources */,
97C146EB1CF9000F007C117D /* Frameworks */,
AEE2471C28CF82200092F192 /* Embed App Extensions */,
97C146EC1CF9000F007C117D /* Resources */,
9705A1C41CF9048500538489 /* Embed Frameworks */,
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
242C769F86A7805781E3C954 /* [CP] Embed Pods Frameworks */,
AEE2471C28CF82200092F192 /* Embed App Extensions */,
);
buildRules = (
);
Expand All @@ -384,7 +373,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 1340;
LastUpgradeCheck = 1300;
LastUpgradeCheck = 1430;
ORGANIZATIONNAME = "";
TargetAttributes = {
0F872E3A28D875E3002954CC = {
Expand Down Expand Up @@ -517,7 +506,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
};
/* End PBXShellScriptBuildPhase section */

Expand Down Expand Up @@ -609,11 +598,9 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_ENTITLEMENTS = Extension/Extension.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 18;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = T583WJWNAK;
DEVELOPMENT_TEAM = T583WJWNAK;
GCC_C_LANGUAGE_STANDARD = gnu11;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Extension/Info.plist;
Expand All @@ -631,7 +618,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.mr.acProjectApp.Extension;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.mr.acProjectApp.Extension";
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_EMIT_LOC_STRINGS = YES;
Expand All @@ -651,11 +637,9 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_ENTITLEMENTS = Extension/Extension.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 18;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = T583WJWNAK;
DEVELOPMENT_TEAM = T583WJWNAK;
GCC_C_LANGUAGE_STANDARD = gnu11;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Extension/Info.plist;
Expand All @@ -672,7 +656,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.mr.acProjectApp.Extension;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.mr.acProjectApp.Extension";
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
Expand All @@ -690,11 +673,9 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_ENTITLEMENTS = Extension/Extension.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 18;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = T583WJWNAK;
DEVELOPMENT_TEAM = T583WJWNAK;
GCC_C_LANGUAGE_STANDARD = gnu11;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Extension/Info.plist;
Expand All @@ -711,7 +692,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.mr.acProjectApp.Extension;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.mr.acProjectApp.Extension";
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -780,11 +760,9 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 18;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = T583WJWNAK;
DEVELOPMENT_TEAM = T583WJWNAK;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
Expand All @@ -795,7 +773,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.mr.acProjectApp;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.mr.acProjectApp";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
Expand Down Expand Up @@ -926,11 +903,9 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 18;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = T583WJWNAK;
DEVELOPMENT_TEAM = T583WJWNAK;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
Expand All @@ -941,7 +916,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.mr.acProjectApp;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.mr.acProjectApp";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
Expand All @@ -962,11 +936,9 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 18;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = T583WJWNAK;
DEVELOPMENT_TEAM = T583WJWNAK;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
Expand All @@ -977,7 +949,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.mr.acProjectApp;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.mr.acProjectApp";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
Expand Down
2 changes: 1 addition & 1 deletion lib/const/consts.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ const reportReasons = [
'SLANDER',
'SPAM',
'PERSONAL_INFO',
'OTHER'
'OTHER',
];
6 changes: 3 additions & 3 deletions lib/cubits/folders/get_user_folders_cubit.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import 'package:ac_project_app/provider/api/folders/folder_api.dart';
import 'package:flutter_bloc/flutter_bloc.dart';

class GetUserFoldersCubit extends Cubit<FolderList> {
GetUserFoldersCubit(): super(FolderList([]));
GetUserFoldersCubit(): super(const FolderList([]));

final FolderApi folderApi = getIt();

Expand All @@ -16,11 +16,11 @@ class GetUserFoldersCubit extends Cubit<FolderList> {
emit(FolderList(list));
},
error: (msg) {
emit(FolderList([]));
emit(const FolderList([]));
},
);
} catch (e) {
emit(FolderList([]));
emit(const FolderList([]));
}
}
}
2 changes: 1 addition & 1 deletion lib/cubits/links/upload_link_cubit.dart
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import 'package:ac_project_app/cubits/links/upload_result_state.dart';
import 'package:ac_project_app/util/url_loader.dart';
import 'package:ac_project_app/di/set_up_get_it.dart';
import 'package:ac_project_app/models/link/link.dart';
import 'package:ac_project_app/models/link/upload_type.dart';
import 'package:ac_project_app/provider/api/folders/link_api.dart';
import 'package:ac_project_app/util/logger.dart';
import 'package:ac_project_app/util/string_utils.dart';
import 'package:ac_project_app/util/url_loader.dart';
import 'package:flutter_bloc/flutter_bloc.dart';

class UploadLinkCubit extends Cubit<UploadResultState> {
Expand Down
12 changes: 8 additions & 4 deletions lib/models/job/topic.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ class Topic {
_name = name;
}

Topic.fromJson(dynamic json) {
_id = json['id'] as int?;
_name = json['name'] as String?;
}

static List<Topic> fromJsonList(List<dynamic> jsonList) {
final result = <Topic>[];
for (final json in jsonList) {
Expand All @@ -15,12 +20,9 @@ class Topic {
return result;
}

Topic.fromJson(dynamic json) {
_id = json['id'] as int?;
_name = json['name'] as String?;
}
int? _id;
String? _name;

Topic copyWith({
int? id,
String? name,
Expand All @@ -29,7 +31,9 @@ class Topic {
id: id ?? _id,
name: name ?? _name,
);

int? get id => _id;

String? get name => _name;

Map<String, dynamic> toJson() {
Expand Down
17 changes: 13 additions & 4 deletions lib/models/user/detail_user.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class DetailUser extends Equatable {
json['job_group'] != null ? JobGroup.fromJson(json['job_group']) : null;
_profile_img = json['profile_img'] as String?;
}

late final int? _id;
late final String? _nickname;
late final JobGroup? _jobGroup;
Expand All @@ -39,9 +40,13 @@ class DetailUser extends Equatable {
jobGroup: jobGroup ?? _jobGroup,
profile_img: profile_img ?? _profile_img,
);

int? get id => _id;

String get nickname => _nickname ?? '';

JobGroup? get jobGroup => _jobGroup;

String get profile_img => _profile_img ?? '';

Map<String, dynamic> toJson() {
Expand Down Expand Up @@ -85,6 +90,11 @@ class JobGroup {
_name = name;
}

JobGroup.fromJson(dynamic json) {
_id = json['id'] as int?;
_name = json['name'] as String?;
}

static List<JobGroup> fromJsonList(List<dynamic> jsonList) {
final result = <JobGroup>[];
for (final json in jsonList) {
Expand All @@ -93,12 +103,9 @@ class JobGroup {
return result;
}

JobGroup.fromJson(dynamic json) {
_id = json['id'] as int?;
_name = json['name'] as String?;
}
int? _id;
String? _name;

JobGroup copyWith({
int? id,
String? name,
Expand All @@ -107,7 +114,9 @@ class JobGroup {
id: id ?? _id,
name: name ?? _name,
);

int? get id => _id;

String? get name => _name;

Map<String, dynamic> toJson() {
Expand Down
2 changes: 1 addition & 1 deletion lib/provider/api/user/profile_api.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class ProfileApi {
final result = await _client.patchUri(
'/users/me',
body: {
'profile_img': profileImg
'profile_img': profileImg,
},
);
return result.when(
Expand Down
10 changes: 5 additions & 5 deletions lib/provider/kakao/kakao.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ import 'package:ac_project_app/cubits/profile/profile_info_cubit.dart';
import 'package:ac_project_app/cubits/profile/profile_state.dart';
import 'package:ac_project_app/di/set_up_get_it.dart';
import 'package:ac_project_app/models/folder/folder.dart';
import 'package:ac_project_app/models/link/link.dart' as MyLink;
import 'package:ac_project_app/models/link/link.dart' as my_link;
import 'package:ac_project_app/models/profile/profile.dart' as Profile;
import 'package:ac_project_app/models/profile/profile_image.dart';
import 'package:ac_project_app/provider/api/folders/link_api.dart';
import 'package:ac_project_app/provider/api/user/user_api.dart' as MyUserApi;
import 'package:ac_project_app/provider/api/user/user_api.dart' as my_user_api;
import 'package:ac_project_app/provider/login/firebase_auth_remote_data_source.dart';
import 'package:ac_project_app/routes.dart';
import 'package:ac_project_app/ui/widget/bottom_toast.dart';
Expand All @@ -22,7 +23,6 @@ import 'package:flutter/services.dart';
import 'package:kakao_flutter_sdk_share/kakao_flutter_sdk_share.dart';
import 'package:kakao_flutter_sdk_user/kakao_flutter_sdk_user.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:ac_project_app/models/profile/profile.dart' as Profile;

class Kakao {
static Future<bool> login() async {
Expand Down Expand Up @@ -94,7 +94,7 @@ class Kakao {
}
}

static Future<void> sendKakaoLinkShare(MyLink.Link link) async {
static Future<void> sendKakaoLinkShare(my_link.Link link) async {
final defaultFeed = FeedTemplate(
content: Content(
title: link.title ?? '',
Expand Down Expand Up @@ -248,7 +248,7 @@ class Kakao {
if (query.keys.contains('folderId')) {
final folderId = query['folderId']!;
final userId = query['userId'] ?? '';
getIt<MyUserApi.UserApi>().getUsersId(userId).then((result) {
getIt<my_user_api.UserApi>().getUsersId(userId).then((result) {
result.when(
success: (user) {
final profileInfoCubit = getIt<GetProfileInfoCubit>();
Expand Down
4 changes: 2 additions & 2 deletions lib/provider/share_data_provider.dart
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class ShareDataProvider {
'describe': item['comment'],
'image': item['image_link'],
'folder_name': item['folder_name'],
'created_at': item['created_at']
'created_at': item['created_at'],
});
}

Expand All @@ -57,7 +57,7 @@ class ShareDataProvider {
final folder = {
'name': json['name'],
'visible': json['visible'],
'created_at': json['created_at']
'created_at': json['created_at'],
};
result.add(folder);
}
Expand Down
Loading
Loading