Skip to content

Commit

Permalink
cleaned
Browse files Browse the repository at this point in the history
  • Loading branch information
Shock@5678 committed Aug 11, 2024
1 parent 8da3162 commit 1a0d997
Show file tree
Hide file tree
Showing 30 changed files with 9 additions and 385 deletions.
1 change: 0 additions & 1 deletion lib/config/service_location.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ class ServiceLocation {

bool _serviceEnabled;
PermissionStatus _permissionGranted;
LocationData _locationData;

_serviceEnabled = await location.serviceEnabled();
if (!_serviceEnabled) {
Expand Down
1 change: 0 additions & 1 deletion lib/core/services/location_services.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'dart:developer';
import 'package:geolocator/geolocator.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';

Expand Down
1 change: 0 additions & 1 deletion lib/data/datasource/remote/remote_auth_api.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'dart:async';
import 'dart:developer';

import 'package:beacon/core/queries/auth.dart';
import 'package:beacon/core/resources/data_state.dart';
Expand Down
5 changes: 1 addition & 4 deletions lib/data/datasource/remote/remote_group_api.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'dart:async';
import 'dart:developer';

import 'package:beacon/core/queries/beacon.dart';
import 'package:beacon/core/queries/group.dart';
Expand All @@ -13,13 +12,11 @@ import 'package:graphql_flutter/graphql_flutter.dart';

class RemoteGroupApi {
late GraphQLClient _authClient;
late GraphQLClient _subscriptionClient;

RemoteGroupApi(this._authClient, this._subscriptionClient);
RemoteGroupApi(this._authClient);

void loadClient(GraphQLClient authClient, GraphQLClient subscriptionClient) {
this._authClient = authClient;
this._subscriptionClient = subscriptionClient;
}

final _groupqueries = GroupQueries();
Expand Down
2 changes: 0 additions & 2 deletions lib/data/datasource/remote/remote_hike_api.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import 'package:beacon/data/models/location/location_model.dart';
import 'package:beacon/data/models/subscriptions/beacon_locations_model/beacon_locations_model.dart';
import 'package:beacon/data/models/subscriptions/join_leave_beacon_model/join_leave_beacon_model.dart';
import 'package:beacon/data/models/user/user_model.dart';
import 'package:beacon/domain/entities/location/location_entity.dart';
import 'package:beacon/domain/entities/subscriptions/join_leave_beacon_entity/join_leave_beacon_entity.dart';
import 'package:beacon/domain/entities/user/user_entity.dart';
import 'package:beacon/locator.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
Expand Down
1 change: 0 additions & 1 deletion lib/data/datasource/remote/remote_home_api.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'dart:developer';
import 'package:beacon/core/queries/group.dart';
import 'package:beacon/core/resources/data_state.dart';
import 'package:beacon/data/models/group/group_model.dart';
Expand Down
2 changes: 0 additions & 2 deletions lib/data/models/beacon/beacon_model.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import 'package:beacon/data/models/location/location_model.dart';
import 'package:beacon/data/models/subscriptions/user_location_model/user_location_model.dart';
import 'package:beacon/data/models/user/user_model.dart';
import 'package:beacon/domain/entities/beacon/beacon_entity.dart';
import 'package:beacon/domain/entities/geofence/geofence_entity.dart';
import 'package:beacon/domain/entities/subscriptions/user_location_entity/user_location_entity.dart';
import 'package:hive/hive.dart';
import 'package:json_annotation/json_annotation.dart';
part 'beacon_model.g.dart';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import 'package:beacon/data/models/location/location_model.dart';
import 'package:beacon/data/models/user/user_model.dart';
import 'package:beacon/domain/entities/location/location_entity.dart';
import 'package:beacon/domain/entities/subscriptions/user_location_entity/user_location_entity.dart';
import 'package:beacon/domain/entities/user/user_entity.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
part 'user_location_model.g.dart';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import 'package:beacon/domain/entities/landmark/landmark_entity.dart';
import 'package:beacon/domain/entities/location/location_entity.dart';
import 'package:beacon/domain/entities/user/user_entity.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
part 'beacon_locations_entity.freezed.dart';

@freezed
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import 'package:beacon/domain/entities/location/location_entity.dart';
import 'package:beacon/domain/entities/user/user_entity.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
part 'user_location_entity.freezed.dart';

@freezed
Expand Down
2 changes: 1 addition & 1 deletion lib/locator.dart
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Future<void> setupLocator() async {
locator.registerSingleton<RemoteHomeApi>(
RemoteHomeApi(clientAuth, subscriptionClient));
locator.registerSingleton<RemoteGroupApi>(
RemoteGroupApi(clientAuth, subscriptionClient));
RemoteGroupApi(clientAuth));
locator.registerSingleton<RemoteHikeApi>(
RemoteHikeApi(clientAuth, subscriptionClient));

Expand Down
2 changes: 0 additions & 2 deletions lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import 'dart:math' as math;

import 'package:beacon/config/enviornment_config.dart';
import 'package:beacon/core/utils/constants.dart';
import 'package:beacon/presentation/auth/auth_cubit/auth_cubit.dart';
Expand Down
2 changes: 0 additions & 2 deletions lib/presentation/auth/auth_cubit/auth_cubit.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import 'dart:developer';

import 'package:beacon/config/router/router.dart';
import 'package:beacon/core/resources/data_state.dart';
import 'package:beacon/domain/usecase/auth_usecase.dart';
Expand Down
1 change: 0 additions & 1 deletion lib/presentation/auth/auth_cubit/auth_state.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'package:beacon/domain/entities/user/user_entity.dart';
import 'package:freezed_annotation/freezed_annotation.dart';

part 'auth_state.freezed.dart';
Expand Down
6 changes: 2 additions & 4 deletions lib/presentation/auth/auth_screen.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import 'package:auto_route/auto_route.dart';
import 'package:beacon/config/router/router.dart';
import 'package:beacon/presentation/auth/auth_cubit/auth_cubit.dart';
import 'package:beacon/presentation/auth/auth_cubit/auth_state.dart';
import 'package:beacon/presentation/auth/verification_cubit/verification_cubit.dart';
import 'package:beacon/presentation/widgets/text_field.dart';
import 'package:beacon/locator.dart';
import 'package:beacon/presentation/widgets/hike_button.dart';
Expand Down Expand Up @@ -178,7 +176,7 @@ class _AuthScreenState extends State<AuthScreen>
Expanded(
child: TextButton(
style: ButtonStyle(
overlayColor: MaterialStateProperty.all(Colors.transparent),
overlayColor: WidgetStateProperty.all(Colors.transparent),
),
//highlightColor: Colors.white,
onPressed: () {
Expand All @@ -201,7 +199,7 @@ class _AuthScreenState extends State<AuthScreen>
Expanded(
child: TextButton(
style: ButtonStyle(
overlayColor: MaterialStateProperty.all(Colors.transparent),
overlayColor: WidgetStateProperty.all(Colors.transparent),
),
onPressed: () {
pageController.animateToPage(1,
Expand Down
2 changes: 0 additions & 2 deletions lib/presentation/auth/verfication_screen.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import 'dart:developer';

import 'package:auto_route/auto_route.dart';
import 'package:beacon/config/router/router.dart';
import 'package:beacon/core/utils/constants.dart';
Expand Down
1 change: 0 additions & 1 deletion lib/presentation/group/cubit/group_cubit/group_cubit.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'dart:async';
import 'dart:developer';
import 'package:beacon/config/local_notification.dart';
import 'package:beacon/core/resources/data_state.dart';
import 'package:beacon/domain/entities/beacon/beacon_entity.dart';
Expand Down
1 change: 0 additions & 1 deletion lib/presentation/group/group_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import 'package:beacon/presentation/group/cubit/members_cubit/members_cubit.dart
import 'package:beacon/presentation/group/widgets/create_join_dialog.dart';
import 'package:beacon/presentation/group/widgets/beacon_card.dart';
import 'package:beacon/presentation/group/widgets/group_widgets.dart';
import 'package:beacon/presentation/home/home_cubit/home_cubit.dart';
import 'package:beacon/presentation/widgets/shimmer.dart';
import 'package:beacon/presentation/widgets/hike_button.dart';
import 'package:beacon/presentation/widgets/loading_screen.dart';
Expand Down
5 changes: 0 additions & 5 deletions lib/presentation/group/widgets/beacon_card.dart
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
import 'dart:async';
import 'dart:developer';
import 'package:auto_route/auto_route.dart';
import 'package:beacon/core/resources/data_state.dart';
import 'package:beacon/core/utils/constants.dart';
import 'package:beacon/domain/entities/beacon/beacon_entity.dart';
import 'package:beacon/domain/usecase/group_usecase.dart';
import 'package:beacon/domain/usecase/hike_usecase.dart';
import 'package:beacon/locator.dart';
import 'package:beacon/presentation/group/cubit/group_cubit/group_cubit.dart';
import 'package:beacon/presentation/hike/widgets/active_beacon.dart';
Expand All @@ -15,7 +11,6 @@ import 'package:beacon/config/router/router.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:gap/gap.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:intl/intl.dart';
import 'package:responsive_sizer/responsive_sizer.dart';

Expand Down
3 changes: 0 additions & 3 deletions lib/presentation/group/widgets/timer.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
import 'package:beacon/domain/entities/beacon/beacon_entity.dart';
import 'package:beacon/locator.dart';
import 'package:beacon/core/utils/constants.dart';
import 'package:beacon/config/router/router.dart';
import 'package:flutter/material.dart';
import 'package:flutter_countdown_timer/index.dart';

Expand Down
Loading

0 comments on commit 1a0d997

Please sign in to comment.