diff --git a/ios/Podfile.lock b/ios/Podfile.lock index e327e6e..a33018c 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -90,6 +90,8 @@ PODS: - path_provider (0.0.1): - Flutter - PromisesObjC (1.2.12) + - shared_preferences (0.0.1): + - Flutter - sqflite (0.0.2): - Flutter - FMDB (>= 2.7.5) @@ -102,6 +104,7 @@ DEPENDENCIES: - flutter_login_facebook (from `.symlinks/plugins/flutter_login_facebook/ios`) - google_sign_in (from `.symlinks/plugins/google_sign_in/ios`) - path_provider (from `.symlinks/plugins/path_provider/ios`) + - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`) - sqflite (from `.symlinks/plugins/sqflite/ios`) SPEC REPOS: @@ -137,6 +140,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/google_sign_in/ios" path_provider: :path: ".symlinks/plugins/path_provider/ios" + shared_preferences: + :path: ".symlinks/plugins/shared_preferences/ios" sqflite: :path: ".symlinks/plugins/sqflite/ios" @@ -163,6 +168,7 @@ SPEC CHECKSUMS: nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97 + shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904 PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c diff --git a/lib/main.dart b/lib/main.dart index 6748065..09753a4 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,9 +1,11 @@ import 'package:firebase_core/firebase_core.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_settings_screens/flutter_settings_screens.dart'; import 'package:le_kiosque_by_gcs/services/auth/main_auth.dart'; import 'package:le_kiosque_by_gcs/ui/landing.dart'; void main() async { + await Settings.init(cacheProvider: SharePreferenceCache()); WidgetsFlutterBinding.ensureInitialized(); await Firebase.initializeApp(); runApp(MyApp()); diff --git a/lib/ui/about.dart b/lib/ui/about.dart new file mode 100644 index 0000000..ee46538 --- /dev/null +++ b/lib/ui/about.dart @@ -0,0 +1,75 @@ +import 'package:flutter/material.dart'; + +class AboutView extends StatelessWidget { + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + centerTitle: false, + backgroundColor: Colors.white, + title: Text( + "A Propos", + style: TextStyle( + color: Colors.black, + ), + ), + iconTheme: IconThemeData( + color: Color(0xFF545454), //change your color here + ), + ), + body: SingleChildScrollView( + child: Center( + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + "Le Kiosque", + style: TextStyle(fontSize: 26, color: Colors.black), + ), + Text( + "Version 1.0.0", + style: TextStyle( + fontSize: 17, + ), + ), + Container( + decoration: BoxDecoration( + color: Colors.grey[200], + image: DecorationImage( + image: AssetImage("assets/images/kiosque_logo.png"), + ), + borderRadius: BorderRadius.all( + Radius.circular(40), + ), + ), + height: 80, + width: 80, + ), + Text( + "Copyright 2020 Le Kiosque", + style: TextStyle( + fontSize: 17, + ), + ), + Text( + "From", + style: TextStyle( + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + Text( + "ZX CONNECT", + style: TextStyle( + fontSize: 22, + fontWeight: FontWeight.bold, + ), + ) + ], + ), + ), + ), + ); + } +} diff --git a/lib/ui/auth.dart b/lib/ui/auth.dart index 0eb69c6..930a7b0 100644 --- a/lib/ui/auth.dart +++ b/lib/ui/auth.dart @@ -26,11 +26,12 @@ class AuthView extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( + backgroundColor: Colors.grey[200], resizeToAvoidBottomInset: false, - body: Column( + body: ListView( children: [ Container( - height: 550, + height: 470, decoration: BoxDecoration( image: DecorationImage( image: AssetImage("assets/images/login_back.png"), @@ -85,7 +86,7 @@ class AuthView extends StatelessWidget { text: "Se connecter avec Facebook", ), SizedBox( - height: 48, + height: 24, ), Text( "En vous connectant, vous acceptez nos conditions et termes d'utilisation.", diff --git a/lib/ui/setting.dart b/lib/ui/setting.dart index 0ff5da1..05a4756 100644 --- a/lib/ui/setting.dart +++ b/lib/ui/setting.dart @@ -1,8 +1,49 @@ import 'package:flutter/material.dart'; +import 'package:flutter_settings_screens/flutter_settings_screens.dart'; class SettingView extends StatelessWidget { @override Widget build(BuildContext context) { - return Container(); + return Scaffold( + appBar: AppBar( + centerTitle: false, + backgroundColor: Colors.white, + title: Text( + "Paramètres", + style: TextStyle( + color: Colors.black, + ), + ), + iconTheme: IconThemeData( + color: Color(0xFF545454), //change your color here + ), + ), + body: Padding( + padding: const EdgeInsets.all(16.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Text( + "Compte", + style: TextStyle( + fontSize: 23, + color: Color(0xFFA7A7A7), + ), + ), + Padding( + padding: const EdgeInsets.only(top: 8.0, bottom: 8.0), + child: Text( + "Changer le mot de passe", + style: TextStyle( + fontSize: 18, + color: Colors.black, + ), + ), + ), + //Text("Changer le mot de passe") + ], + ), + ), + ); } } diff --git a/pubspec.lock b/pubspec.lock index be07ec3..2b6f5e9 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -160,6 +160,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.4.0+1" + flutter_material_color_picker: + dependency: transitive + description: + name: flutter_material_color_picker + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.5" + flutter_settings_screens: + dependency: "direct main" + description: + name: flutter_settings_screens + url: "https://pub.dartlang.org" + source: hosted + version: "0.2.1+1" flutter_test: dependency: "direct dev" description: flutter @@ -351,7 +365,7 @@ packages: name: provider url: "https://pub.dartlang.org" source: hosted - version: "5.0.0" + version: "4.3.3" quiver: dependency: transitive description: @@ -366,6 +380,48 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.25.0" + shared_preferences: + dependency: transitive + description: + name: shared_preferences + url: "https://pub.dartlang.org" + source: hosted + version: "0.5.12+4" + shared_preferences_linux: + dependency: transitive + description: + name: shared_preferences_linux + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.2+4" + shared_preferences_macos: + dependency: transitive + description: + name: shared_preferences_macos + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.1+11" + shared_preferences_platform_interface: + dependency: transitive + description: + name: shared_preferences_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.4" + shared_preferences_web: + dependency: transitive + description: + name: shared_preferences_web + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.2+7" + shared_preferences_windows: + dependency: transitive + description: + name: shared_preferences_windows + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.2+3" sky_engine: dependency: transitive description: flutter diff --git a/pubspec.yaml b/pubspec.yaml index 1e29628..30f64d1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -32,8 +32,9 @@ dependencies: firebase_auth: 0.18.2 google_sign_in: ^4.5.6 flutter_login_facebook: 0.4.0+1 - provider: ^5.0.0 + provider: ^4.0.0 advance_pdf_viewer: ^1.2.2 + flutter_settings_screens: ^0.2.1+1 dev_dependencies: flutter_test: