diff --git a/app/lib/models/models.dart b/app/lib/models/models.dart index 8f815c92..8d8dfee5 100644 --- a/app/lib/models/models.dart +++ b/app/lib/models/models.dart @@ -1,6 +1,6 @@ export 'hatim/hatim_juz.dart'; -export 'home/home_model.dart'; -export 'home/hatim_read_model.dart'; +export '../modules/home/data/home_model/home_model.dart'; +export '../modules/home/data/home_model/hatim_read_model.dart'; export 'hatim/hatim_page.dart'; export 'juz/juz_data.dart'; export 'juz/juz_model.dart'; diff --git a/app/lib/models/home/hatim_read_model.dart b/app/lib/modules/home/data/home_model/hatim_read_model.dart similarity index 100% rename from app/lib/models/home/hatim_read_model.dart rename to app/lib/modules/home/data/home_model/hatim_read_model.dart diff --git a/app/lib/models/home/hatim_read_model.g.dart b/app/lib/modules/home/data/home_model/hatim_read_model.g.dart similarity index 100% rename from app/lib/models/home/hatim_read_model.g.dart rename to app/lib/modules/home/data/home_model/hatim_read_model.g.dart diff --git a/app/lib/models/home/home_model.dart b/app/lib/modules/home/data/home_model/home_model.dart similarity index 100% rename from app/lib/models/home/home_model.dart rename to app/lib/modules/home/data/home_model/home_model.dart diff --git a/app/lib/models/home/home_model.g.dart b/app/lib/modules/home/data/home_model/home_model.g.dart similarity index 100% rename from app/lib/models/home/home_model.g.dart rename to app/lib/modules/home/data/home_model/home_model.g.dart diff --git a/app/lib/modules/home/service/home_service.dart b/app/lib/modules/home/domain/service/home_service.dart similarity index 100% rename from app/lib/modules/home/service/home_service.dart rename to app/lib/modules/home/domain/service/home_service.dart diff --git a/app/lib/modules/home/home.dart b/app/lib/modules/home/home.dart index 8dfa66e6..7ada9b53 100644 --- a/app/lib/modules/home/home.dart +++ b/app/lib/modules/home/home.dart @@ -1,4 +1,4 @@ -export 'logic/home_cubit.dart'; -export 'view/home_view.dart'; -export 'widgets/home_card.dart'; -export 'service/home_service.dart'; +export 'presentation/cubit/home_cubit.dart'; +export 'presentation/view/home_view.dart'; +export 'presentation/widgets/home_card.dart'; +export 'domain/service/home_service.dart'; diff --git a/app/lib/modules/home/logic/home_cubit.dart b/app/lib/modules/home/presentation/cubit/home_cubit.dart similarity index 100% rename from app/lib/modules/home/logic/home_cubit.dart rename to app/lib/modules/home/presentation/cubit/home_cubit.dart diff --git a/app/lib/modules/home/logic/home_state.dart b/app/lib/modules/home/presentation/cubit/home_state.dart similarity index 100% rename from app/lib/modules/home/logic/home_state.dart rename to app/lib/modules/home/presentation/cubit/home_state.dart diff --git a/app/lib/modules/home/view/home_view.dart b/app/lib/modules/home/presentation/view/home_view.dart similarity index 100% rename from app/lib/modules/home/view/home_view.dart rename to app/lib/modules/home/presentation/view/home_view.dart diff --git a/app/lib/modules/home/widgets/home_card.dart b/app/lib/modules/home/presentation/widgets/home_card.dart similarity index 100% rename from app/lib/modules/home/widgets/home_card.dart rename to app/lib/modules/home/presentation/widgets/home_card.dart diff --git a/app/pubspec.lock b/app/pubspec.lock index 2dcfd255..42217a87 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -221,10 +221,10 @@ packages: dependency: transitive description: name: coverage - sha256: "595a29b55ce82d53398e1bcc2cba525d7bd7c59faeb2d2540e9d42c390cfeeeb" + sha256: "8acabb8306b57a409bf4c83522065672ee13179297a6bb0cb9ead73948df7c76" url: "https://pub.dev" source: hosted - version: "1.6.4" + version: "1.7.2" crypto: dependency: transitive description: @@ -317,10 +317,10 @@ packages: dependency: transitive description: name: file - sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" url: "https://pub.dev" source: hosted - version: "6.1.4" + version: "7.0.0" fixnum: dependency: transitive description: @@ -435,10 +435,10 @@ packages: dependency: "direct main" description: name: go_router - sha256: "07ee2436909f749d606f53521dc1725dd738dc5196e5ff815bc254253c594075" + sha256: "170c46e237d6eb0e6e9f0e8b3f56101e14fb64f787016e42edd74c39cf8b176a" url: "https://pub.dev" source: hosted - version: "13.1.0" + version: "13.2.0" graphs: dependency: transitive description: @@ -560,6 +560,30 @@ packages: url: "https://pub.dev" source: hosted version: "0.4.9" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + url: "https://pub.dev" + source: hosted + version: "10.0.0" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + url: "https://pub.dev" + source: hosted + version: "2.0.1" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + url: "https://pub.dev" + source: hosted + version: "2.0.1" logging: dependency: transitive description: @@ -572,26 +596,26 @@ packages: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.8.0" meta: dependency: "direct main" description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.0" mime: dependency: transitive description: @@ -682,10 +706,10 @@ packages: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" path_parsing: dependency: transitive description: @@ -754,10 +778,10 @@ packages: dependency: transitive description: name: platform - sha256: ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102 + sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec" url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.1.4" plugin_platform_interface: dependency: transitive description: @@ -778,10 +802,10 @@ packages: dependency: transitive description: name: process - sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" + sha256: "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32" url: "https://pub.dev" source: hosted - version: "4.2.4" + version: "5.0.2" provider: dependency: transitive description: @@ -1223,10 +1247,10 @@ packages: dependency: transitive description: name: vm_service - sha256: c538be99af830f478718b51630ec1b6bee5e74e52c8a802d328d9e71d35d2583 + sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 url: "https://pub.dev" source: hosted - version: "11.10.0" + version: "13.0.0" watcher: dependency: transitive description: @@ -1255,10 +1279,10 @@ packages: dependency: transitive description: name: webdriver - sha256: "3c923e918918feeb90c4c9fdf1fe39220fa4c0e8e2c0fffaded174498ef86c49" + sha256: "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e" url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.3" webkit_inspection_protocol: dependency: transitive description: diff --git a/app/pubspec.yaml b/app/pubspec.yaml index e41362a7..e163c37d 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -34,7 +34,7 @@ dependencies: path: just_audio just_audio_background: ^0.0.1-beta.11 meta: ^1.10.0 # 1.11.0 - go_router: ^13.1.0 + go_router: ^13.2.0 mq_storage: path: ../packages/mq_storage/ mq_ci_keys: