Skip to content

Commit

Permalink
feat: 컨텐츠 대표이미지 10장 추가 및 등록 로직 수정 (#52)
Browse files Browse the repository at this point in the history
  • Loading branch information
@nain93
nain93 authored Aug 4, 2023
1 parent 2c89b57 commit 60761ed
Show file tree
Hide file tree
Showing 19 changed files with 333 additions and 260 deletions.
Binary file added assets/images/bagMoa.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/book.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/brush.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/heartMoa.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/hearts.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/location.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/movie.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/movie2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/newsMoa.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/recipe.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/style.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions lib/constants/file_constants.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,18 @@ class Assets {
static AssetImage profileMoa = const AssetImage('$_imgPath/profileMoa.png');
static AssetImage link = const AssetImage('$_imgPath/link.png');
static AssetImage image = const AssetImage('$_imgPath/image.png');

static AssetImage bagMoa = const AssetImage('$_imgPath/bagMoa.png');
static AssetImage book = const AssetImage('$_imgPath/book.png');
static AssetImage brush = const AssetImage('$_imgPath/brush.png');
static AssetImage heartMoa = const AssetImage('$_imgPath/heartMoa.png');
static AssetImage hearts = const AssetImage('$_imgPath/hearts.png');
static AssetImage location = const AssetImage('$_imgPath/location.png');
static AssetImage movie = const AssetImage('$_imgPath/movie.png');
static AssetImage movie2 = const AssetImage('$_imgPath/movie2.png');
static AssetImage newsMoa = const AssetImage('$_imgPath/newsMoa.png');
static AssetImage recipe = const AssetImage('$_imgPath/recipe.png');
static AssetImage style = const AssetImage('$_imgPath/style.png');
}

class Svgs {
Expand Down
1 change: 1 addition & 0 deletions lib/screens/add_content/add_image_content.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ class AddImageContent extends HookConsumerWidget {
}

loading.value = true;

String base64Image = await xFileToBase64(imageFile.value!);

var selectTag = [];
Expand Down
281 changes: 168 additions & 113 deletions lib/screens/add_content/add_link_content.dart
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import 'dart:convert';
import 'dart:io';

import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:go_router/go_router.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
Expand Down Expand Up @@ -34,15 +36,30 @@ class AddLinkContent extends HookConsumerWidget {
var loading = useState(false);
var picker = ImagePicker();
var imageFile = useState<XFile?>(null);
var receiveImage = useState<String?>(null);
// var defaultImageList = useState<List<String>>([]);

var defaultImage = useState<String?>(null);
var defaultImageList = useState<List<AssetImage?>>([
null,
Assets.bagMoa,
Assets.book,
Assets.brush,
Assets.heartMoa,
Assets.hearts,
Assets.location,
Assets.movie,
Assets.movie2,
Assets.newsMoa,
Assets.recipe,
Assets.style
]);

var selectedIndex = useState(-1);
var title = useState('');
var link = useState('');
var memo = useState('');
var hashtag = useState('');
var hashtagController = useTextEditingController();
var selectedTagList = useState<List<SelectedTagModel>>([]);
var lifeCycle = useAppLifecycleState();

var imageError = useState('');
var titleError = useState('');
Expand All @@ -60,11 +77,7 @@ class AddLinkContent extends HookConsumerWidget {
return;
}

// todo 기본제공 이미지 10종 리스트에서 추가
// imageFile.value = defaultImageList.value[index - 1];

// todo 대표 이미지 미지정시 하트들고있는 모아 이미지로 대체

if (imageFile.value != null) {
imageError.value = '';
}
Expand All @@ -89,8 +102,12 @@ class AddLinkContent extends HookConsumerWidget {
return;
}
loading.value = true;

String base64Image = await xFileToBase64(imageFile.value!);
late String base64Image;
if (defaultImage.value == null) {
base64Image = await xFileToBase64(imageFile.value!);
} else {
base64Image = defaultImage.value!;
}

var selectTag = [];
selectedTagList.value.map((element) {
Expand Down Expand Up @@ -181,31 +198,33 @@ class AddLinkContent extends HookConsumerWidget {
var crawledTitle = document.head
?.querySelector("meta[property='og:title']")
?.attributes['content'];

if (crawledTitle != null && crawledTitle.length > 30) {
crawledTitle = '${crawledTitle.substring(0, 30)}...';
}
var crawledDescription = document.head
?.querySelector("meta[property='og:description']")
?.attributes['content'];
var crawledImage = document.head
?.querySelector("meta[property='og:image']")
?.attributes['content'];
// var crawledImage = document.head
// ?.querySelector("meta[property='og:image']")
// ?.attributes['content'];

link.value = url;
linkController.text = url;
title.value = crawledTitle ?? '';
titleController.text = crawledTitle ?? '';
memo.value = crawledDescription ?? '';
memoController.text = crawledDescription ?? '';
receiveImage.value = crawledImage ?? '';
// imageFile.value = XFile(crawledImage ?? '');
});
}

useEffect(() {
if (receiveUrl != null) {
if (receiveUrl != null && lifeCycle == AppLifecycleState.resumed) {
// todo 유효한 url인지 체크필요
getCrawlUrl(receiveUrl!);
}
return null;
}, []);
}, [lifeCycle]);

return Scaffold(
appBar: const AppBarBack(
Expand All @@ -215,109 +234,145 @@ class AddLinkContent extends HookConsumerWidget {
body: Stack(
fit: StackFit.expand,
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 15),
child: SingleChildScrollView(
physics: const ClampingScrollPhysics(),
padding: const EdgeInsets.only(bottom: 100),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Text(
'링크',
style: H4TextStyle(),
SingleChildScrollView(
physics: const ClampingScrollPhysics(),
padding: const EdgeInsets.only(bottom: 100),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 15),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Text(
'링크',
style: H4TextStyle(),
),
const SizedBox(height: 5),
EditText(
controller: linkController,
onChanged: onChangedLink,
hintText: '링크를 입력하세요.',
),
ErrorText(
errorText: linkError.value,
errorValidate: linkError.value.isNotEmpty,
),
const SizedBox(height: 25),
const Text(
'대표 이미지',
style: H4TextStyle(),
),
],
),
const SizedBox(height: 5),
EditText(
controller: linkController,
onChanged: onChangedLink,
hintText: '링크를 입력하세요.',
),
ErrorText(
errorText: linkError.value,
errorValidate: linkError.value.isNotEmpty,
),
const SizedBox(height: 25),
const Text(
'대표 이미지',
style: H4TextStyle(),
),
const SizedBox(height: 5),
SizedBox(
width: double.infinity,
height: 85,
child: ListView.builder(
itemCount: 11,
scrollDirection: Axis.horizontal,
itemBuilder: (context, index) {
return Padding(
padding: const EdgeInsets.symmetric(horizontal: 7),
child: Ink(
width: 85,
height: 85,
decoration: BoxDecoration(
borderRadius: const BorderRadius.all(
Radius.circular(15),
),
border: Border.all(
color: AppColors.grayBackground,
width: 0.5,
),
color: AppColors.textInputBackground,
),
const SizedBox(height: 5),
SizedBox(
width: double.infinity,
height: 85,
child: ListView.builder(
padding: const EdgeInsets.symmetric(horizontal: 15),
itemCount: defaultImageList.value.length,
scrollDirection: Axis.horizontal,
itemBuilder: (context, index) {
var image = defaultImageList.value[index];
return Padding(
padding: const EdgeInsets.symmetric(horizontal: 7),
child: Ink(
width: 85,
height: 85,
decoration: BoxDecoration(
borderRadius: const BorderRadius.all(
Radius.circular(15),
),
border: Border.all(
color: selectedIndex.value == index
? AppColors.primaryColor
: AppColors.grayBackground,
width: 0.5,
),
child: InkWell(
onTap: () => pickImage(
source: ImageSource.gallery, index: index),
borderRadius: const BorderRadius.all(
Radius.circular(15),
),
child: index == 0
? imageFile.value != null
? Container(
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(15),
border: Border.all(
color: AppColors.grayBackground,
width: 0.5,
),
image: DecorationImage(
fit: BoxFit.cover,
image: FileImage(
File(imageFile.value!.path)),
),
color: selectedIndex.value == index
? AppColors.moaSecondary
: AppColors.textInputBackground,
),
child: InkWell(
onTap: () async {
if (index == 0) {
pickImage(
source: ImageSource.gallery, index: index);
selectedIndex.value = -1;
return;
}

ByteData bytes = await rootBundle
.load(image!.assetName.toString());
var buffer = bytes.buffer;
var base64Images =
base64.encode(Uint8List.view(buffer));
defaultImage.value = base64Images;
imageFile.value = null;
selectedIndex.value = index;
},
borderRadius: const BorderRadius.all(
Radius.circular(15),
),
child: index == 0
? imageFile.value != null
? Container(
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(15),
border: Border.all(
color: AppColors.grayBackground,
width: 0.5,
),
)
: Center(
child: Image(
width: 15,
height: 15,
image: Assets.circlePlus,
image: DecorationImage(
fit: BoxFit.cover,
image: FileImage(
File(imageFile.value!.path)),
),
)
: const SizedBox(),
),
),
)
: Center(
child: Image(
width: 15,
height: 15,
image: Assets.circlePlus,
),
)
: Padding(
padding: const EdgeInsets.symmetric(
horizontal: 10,
vertical: 20,
),
child: Center(
child: Image(
image: image!,
),
),
),
),
);
},
),
),
);
},
),
AddContentBottom(
onChangedTitle: onChangedTitle,
titleController: titleController,
memoController: memoController,
addHashtag: addHashtag,
hashtagController: hashtagController,
onChangedHashtag: onChangedHashtag,
onChangedMemo: onChangedMemo,
memo: memo,
tagError: tagError,
title: title,
titleError: titleError,
selectedTagList: selectedTagList,
)
],
),
),
AddContentBottom(
onChangedTitle: onChangedTitle,
titleController: titleController,
memoController: memoController,
addHashtag: addHashtag,
hashtagController: hashtagController,
onChangedHashtag: onChangedHashtag,
onChangedMemo: onChangedMemo,
memo: memo,
tagError: tagError,
title: title,
titleError: titleError,
selectedTagList: selectedTagList,
)
],
),
),
Positioned(
Expand Down
Loading

0 comments on commit 60761ed

Please sign in to comment.