Merge branch 'main' into main

Author: appflowy

frontend/Makefile.toml

@@ -14,7 +14,7 @@ extend = [
 on_error_task = "catch"
 
 [tasks.catch]
-run_task = {name = ["restore-crate-type"]}
+run_task = { name = ["restore-crate-type"] }
 
 [env]
 RUST_LOG = "info"
@@ -42,8 +42,8 @@ PRODUCT_NAME = "AppFlowy"
 CRATE_TYPE = "staticlib"
 SDK_EXT = "a"
 APP_ENVIRONMENT = "local"
-FLUTTER_FLOWY_SDK_PATH="app_flowy/packages/flowy_sdk"
-PROTOBUF_DERIVE_CACHE="../shared-lib/flowy-derive/src/derive_cache/derive_cache.rs"
+FLUTTER_FLOWY_SDK_PATH = "app_flowy/packages/flowy_sdk"
+PROTOBUF_DERIVE_CACHE = "../shared-lib/flowy-derive/src/derive_cache/derive_cache.rs"
 
 [env.development-mac-arm64]
 RUST_LOG = "info"
@@ -139,8 +139,7 @@ LINUX_ARCH = "arm64"
 APP_ENVIRONMENT = "production"
 
 [tasks.echo_env]
-script = [
-    '''
+script = ['''
     echo "-------- Env Parameters --------"
     echo CRATE_TYPE: ${CRATE_TYPE}
     echo BUILD_FLAG: ${BUILD_FLAG}
@@ -151,8 +150,7 @@ script = [
     echo APP_ENVIRONMENT: ${APP_ENVIRONMENT}
     echo ${platforms}
     echo ${BUILD_ARCHS}
-    '''
-]
+    ''']
 script_runner = "@shell"
 
 [env.production-ios]
@@ -166,6 +164,14 @@ BUILD_FLAG = "debug"
 TARGET_OS = "android"
 CRATE_TYPE = "cdylib"
 FLUTTER_OUTPUT_DIR = "Debug"
+FEATURES = "flutter,openssl_vendored"
+
+[env.production-android]
+BUILD_FLAG = "release"
+TARGET_OS = "android"
+CRATE_TYPE = "cdylib"
+FLUTTER_OUTPUT_DIR = "Release"
+FEATURES = "flutter,openssl_vendored"
 
 [tasks.setup-crate-type]
 private = true
@@ -192,11 +198,9 @@ script = [
 script_runner = "@duckscript"
 
 [tasks.test-build]
-condition = { env_set = [ "FLUTTER_FLOWY_SDK_PATH"] }
-script = [
-    """
+condition = { env_set = ["FLUTTER_FLOWY_SDK_PATH"] }
+script = ["""
       cd ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/rust-lib/flowy-net
       cargo build -vv --features=dart
-      """,
-]
+      """]
 script_runner = "@shell"

frontend/app_flowy/assets/translations/en.json

@@ -213,8 +213,8 @@
       "aquaColor": "Aqua",
       "blueColor": "Blue",
       "deleteTag": "Delete tag",
-      "colorPannelTitle": "Colors",
-      "pannelTitle": "Select an option or create one",
+      "colorPanelTitle": "Colors",
+      "panelTitle": "Select an option or create one",
       "searchOption": "Search for an option"
     },
     "menuName": "Grid"

frontend/app_flowy/assets/translations/es-VE.json

@@ -201,8 +201,8 @@
       "aquaColor": "Agua",
       "blueColor": "Azul",
       "deleteTag": "Borrar etiqueta",
-      "colorPannelTitle": "Colores",
-      "pannelTitle": "Selecciona una opción o crea una",
+      "colorPanelTitle": "Colores",
+      "panelTitle": "Selecciona una opción o crea una",
       "searchOption": "Buscar una opción"
     },
     "menuName": "Grid"
@@ -218,4 +218,4 @@
     "openSidebar": "Open sidebar",
     "closeSidebar": "Close sidebar"
   }
-}
+}

frontend/app_flowy/assets/translations/fr-FR.json

@@ -199,8 +199,8 @@
       "aquaColor": "Aqua",
       "blueColor": "Bleu",
       "deleteTag": "Supprimer l'étiquette",
-      "colorPannelTitle": "Couleurs",
-      "pannelTitle": "Sélectionnez une option ou créez-en une",
+      "colorPanelTitle": "Couleurs",
+      "panelTitle": "Sélectionnez une option ou créez-en une",
       "searchOption": "Rechercher une option"
     },
     "menuName": "Grille"
@@ -212,4 +212,4 @@
       "timeHintTextInTwentyFourHour": "12:00"
     }
   }
-}
+}

frontend/app_flowy/assets/translations/id-ID.json

@@ -202,8 +202,8 @@
       "aquaColor": "Air",
       "blueColor": "Biru",
       "deleteTag": "Hapus tag",
-      "colorPannelTitle": "Warna",
-      "pannelTitle": "Pilih opsi atau buat baru",
+      "colorPanelTitle": "Warna",
+      "panelTitle": "Pilih opsi atau buat baru",
       "searchOption": "Cari opsi"
     },
     "menuName": "Grid"

frontend/app_flowy/assets/translations/ja-JP.json

@@ -191,8 +191,8 @@
       "aquaColor": "水色",
       "blueColor": "青",
       "deleteTag": "選択候補を削除",
-      "colorPannelTitle": "色",
-      "pannelTitle": "選択候補を検索 または 作成する",
+      "colorPanelTitle": "色",
+      "panelTitle": "選択候補を検索 または 作成する",
       "searchOption": "選択候補を検索"
     }
   },