diff --git a/.metadata b/.metadata index ce13b420..f4a1077a 100644 --- a/.metadata +++ b/.metadata @@ -4,8 +4,8 @@ # This file should be version controlled. version: - revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 - channel: stable + revision: 028c6e29e0ca049ab4b9bc9d966550d2c251050b + channel: master project_type: app @@ -13,26 +13,26 @@ project_type: app migration: platforms: - platform: root - create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 - base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 + create_revision: 028c6e29e0ca049ab4b9bc9d966550d2c251050b + base_revision: 028c6e29e0ca049ab4b9bc9d966550d2c251050b - platform: android - create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 - base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 + create_revision: 028c6e29e0ca049ab4b9bc9d966550d2c251050b + base_revision: 028c6e29e0ca049ab4b9bc9d966550d2c251050b - platform: ios - create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 - base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 + create_revision: 028c6e29e0ca049ab4b9bc9d966550d2c251050b + base_revision: 028c6e29e0ca049ab4b9bc9d966550d2c251050b - platform: linux - create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 - base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 + create_revision: 028c6e29e0ca049ab4b9bc9d966550d2c251050b + base_revision: 028c6e29e0ca049ab4b9bc9d966550d2c251050b - platform: macos - create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 - base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 + create_revision: 028c6e29e0ca049ab4b9bc9d966550d2c251050b + base_revision: 028c6e29e0ca049ab4b9bc9d966550d2c251050b - platform: web - create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 - base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 + create_revision: 028c6e29e0ca049ab4b9bc9d966550d2c251050b + base_revision: 028c6e29e0ca049ab4b9bc9d966550d2c251050b - platform: windows - create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 - base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 + create_revision: 028c6e29e0ca049ab4b9bc9d966550d2c251050b + base_revision: 028c6e29e0ca049ab4b9bc9d966550d2c251050b # User provided section diff --git a/lib/main.dart b/lib/main.dart index 74a0f218..4c8f8860 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -51,6 +51,7 @@ void main() async { }; // load settings before first render to get theme data early + Get.put(ViewerHandler(), permanent: true); final SettingsHandler settingsHandler = Get.put(SettingsHandler(), permanent: true); await settingsHandler.initialize(); @@ -92,7 +93,6 @@ class _MainAppState extends State { late final SettingsHandler settingsHandler; late final SearchHandler searchHandler; late final SnatchHandler snatchHandler; - late final ViewerHandler viewerHandler; late final NavigationHandler navigationHandler; late final TagHandler tagHandler; late final NotifyHandler notifyHandler; @@ -105,7 +105,6 @@ class _MainAppState extends State { settingsHandler = Get.find(); searchHandler = Get.put(SearchHandler(updateState), permanent: true); snatchHandler = Get.put(SnatchHandler(), permanent: true); - viewerHandler = Get.put(ViewerHandler(), permanent: true); tagHandler = Get.put(TagHandler(), permanent: true); navigationHandler = Get.put(NavigationHandler(), permanent: true); notifyHandler = Get.put(NotifyHandler(), permanent: true); diff --git a/lib/src/data/constants.dart b/lib/src/data/constants.dart index a86b9e43..b3a5ba2f 100644 --- a/lib/src/data/constants.dart +++ b/lib/src/data/constants.dart @@ -4,8 +4,8 @@ class Constants { static String appName = "LoliSnatcher"; // TODO don't forget to update on every new release // TODO take these from smth like .env? - static String appVersion = "2.3.0"; - static int appBuildNumber = 178; + static String appVersion = "2.3.1"; + static int appBuildNumber = 179; // static const int defaultItemLimit = 20; diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index d0150f71..d4da3f2c 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -4,10 +4,10 @@ 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 "lolisnatcher") +set(BINARY_NAME "loli") # The unique GTK application identifier for this application. See: # https://wiki.gnome.org/HowDoI/ChooseApplicationID -set(APPLICATION_ID "com.noaisu.lolisnatcher") +set(APPLICATION_ID "com.example.loli") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. diff --git a/linux/my_application.cc b/linux/my_application.cc index e65b2870..d5e95f3a 100644 --- a/linux/my_application.cc +++ b/linux/my_application.cc @@ -40,11 +40,11 @@ static void my_application_activate(GApplication* application) { if (use_header_bar) { GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); gtk_widget_show(GTK_WIDGET(header_bar)); - gtk_header_bar_set_title(header_bar, "lolisnatcher"); + gtk_header_bar_set_title(header_bar, "loli"); gtk_header_bar_set_show_close_button(header_bar, TRUE); gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); } else { - gtk_window_set_title(window, "lolisnatcher"); + gtk_window_set_title(window, "loli"); } gtk_window_set_default_size(window, 1280, 720); diff --git a/pubspec.yaml b/pubspec.yaml index e26fafa0..58a1b10c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -12,7 +12,7 @@ publish_to: none # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 2.3.0+178 +version: 2.3.1+179 environment: sdk: ">=2.17.0 <3.0.0" diff --git a/update.json b/update.json index 337e152d..2933f7a4 100644 --- a/update.json +++ b/update.json @@ -1,9 +1,9 @@ { - "version_name": "2.3.0", - "build_number": 178, - "title": "Better late than never", - "changelog": "[Note]: In this release we refactored a lot of our code and reworked some important systems. If you encounter any problems or bugs, please create an issue on Github or post about it in our discord server.\n\n[Warning]: Starting from this version, minimum Android version is 5.0 (sdk21)\n\nYou probably thought that this is an abandonware at this point, yeah?\n\n\nMain things in this version:\n- Tag types / Colored tags\n- Improved Tab Manager\n- Fixes for multiple boorus\n- Better immersive mode\n\n--------------------\n\nNew Features:\n- Tag types/colors system\n-- Works on: gelbooru, danbooru, sankaku, \n-- Will work on other boorus too, but only for tags you encountered on supported boorus\n- Expanded Tab manager: move tabs by long press+drag or through tab dialog option, delete multiple tabs, show tab index...\n-- [Reminder] You can access Tab manager by long pressing the tab selector\n\n\nChanges:\n- Main toolbar now includes tab selector instead of title\n- Redesigned tab manager, search history and comment viewer pages\n- Added \"Hand Side\" setting in Interface - (for now only allows to change where button to open the main drawer is placed, will be expanded with more changes in the future)\n- Added a fancy shimmer effect when first page and previews are loading\n- Reworked how system status bar is handled - now you can enter immersive mode by tapping on the media in gallery view (on videos you still need to long tap)\n- Removed \"Show Status Bar\" setting\n- Video controls now don't zoom with the video\n- Search bar now uses word on the left side of the cursor, instead of the last word in a string\n- Added support for ~(OR) in search bar\n- Search bar can now detect search modifiers (rating:..., sort:...)\n- Completely reworked floating buttons in gallery view (zoom, next/prev item)\n- Animated loading bars in gallery view\n- Moved \"Page Number\" dialog button from toolbar to the drawer\n- Added ability to select and delete multiple search history entries\n- Tabs which haven't been loaded yet or have zero items in them now will be displayed in italic text\n- Improved filtering in tab manager (see help dialog there for more details)\n- Improved comments parsing and rendering\n- Added a warning when user enters incorrect rating on gelbooru/danbooru, app will autocorrect api requests for these searches\n- Added notes support to danbooru\n- Added ability to search on tags filters page\n- Added a setting to disable download notifications\n\n\nFixes:\n- Fixed coloring and styling of some parts of the UI, now app correctly updates colors when theme changes\n- Fixed \"Started X sec ago\" message not resetting when it should\n- Fixed a possibility when app could be opened in multiple instances\n- Fixed comments on sankaku\n- Fixed broken api data on realbooru\n- Fixed broken api data on rule34xyz/world\n- Fixed error handling on gelbooru\n- Fixed favourite booru duplication bug, also disables sharing and saving of fav booru\n- Added validation to booru names to avoid path conflicts\n- Added a check for duplicates when backupping data\n- App will now restart after restoring database from backup to guarantee that restore completed correctly (this will also restore tabs from that backup)\n\n\n- and a lot of other small changes and fixes...", - "is_in_store": true, + "version_name": "2.3.1", + "build_number": 179, + "title": "Improvements", + "changelog": "2.3.1: \n- Fixed danbooru api key check\n- Fixed freezes after loading a new page when \"Remove Items with Hated Tags\" setting is enabled\n- Fixed not being able to exclude tags when searching in favourites\n- Simplified http error messages text \n - Fixed Hydrus\n 2.3.0: \n[Note]: In this release we refactored a lot of our code and reworked some important systems. If you encounter any problems or bugs, please create an issue on Github or post about it in our discord server.\n\n[Warning]: Starting from this version, minimum Android version is 5.0 (sdk21)\n\nYou probably thought that this is an abandonware at this point, yeah?\n\n\nMain things in this version:\n- Tag types / Colored tags\n- Improved Tab Manager\n- Fixes for multiple boorus\n- Better immersive mode\n\n--------------------\n\nNew Features:\n- Tag types/colors system\n-- Works on: gelbooru, danbooru, sankaku, \n-- Will work on other boorus too, but only for tags you encountered on supported boorus\n- Expanded Tab manager: move tabs by long press+drag or through tab dialog option, delete multiple tabs, show tab index...\n-- [Reminder] You can access Tab manager by long pressing the tab selector\n\n\nChanges:\n- Main toolbar now includes tab selector instead of title\n- Redesigned tab manager, search history and comment viewer pages\n- Added \"Hand Side\" setting in Interface - (for now only allows to change where button to open the main drawer is placed, will be expanded with more changes in the future)\n- Added a fancy shimmer effect when first page and previews are loading\n- Reworked how system status bar is handled - now you can enter immersive mode by tapping on the media in gallery view (on videos you still need to long tap)\n- Removed \"Show Status Bar\" setting\n- Video controls now don't zoom with the video\n- Search bar now uses word on the left side of the cursor, instead of the last word in a string\n- Added support for ~(OR) in search bar\n- Search bar can now detect search modifiers (rating:..., sort:...)\n- Completely reworked floating buttons in gallery view (zoom, next/prev item)\n- Animated loading bars in gallery view\n- Moved \"Page Number\" dialog button from toolbar to the drawer\n- Added ability to select and delete multiple search history entries\n- Tabs which haven't been loaded yet or have zero items in them now will be displayed in italic text\n- Improved filtering in tab manager (see help dialog there for more details)\n- Improved comments parsing and rendering\n- Added a warning when user enters incorrect rating on gelbooru/danbooru, app will autocorrect api requests for these searches\n- Added notes support to danbooru\n- Added ability to search on tags filters page\n- Added a setting to disable download notifications\n\n\nFixes:\n- Fixed coloring and styling of some parts of the UI, now app correctly updates colors when theme changes\n- Fixed \"Started X sec ago\" message not resetting when it should\n- Fixed a possibility when app could be opened in multiple instances\n- Fixed comments on sankaku\n- Fixed broken api data on realbooru\n- Fixed broken api data on rule34xyz/world\n- Fixed error handling on gelbooru\n- Fixed favourite booru duplication bug, also disables sharing and saving of fav booru\n- Added validation to booru names to avoid path conflicts\n- Added a check for duplicates when backupping data\n- App will now restart after restoring database from backup to guarantee that restore completed correctly (this will also restore tabs from that backup)\n\n\n- and a lot of other small changes and fixes...", + "is_in_store": false, "is_important": false, "store_package": "com.noaisu.play.loliSnatcher", "github_url": "https://github.com/NO-ob/LoliSnatcher_Droid/releases/latest", diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 8620d50f..1aa5e8f2 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -6,7 +6,7 @@ #include "generated_plugin_registrant.h" -#include +#include #include #include #include @@ -17,8 +17,8 @@ #include void RegisterPlugins(flutter::PluginRegistry* registry) { - AppLinksWindowsPluginRegisterWithRegistrar( - registry->GetRegistrarForPlugin("AppLinksWindowsPlugin")); + AppLinksPluginCApiRegisterWithRegistrar( + registry->GetRegistrarForPlugin("AppLinksPluginCApi")); AwesomeNotificationsPluginCApiRegisterWithRegistrar( registry->GetRegistrarForPlugin("AwesomeNotificationsPluginCApi")); DartVlcPluginRegisterWithRegistrar(