refactor code to prepare for Android (#35)

1. fix bugs after 0.0.4 developer
2. add flutter api for Android, and do some pre jobs of Android App development

Author: timzaak

.github/workflows/android_build.yml

@@ -0,0 +1,67 @@
+name: fornet Android client build
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        required: true
+        description: "version to release"
+jobs:
+  build_android:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1        
+        with:
+          toolchain: stable
+          target: armv7-linux-androideabi, aarch64-linux-android
+          profile: minimal
+      - name: Set up JDK
+        uses: actions/setup-java@v2
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: gradle
+      - name: Set up Android NDK
+        uses: nttld/setup-ndk@v1
+        with:
+          ndk-version: 'r25b'
+          local-cache: true    
+      - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: '3.10.6'
+          cache: true
+      - name: Set up cargo cache
+        uses: actions/cache@v3
+        continue-on-error: false
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            client/target/            
+          key: ubuntu-android-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: ubuntu-cargo-android
+      - name: Download Android keystore
+        id: android_keystore
+        uses: timheuer/base64-to-file@v1.0.3
+        with:
+          fileName: upload-keystore.jks
+          encodedString: ${{ secrets.KEYSTORE_BASE64 }}      
+      - name: Create key.properties
+        run: |
+          echo "storeFile=${{ steps.android_keystore.outputs.filePath }}" > app/android/sign.properties
+          echo "storePassword=${{ secrets.STORE_PASSWORD }}" >> app/android/sign.properties
+          echo "keyPassword=${{ secrets.KEY_PASSWORD }}" >> app/android/sign.properties
+          echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> app/android/sign.properties
+      - name: Build
+        run: make release-android
+      - name: Upload artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: android-apk.zip
+          path: app/android/app/build/outputs/apk/*.apk
+          if-no-files-found: error

Makefile

@@ -1,5 +1,5 @@
 # This is for .github/workflows.
-.PHONY: release-mac-x86_64, release-mac-aarch64, release-linux, release-backend, release-linux-aarch64
+.PHONY: release-mac-x86_64, release-mac-aarch64, release-linux, release-backend, release-linux-aarch64, release-android
 
 #base_dir := $(shell pwd)
 
@@ -54,4 +54,9 @@ release-backend:
 	cd backend && sbt universal:packageBin && cd ../
 	mkdir -p release
 	cp backend/target/universal/app-*.zip release/
-	cp backend/target/universal/app-*.zip command/docker/backend/app.zip && cd command/docker/backend && unzip app.zip && rm app.zip && mv app-* app
+	cp backend/target/universal/app-*.zip command/docker/backend/app.zip && cd command/docker/backend && unzip app.zip && rm app.zip && mv app-* app
+
+release-android:
+	cargo install cargo-ndk
+	cd app && flutter pub get && flutter build apk
+

admin-web/config-overrides.js

@@ -0,0 +1,22 @@
+const {
+    override,
+    addLessLoader,
+    addWebpackAlias,
+    adjustStyleLoaders,
+} = require('customize-cra')
+const path = require('path')
+
+module.exports = override(
+    addLessLoader({
+        // lessOptions: {
+        //     javascriptEnabled: true,
+        // },
+    }),
+    adjustStyleLoaders(({use: [, , postcss]}) => {
+        const postcssOptions = postcss.options;
+        postcss.options = {postcssOptions};
+    }),
+    addWebpackAlias({
+        '@': path.resolve(__dirname, 'src'),
+    }),
+)

admin-web/package-lock.json

@@ -24,8 +24,8 @@
     "typescript": "^4.4.2"
   },
   "scripts": {
-    "start": "dotenv -e .env.dev react-scripts start",
-    "build:prod": "dotenv -e .env.prod react-scripts build",
+    "start": "dotenv -e .env.dev react-app-rewired start",
+    "build:prod": "dotenv -e .env.prod react-app-rewired build",
     "eject": "react-scripts eject"
   },
   "eslintConfig": {
@@ -48,7 +48,11 @@
   },
   "devDependencies": {
     "@types/lodash": "^4.14.186",
+    "customize-cra": "^1.0.0",
     "dotenv-cli": "^7.2.1",
-    "http-proxy-middleware": "^2.0.6"
+    "http-proxy-middleware": "^2.0.6",
+    "less": "^4.2.0",
+    "less-loader": "^11.1.3",
+    "react-app-rewired": "^2.2.1"
   }
 }

admin-web/package.json

@@ -4,7 +4,7 @@ import './index.less';
 import {Provider} from "react-redux";
 import {store} from "./store";
 import AppRouter from "./routes";
-import {ConfigProvider} from "antd";
+import {ConfigProvider, theme} from "antd";
 import 'dayjs/locale/zh-cn'
 import 'dayjs/locale/en'
 import {RawIntlProvider} from 'react-intl'
@@ -18,7 +18,7 @@ const root = ReactDOM.createRoot(
 );
 const render = () => root.render(
     <Provider store={store}>
-        <ConfigProvider locale={antdLocale}>
+        <ConfigProvider locale={antdLocale} theme={{algorithm: theme.darkAlgorithm}}>
             <RawIntlProvider value={intl}>
                 <AppRouter/>
             </RawIntlProvider>

admin-web/src/index.tsx

@@ -3,5 +3,5 @@
   //padding: 24px;
   overflow:auto;
   height:100%;
-  background: #0F1116;
+  //background: #0F1116;
 }

admin-web/src/layout/AppLayout.less

@@ -1,5 +1,6 @@
 .App {
   text-align: center;
+  background-color: #1f1f1f;
 }
 
 .App-logo {

admin-web/src/view/login/LoginPage.less

@@ -0,0 +1,15 @@
+gradle-wrapper.jar
+/.gradle
+/captures/
+/gradlew
+/gradlew.bat
+/local.properties
+GeneratedPluginRegistrant.java
+
+# Remember to never publicly share your keystore.
+# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+key.properties
+**/*.keystore
+**/*.jks
+
+app/src/main/jniLibs/*