Browse Source

chore: remove unused code

Lucas.Xu 2 years ago
parent
commit
93f6418400

+ 0 - 12
frontend/Makefile.toml

@@ -167,18 +167,6 @@ TARGET_OS = "android"
 CRATE_TYPE = "cdylib"
 FLUTTER_OUTPUT_DIR = "Debug"
 
-[tasks.setup-crate-android]
-private = true
-script_runner = "@duckscript"
-script = [
-    """
-      toml = readfile ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/rust-lib/${CARGO_MAKE_CRATE_NAME}/Cargo.toml
-      val = replace ${toml} "cdylib" ${CRATE_TYPE}
-      result = writefile ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/rust-lib/${CARGO_MAKE_CRATE_NAME}/Cargo.toml ${val}
-      assert ${result}
-      """,
-]
-
 [tasks.setup-crate-type]
 private = true
 script = [

+ 10 - 6
frontend/app_flowy/packages/appflowy_board/example/lib/multi_board_list_example.dart

@@ -35,11 +35,15 @@ class _MultiBoardListExampleState extends State<MultiBoardListExample> {
       TextItem("Card 9"),
     ];
 
-    final column1 = AFBoardColumnData(id: "To Do", items: a);
-    final column2 = AFBoardColumnData(id: "In Progress", items: <AFColumnItem>[
-      RichTextItem(title: "Card 10", subtitle: 'Aug 1, 2020 4:05 PM'),
-      TextItem("Card 11"),
-    ]);
+    final column1 = AFBoardColumnData(id: "To Do", name: "To Do", items: a);
+    final column2 = AFBoardColumnData(
+      id: "In Progress",
+      name: "In Progress",
+      items: <AFColumnItem>[
+        RichTextItem(title: "Card 10", subtitle: 'Aug 1, 2020 4:05 PM'),
+        TextItem("Card 11"),
+      ],
+    );
 
     final column3 =
         AFBoardColumnData(id: "Done", name: "Done", items: <AFColumnItem>[]);
@@ -111,7 +115,7 @@ class _MultiBoardListExampleState extends State<MultiBoardListExample> {
       return Align(
         alignment: Alignment.centerLeft,
         child: Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 40),
+          padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 60),
           child: Text(item.s),
         ),
       );

+ 1 - 1
frontend/app_flowy/packages/appflowy_board/lib/src/widgets/board.dart

@@ -217,7 +217,7 @@ class _BoardContentState extends State<BoardContent> {
               final boardColumn = AFBoardColumnWidget(
                 margin: _marginFromIndex(columnIndex),
                 itemMargin: widget.config.columnItemPadding,
-                headerBuilder: widget.headerBuilder,
+                headerBuilder: _buildHeader,
                 footBuilder: widget.footBuilder,
                 cardBuilder: widget.cardBuilder,
                 dataSource: dataSource,

+ 2 - 1
frontend/app_flowy/packages/flowy_sdk/lib/ffi.dart

@@ -16,7 +16,8 @@ DynamicLibrary _open() {
     final prefix = "${Directory.current.path}/.sandbox";
     if (Platform.isLinux)
       return DynamicLibrary.open('${prefix}/libdart_ffi.so');
-    if (Platform.isAndroid) return DynamicLibrary.open('libdart_ffi.so');
+    if (Platform.isAndroid)
+      return DynamicLibrary.open('${prefix}/libdart_ffi.so');
     if (Platform.isMacOS) return DynamicLibrary.open('${prefix}/libdart_ffi.a');
     if (Platform.isIOS) return DynamicLibrary.open('${prefix}/libdart_ffi.a');
     if (Platform.isWindows)

+ 11 - 0
frontend/rust-lib/Cargo.lock

@@ -1796,6 +1796,7 @@ dependencies = [
  "lazy_static",
  "libsqlite3-sys",
  "log",
+ "openssl",
  "r2d2",
  "scheduled-thread-pool",
 ]
@@ -2096,6 +2097,15 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
+[[package]]
+name = "openssl-src"
+version = "111.22.0+1.1.1q"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "openssl-sys"
 version = "0.9.72"
@@ -2105,6 +2115,7 @@ dependencies = [
  "autocfg",
  "cc",
  "libc",
+ "openssl-src",
  "pkg-config",
  "vcpkg",
 ]

+ 1 - 1
frontend/rust-lib/dart-ffi/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 name = "dart_ffi"
 # this value will change depending on the target os
 # default static lib
-crate-type = ["staticlib", "cdylib"]
+crate-type = ["staticlib"]
 
 
 [dependencies]