Merge pull request #10 from geeker-ai/android-sign

Android sign

.github/workflows/publish.yml

@@ -88,8 +88,15 @@ jobs:
           CHANNEL: "site"
           SYSTEM_OS_NAME: "macos"
           VERSION: "${{ steps.get_version.outputs.version-without-v }}"
+          ANDROID_KEY_STORE_PASSWORD: ${{ secrets.ANDROID_KEY_STORE_PASSWORD }}
+          ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
+          ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
+          ANDROID_SIGN_KEY: ${{ secrets.ANDROID_SIGN_KEY }}
+          ANDROID_SIGN: true
+          ANDROID_KEY_PATH: key.jks
         run: |
           echo "$HOME/.pub-cache/bin" >> $GITHUB_PATH
+          echo $ANDROID_SIGN_KEY | base64 -d > android/app/key.jks
           make change-channel
           flutter_distributor release --name macos --skip-clean
           flutter_distributor release --name android --skip-clean

README.md

@@ -77,6 +77,7 @@ python script/deploy.py
 - https://codewithandrea.com/articles/flutter-responsive-layouts-split-view-drawer-navigation/
 - https://flutterawesome.com/
 - [Other Plugins](https://github.com/jahnli/awesome-flutter-plugins)
+- https://summerscar.me/2020/11/06/flutter-%E9%A1%B9%E7%9B%AE%E4%BD%BF%E7%94%A8-github-actions/
 
 [Flutter cli](https://flutter.cn/docs/reference/flutter-cli)
 

android/app/build.gradle

@@ -22,6 +22,14 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
+def keystoreProperties = new Properties()
+if (System.getenv('ANDROID_SIGN')) {
+    keystoreProperties.setProperty('storePassword', System.getenv('ANDROID_KEY_STORE_PASSWORD'))
+    keystoreProperties.setProperty('keyPassword', System.getenv('ANDROID_KEY_PASSWORD'))
+    keystoreProperties.setProperty('keyAlias', System.getenv('ANDROID_KEY_ALIAS'))
+    keystoreProperties.setProperty('storeFile', System.getenv('ANDROID_KEY_PATH'))
+}
+
 android {
     namespace "com.macgeeker.geek_chat"
     compileSdkVersion flutter.compileSdkVersion
@@ -51,11 +59,20 @@ android {
         versionName flutterVersionName
     }
 
+    signingConfigs {
+        release {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+            storePassword keystoreProperties['storePassword']
+        }
+    }
+
     buildTypes {
         release {
             // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
+            signingConfig signingConfigs.release
         }
     }
 }

lib/components/chat/chat_list_menu_item.dart

@@ -21,11 +21,13 @@ class ChatListMenuItemComponent extends StatelessWidget {
     bool isSelected = currentSession?.sid == session.sid ? true : false;
     return PopupMenuItem(
       padding: const EdgeInsets.all(0),
+      height: 42,
       // value: session.sid,
       child: ListTile(
         minVerticalPadding: 0,
+        visualDensity: const VisualDensity(horizontal: -2, vertical: -3),
         contentPadding:
-            const EdgeInsets.only(right: 2, left: 18, top: 0, bottom: 0),
+            const EdgeInsets.only(right: 2, left: 16, top: 0, bottom: 0),
         title: buildMenuItem(context, isSelected, onDelete),
         selectedTileColor: const Color.fromARGB(50, 84, 77, 77),
         leading: const Icon(Icons.chat_bubble_outline),

lib/components/desktop_main_right_component.dart

@@ -21,7 +21,7 @@ class DeskTopMainRightComponent extends StatelessWidget {
         scrollButtonListener();
       });
       scrollButtonListener();
-      questionInputFocus.requestFocus();
+      // questionInputFocus.requestFocus();
     });
   }
 

lib/pages/desktop_home_page.dart

@@ -25,101 +25,107 @@ class DesktopHomePage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(top: 4, left: 8, bottom: 10),
-      child: Row(
-        children: [
-          SizedBox(
-            width: 240,
-            child: Column(
-              children: [
-                SizedBox(
-                  height: 40,
-                  width: double.infinity,
-                  child: OutlinedButton.icon(
-                    style: OutlinedButton.styleFrom(
-                        shape: RoundedRectangleBorder(
-                            borderRadius: BorderRadius.circular(3))),
-                    onPressed: () {
-                      Get.toNamed('/editchat',
-                          parameters: {'opt': 'new', 'sid': ''});
-                    },
-                    label: const Text("New Chat"),
-                    icon: const Icon(Icons.add),
-                  ),
-                ),
-                const SizedBox(
-                  height: 5,
-                ),
-                Expanded(
-                  child: GetBuilder<ChatListController>(builder: (controller) {
-                    return ListView.builder(
-                        itemCount: controller.sessions.length,
-                        controller: ScrollController(),
-                        itemBuilder: (BuildContext ctxt, int index) {
-                          return ChatListMenuItemComponent(
-                              session: controller.sessions.elementAt(index),
-                              onTap: (String sid) {
-                                controller.switchSession(sid);
-                                controller.update();
-                              },
-                              currentSession: controller.currentSession,
-                              onDelete: (SessionModel session) {
-                                chatMessageController
-                                    .cleanSessionMessages(session.sid);
-                                controller.remove(session);
-                                controller.reloadSessions();
-                                controller.update();
-                              });
-                        });
-                  }),
-                ),
-                const Padding(
-                  padding: EdgeInsets.only(left: 5, right: 10),
-                  child: Divider(),
-                ),
-                SizedBox(
-                  width: double.infinity,
-                  child: Column(children: [
-                    LeftMenuButtonComponent(
-                      title: "Settings".tr,
-                      onPressed: () {
-                        Get.toNamed("/dsettings");
-                      },
-                      icon: Icons.settings,
-                    ),
-                    LeftMenuButtonComponent(
-                      title:
-                          "${'About'.tr}(v${settingsController.packageInfo.version})",
+    return Scaffold(
+      appBar: AppBar(
+        toolbarHeight: 0,
+      ),
+      body: Padding(
+        padding: const EdgeInsets.only(top: 4, left: 8, bottom: 10),
+        child: Row(
+          children: [
+            SizedBox(
+              width: 240,
+              child: Column(
+                children: [
+                  SizedBox(
+                    height: 40,
+                    width: double.infinity,
+                    child: OutlinedButton.icon(
+                      style: OutlinedButton.styleFrom(
+                          shape: RoundedRectangleBorder(
+                              borderRadius: BorderRadius.circular(3))),
                       onPressed: () {
-                        Get.toNamed("/about");
-                        // Get.snackbar(
-                        //   'Sorry!'.tr,
-                        //   'This feature will coming soon!'.tr,
-                        //   duration: const Duration(seconds: 2),
-                        //   snackPosition: SnackPosition.TOP,
-                        // );
+                        Get.toNamed('/editchat',
+                            parameters: {'opt': 'new', 'sid': ''});
                       },
-                      icon: Icons.info_outline,
+                      label: const Text("New Chat"),
+                      icon: const Icon(Icons.add),
                     ),
-                  ]),
-                ),
-              ],
+                  ),
+                  const SizedBox(
+                    height: 5,
+                  ),
+                  Expanded(
+                    child:
+                        GetBuilder<ChatListController>(builder: (controller) {
+                      return ListView.builder(
+                          itemCount: controller.sessions.length,
+                          controller: ScrollController(),
+                          itemBuilder: (BuildContext ctxt, int index) {
+                            return ChatListMenuItemComponent(
+                                session: controller.sessions.elementAt(index),
+                                onTap: (String sid) {
+                                  controller.switchSession(sid);
+                                  controller.update();
+                                },
+                                currentSession: controller.currentSession,
+                                onDelete: (SessionModel session) {
+                                  chatMessageController
+                                      .cleanSessionMessages(session.sid);
+                                  controller.remove(session);
+                                  controller.reloadSessions();
+                                  controller.update();
+                                });
+                          });
+                    }),
+                  ),
+                  const Padding(
+                    padding: EdgeInsets.only(left: 5, right: 10),
+                    child: Divider(),
+                  ),
+                  SizedBox(
+                    width: double.infinity,
+                    child: Column(children: [
+                      LeftMenuButtonComponent(
+                        title: "Settings".tr,
+                        onPressed: () {
+                          Get.toNamed("/dsettings");
+                        },
+                        icon: Icons.settings,
+                      ),
+                      LeftMenuButtonComponent(
+                        title:
+                            "${'About'.tr}(v${settingsController.packageInfo.version})",
+                        onPressed: () {
+                          Get.toNamed("/about");
+                          // Get.snackbar(
+                          //   'Sorry!'.tr,
+                          //   'This feature will coming soon!'.tr,
+                          //   duration: const Duration(seconds: 2),
+                          //   snackPosition: SnackPosition.TOP,
+                          // );
+                        },
+                        icon: Icons.info_outline,
+                      ),
+                    ]),
+                  ),
+                ],
+              ),
+            ),
+            Container(
+              width: 0.5,
+              // color: Colors.black,
             ),
-          ),
-          Container(
-            width: 0.5,
-            // color: Colors.black,
-          ),
-          Expanded(
-            child: GetBuilder<ChatListController>(builder: (controller) {
-              return chatListController.currentSessionId.isEmpty
-                  ? const Text("Error!")
-                  : DeskTopMainRightComponent(
-                      sid: chatListController.currentSession.sid);
-            }),
-          )
-        ],
+            Expanded(
+              child: GetBuilder<ChatListController>(builder: (controller) {
+                return chatListController.currentSessionId.isEmpty
+                    ? const Text("Error!")
+                    : DeskTopMainRightComponent(
+                        sid: chatListController.currentSession.sid);
+              }),
+            )
+          ],
+        ),
       ),
     );
   }

lib/util/functions.dart

@@ -33,7 +33,10 @@ DeviceType getDeviceType() {
     return DeviceType.wide;
   }
 
-  // TODO 折叠屏设备? iPad等设备
+  // Pixel fold
+  if (size.width > 1500 && size.height > 2000) {
+    return DeviceType.wide;
+  }
   if (width > 1000.0 && height > 700.0) {
     return DeviceType.wide;
   }

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.0.1+1
+version: 0.0.45+1
 
 environment:
   sdk: ">=3.1.0 <4.0.0"