Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions .idea/runConfigurations/main_dev_dart.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/runConfigurations/main_dev_preview_dart.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/runConfigurations/main_prod_dart.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/runConfigurations/main_qa_dart.xml

This file was deleted.

1 change: 1 addition & 0 deletions app/lib/dependencies.dart
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ final configurators = [
DomainDependencyConfigurator(),

//configure location

LocationDependencyConfigurator(),

];
Expand Down
103 changes: 103 additions & 0 deletions app/lib/di/app_dependency_configurator.config.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions app/lib/di/states/viewmodels.dart
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ final searchViewModelProvider =
);

final dashboardViewModelProvider =
ChangeNotifierProvider.autoDispose<DashboardPageViewModel>(
(ref) => DashboardPageViewModel(
ChangeNotifierProvider.autoDispose<DashboardViewModel>(
(ref) => DashboardViewModel(
getIt.get<CheckLocationPermissionUseCase>(),
getIt.get<RequestLocationPermissionUseCase>(),
getIt.get<GetLocationUseCase>(),
Expand Down
19 changes: 10 additions & 9 deletions app/lib/feature/dashboard/dashboard_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,21 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:localisation/strings.dart';
import 'package:statemanagement_riverpod/statemanagement_riverpod.dart';

class DashboardPage extends BasePage<DashboardPageViewModel> {
class DashboardPage extends BasePage<DashboardViewModel> {
const DashboardPage({Key? key}) : super(key: key);

@override
DashboardPageState createState() => DashboardPageState();
}

class DashboardPageState
extends BaseStatefulPage<DashboardPageViewModel, DashboardPage> {
@override
ProviderBase<DashboardPageViewModel> provideBase() {

return dashboardViewModelProvider;
}
extends BaseStatefulPage<DashboardViewModel, DashboardPage> {

@override
void onModelReady(DashboardPageViewModel model) {
void onModelReady(DashboardViewModel model) {
model.exceptionHandlerBinder.bind(context, super.stateObserver);
model.checkLocationPermission();
super.onModelReady(model);
}

@override
Expand Down Expand Up @@ -119,9 +115,14 @@ class DashboardPageState
}

@override
Widget buildView(BuildContext context, DashboardPageViewModel model) {
Widget buildView(BuildContext context, DashboardViewModel model) {
return DashboardPageView(provideBase());
}

@override
ProviderBase<DashboardViewModel> provideBase() {
return dashboardViewModelProvider;
}
}

class CustomTabItem extends StatelessWidget {
Expand Down
4 changes: 2 additions & 2 deletions app/lib/feature/dashboard/dashboard_page_model.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ import '../../model/resource.dart';
import '../../utils/request_manager.dart';

@injectable
class DashboardPageViewModel extends BasePageViewModel {
class DashboardViewModel extends BasePageViewModel {
final CheckLocationPermissionUseCase checkLocationPermissionUseCase;
final RequestLocationPermissionUseCase requestLocationPermissionUseCase;
final GetLocationUseCase getLocationUseCase;
final CreateLocationUseCase createLocationUseCase;
final FlutterExceptionHandlerBinder exceptionHandlerBinder;

DashboardPageViewModel(
DashboardViewModel(
this.checkLocationPermissionUseCase,
this.requestLocationPermissionUseCase,
this.getLocationUseCase,
Expand Down
29 changes: 14 additions & 15 deletions app/lib/feature/dashboard/dashboard_page_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,28 @@ import 'package:app/feature/tabs/profile/profile_page.dart';
import 'package:app/feature/tabs/search/search_page.dart';
import 'package:app/widgets/fade_indexed_stack.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:statemanagement_riverpod/statemanagement_riverpod.dart';

class DashboardPageView extends BasePageViewWidget<DashboardPageViewModel> {
DashboardPageView(ProviderBase<DashboardPageViewModel> model) : super(model);
class DashboardPageView extends BasePageViewWidget<DashboardViewModel> {
DashboardPageView(super.providerBase, {Key? key}) : super(key: key);

@override
Widget build(BuildContext context, model) {
return BaseWidget<BottomNavigationViewModel>(
providerBase: bottomNavigationViewModelProvider,
builder: (BuildContext context,
BottomNavigationViewModel? bottomNavigationViewModel,
Widget? child) =>
BottomNavigationViewModel? bottomNavigationViewModel,
Widget? child) =>
FadeIndexedStack(
duration: const Duration(milliseconds: 500),
index: bottomNavigationViewModel?.currentTab.toInt(),
children: const <Widget>[
HomePage(),
SearchPage(),
NavigationPage(),
ProfilePage()
],
),
duration: const Duration(milliseconds: 500),
index: bottomNavigationViewModel?.currentTab.toInt(),
children: const <Widget>[
HomePage(),
SearchPage(),
NavigationPage(),
ProfilePage()
],
),
);
}
}
}
21 changes: 1 addition & 20 deletions app/lib/feature/splash/splash_page.dart
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import 'package:app/feature/weather_detail/weather_detail_page.dart';
import 'package:app/navigation/route_paths.dart';
import 'package:domain/domain.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:statemanagement_riverpod/statemanagement_riverpod.dart';

import '../../di/states/viewmodels.dart';
import 'splash_page_model.dart';
import 'splash_page_view.dart';
Expand All @@ -28,23 +25,7 @@ class SplashPageState extends BaseStatefulPage<SplashViewModel, SplashPage> {
model.exceptionHandlerBinder.bind(context, super.stateObserver);
getViewModel().navigateToDashboard().listen((event) {
if (event) {
Navigator.pushReplacementNamed(
context,
RoutePaths.weatherDetail,
arguments: WeatherDetailPageParam(
Location(
locationId: '633191078d244f330e4f238d',
name: 'Pune',
geometryLocation: GeometryLocation(
type: 'Point',
coordinates: [
73.856743,
18.520430,
],
),
),
),
);
Navigator.pushReplacementNamed(context, RoutePaths.dashboard);
}
});
}
Expand Down
2 changes: 1 addition & 1 deletion app/lib/feature/splash/splash_page_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'package:statemanagement_riverpod/statemanagement_riverpod.dart';
import 'splash_page_model.dart';

class SplashPageView extends BasePageViewWidget<SplashViewModel> {
SplashPageView(ProviderBase<SplashViewModel> model) : super(model);
SplashPageView(ProviderBase<SplashViewModel> model, {Key? key}) : super(key: key, model);

@override
Widget build(BuildContext context, model) {
Expand Down
10 changes: 6 additions & 4 deletions app/lib/feature/tabs/home/home_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@ class HomePage extends BasePage<HomePageViewModel> {
}

class HomePageState extends BaseStatefulPage<HomePageViewModel, HomePage> {
@override
ProviderBase<HomePageViewModel> provideBase() {
return homeViewModelProvider;
}


@override
void onModelReady(HomePageViewModel model) {
Expand All @@ -36,4 +33,9 @@ class HomePageState extends BaseStatefulPage<HomePageViewModel, HomePage> {
Widget buildView(BuildContext context, HomePageViewModel model) {
return HomePageView(provideBase());
}

@override
ProviderBase<HomePageViewModel> provideBase() {
return homeViewModelProvider;
}
}
11 changes: 5 additions & 6 deletions app/lib/feature/tabs/home/home_page_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ import 'package:app/feature/tabs/home/widgets/favourite_whether_widget.dart';
import 'package:app/feature/tabs/home/widgets/header_widget.dart';
import 'package:app/feature/tabs/home/widgets/whether_list_widget.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:localisation/strings.dart';
import 'package:statemanagement_riverpod/statemanagement_riverpod.dart';

import 'home_page_model.dart';

class HomePageView extends BasePageViewWidget<HomePageViewModel> {
HomePageView(ProviderBase<HomePageViewModel> model) : super(model);
HomePageView(super.providerBase, {Key? key}) : super(key: key);

@override
Widget build(BuildContext context, model) {
Expand All @@ -23,9 +22,9 @@ class HomePageView extends BasePageViewWidget<HomePageViewModel> {
Container(
margin: const EdgeInsets.only(top: 30),
child: const WhetherListWidget()),
const FavouriteWhetherWidget(
temperature: "12",
city: "Los Angeles",
FavouriteWhetherWidget(
temperature: Strings.of(context).favDegreeStaticText,
city: Strings.of(context).losAngelesStaticText,
)
],
),
Expand Down
Loading