fr/android_fuelstats
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: fr:86e2d40e864a788524b7ebbea01b3d553dada0d8
Branches Tags
fr:master
fr:v0.1.1
..
compare: fr:7f486aa106769045f25f41743b0bc5990479511f
Branches Tags
fr:master
fr:v0.1.1

No commits in common. "86e2d40e864a788524b7ebbea01b3d553dada0d8" and "7f486aa106769045f25f41743b0bc5990479511f" have entirely different histories.
86e2d40e86 ... 7f486aa106

8 changed files with 52 additions and 556 deletions
Show Stats Expand all files Collapse all files

117
lib/main.dart
View File

@ -1,24 +1,12 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'services/session_manager.dart';
import 'screens/home_screen.dart'; import 'screens/home_screen.dart';
import 'screens/add_screen.dart'; import 'screens/add_screen.dart';
import 'screens/vehicles_screen.dart'; import 'screens/vehicles_screen.dart';
import 'screens/history_screen.dart'; import 'screens/history_screen.dart';
import 'screens/user_settings.dart'; import 'screens/user_settings.dart';
import 'screens/login.dart';
import 'screens/signup.dart';
void main() async { void main() {
WidgetsFlutterBinding.ensureInitialized(); runApp(FuelStatsApp());
await SessionManager().init();
runApp(
ChangeNotifierProvider(
create: (_) => SessionManager(),
child: FuelStatsApp(),
),
);
} }
class FuelStatsApp extends StatelessWidget { class FuelStatsApp extends StatelessWidget {
@ -43,99 +31,41 @@ class MainNavigation extends StatefulWidget {
class _MainNavigationState extends State<MainNavigation> { class _MainNavigationState extends State<MainNavigation> {
int _currentIndex = 0; int _currentIndex = 0;
bool get isAuthScreen => _currentIndex == 5 || _currentIndex == 6; final List<Widget> _screens = [
Widget get currentTitle {
switch (_currentIndex) {
case 0:
return Text("Fuel Stats");
case 1:
return Text("Add record");
case 2:
return Text("Vehicles");
case 3:
return Text("History");
case 4:
return Text("Settings");
case 5:
return Text("Login");
case 6:
return Text("Sign up");
default:
return Text("Fuel Stats");
}
}
@override
Widget build(BuildContext context) {
final session = Provider.of<SessionManager>(context);
// Auto-redirect to login if not logged in and not already on auth screens
Future.delayed(Duration(milliseconds: 100), () {
if (!session.isLoggedIn && !isAuthScreen) {
setState(() => _currentIndex = 5);
}
});
final screens = [
HomeScreen(), HomeScreen(),
AddScreen(), AddScreen(),
VehiclesScreen(), VehiclesScreen(),
HistoryScreen(), HistoryScreen(),
UserSettingsScreen( UserSettingsScreen(),
onLogout: () {
setState(() => _currentIndex = 5); // Go to login
},
),
LoginScreen(
onSwitchToSignup: () {
WidgetsBinding.instance.addPostFrameCallback((_) {
setState(() => _currentIndex = 6);
});
},
onLoginSuccess: () {
WidgetsBinding.instance.addPostFrameCallback((_) {
setState(() => _currentIndex = 0); // Go to Home
});
},
),
SignupScreen(
onSwitchToLogin: () {
WidgetsBinding.instance.addPostFrameCallback((_) {
setState(() => _currentIndex = 5);
});
},
),
]; ];
final List<Widget> titles = [
Text("Fuel Stats"),
Text("Add record"),
Text("Vehicles"),
Text("History"),
];
@override
Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: currentTitle, title: _currentIndex <= 3 ? titles[_currentIndex] : Text("Fuel Stats"),
actions: !isAuthScreen actions: [
? [
IconButton( IconButton(
icon: const Icon(Icons.person), icon: const Icon(Icons.person),
tooltip: "User settings", tooltip: "User settings",
onPressed: () { onPressed: () {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(builder: (context) => UserSettingsScreen()),
builder: (context) => UserSettingsScreen(
onLogout: () {
Navigator.pop(context); // Close settings
setState(() => _currentIndex = 5); // Go to Login
},
),
),
); );
}, },
), ),
] ],
: null,
), ),
body: screens[_currentIndex], body: _screens[_currentIndex],
bottomNavigationBar: !isAuthScreen bottomNavigationBar: BottomNavigationBar(
? BottomNavigationBar(
currentIndex: _currentIndex <= 3 ? _currentIndex : 0, currentIndex: _currentIndex <= 3 ? _currentIndex : 0,
onTap: (index) => setState(() => _currentIndex = index), onTap: (index) => setState(() => _currentIndex = index),
backgroundColor: Colors.grey[900], backgroundColor: Colors.grey[900],
@ -144,12 +74,13 @@ class _MainNavigationState extends State<MainNavigation> {
items: const [ items: const [
BottomNavigationBarItem(icon: Icon(Icons.home), label: 'Home'), BottomNavigationBarItem(icon: Icon(Icons.home), label: 'Home'),
BottomNavigationBarItem(icon: Icon(Icons.add), label: 'Add'), BottomNavigationBarItem(icon: Icon(Icons.add), label: 'Add'),
BottomNavigationBarItem(icon: Icon(Icons.directions_car), label: 'Vehicles'), BottomNavigationBarItem(
icon: Icon(Icons.directions_car),
label: 'Vehicles',
),
BottomNavigationBarItem(icon: Icon(Icons.history), label: 'History'), BottomNavigationBarItem(icon: Icon(Icons.history), label: 'History'),
], ],
) ),
: null,
); );
} }
} }

122
lib/screens/login.dart
View File

@ -1,122 +0,0 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../services/session_manager.dart';
class LoginScreen extends StatefulWidget {
final VoidCallback onSwitchToSignup;
final VoidCallback onLoginSuccess; // ✅ ADD THIS
const LoginScreen({
required this.onSwitchToSignup,
required this.onLoginSuccess, // ✅ ADD THIS
super.key,
});
@override
State<LoginScreen> createState() => _LoginScreenState();
}
class _LoginScreenState extends State<LoginScreen> {
final _formKey = GlobalKey<FormState>();
final _emailController = TextEditingController();
final _passwordController = TextEditingController();
void _login() {
if (_formKey.currentState!.validate()) {
final email = _emailController.text;
final password = _passwordController.text;
if (email == "test@test.com" && password == "Test1234") {
Provider.of<SessionManager>(context, listen: false).login(
token: "dummy_token",
email: email,
name: "John Doe",
);
widget.onLoginSuccess(); // ✅ FIXED: now defined
} else {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text("Invalid credentials")),
);
}
}
}
@override
Widget build(BuildContext context) {
return Scaffold(
body: Padding(
padding: const EdgeInsets.all(24.0),
child: Form(
key: _formKey,
child: Center(
child: SingleChildScrollView(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
'Log in to Fuel Stats',
style: TextStyle(
fontSize: 24,
fontWeight: FontWeight.bold,
),
),
const SizedBox(height: 32),
TextFormField(
controller: _emailController,
decoration: InputDecoration(
labelText: 'Email',
prefixIcon: Icon(Icons.email),
border: OutlineInputBorder(),
),
keyboardType: TextInputType.emailAddress,
validator: (value) {
if (value == null || value.isEmpty)
return 'Please enter your email';
if (!RegExp(r'^[^@]+@[^@]+\.[^@]+').hasMatch(value))
return 'Enter a valid email';
return null;
},
),
const SizedBox(height: 16),
TextFormField(
controller: _passwordController,
decoration: InputDecoration(
labelText: 'Password',
prefixIcon: Icon(Icons.lock),
border: OutlineInputBorder(),
),
obscureText: true,
validator: (value) {
if (value == null || value.isEmpty)
return 'Please enter your password';
if (value.length < 6)
return 'Password must be at least 6 characters';
return null;
},
),
const SizedBox(height: 24),
ElevatedButton.icon(
onPressed: _login,
icon: Icon(Icons.login),
label: Text('Log In'),
style: ElevatedButton.styleFrom(
backgroundColor: Colors.green,
foregroundColor: Colors.white,
padding: EdgeInsets.symmetric(horizontal: 32, vertical: 12),
),
),
const SizedBox(height: 12),
TextButton(
onPressed: widget.onSwitchToSignup,
child: Text("Don't have an account? Sign up"),
),
],
),
),
),
),
),
);
}
}

119
lib/screens/signup.dart
View File

@ -1,119 +0,0 @@
import 'package:flutter/material.dart';
class SignupScreen extends StatefulWidget {
final VoidCallback onSwitchToLogin;
const SignupScreen({required this.onSwitchToLogin, super.key});
@override
State<SignupScreen> createState() => _SignupScreenState();
}
class _SignupScreenState extends State<SignupScreen> {
final _formKey = GlobalKey<FormState>();
final _usernameController = TextEditingController();
final _emailController = TextEditingController();
final _passwordController = TextEditingController();
void _signup() {
if (_formKey.currentState!.validate()) {
final username = _usernameController.text;
final email = _emailController.text;
final password = _passwordController.text;
// TODO: Replace with actual signup logic
print('Signing up with $username, $email, $password');
}
}
@override
Widget build(BuildContext context) {
return Scaffold(
//appBar: AppBar(title: Text('Sign Up')),
body: Padding(
padding: const EdgeInsets.all(24.0),
child: Form(
key: _formKey,
child: Center(
child: SingleChildScrollView(
child: Column(
children: [
Text(
'Create your Fuel Stats account',
style: TextStyle(
fontSize: 24,
fontWeight: FontWeight.bold,
),
),
const SizedBox(height: 32),
TextFormField(
controller: _usernameController,
decoration: InputDecoration(
labelText: 'Username',
prefixIcon: Icon(Icons.person),
border: OutlineInputBorder(),
),
validator: (value) {
if (value == null || value.isEmpty)
return 'Please enter a username';
return null;
},
),
const SizedBox(height: 16),
TextFormField(
controller: _emailController,
decoration: InputDecoration(
labelText: 'Email',
prefixIcon: Icon(Icons.email),
border: OutlineInputBorder(),
),
keyboardType: TextInputType.emailAddress,
validator: (value) {
if (value == null || value.isEmpty)
return 'Please enter an email';
if (!RegExp(r'^[^@]+@[^@]+\.[^@]+').hasMatch(value))
return 'Enter a valid email';
return null;
},
),
const SizedBox(height: 16),
TextFormField(
controller: _passwordController,
decoration: InputDecoration(
labelText: 'Password',
prefixIcon: Icon(Icons.lock),
border: OutlineInputBorder(),
),
obscureText: true,
validator: (value) {
if (value == null || value.isEmpty)
return 'Please enter a password';
if (value.length < 6)
return 'Password must be at least 6 characters';
return null;
},
),
const SizedBox(height: 24),
ElevatedButton.icon(
onPressed: _signup,
icon: Icon(Icons.person_add),
label: Text('Sign Up'),
style: ElevatedButton.styleFrom(
backgroundColor: Colors.blue,
foregroundColor: Colors.white,
padding: EdgeInsets.symmetric(horizontal: 32, vertical: 12),
),
),
const SizedBox(height: 12),
TextButton(
onPressed: widget.onSwitchToLogin,
child: Text("Already have an account? Log in"),
),
],
),
),
),
),
),
);
}
}

24
lib/screens/user_settings.dart
View File

@ -1,41 +1,30 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:package_info_plus/package_info_plus.dart'; import 'package:package_info_plus/package_info_plus.dart';
import 'package:flutter/material.dart';
import 'package:package_info_plus/package_info_plus.dart';
import 'package:provider/provider.dart';
import '../services/session_manager.dart';
class UserSettingsScreen extends StatelessWidget { class UserSettingsScreen extends StatelessWidget {
final VoidCallback onLogout;
const UserSettingsScreen({required this.onLogout, super.key});
Future<String> _getVersion() async { Future<String> _getVersion() async {
final info = await PackageInfo.fromPlatform(); final info = await PackageInfo.fromPlatform();
//return 'Version: ${info.version}+${info.buildNumber}';
return 'Version: ${info.version}'; return 'Version: ${info.version}';
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final session = Provider.of<SessionManager>(context);
final userName = session.name ?? "Unknown User"; // fallback just in case
return Scaffold( return Scaffold(
appBar: AppBar(title: Text('User settings')), appBar: AppBar(title: Text('User settings')),
body: Center( body: Center(
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
Text( const Text(
userName, "Test User",
style: TextStyle(fontSize: 32, fontWeight: FontWeight.bold), style: TextStyle(fontSize: 32, fontWeight: FontWeight.bold),
), ),
SizedBox(height: 20), SizedBox(height: 20),
ElevatedButton.icon( ElevatedButton.icon(
onPressed: () async { onPressed: () {
await session.logout(); // TODO: Add sign-out logic here
onLogout();
}, },
icon: Icon(Icons.logout), icon: Icon(Icons.logout),
label: Text("Sign Out"), label: Text("Sign Out"),
@ -64,4 +53,3 @@ class UserSettingsScreen extends StatelessWidget {
); );
} }
} }

58
lib/services/session_manager.dart
View File

@ -1,58 +0,0 @@
import 'package:flutter/material.dart';
import 'package:shared_preferences/shared_preferences.dart';
class SessionManager extends ChangeNotifier {
static final SessionManager _instance = SessionManager._internal();
factory SessionManager() => _instance;
SessionManager._internal();
bool _loggedIn = false;
String? _token;
String? _email;
String? _name;
bool get isLoggedIn => _loggedIn;
String? get token => _token;
String? get email => _email;
String? get name => _name;
final _prefs = SharedPreferencesAsync(); // ✅ New API
Future<void> init() async {
_token = await _prefs.getString('token');
_email = await _prefs.getString('email');
_name = await _prefs.getString('name');
_loggedIn = _token != null;
notifyListeners();
}
Future<void> login({
required String token,
required String email,
String? name,
}) async {
await _prefs.setString('token', token);
await _prefs.setString('email', email);
if (name != null) await _prefs.setString('name', name);
_token = token;
_email = email;
_name = name;
_loggedIn = true;
notifyListeners();
}
Future<void> logout() async {
await _prefs.remove('token');
await _prefs.remove('email');
await _prefs.remove('name');
_token = null;
_email = null;
_name = null;
_loggedIn = false;
notifyListeners();
}
}

2
macos/Flutter/GeneratedPluginRegistrant.swift
View File

@ -6,9 +6,7 @@ import FlutterMacOS
import Foundation import Foundation
import package_info_plus import package_info_plus
import shared_preferences_foundation
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
} }

122
pubspec.lock
View File

@ -65,14 +65,6 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.1.4" version: "2.1.4"
file:
dependency: transitive
description:
name: file
sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
url: "https://pub.dev"
source: hosted
version: "7.0.1"
flutter: flutter:
dependency: "direct main" dependency: "direct main"
description: flutter description: flutter
@ -168,14 +160,6 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.16.0" version: "1.16.0"
nested:
dependency: transitive
description:
name: nested
sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
url: "https://pub.dev"
source: hosted
version: "1.0.0"
package_info_plus: package_info_plus:
dependency: "direct main" dependency: "direct main"
description: description:
@ -200,38 +184,6 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.9.1" version: "1.9.1"
path_provider_linux:
dependency: transitive
description:
name: path_provider_linux
sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
url: "https://pub.dev"
source: hosted
version: "2.2.1"
path_provider_platform_interface:
dependency: transitive
description:
name: path_provider_platform_interface
sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
url: "https://pub.dev"
source: hosted
version: "2.1.2"
path_provider_windows:
dependency: transitive
description:
name: path_provider_windows
sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
url: "https://pub.dev"
source: hosted
version: "2.3.0"
platform:
dependency: transitive
description:
name: platform
sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
url: "https://pub.dev"
source: hosted
version: "3.1.6"
plugin_platform_interface: plugin_platform_interface:
dependency: transitive dependency: transitive
description: description:
@ -240,70 +192,6 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.1.8" version: "2.1.8"
provider:
dependency: "direct main"
description:
name: provider
sha256: "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84"
url: "https://pub.dev"
source: hosted
version: "6.1.5"
shared_preferences:
dependency: "direct main"
description:
name: shared_preferences
sha256: "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5"
url: "https://pub.dev"
source: hosted
version: "2.5.3"
shared_preferences_android:
dependency: transitive
description:
name: shared_preferences_android
sha256: "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac"
url: "https://pub.dev"
source: hosted
version: "2.4.10"
shared_preferences_foundation:
dependency: transitive
description:
name: shared_preferences_foundation
sha256: "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03"
url: "https://pub.dev"
source: hosted
version: "2.5.4"
shared_preferences_linux:
dependency: transitive
description:
name: shared_preferences_linux
sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f"
url: "https://pub.dev"
source: hosted
version: "2.4.1"
shared_preferences_platform_interface:
dependency: transitive
description:
name: shared_preferences_platform_interface
sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80"
url: "https://pub.dev"
source: hosted
version: "2.4.1"
shared_preferences_web:
dependency: transitive
description:
name: shared_preferences_web
sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019
url: "https://pub.dev"
source: hosted
version: "2.4.3"
shared_preferences_windows:
dependency: transitive
description:
name: shared_preferences_windows
sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1"
url: "https://pub.dev"
source: hosted
version: "2.4.1"
sky_engine: sky_engine:
dependency: transitive dependency: transitive
description: flutter description: flutter
@ -397,14 +285,6 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "5.12.0" version: "5.12.0"
xdg_directories:
dependency: transitive
description:
name: xdg_directories
sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
url: "https://pub.dev"
source: hosted
version: "1.1.0"
sdks: sdks:
dart: ">=3.7.2 <4.0.0" dart: ">=3.7.2 <4.0.0"
flutter: ">=3.27.0" flutter: ">=3.19.0"

2
pubspec.yaml
View File

@ -30,8 +30,6 @@ environment:
dependencies: dependencies:
flutter: flutter:
sdk: flutter sdk: flutter
shared_preferences: ^2.5.3
provider: ^6.1.5
# The following adds the Cupertino Icons font to your application. # The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons. # Use with the CupertinoIcons class for iOS style icons.