From 4135503a302b0fc81a0e1d1342c218f8b28b5160 Mon Sep 17 00:00:00 2001 From: BalazsManus Date: Thu, 13 Feb 2025 14:44:08 +0100 Subject: [PATCH] force push --- refilc/android/app/build.gradle | 13 +++++++++++++ refilc/pubspec.yaml | 15 +-------------- .../widgets/absence_group/absence_group_tile.dart | 1 - .../lib/pages/grades/grades_count.dart | 1 - refilc_mobile_ui/pubspec.yaml | 11 ++--------- refilc_plus | 2 +- 6 files changed, 17 insertions(+), 26 deletions(-) diff --git a/refilc/android/app/build.gradle b/refilc/android/app/build.gradle index 9634626..ed504f6 100644 --- a/refilc/android/app/build.gradle +++ b/refilc/android/app/build.gradle @@ -39,6 +39,19 @@ def debugKeystoreProperties = new Properties() def debugKeystorePropertiesFile = rootProject.file("debugkey.properties") debugKeystoreProperties.load(new FileInputStream(debugKeystorePropertiesFile)) +subprojects { + afterEvaluate { project -> + if (project.hasProperty('android')) { + project.android { + if (!hasProperty('namespace') || namespace == null || namespace.isEmpty()) { + // Assign a default namespace based on the project name or group + namespace = project.group.toString() ?: "com.example.${project.name}" + } + } + } + } +} + android { namespace = "hu.refilc.naplo" diff --git a/refilc/pubspec.yaml b/refilc/pubspec.yaml index b6e829c..f0d15c9 100644 --- a/refilc/pubspec.yaml +++ b/refilc/pubspec.yaml @@ -33,10 +33,6 @@ dependencies: uuid: ^4.2.1 html: ^0.15.0 open_filex: ^4.3.4 - # open_file: - # git: - # url: https://github.com/crazecoder/open_file - # ref: master path_provider: ^2.0.2 permission_handler: ^11.0.1 share_plus: ^10.0.3 @@ -55,16 +51,9 @@ dependencies: rive: ^0.12.4 animated_background: ^2.0.0 dropdown_button2: ^2.3.9 - home_widget: - git: - url: https://github.com/refilc/home_widget.git - ref: flutter-beta + home_widget: ^0.7.0+1 flutter_expandable_fab: ^2.0.0 url_launcher: ^6.1.6 - # workmanager: - # git: - # url: https://github.com/refilc/flutter_workmanager.git - # ref: v0.5.1 flutter_svg: ^2.0.10+1 image_picker: ^1.0.7 animations: ^2.0.1 @@ -73,14 +62,12 @@ dependencies: package_info_plus: ^8.0.0 screenshot: ^3.0.0 flutter_staggered_grid_view: ^0.7.0 - # sqflite_common_ffi_web: ^0.4.0 image_crop_plus: ^1.0.0 googleapis: ^13.2.0 google_sign_in: ^6.2.1 extension_google_sign_in_as_googleapis_auth: ^2.0.12 maps_launcher: ^3.0.0+1 google_fonts: ^6.1.0 - # flutter_stripe: ^11.3.0 get_it: ^7.6.7 xml: ^6.5.0 carousel_slider: ^5.0.0 diff --git a/refilc_mobile_ui/lib/common/widgets/absence_group/absence_group_tile.dart b/refilc_mobile_ui/lib/common/widgets/absence_group/absence_group_tile.dart index c9f9307..1685df3 100644 --- a/refilc_mobile_ui/lib/common/widgets/absence_group/absence_group_tile.dart +++ b/refilc_mobile_ui/lib/common/widgets/absence_group/absence_group_tile.dart @@ -41,7 +41,6 @@ class AbsenceGroupTile extends StatelessWidget { const EdgeInsets.symmetric(horizontal: 12.0, vertical: 0), tileColor: Colors.transparent, duration: const Duration(milliseconds: 250), - trailingDuration: 0.5, trailing: const Icon(FeatherIcons.chevronDown), leading: Container( width: 39.0, diff --git a/refilc_mobile_ui/lib/pages/grades/grades_count.dart b/refilc_mobile_ui/lib/pages/grades/grades_count.dart index 07a7878..bcb9ba2 100644 --- a/refilc_mobile_ui/lib/pages/grades/grades_count.dart +++ b/refilc_mobile_ui/lib/pages/grades/grades_count.dart @@ -26,7 +26,6 @@ class GradesCount extends StatelessWidget { contentPadding: EdgeInsets.zero, visualDensity: const VisualDensity(vertical: -4), duration: const Duration(milliseconds: 250), - trailingDuration: 0.5, trailing: const Icon(FeatherIcons.chevronDown), title: Text( 'grades_cnt'.i18n.fill([ diff --git a/refilc_mobile_ui/pubspec.yaml b/refilc_mobile_ui/pubspec.yaml index 56465a8..94ca9ea 100644 --- a/refilc_mobile_ui/pubspec.yaml +++ b/refilc_mobile_ui/pubspec.yaml @@ -36,10 +36,7 @@ dependencies: lottie: ^3.1.0 rive: ^0.12.4 animated_background: ^2.0.0 - home_widget: - git: - url: https://github.com/refilc/home_widget.git - ref: flutter-beta + home_widget: ^0.7.0+1 dropdown_button2: ^2.3.9 flutter_svg: ^2.0.10+1 background_fetch: ^1.2.2 @@ -48,10 +45,7 @@ dependencies: dotted_border: ^2.0.0+3 screenshot: ^3.0.0 image_gallery_saver_plus: ^3.0.5 - rounded_expansion_tile: - git: - url: https://github.com/kimaah/rounded_expansion_tile.git - # go_router: ^14.2.0 + rounded_expansion_tile: ^0.0.13 flutter_expandable_fab: ^2.0.0 intl: ^0.19.0 i18n_extension: ^12.0.1 @@ -65,7 +59,6 @@ dependencies: uuid: ^4.3.3 maps_launcher: ^3.0.0+1 google_fonts: ^6.1.0 - # flutter_any_logo: ^1.1.1 custom_sliding_segmented_control: ^1.8.1 get_it: ^7.6.7 xml: ^6.5.0 diff --git a/refilc_plus b/refilc_plus index 66b133c..478edbe 160000 --- a/refilc_plus +++ b/refilc_plus @@ -1 +1 @@ -Subproject commit 66b133ced509a89237d5ae4732701a8cff93d9b9 +Subproject commit 478edbefc025f89270c345bd3b3e8ab3325a30f9