resolve merge conflict

2023-02-12 06:15:27 +01:00
parent 0a58280f3d
commit 0e00805187
83 changed files with 1733 additions and 1101 deletions
@@ -15,7 +15,7 @@ class ProfileDrawer extends HookConsumerWidget {

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    buildSignoutButton() {
+    buildSignOutButton() {
      return ListTile(
        horizontalTitleGap: 0,
        leading: SizedBox(
@@ -95,6 +95,9 @@ class ProfileDrawer extends HookConsumerWidget {
    }

    return Drawer(
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.zero,
+      ),
      child: Column(
        mainAxisAlignment: MainAxisAlignment.spaceBetween,
        children: [
@@ -105,7 +108,7 @@ class ProfileDrawer extends HookConsumerWidget {
              const ProfileDrawerHeader(),
              buildSettingButton(),
              buildAppLogButton(),
-              buildSignoutButton(),
+              buildSignOutButton(),
            ],
          ),
          const ServerInfoBox()