Changes to support flutter-common

.github/workflows/flutter-build.yml

@@ -27,8 +27,8 @@ jobs:
           - target: apk
             os: ubuntu-latest
             upload_paths: |
-              build/app/outputs/flutter-apk/app-release.apk
-              build/app/outputs/bundle/release/app-release.aab
+              build/app/outputs/flutter-apk/netr-release.apk
+              build/app/outputs/bundle/release/netr-release.aab
           - target: web
             os: ubuntu-latest
             upload_paths: "netr-web.zip"
@@ -78,14 +78,22 @@ jobs:
       - name: Build Flutter Target (${{ matrix.target }})
         shell: bash
         run: |
-          flutter build ${{ matrix.target }} --release \
+          flutter build ${{ matrix.target }} --release --no-pub \
             --dart-define=GH_OWNER=$GITHUB_REPOSITORY_OWNER \
             --dart-define=GH_REPO=${GITHUB_REPOSITORY#*/}
 
       - name: Build Android App Bundle
         if: matrix.target == 'apk'
         run: flutter build appbundle --release
-
+
+      - name: Rename apk/aab (android)
+        if: matrix.target == 'apk'
+        run: |
+          mv "build/app/outputs/flutter-apk/app-release.apk" \
+             "build/app/outputs/flutter-apk/netr-android.apk"
+          mv "build/app/outputs/bundle/release/app-release.aab" \
+             "build/app/outputs/bundle/release/netr-android.aab"
+
       - name: Compile Windows MSIX Installer
         if: matrix.target == 'windows'
         run: flutter pub run msix:create
@@ -111,7 +119,7 @@ jobs:
       - name: Overwrite Unsigned APK with Signed APK
         if: matrix.target == 'apk'
         run: |
-          mv "${{ steps.sign_android_apk.outputs.signedReleaseFile }}" build/app/outputs/flutter-apk/app-release.apk
+          mv "${{ steps.sign_android_apk.outputs.signedReleaseFile }}" build/app/outputs/flutter-apk/netr-android.apk
 
       - name: Package Linux Target
         if: matrix.target == 'linux'
@@ -324,8 +332,8 @@ jobs:
       - name: Organize Files for Upload
         run: |
           mkdir -p ./release-assets
-          find ./artifacts \( -name "app-release.apk" -o \
-                              -name "app-release.aab" -o \
+          find ./artifacts \( -name "netr-android.apk" -o \
+                              -name "netr-android.aab" -o \
                               -name "netr-web.zip" -o \
                               -name "netr-linux-x64.tar.gz" -o \
                               -name "netr-linux-x64.pkg.tar.zst" -o \

lib/app_home.dart

@@ -9,6 +9,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_common/cubit/settings/theme_cubit.dart';
 
 import 'application_life_cycle.dart';
 import 'cubit/common.dart';
@@ -22,7 +23,6 @@ import 'dialog/about_dialog.dart';
 import 'mixin/fields_common.dart';
 import 'pages/archive_page.dart';
 import 'constants.dart' as constants;
-import 'cubit/settings/theme_cubit.dart';
 import 'pages/live_page.dart';
 import 'pages/settings/settings_page.dart';
 import 'widgets/internet_status.dart';

lib/constants.dart

@@ -13,4 +13,5 @@ const String githubOrganization =
     String.fromEnvironment('GH_OWNER', defaultValue: 'homebackend');
 const String githubRepo =
     String.fromEnvironment('GH_REPO', defaultValue: 'netr');
+const String baseAssetName = 'netr';
 const String upgradeFileName = 'netr-release.apk';

lib/controllers/full_screen_controller.dart

@@ -8,10 +8,9 @@
 
 import 'dart:developer';
 import 'package:flutter/services.dart';
+import 'package:flutter_common/tool.dart';
 import 'package:window_manager/window_manager.dart';
 
-import '../tool.dart';
-
 class FullScreenController {
   static Future<void> enter() async {
     log("Entering fullscreen mode");

lib/cubit/settings/general_settings_cubit.dart

@@ -14,11 +14,11 @@ import 'dart:typed_data';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_common/tool.dart';
 import 'package:path/path.dart';
 import 'package:share_plus/share_plus.dart';
 
 import '../../mixin/preferences.dart';
-import '../../tool.dart';
 
 part 'general_settings_state.dart';