Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Preparing for Riverpod
  • Loading branch information
jg-l committed Oct 7, 2020
1 parent 48a7499 commit 513bc92
Show file tree
Hide file tree
Showing 11 changed files with 133 additions and 113 deletions.
2 changes: 1 addition & 1 deletion android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.just_breathe">
package="ca.lising.justbreathe">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
Expand Down
2 changes: 1 addition & 1 deletion lib/constants/quotes.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:just_breathe/data/quote.dart';
import 'package:just_breathe/model/quote.dart';
import 'package:just_breathe/generated/l10n.dart';

/// These are the default quotes displayed in [CompletionScreen]
Expand Down
7 changes: 0 additions & 7 deletions lib/data/quote.dart

This file was deleted.

17 changes: 0 additions & 17 deletions lib/data/settings.dart

This file was deleted.

91 changes: 46 additions & 45 deletions lib/main.dart
@@ -1,9 +1,10 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_riverpod/all.dart';
import 'package:just_breathe/constants/theme.dart';
import 'package:just_breathe/constants/ui.dart';
import 'package:just_breathe/data/settings.dart';
import 'package:just_breathe/model/settings.dart';
import 'package:just_breathe/utils/utils.dart';
import 'package:just_breathe/pages_routes.dart';
import 'package:just_breathe/screens/main_screen.dart';
Expand All @@ -18,56 +19,56 @@ void main() {
// Restrict device orientiation to portraitUp
SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp])
.then((_) {
runApp(new MyApp());
runApp(
ProviderScope(
child: MyApp(),
),
);
});
}

class MyApp extends StatelessWidget {
@override
Widget build(BuildContext context) {
return ChangeNotifierProvider(
create: (_) => MeditationModel(),
child: MaterialApp(
localizationsDelegates: [
S.delegate,
GlobalMaterialLocalizations.delegate,
GlobalWidgetsLocalizations.delegate,
],
supportedLocales: S.delegate.supportedLocales,
builder: (context, widget) {
return ResponsiveWrapper.builder(
widget,
maxWidth: 1200,
minWidth: 450,
defaultScale: true,
breakpoints: [
ResponsiveBreakpoint(breakpoint: 450, name: MOBILE),
ResponsiveBreakpoint(
breakpoint: 800, name: TABLET, autoScale: true),
ResponsiveBreakpoint(
breakpoint: 1000, name: TABLET, autoScale: true),
ResponsiveBreakpoint(breakpoint: 1200, name: DESKTOP),
ResponsiveBreakpoint(
breakpoint: 2460, name: "4K", autoScale: true),
],
background: Container(
color: isDark(context) ? bgDark : fgDark,
),
);
},
title: appTitle,
theme: lightTheme,
darkTheme: darkTheme,
themeMode: ThemeMode.system,
// ignore: missing_return
onGenerateRoute: (settings) {
if (settings.name == '/') {
return PageRoutes.fade(() => MainScreen(
startingAnimation: true,
));
}
},
),
return MaterialApp(
localizationsDelegates: [
S.delegate,
GlobalMaterialLocalizations.delegate,
GlobalWidgetsLocalizations.delegate,
],
supportedLocales: S.delegate.supportedLocales,
builder: (context, widget) {
return ResponsiveWrapper.builder(
widget,
maxWidth: 1200,
minWidth: 450,
defaultScale: true,
breakpoints: [
ResponsiveBreakpoint(breakpoint: 450, name: MOBILE),
ResponsiveBreakpoint(
breakpoint: 800, name: TABLET, autoScale: true),
ResponsiveBreakpoint(
breakpoint: 1000, name: TABLET, autoScale: true),
ResponsiveBreakpoint(breakpoint: 1200, name: DESKTOP),
ResponsiveBreakpoint(breakpoint: 2460, name: "4K", autoScale: true),
],
background: Container(
color: isDark(context) ? bgDark : fgDark,
),
);
},
title: appTitle,
theme: lightTheme,
darkTheme: darkTheme,
themeMode: ThemeMode.system,
// ignore: missing_return
onGenerateRoute: (settings) {
if (settings.name == '/') {
return PageRoutes.fade(() => MainScreen(
startingAnimation: true,
));
}
},
);
}
}
2 changes: 1 addition & 1 deletion lib/screens/completion_screen.dart
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:just_breathe/constants/theme.dart';
import 'package:just_breathe/data/quote.dart';
import 'package:just_breathe/model/quote.dart';
import 'package:just_breathe/generated/l10n.dart';
import 'package:just_breathe/pages_routes.dart';
import 'package:just_breathe/screens/main_screen.dart';
Expand Down
2 changes: 1 addition & 1 deletion lib/screens/main_screen.dart
Expand Up @@ -5,7 +5,7 @@ import 'package:google_fonts/google_fonts.dart';
import 'package:just_breathe/constants/preset_timers.dart';
import 'package:just_breathe/constants/theme.dart';
import 'package:just_breathe/constants/ui.dart';
import 'package:just_breathe/data/settings.dart';
import 'package:just_breathe/model/settings.dart';
import 'package:just_breathe/generated/l10n.dart';
import 'package:just_breathe/pages_routes.dart';
import 'package:just_breathe/screens/about_screen.dart';
Expand Down
2 changes: 1 addition & 1 deletion lib/screens/meditation_screen.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:just_breathe/data/settings.dart';
import 'package:just_breathe/model/settings.dart';
import 'package:just_breathe/widgets/timer_countdown.dart';
import 'package:provider/provider.dart';

Expand Down
2 changes: 1 addition & 1 deletion lib/utils/utils.dart
Expand Up @@ -4,7 +4,7 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:just_breathe/constants/quotes.dart';
import 'package:just_breathe/data/quote.dart';
import 'package:just_breathe/model/quote.dart';

/// Loads the licenses and attributions used by this project
void loadLicenses() {
Expand Down

0 comments on commit 513bc92

Please sign in to comment.