Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#19] [UI] As a logged-in user, I can see the Survey Detail screen #70

Merged
merged 2 commits into from
Aug 30, 2023
Merged
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
3 changes: 2 additions & 1 deletion lib/l10n/app_en.arb
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"genericError": "Something went wrong.\nPlease try again!",
"loginFailAlertTitle": "Unable to log in",
"today": "Today",
"errorText": "Error"
"errorText": "Error",
"startSurveyButton": "Start Survey"
}
17 changes: 12 additions & 5 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@ import 'package:flutter_config/flutter_config.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart';
import 'package:survey_flutter/model/survey_model.dart';
import 'package:survey_flutter/screens/app_route.dart';
import 'package:survey_flutter/screens/home/home_screen.dart';
import 'package:survey_flutter/screens/login/login_screen.dart';
import 'package:survey_flutter/screens/splash/splash_screen.dart';
import 'package:survey_flutter/screens/survey/survey_screen.dart';
import 'package:survey_flutter/storage/survey_storage.dart';
import 'package:survey_flutter/theme/app_theme.dart';

Expand All @@ -20,27 +23,31 @@ void main() async {
);
}

const routePathSplashScreen = '/';

class App extends StatelessWidget {
App({Key? key}) : super(key: key);

final GoRouter _router = GoRouter(
routes: <GoRoute>[
GoRoute(
path: routePathSplashScreen,
path: AppRoute.splash.path,
builder: (_, __) => const SplashScreen(),
),
GoRoute(
path: routePathLoginScreen,
path: AppRoute.login.path,
pageBuilder: (_, __) => const NoTransitionPage<void>(
child: LoginScreen(),
),
),
GoRoute(
path: routePathHomeScreen,
path: AppRoute.home.path,
builder: (_, __) => const HomeScreen(),
),
GoRoute(
path: AppRoute.survey.path,
builder: (_, state) => SurveyScreen(
survey: state.extra as SurveyModel,
),
),
],
);

Expand Down
21 changes: 21 additions & 0 deletions lib/screens/app_route.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
enum AppRoute {
splash,
login,
home,
survey,
}

extension AppRoutePath on AppRoute {
String get path {
switch (this) {
case AppRoute.splash:
return '/';
case AppRoute.login:
return '/login';
case AppRoute.home:
return '/home';
case AppRoute.survey:
return '/survey';
}
}
}
9 changes: 3 additions & 6 deletions lib/screens/home/home_pages_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ class HomePagesWidget extends StatelessWidget {
final List<SurveyModel> surveys;
final ValueNotifier<int> currentPage;
final PageController _pageController = PageController();
final VoidCallback onNextButtonPressed;

HomePagesWidget({
Key? key,
required this.surveys,
required this.currentPage,
required this.onNextButtonPressed,
}) : super(key: key);

@override
Expand Down Expand Up @@ -50,12 +52,7 @@ class HomePagesWidget extends StatelessWidget {
),
child: HomeFooterWidget(
survey: surveys[index],
onNextButtonPressed: () {
if (currentPage.value < surveys.length - 1) {
currentPage.value = index + 1;
_pageController.jumpToPage(currentPage.value);
}
},
onNextButtonPressed: onNextButtonPressed,
),
),
),
Expand Down
13 changes: 10 additions & 3 deletions lib/screens/home/home_screen.dart
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart';
import 'package:survey_flutter/model/survey_model.dart';
import 'package:survey_flutter/screens/app_route.dart';
import 'package:survey_flutter/screens/home/home_header_widget.dart';
import 'package:survey_flutter/screens/home/home_pages_widget.dart';
import 'package:survey_flutter/screens/home/home_page_indicator_widget.dart';
import 'package:survey_flutter/screens/home/home_pages_widget.dart';
import 'package:survey_flutter/screens/home/home_shimmer_loading.dart';
import 'package:survey_flutter/screens/home/home_view_model.dart';
import 'package:survey_flutter/utils/build_context_ext.dart';
import 'package:survey_flutter/widgets/alert_dialog.dart';

const routePathHomeScreen = '/home';

class HomeScreen extends ConsumerStatefulWidget {
const HomeScreen({Key? key}) : super(key: key);

Expand Down Expand Up @@ -85,6 +85,13 @@ class _HomeScreenState extends ConsumerState<HomeScreen> {
HomePagesWidget(
surveys: surveys,
currentPage: _currentPage,
onNextButtonPressed: () {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Thieurom Next time, please move all the action functions outside the build functions. It will reduce the LOC in each function and make it more readability 🙏

final survey = surveys[_currentPage.value];
context.push(
AppRoute.survey.path,
extra: survey,
);
},
),
const HomeHeaderWidget(),
Align(
Expand Down
6 changes: 2 additions & 4 deletions lib/screens/login/login_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,14 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart';
import 'package:survey_flutter/gen/assets.gen.dart';
import 'package:survey_flutter/screens/home/home_screen.dart';
import 'package:survey_flutter/screens/app_route.dart';
import 'package:survey_flutter/screens/login/login_form.dart';
import 'package:survey_flutter/screens/login/login_view_model.dart';
import 'package:survey_flutter/theme/app_constants.dart';
import 'package:survey_flutter/uimodels/app_error.dart';
import 'package:survey_flutter/utils/build_context_ext.dart';
import 'package:survey_flutter/widgets/alert_dialog.dart';

const routePathLoginScreen = '/login';

class LoginScreen extends ConsumerStatefulWidget {
const LoginScreen({Key? key}) : super(key: key);

Expand Down Expand Up @@ -117,7 +115,7 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
_setUpListener(BuildContext context) {
ref.listen<AsyncValue<void>>(loginViewModelProvider, (_, next) {
next.maybeWhen(
data: (_) => context.go(routePathHomeScreen),
data: (_) => context.go(AppRoute.home.path),
error: (error, _) {
showAlertDialog(
context: context,
Expand Down
7 changes: 3 additions & 4 deletions lib/screens/splash/splash_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart';
import 'package:survey_flutter/gen/assets.gen.dart';
import 'package:survey_flutter/screens/home/home_screen.dart';
import 'package:survey_flutter/screens/login/login_screen.dart';
import 'package:survey_flutter/screens/app_route.dart';
import 'package:survey_flutter/screens/splash/splash_view_model.dart';

class SplashScreen extends ConsumerStatefulWidget {
Expand Down Expand Up @@ -57,9 +56,9 @@ class _SplashScreenState extends ConsumerState<SplashScreen> {
child: Assets.images.splashLogoWhite.image(),
onEnd: () {
if (_isLoggedIn == true) {
context.go(routePathHomeScreen);
context.go(AppRoute.home.path);
} else {
context.go(routePathLoginScreen);
context.go(AppRoute.login.path);
}
},
);
Expand Down
112 changes: 112 additions & 0 deletions lib/screens/survey/survey_screen.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
import 'package:flutter/material.dart';
import 'package:survey_flutter/gen/assets.gen.dart';
import 'package:survey_flutter/model/survey_model.dart';
import 'package:survey_flutter/theme/app_constants.dart';
import 'package:survey_flutter/theme/primary_button_style.dart';
import 'package:survey_flutter/utils/build_context_ext.dart';

const _buttonHeight = 56.0;

class SurveyScreen extends StatelessWidget {
final SurveyModel survey;
SurveyScreen({
super.key,
required this.survey,
});

late final _backgroundImage = FadeInImage.assetNetwork(
placeholder: Assets.images.placeholder.path,
image: survey.coverImageUrl,
fit: BoxFit.cover,
width: double.infinity,
height: double.infinity,
);

late final _gradientOverlay = Container(
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [
Colors.black.withOpacity(0.8),
Colors.black.withOpacity(0.2),
Colors.black.withOpacity(0.8),
],
),
),
);

Widget _buildTitle(BuildContext context) {
return Text(
survey.title,
style: context.textTheme.titleMedium,
maxLines: 2,
);
}

Widget _buildDescription(BuildContext context) {
return Text(
survey.description,
style: context.textTheme.bodyMedium,
maxLines: 2,
);
}

Widget _buildButton(BuildContext context) {
return SizedBox(
height: _buttonHeight,
child: ElevatedButton(
style: PrimaryButtonStyle(
hintTextStyle: context.textTheme.labelMedium,
),
child: Text(
context.localizations.startSurveyButton,
),
onPressed: () {
// TODO: Start survey
},
),
);
}

@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
backgroundColor: Colors.transparent,
elevation: 0,
),
extendBodyBehindAppBar: true,
body: Stack(
children: [
_backgroundImage,
_gradientOverlay,
Container(
padding: const EdgeInsets.only(
bottom: Metrics.spacing20,
left: Metrics.spacing20,
right: Metrics.spacing20,
),
child: SafeArea(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_buildTitle(context),
const SizedBox(height: Metrics.spacing16),
_buildDescription(context),
const Spacer(),
Row(
children: [
const Spacer(),
_buildButton(context),
],
),
],
),
),
),
],
),
);
}
}
Loading