diff --git a/.gitignore b/.gitignore index 24476c5..0bc0e3e 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,5 @@ app.*.map.json /android/app/debug /android/app/profile /android/app/release + +/debian/packages \ No newline at end of file diff --git a/README.md b/README.md index 293e8fb..1ee0985 100644 --- a/README.md +++ b/README.md @@ -60,14 +60,19 @@ On [this repository](https://github.com/JuanRodenas/Pihole_list) you can find a
  • Linux -
      -
    1. flutter clean
    2. -
    3. flutter pub get
    4. -
    5. flutter build linux --release
    6. -
    7. Open debian.yaml file inside debian/ and update the version number
    8. -
    9. Run flutter_to_debian
    10. -
    11. The .deb package is at debian/packages
    12. -
    +
  • Windows diff --git a/assets/icon/icon-circle-256.png b/assets/icon/icon-circle-256.png new file mode 100644 index 0000000..517e26a Binary files /dev/null and b/assets/icon/icon-circle-256.png differ diff --git a/debian/debian.yaml b/debian/debian.yaml index ddc864c..df64eae 100644 --- a/debian/debian.yaml +++ b/debian/debian.yaml @@ -1,5 +1,5 @@ flutter_app: - command: adguard_home_manager + command: AdGuardHomeManager arch: x64 parent: /usr/local/lib diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index bf11fa4..273981d 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -4,7 +4,7 @@ project(runner LANGUAGES CXX) # The name of the executable created for the application. Change this to change # the on-disk name of your application. -set(BINARY_NAME "adguard_home_manager") +set(BINARY_NAME "AdGuardHomeManager") # The unique GTK application identifier for this application. See: # https://wiki.gnome.org/HowDoI/ChooseApplicationID set(APPLICATION_ID "com.jgeek00.adguard_home_manager") diff --git a/linux/build-app.sh b/linux/build-app.sh new file mode 100755 index 0000000..513fd3b --- /dev/null +++ b/linux/build-app.sh @@ -0,0 +1,30 @@ +#!/bin/bash + + +# Build the Flutter app and package into an archive. + + +# Exit if any command fails +set -e + +# Echo all commands for debug purposes +set -x + + +projectName=AdGuard-Home-Manager + +archiveName=$projectName-Linux.tar.gz +baseDir=$(pwd) + + +# ----------------------------- Build Flutter app ---------------------------- # + +flutter clean +flutter pub get +flutter build linux --release + +flutter_to_debian + +cd build/linux/x64/release/bundle || exit +mv "AdGuardHomeManager" "AdGuard Home Manager" +tar -czaf $archiveName ./* \ No newline at end of file diff --git a/linux/my_application.cc b/linux/my_application.cc index 1f79b20..49e0a92 100644 --- a/linux/my_application.cc +++ b/linux/my_application.cc @@ -51,6 +51,13 @@ static void my_application_activate(GApplication* application) { gtk_widget_show(GTK_WIDGET(window)); g_autoptr(FlDartProject) project = fl_dart_project_new(); + + g_autoptr(GError) error = nullptr; + gtk_window_set_icon_from_file(window, g_strconcat(fl_dart_project_get_assets_path(project), "/assets/icon/icon-circle-256.png", NULL), &error); + if (error != nullptr) { + g_warning("Failed to set icon: %s", error->message); + } + fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments); FlView* view = fl_view_new(project); diff --git a/pubspec.yaml b/pubspec.yaml index b9bc0cf..6d6f8ce 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -22,6 +22,10 @@ version: 2.0.0+53 environment: sdk: '>=2.18.1 <3.0.0' +scripts: + build: + linux: "./linux/build-app.sh" + # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions # consider running `flutter pub upgrade --major-versions`. Alternatively, @@ -121,6 +125,7 @@ flutter: - assets/icon/icon-splash.png - assets/icon/icon-macos.png - assets/icon/icon-circle.png + - assets/icon/icon-circle-256.png - assets/icon/icon1024-white-center.png - assets/other/get_google_play.png - assets/resources/github.svg