merge: pull request #120 from Solvro/revert-119-refactor/unify-names

README.md

@@ -143,7 +143,6 @@ fvm flutter run
 2. Introductions to internationalizing flutter apps (making them available in different languages): https://docs.flutter.dev/ui/accessibility-and-internationalization/internationalization
 3. Api helper module instructions: https://github.com/Solvro/topwr-mobile/tree/main/lib/api_base
 4. We use `flutter_gen` for generating asset paths: https://pub.dev/packages/flutter_gen 
-5. For unified names read and follow: [taxonomy.md](./taxonomy.md)
 
 # Before you push a commit
 - run the linter

lib/api_base/directus_assets_url.dart

@@ -1,12 +1,12 @@
 import "../config/api_base_config.dart";
 
-extension DirectusAssetsUrlX on String {
+extension DirectusAssetsUrl on String {
   String get directusUrl {
     return "${ApiBaseEnv.assetsUrl}/$this";
   }
 }
 
-extension DirectusAssetsUrlNullableX on String? {
+extension DirectusAssetsUrlNullable on String? {
   String get directusUrl {
     return this?.directusUrl ?? "";
   }

lib/api_base/ttl/local_timestamp_repository.dart

@@ -9,11 +9,11 @@ import "ttl_timestamp.dart";
 
 part "local_timestamp_repository.g.dart";
 
-class LocalTimestampRepository {
+class LocalTimestampRepo {
   final TtlKey _key;
   final SharedPreferences _prefs;
 
-  LocalTimestampRepository(this._key, this._prefs);
+  LocalTimestampRepo(this._key, this._prefs);
 
   String get _storeKey => "${ApiBaseConfig.ttlPrefsPrefix}$_key";
 
@@ -36,10 +36,10 @@ Future<SharedPreferences> _prefs(_PrefsRef ref) async {
 }
 
 @riverpod
-Future<LocalTimestampRepository> localTimestampRepository(
-  LocalTimestampRepositoryRef ref,
+Future<LocalTimestampRepo> localTimestampRepo(
+  LocalTimestampRepoRef ref,
   TtlKey key,
 ) async {
   final prefs = await ref.watch(_prefsProvider.future);
-  return LocalTimestampRepository(key, prefs);
+  return LocalTimestampRepo(key, prefs);
 }

lib/api_base/ttl/ttl_service.dart

@@ -20,8 +20,8 @@ class TtlService extends _$TtlService {
     return FetchPolicy.cacheAndNetwork; // force re-fetch
   }
 
-  Future<LocalTimestampRepository> get repository async =>
-      ref.watch(localTimestampRepositoryProvider.call(key).future);
+  Future<LocalTimestampRepo> get repository async =>
+      ref.watch(localTimestampRepoProvider.call(key).future);
 
   Future<QueryResult<T>> interceptAndSaveTimestamps<T>(
     QueryResult<T> event,

lib/api_base/watch_query_adapter.dart

@@ -10,7 +10,7 @@ class GqlOfflineException implements Exception {
   final TtlKey ttlKey;
 }
 
-extension _WatchQueryStreamAdapterX<T> on Ref {
+extension _WatchQueryStreamAdapter<T> on Ref {
   void handleErrors(QueryResult<T> event, TtlKey ttlKey) {
     if (!event.hasException) return;
 
@@ -39,7 +39,7 @@ extension _WatchQueryStreamAdapterX<T> on Ref {
   }
 }
 
-extension TTLWatchQueryAdapterX on AutoDisposeStreamProviderRef {
+extension TTLWatchQueryAdapter on AutoDisposeStreamProviderRef {
   Stream<T?> watchQueryWithCache<T>(
     WatchQueryOptions<T> watchQueryOptions,
     TtlKey ttlKey,

lib/config/nav_bar_config.dart

@@ -4,19 +4,19 @@ import "package:enum_map/enum_map.dart";
 import "package:flutter/material.dart";
 
 import "../features/bottom_nav_bar/bottom_nav_bar_icon_icons.icons.dart";
+import "../features/iparking/widgets/i_parking_icons_icons.icons.dart";
 import "../features/navigator/app_router.dart";
-import "../features/parkings_view/widgets/parkings_icons.icons.dart";
 
 part "nav_bar_config.g.dart";
 
 @unmodifiableEnumMap
 enum NavBarEnum {
   home(BottomNavBarIcon.home_icon, 26, "Home"),
-  buildings(BottomNavBarIcon.map_icon, 20, "Map"),
-  parkings(ParkingsIcons.directions_car, 19, "Parkings"),
-  departments(BottomNavBarIcon.faculty_icon, 26, "Faculties"),
-  scienceClubs(BottomNavBarIcon.sci_circle_icon, 20, "Science Clubs"),
-  guide(BottomNavBarIcon.info_icon, 20, "Info");
+  mapp(BottomNavBarIcon.map_icon, 20, "Map"),
+  parkings(IParkingIcons.directions_car, 19, "Parkings"),
+  faculties(BottomNavBarIcon.faculty_icon, 26, "Faculties"),
+  sciCircles(BottomNavBarIcon.sci_circle_icon, 20, "Scientific Circles"),
+  info(BottomNavBarIcon.info_icon, 20, "Info");
 
   const NavBarEnum(this.icon, this.size, this.label);
 
@@ -28,11 +28,11 @@ enum NavBarEnum {
 abstract class NavBarConfig {
   static const tabViews = UnmodifiableNavBarEnumMap(
     home: HomeRoute(),
-    buildings: BuildingsRoute(),
-    parkings: ParkingsRoute(),
-    departments: DepartmentsRoute(),
-    scienceClubs: ScienceClubsRoute(),
-    guide: GuideRoute(),
+    mapp: BuildingMapRoute(),
+    parkings: ParkingsMapRoute(),
+    faculties: DepartmentRoute(),
+    sciCircles: ScientificCirclesRoute(),
+    info: GuideRouteTemplate(),
   );
 }
 

lib/config/ttl_config.dart

@@ -6,15 +6,15 @@ part "ttl_config.g.dart";
 @unmodifiableEnumMap
 enum TtlKey {
   /// We need unique key for every data source for its ttl tracking
+  sciCirclesPreviewRepository,
   academicCalendarRepository,
-  newsRepository,
-  scienceClubsRepository,
-  scienceClubDetailsRepository,
+  infosPreviewRepository,
+  sciCirclesRepository,
   tagsRepository,
+  mapBuildingsRepository,
   departmentsRepository,
-  departmentDetailsRepository,
   aboutUsRepository,
-  buildingsRepository,
+  departmentsDetailsRepository,
   // ... add a new key here if you create a new repository
 }
 
@@ -26,15 +26,15 @@ abstract class TtlStrategy {
 
   static const _ttlDurations = UnmodifiableTtlKeyMap(
     // TODO(simon-the-shark): specific values are yet ment to be accordingly adjusted.
-    newsRepository: day,
+    infosPreviewRepository: day,
     academicCalendarRepository: day,
-    scienceClubDetailsRepository: thirtyDays,
-    scienceClubsRepository: thirtyDays,
+    sciCirclesPreviewRepository: thirtyDays,
+    sciCirclesRepository: thirtyDays,
     tagsRepository: thirtyDays,
-    buildingsRepository: thirtyDays,
+    mapBuildingsRepository: thirtyDays,
     departmentsRepository: thirtyDays,
     aboutUsRepository: thirtyDays,
-    departmentDetailsRepository: thirtyDays,
+    departmentsDetailsRepository: thirtyDays,
   );
 
   static Duration get(TtlKey key) {

lib/config/ui_config.dart

@@ -1,6 +1,6 @@
 import "package:flutter/material.dart";
 
-import "../features/parking_chart/utils/range_hour_points.dart";
+import "../features/iparking_chart/utils/range_hour_points.dart";
 import "../theme/hex_color.dart";
 
 abstract class MyAppConfig {
@@ -24,7 +24,7 @@ abstract class DepartmentsConfig {
 
   static const listSeparatorSize = 16.0;
 
-  static const departmentsViewGridDelegate =
+  static const departmentsTabGridDelegate =
       SliverGridDelegateWithMaxCrossAxisExtent(
     maxCrossAxisExtent: 600,
     mainAxisExtent: 92,
@@ -37,7 +37,7 @@ abstract class DateChipConfig {
   static const dateTimeFormat = "dd.MM.yyyy";
 }
 
-abstract class HomeViewConfig {
+abstract class HomeScreenConfig {
   static const paddingSmall = 6.0;
   static const paddingMedium = 16.0;
 
@@ -55,7 +55,7 @@ abstract class BigPreviewCardConfig {
   static const cardWidth = 240.0;
 }
 
-abstract class SearchBoxConfig {
+abstract class SearchWidgetConfig {
   static const height = 36.0;
 }
 
@@ -77,15 +77,15 @@ abstract class WideTileCardConfig {
   ];
 }
 
-abstract class DetailViewsConfig {
+abstract class DetailsScreenConfig {
   static const double spacerHeight = 16;
 }
 
-abstract class DetailViewsHeaderConfig {
+abstract class DetailsScreenHeaderConfig {
   static const double logoSize = 130;
 }
 
-abstract class ScienceClubsViewConfig {
+abstract class ScientificCirclesTabConfig {
   static const listSeparatorSize = 16.0;
   static const microPadding = 4.0;
   static const smallPadding = 16.0;
@@ -109,11 +109,11 @@ abstract class ScienceClubsViewConfig {
   );
 }
 
-abstract class ScienceClubCardConfig {
+abstract class ScientificCircleCardConfig {
   static const trailingPadding = 2.0;
 }
 
-abstract class ParkingsConfig {
+abstract class IParkingConfig {
   static const padding = EdgeInsets.only(
     left: 13,
     top: 10,

lib/config/contact_icons.dart → lib/config/url_icons.dart

@@ -1,6 +1,6 @@
 import "../gen/assets.gen.dart";
 
-abstract class ContactIconsConfig {
+abstract class IconsConfig {
   static final iconsPaths = {
     "facebook": Assets.contactIcons.fb,
     "instagram": Assets.contactIcons.ig,

lib/features/academic_calendar/model/academic_calendar_extensions.dart → lib/features/academic_calendar_greeting/model/academic_calendar_data.dart

@@ -4,7 +4,7 @@ import "academic_day.dart";
 import "academic_week_exception.dart";
 import "weekday_enum.dart";
 
-extension AcademicCalendarDataX on AcademicCalendarData {
+extension AcademicCalendarDataExtraAttrs on AcademicCalendarData {
   bool isHolidays() {
     return now.isBefore(semesterStartDate) || now.isAfter(examSessionLastDay);
   }
@@ -38,7 +38,7 @@ extension AcademicCalendarDataX on AcademicCalendarData {
   }
 }
 
-extension AcademicCalendarX on AcademicCalendar {
+extension AcademicCalendarExtraAttrs on AcademicCalendar {
   AcademicDay? get academicDay {
     if (weeks.isTodayAnException) {
       return weeks.changedDay ?? data?.standardAcademicDay;

lib/features/academic_calendar/model/academic_week_exception.dart → lib/features/academic_calendar_greeting/model/academic_week_exception.dart

@@ -5,7 +5,7 @@ import "../repository/academic_calendar_repo.dart";
 import "academic_day.dart";
 import "weekday_enum.dart";
 
-extension AcademicWeekExceptionX on List<AcademicWeekException> {
+extension AcadWeekExceptionExtraAttrs on List<AcademicWeekException> {
   bool _checkIfThisIsToday(AcademicWeekException element) =>
       element.day.isSameDay(now);
 

lib/features/academic_calendar/repository/academic_calendar_repo.dart → lib/features/academic_calendar_greeting/repository/academic_calendar_repo.dart

@@ -19,7 +19,7 @@ Stream<AcademicCalendar?> academicCalendarRepo(AcademicCalendarRepoRef ref) {
   return stream;
 }
 
-extension FixNestedTypesX on AcademicCalendar {
+extension FixNestedTypes on AcademicCalendar {
   AcademicCalendarData? get data => this.AcademicCalendarData;
   List<AcademicWeekException> get weeks => WeekExceptions;
 }

lib/features/academic_calendar/widgets/home_screen_greeting.dart → lib/features/academic_calendar_greeting/widgets/home_screen_greeting.dart

@@ -5,7 +5,7 @@ import "../../../theme/app_theme.dart";
 import "../../../utils/context_extensions.dart";
 import "../../../widgets/my_error_widget.dart";
 import "../../home_view/widgets/loading_widgets/horizontal_rectangular_section_loading.dart";
-import "../model/academic_calendar_extensions.dart";
+import "../model/academic_calendar_data.dart";
 import "../repository/academic_calendar_repo.dart";
 import "../utils/localize_academic_day.dart";
 

lib/features/buildings_view/building_tile.dart → lib/features/buildings_map/building_tile.dart

@@ -2,11 +2,11 @@ import "package:flutter/material.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
 
 import "../../api_base/directus_assets_url.dart";
+import "../../shared_repositories/buildings_repository/building_model.dart";
 import "../../theme/app_theme.dart";
 import "../../utils/context_extensions.dart";
 import "../../widgets/wide_tile_card.dart";
 import "controllers.dart";
-import "model/building_model.dart";
 
 class BuildingTile extends ConsumerWidget {
   const BuildingTile(

lib/features/buildings_view/buildings_view.dart → lib/features/buildings_map/buildings_view.dart

@@ -4,20 +4,20 @@ import "package:flutter_riverpod/flutter_riverpod.dart";
 import "package:google_maps_flutter/google_maps_flutter.dart";
 
 import "../../config/map_view_config.dart";
+import "../../shared_repositories/buildings_repository/building_model.dart";
 import "../../utils/context_extensions.dart";
 import "../map_view/map_view.dart";
 import "../map_view/utils/map_marker_utils.dart";
 import "building_tile.dart";
 import "controllers.dart";
-import "model/building_model.dart";
 
 @RoutePage()
-class BuildingsView extends ConsumerWidget {
-  const BuildingsView({super.key});
+class BuildingMapView extends ConsumerWidget {
+  const BuildingMapView({super.key});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    return MapView<BuildingModel>(
+    return GeneralMapView<BuildingModel>(
       mapViewTexts: (
         emptyList: context.localize.building_not_found,
         title: context.localize.buildings_title,
@@ -30,8 +30,8 @@ class BuildingsView extends ConsumerWidget {
         markerId: item.markerId,
         position: item.location,
         icon: isActive
-            ? MapMarkerUtils.activeBuildingMapMarker
-            : MapMarkerUtils.buildingMapMarker,
+            ? MapMarkerUtils.activeMapMarker
+            : MapMarkerUtils.mapMarker,
         onTap: () {
           ref.read(buildingsMapControllerProvider.notifier).onMarkerTap(item);
         },

lib/features/buildings_view/controllers.dart → lib/features/buildings_map/controllers.dart

@@ -1,12 +1,12 @@
 import "package:google_maps_flutter/google_maps_flutter.dart";
 import "package:riverpod_annotation/riverpod_annotation.dart";
 
+import "../../shared_repositories/buildings_repository/building_model.dart";
+import "../../shared_repositories/buildings_repository/map_buildings_repo.dart";
 import "../map_view/controllers/active_map_marker_cntrl.dart";
 import "../map_view/controllers/controllers_set.dart";
 import "../map_view/controllers/map_controller.dart";
 import "../map_view/controllers/map_data_controller.dart";
-import "model/building_model.dart";
-import "repository/buildings_repository.dart";
 import "utils.dart";
 
 part "controllers.g.dart";
@@ -21,9 +21,9 @@ class ActiveBuildingController extends _$ActiveBuildingController
 }
 
 @riverpod
-class BuildingsViewController extends _$BuildingsViewController
+class BuildingsListViewController extends _$BuildingsListViewController
     with MapDataController<BuildingModel> {
-  BuildingsViewController() {
+  BuildingsListViewController() {
     mapControllers = mapControllersBuildings;
   }
   @override
@@ -55,7 +55,7 @@ class BuildingsMapController extends _$BuildingsMapController
 
 final MapControllers<BuildingModel> mapControllersBuildings = (
   activeMarker: activeBuildingControllerProvider,
-  sourceRepo: buildingsRepositoryProvider,
+  sourceRepo: mapBuildingsRepositoryProvider,
   map: buildingsMapControllerProvider,
-  dataController: buildingsViewControllerProvider,
+  dataController: buildingsListViewControllerProvider,
 );