✨ New moment

2024-04-14 15:58:27 +08:00
parent 07935a4017
commit c693b0dcd7
20 changed files with 655 additions and 33 deletions
--- a/lib/screens/account.dart
+++ b/lib/screens/account.dart
@ -3,7 +3,7 @@ import 'package:provider/provider.dart';
 import 'package:solian/providers/auth.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:solian/utils/service_url.dart';
-import 'package:solian/widgets/wrapper.dart';
+import 'package:solian/widgets/common_wrapper.dart';
 import 'package:url_launcher/url_launcher.dart';

 class AccountScreen extends StatefulWidget {
@ -66,7 +66,7 @@ class _AccountScreenState extends State<AccountScreen> {
                    caption: AppLocalizations.of(context)!.signInCaption,
                    onTap: () {
                      auth.signIn(context).then((_) {
-                        authClient.isAuthorized().then((val) {
+                        auth.isAuthorized().then((val) {
                          setState(() => isAuthorized = val);
                        });
                      });
@ -90,13 +90,15 @@ class _AccountScreenState extends State<AccountScreen> {
 class NameCard extends StatelessWidget {
  const NameCard({super.key});

-  Future<Widget> renderAvatar() async {
-    final profiles = await authClient.getProfiles();
+  Future<Widget> renderAvatar(BuildContext context) async {
+    final auth = context.read<AuthProvider>();
+    final profiles = await auth.getProfiles();
    return CircleAvatar(backgroundImage: NetworkImage(profiles["picture"]));
  }

-  Future<Column> renderLabel() async {
-    final profiles = await authClient.getProfiles();
+  Future<Column> renderLabel(BuildContext context) async {
+    final auth = context.read<AuthProvider>();
+    final profiles = await auth.getProfiles();
    return Column(
      crossAxisAlignment: CrossAxisAlignment.start,
      children: [
@ -122,7 +124,7 @@ class NameCard extends StatelessWidget {
          child: Row(
            children: [
              FutureBuilder(
-                future: renderAvatar(),
+                future: renderAvatar(context),
                builder:
                    (BuildContext context, AsyncSnapshot<Widget> snapshot) {
                  if (snapshot.hasData) {
@ -134,7 +136,7 @@ class NameCard extends StatelessWidget {
              ),
              const SizedBox(width: 20),
              FutureBuilder(
-                future: renderLabel(),
+                future: renderLabel(context),
                builder:
                    (BuildContext context, AsyncSnapshot<Column> snapshot) {
                  if (snapshot.hasData) {
--- a/lib/screens/explore.dart
+++ b/lib/screens/explore.dart
@ -8,8 +8,8 @@ import 'package:solian/utils/service_url.dart';
 import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:http/http.dart' as http;
+import 'package:solian/widgets/indent_wrapper.dart';
 import 'package:solian/widgets/posts/item.dart';
-import 'package:solian/widgets/wrapper.dart';

 class ExploreScreen extends StatefulWidget {
  const ExploreScreen({super.key});
@ -58,7 +58,15 @@ class _ExploreScreenState extends State<ExploreScreen> {

  @override
  Widget build(BuildContext context) {
-    return LayoutWrapper(
+    return IndentWrapper(
+      noSafeArea: true,
+      floatingActionButton: FloatingActionButton(
+        child: const Icon(Icons.edit),
+        onPressed: () async {
+          final did = await router.pushNamed("posts.moments.new");
+          if (did == true) _pagingController.refresh();
+        },
+      ),
      title: AppLocalizations.of(context)!.explore,
      child: RefreshIndicator(
        onRefresh: () => Future.sync(
@ -75,7 +83,7 @@ class _ExploreScreenState extends State<ExploreScreen> {
                itemBuilder: (context, item, index) => GestureDetector(
                  child: PostItem(item: item),
                  onTap: () {
-                    router.goNamed(
+                    router.pushNamed(
                      'posts.screen',
                      pathParameters: {
                        'alias': item.alias,
--- a/lib/screens/posts/new_moment.dart
+++ b/lib/screens/posts/new_moment.dart
@ -1,19 +1,143 @@
-import 'package:flutter/material.dart';
+import 'dart:convert';

-class NewMomentScreen extends StatelessWidget {
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:solian/models/post.dart';
+import 'package:solian/providers/auth.dart';
+import 'package:solian/router.dart';
+import 'package:solian/utils/service_url.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:solian/widgets/indent_wrapper.dart';
+import 'package:solian/widgets/posts/attachment_editor.dart';
+
+class NewMomentScreen extends StatefulWidget {
  const NewMomentScreen({super.key});

  @override
-  Widget build(BuildContext context) {
-    return Center(
-      child: Container(
-        constraints: const BoxConstraints(maxWidth: 640),
-        child: Column(
-          children: [
+  State<NewMomentScreen> createState() => _NewMomentScreenState();
+}

-          ],
+class _NewMomentScreenState extends State<NewMomentScreen> {
+  final _textController = TextEditingController();
+
+  bool _isSubmitting = false;
+
+  List<Attachment> _attachments = List.empty(growable: true);
+
+  void viewAttachments(BuildContext context) {
+    showModalBottomSheet(
+      context: context,
+      builder: (context) => AttachmentEditor(
+        current: _attachments,
+        onUpdate: (value) => _attachments = value,
+      ),
+    );
+  }
+
+  Future<void> createPost(BuildContext context) async {
+    final auth = context.read<AuthProvider>();
+    if (!await auth.isAuthorized()) return;
+
+    setState(() => _isSubmitting = true);
+    var res = await auth.client!.post(
+      getRequestUri('interactive', '/api/p/moments'),
+      headers: <String, String>{
+        'Content-Type': 'application/json',
+      },
+      body: jsonEncode(<String, dynamic>{
+        'content': _textController.value.text,
+        'attachments': _attachments,
+      }),
+    );
+    if (res.statusCode != 200) {
+      var message = utf8.decode(res.bodyBytes);
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text("Something went wrong... $message")),
+      );
+    } else {
+      if (router.canPop()) {
+        router.pop(true);
+      }
+    }
+    setState(() => _isSubmitting = false);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final auth = context.read<AuthProvider>();
+
+    return IndentWrapper(
+      hideDrawer: true,
+      title: AppLocalizations.of(context)!.newMoment,
+      appBarActions: <Widget>[
+        TextButton(
+          onPressed: !_isSubmitting ? () => createPost(context) : null,
+          child: Text(AppLocalizations.of(context)!.postVerb),
+        ),
+      ],
+      child: Center(
+        child: Container(
+          constraints: const BoxConstraints(maxWidth: 640),
+          child: Column(
+            children: [
+              _isSubmitting ? const LinearProgressIndicator() : Container(),
+              FutureBuilder(
+                future: auth.getProfiles(),
+                builder: (context, snapshot) {
+                  if (snapshot.hasData) {
+                    var userinfo = snapshot.data;
+                    return ListTile(
+                      title: Text(userinfo["nick"]),
+                      subtitle: Text(
+                        AppLocalizations.of(context)!.postIdentityNotify,
+                      ),
+                      leading: CircleAvatar(
+                        backgroundImage: NetworkImage(userinfo["picture"]),
+                      ),
+                    );
+                  } else {
+                    return Container();
+                  }
+                },
+              ),
+              const Divider(thickness: 0.3),
+              Expanded(
+                child: Container(
+                  padding:
+                      const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+                  child: TextField(
+                    maxLines: null,
+                    autofocus: true,
+                    autocorrect: true,
+                    keyboardType: TextInputType.multiline,
+                    controller: _textController,
+                    decoration: InputDecoration.collapsed(
+                      hintText:
+                          AppLocalizations.of(context)!.postContentPlaceholder,
+                    ),
+                  ),
+                ),
+              ),
+              Container(
+                decoration: const BoxDecoration(
+                  border: Border(
+                    top: BorderSide(width: 0.3, color: Color(0xffdedede)),
+                  ),
+                ),
+                child: Row(
+                  children: [
+                    TextButton(
+                      style: TextButton.styleFrom(shape: const CircleBorder()),
+                      child: const Icon(Icons.camera_alt),
+                      onPressed: () => viewAttachments(context),
+                    )
+                  ],
+                ),
+              ),
+            ],
+          ),
        ),
      ),
    );
  }
-}
+}
--- a/lib/screens/posts/screen.dart
+++ b/lib/screens/posts/screen.dart
@ -5,9 +5,9 @@ import 'package:http/http.dart' as http;
 import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 import 'package:solian/models/post.dart';
 import 'package:solian/utils/service_url.dart';
+import 'package:solian/widgets/indent_wrapper.dart';
 import 'package:solian/widgets/posts/comment_list.dart';
 import 'package:solian/widgets/posts/item.dart';
-import 'package:solian/widgets/wrapper.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';

 class PostScreen extends StatefulWidget {
@ -43,7 +43,8 @@ class _PostScreenState extends State<PostScreen> {

  @override
  Widget build(BuildContext context) {
-    return LayoutWrapper(
+    return IndentWrapper(
+      hideDrawer: true,
      title: AppLocalizations.of(context)!.post,
      child: FutureBuilder(
        future: fetchPost(context),