Merge pull request 'mso7nueh-feat(chat)' (#45) from mso7nueh-feat(chat) into diary_refactor

Reviewed-on: maxxkim/eatvio_app#45
This commit is contained in:
mso7nueh
2024-07-03 14:08:17 +00:00
4 changed files with 18 additions and 13 deletions

View File

@@ -18,6 +18,15 @@ class FeedScreen extends StatelessWidget {
builder: (BuildContext context, FeedState state) { builder: (BuildContext context, FeedState state) {
if (state is FeedStateLoaded) { if (state is FeedStateLoaded) {
return _buildFeedScreen(context, state); return _buildFeedScreen(context, state);
} else if (state is FeedStateError) {
return Scaffold(
body: Padding(
padding: const EdgeInsets.all(16),
child: Center(
child: Text(state.errorMessage),
),
),
);
} else { } else {
return Scaffold( return Scaffold(
body: Center( body: Center(
@@ -100,8 +109,7 @@ class FeedScreen extends StatelessWidget {
flex: 1, flex: 1,
child: CustomOutlinedButton( child: CustomOutlinedButton(
text: "+", text: "+",
onPressed: () => onPressed: () => GoRouter.of(context).goNamed('blogPostCreateScreen'),
GoRouter.of(context).goNamed('blogPostCreateScreen'),
buttonStyle: CustomButtonStyles.outlinePrimaryTL15, buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
), ),
), ),
@@ -220,8 +228,7 @@ class FeedScreen extends StatelessWidget {
imageBuilder: (context, imageProvider) => Stack( imageBuilder: (context, imageProvider) => Stack(
children: [ children: [
ClipRRect( ClipRRect(
borderRadius: borderRadius: const BorderRadius.all(Radius.circular(8.0)),
const BorderRadius.all(Radius.circular(8.0)),
child: Image( child: Image(
image: imageProvider, image: imageProvider,
), ),

View File

@@ -8,7 +8,7 @@ class FeedRepository {
Future<List<FeedBlogPostModel>> getFeedBlogPostList() async { Future<List<FeedBlogPostModel>> getFeedBlogPostList() async {
try { try {
return await feedService.getBlocPostList(); return (await feedService.getBlocPostList()).entries.map((entry) => entry.value).toList();
} catch (e) { } catch (e) {
rethrow; rethrow;
} }

View File

@@ -9,5 +9,5 @@ abstract class FeedService {
factory FeedService(Dio dio, {String baseUrl}) = _FeedService; factory FeedService(Dio dio, {String baseUrl}) = _FeedService;
@GET('/feed/index') @GET('/feed/index')
Future<List<FeedBlogPostModel>> getBlocPostList(); Future<Map<String, FeedBlogPostModel>> getBlocPostList();
} }

View File

@@ -19,13 +19,13 @@ class _FeedService implements FeedService {
String? baseUrl; String? baseUrl;
@override @override
Future<List<FeedBlogPostModel>> getBlocPostList() async { Future<Map<String, FeedBlogPostModel>> getBlocPostList() async {
final _extra = <String, dynamic>{}; final _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{}; final queryParameters = <String, dynamic>{};
final _headers = <String, dynamic>{}; final _headers = <String, dynamic>{};
const Map<String, dynamic>? _data = null; const Map<String, dynamic>? _data = null;
final _result = await _dio final _result = await _dio.fetch<Map<String, dynamic>>(
.fetch<List<dynamic>>(_setStreamType<List<FeedBlogPostModel>>(Options( _setStreamType<Map<String, FeedBlogPostModel>>(Options(
method: 'GET', method: 'GET',
headers: _headers, headers: _headers,
extra: _extra, extra: _extra,
@@ -41,10 +41,8 @@ class _FeedService implements FeedService {
_dio.options.baseUrl, _dio.options.baseUrl,
baseUrl, baseUrl,
)))); ))));
var _value = _result.data! var _value = _result.data!.map((k, dynamic v) =>
.map((dynamic i) => MapEntry(k, FeedBlogPostModel.fromJson(v as Map<String, dynamic>)));
FeedBlogPostModel.fromJson(i as Map<String, dynamic>))
.toList();
return _value; return _value;
} }