Working auth and added shared notes

This commit is contained in:
Nathan Anderson 2023-07-27 01:40:26 -06:00
parent 18aad2b3d5
commit 83393807c7
68 changed files with 2138 additions and 661 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 544 B

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 442 B

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 721 B

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 8.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#FFA188A6</color>
</resources>

BIN
assets/app_icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 163 KiB

BIN
assets/app_icon1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 219 KiB

BIN
assets/app_icon_round.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 250 KiB

BIN
assets/splash_icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 443 KiB

View File

@ -1,122 +1,122 @@
{
"images": [
{
"size" : "20x20",
"idiom" : "iphone",
"filename": "Icon-App-20x20@2x.png",
"scale" : "2x"
"idiom": "iphone",
"scale": "2x",
"size": "20x20"
},
{
"size" : "20x20",
"idiom" : "iphone",
"filename": "Icon-App-20x20@3x.png",
"scale" : "3x"
"idiom": "iphone",
"scale": "3x",
"size": "20x20"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename": "Icon-App-29x29@1x.png",
"scale" : "1x"
"idiom": "iphone",
"scale": "1x",
"size": "29x29"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename": "Icon-App-29x29@2x.png",
"scale" : "2x"
"idiom": "iphone",
"scale": "2x",
"size": "29x29"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename": "Icon-App-29x29@3x.png",
"scale" : "3x"
"idiom": "iphone",
"scale": "3x",
"size": "29x29"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename": "Icon-App-40x40@2x.png",
"scale" : "2x"
"idiom": "iphone",
"scale": "2x",
"size": "40x40"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename": "Icon-App-40x40@3x.png",
"scale" : "3x"
"idiom": "iphone",
"scale": "3x",
"size": "40x40"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename": "Icon-App-60x60@2x.png",
"scale" : "2x"
},
{
"size" : "60x60",
"idiom": "iphone",
"scale": "2x",
"size": "60x60"
},
{
"filename": "Icon-App-60x60@3x.png",
"scale" : "3x"
"idiom": "iphone",
"scale": "3x",
"size": "60x60"
},
{
"size" : "20x20",
"idiom" : "ipad",
"filename": "Icon-App-20x20@1x.png",
"scale" : "1x"
"idiom": "ipad",
"scale": "1x",
"size": "20x20"
},
{
"size" : "20x20",
"idiom" : "ipad",
"filename": "Icon-App-20x20@2x.png",
"scale" : "2x"
"idiom": "ipad",
"scale": "2x",
"size": "20x20"
},
{
"size" : "29x29",
"idiom" : "ipad",
"filename": "Icon-App-29x29@1x.png",
"scale" : "1x"
"idiom": "ipad",
"scale": "1x",
"size": "29x29"
},
{
"size" : "29x29",
"idiom" : "ipad",
"filename": "Icon-App-29x29@2x.png",
"scale" : "2x"
"idiom": "ipad",
"scale": "2x",
"size": "29x29"
},
{
"size" : "40x40",
"idiom" : "ipad",
"filename": "Icon-App-40x40@1x.png",
"scale" : "1x"
"idiom": "ipad",
"scale": "1x",
"size": "40x40"
},
{
"size" : "40x40",
"idiom" : "ipad",
"filename": "Icon-App-40x40@2x.png",
"scale" : "2x"
"idiom": "ipad",
"scale": "2x",
"size": "40x40"
},
{
"size" : "76x76",
"idiom" : "ipad",
"filename": "Icon-App-76x76@1x.png",
"scale" : "1x"
"idiom": "ipad",
"scale": "1x",
"size": "76x76"
},
{
"size" : "76x76",
"idiom" : "ipad",
"filename": "Icon-App-76x76@2x.png",
"scale" : "2x"
},
{
"size" : "83.5x83.5",
"idiom": "ipad",
"filename" : "Icon-App-83.5x83.5@2x.png",
"scale" : "2x"
"scale": "2x",
"size": "76x76"
},
{
"filename": "Icon-App-83.5x83.5@2x.png",
"idiom": "ipad",
"scale": "2x",
"size": "83.5x83.5"
},
{
"size" : "1024x1024",
"idiom" : "ios-marketing",
"filename": "Icon-App-1024x1024@1x.png",
"scale" : "1x"
"idiom": "ios-marketing",
"scale": "1x",
"size": "1024x1024"
}
],
"info": {
"version" : 1,
"author" : "xcode"
"author": "icons_launcher",
"version": 1
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 295 B

After

Width:  |  Height:  |  Size: 629 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 406 B

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 450 B

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 282 B

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 462 B

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 704 B

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 406 B

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 586 B

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 862 B

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 862 B

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 762 B

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

View File

@ -0,0 +1,115 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:helpers/helpers/misc_build/build_media.dart';
import 'package:rluv/features/account/signup.dart';
import 'package:rluv/global/styles.dart';
import '../../global/api.dart';
import '../../global/widgets/ui_button.dart';
import '../../main.dart';
import 'login.dart';
class AccountCreateScreen extends ConsumerStatefulWidget {
const AccountCreateScreen({super.key});
@override
ConsumerState<AccountCreateScreen> createState() =>
_AccountCreateScreenState();
}
enum _AccountScreen { options, login, signup }
class _AccountCreateScreenState extends ConsumerState<AccountCreateScreen> {
_AccountScreen currentScreen = _AccountScreen.options;
static final signupFormKey = GlobalKey<FormState>();
static final loginFormKey = GlobalKey<FormState>();
bool usingUsername = true;
bool hasFamilyCode = false;
@override
Widget build(BuildContext context) {
if (ref.watch(tokenProvider) != null) {
WidgetsBinding.instance.addPostFrameCallback(
(_) {
Navigator.pushAndRemoveUntil(
context,
MaterialPageRoute(builder: (ctx) => const Home()),
(r) => false,
);
},
);
}
final screen = BuildMedia(context).size;
return Scaffold(
backgroundColor: Styles.purpleNurple,
body: SafeArea(
child: AnimatedSwitcher(
duration: const Duration(milliseconds: 300),
child: currentScreen == _AccountScreen.options
? Center(
child: SizedBox(
width: screen.width * 0.5 > 400 ? 400 : screen.width * 0.5,
child: Column(
children: [
const Spacer(),
const Text(
'Welcome!',
style: TextStyle(fontSize: 28),
),
Padding(
padding: const EdgeInsets.symmetric(vertical: 40.0),
child: Image.asset("assets/app_icon.png",
height:
screen.width > 500 ? 250 : screen.width * 0.5,
width: screen.width > 500
? 250
: screen.width * 0.5),
),
UiButton(
color: Styles.sunflower,
onPressed: () {
setState(
() => currentScreen = _AccountScreen.signup,
);
},
text: 'Signup',
),
const SizedBox(height: 20),
UiButton(
color: Styles.flounderBlue,
onPressed: () {
setState(
() => currentScreen = _AccountScreen.login,
);
},
text: 'Login',
),
const Spacer(),
],
),
),
)
: currentScreen == _AccountScreen.login
? Login(formKey: loginFormKey, exitNav: exitNav())
: Signup(
formKey: signupFormKey,
exitNav: exitNav(),
),
),
),
);
}
Widget exitNav() => Align(
alignment: Alignment.topLeft,
child: IconButton(
icon: const Icon(Icons.chevron_left),
onPressed: () {
setState(
() => currentScreen = _AccountScreen.options,
);
},
),
);
}

View File

@ -0,0 +1,232 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:helpers/helpers/misc_build/build_media.dart';
import 'package:helpers/helpers/print.dart';
import '../../global/api.dart';
import '../../global/styles.dart';
import '../../global/utils.dart';
import '../../global/widgets/ui_button.dart';
class Login extends ConsumerStatefulWidget {
const Login({super.key, required this.formKey, required this.exitNav});
final GlobalKey<FormState> formKey;
final Widget exitNav;
@override
ConsumerState<Login> createState() => _LoginState();
}
class _LoginState extends ConsumerState<Login> {
bool usingUsername = false;
final emailController = TextEditingController();
final usernameController = TextEditingController();
final passwordController = TextEditingController();
final focusNodes = [
FocusNode(),
FocusNode(),
FocusNode(),
];
@override
Widget build(BuildContext context) {
final screen = BuildMedia(context).size;
return Form(
key: widget.formKey,
child: Stack(
children: [
Column(
children: [
const Spacer(),
const Text(
'Login',
style: TextStyle(fontSize: 24),
),
const Spacer(flex: 2),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Column(
children: [
const Padding(
padding: EdgeInsets.all(2.0),
child: Text(
'Username',
style: TextStyle(
fontSize: 16,
),
),
),
Checkbox(
activeColor: Styles.lavender,
onChanged: (bool? value) {
setState(() => usingUsername = true);
},
value: usingUsername,
),
],
),
const SizedBox(
width: 35,
),
Column(
children: [
const Padding(
padding: EdgeInsets.all(2.0),
child: Text(
'Email',
style: TextStyle(
fontSize: 16,
),
),
),
Checkbox(
activeColor: Styles.lavender,
onChanged: (bool? value) {
setState(() => usingUsername = false);
},
value: !usingUsername,
),
],
),
],
),
AnimatedSwitcher(
duration: const Duration(milliseconds: 200),
child: !usingUsername
? generateTextField(
controller: emailController,
size: screen,
text: 'Email: ',
validatorFunc: (s) {
if (s != null && s.isNotEmpty && !isEmailValid(s)) {
return 'Email entered is invalid';
}
return null;
},
index: 0)
: generateTextField(
controller: usernameController,
size: screen,
text: 'Username: ',
validatorFunc: (s) {
if (s == null || s.isEmpty) {
return 'Invalid Username';
}
if (s.length < 3) {
return 'Username Not 3 Letters Long';
}
if (s.length > 20) {
return 'Username Too Long';
}
if (!isUsernameValid(s)) {
return 'Letters, Numbers, and ., -, _ Allowed';
}
return null;
},
index: 0),
),
generateTextField(
controller: passwordController,
size: screen,
text: 'Password: ',
validatorFunc: (s) {
if (s != null && s.length < 6) {
return 'Please do a better password (you have to)';
}
return null;
},
index: 1,
isPassword: true),
const Spacer(flex: 2),
UiButton(
width: screen.width * 0.85 > 400 ? 400 : screen.width * 0.85,
showLoading: true,
onPressed: () => login(),
text: 'Submit',
color: Styles.seaweedGreen,
),
const Spacer(),
],
),
widget.exitNav,
],
),
);
}
Widget generateTextField({
required String text,
String? label,
required int index,
required TextEditingController controller,
isPassword = false,
required Size size,
required String? Function(String?) validatorFunc,
}) {
return Padding(
padding: const EdgeInsets.all(8.0),
child: Row(
children: [
Padding(
padding: const EdgeInsets.all(8.0),
child: Text(
text,
style: TextStyle(fontSize: size.width < 350 ? 16 : 20),
),
),
const Spacer(),
Container(
decoration: Styles.boxLavenderBubble,
width: size.width * 0.5 > 300 ? 300 : size.width * 0.5,
child: TextFormField(
validator: validatorFunc,
controller: controller,
decoration: Styles.inputLavenderBubble(labelText: label),
obscureText: isPassword,
focusNode: focusNodes[index],
style: const TextStyle(fontSize: 16),
onFieldSubmitted: (_) {
if (index != focusNodes.length - 1) {
focusNodes[index + 1].requestFocus();
}
},
),
),
SizedBox(
width: size.width * 0.05,
),
],
),
);
}
Future login() async {
try {
if (widget.formKey.currentState != null &&
!widget.formKey.currentState!.validate()) {
return;
}
final data =
await ref.read(apiProvider.notifier).post(path: 'auth/login', data: {
'username':
usernameController.text.isEmpty ? null : usernameController.text,
'email': emailController.text.isEmpty ? null : emailController.text,
'password': passwordController.text,
});
final bool success = data?['success'] ?? false;
showSnack(
ref: ref,
text: data?['message'] ?? success
? 'Login successful'
: 'Login unsuccessful',
type: !success ? SnackType.error : SnackType.success);
printAmber(data);
} catch (err, st) {
printRed('Error in login: $err\n$st');
}
}
}

View File

@ -0,0 +1,250 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:helpers/helpers/misc_build/build_media.dart';
import 'package:helpers/helpers/print.dart';
import '../../global/api.dart';
import '../../global/styles.dart';
import '../../global/utils.dart';
import '../../global/widgets/ui_button.dart';
class Signup extends ConsumerStatefulWidget {
const Signup({super.key, required this.formKey, required this.exitNav});
final GlobalKey<FormState> formKey;
final Widget exitNav;
@override
ConsumerState<Signup> createState() => _SignupState();
}
class _SignupState extends ConsumerState<Signup> {
bool hasFamilyCode = false;
final nameCotroller = TextEditingController();
final usernameController = TextEditingController();
final emailController = TextEditingController();
final passwordController = TextEditingController();
final familyCodeController = TextEditingController();
final focusNodes = [
FocusNode(),
FocusNode(),
FocusNode(),
FocusNode(),
FocusNode(),
];
@override
Widget build(BuildContext context) {
final screen = BuildMedia(context).size;
return Form(
key: widget.formKey,
child: Stack(
children: [
Column(
children: [
const Spacer(),
const Text(
'Signup',
style: TextStyle(fontSize: 24),
),
const Spacer(),
generateTextField(
controller: nameCotroller,
size: screen,
text: 'Name:',
validatorFunc: (s) {
if (s == null || s.isEmpty) {
return 'You matter! Enter a name :)';
}
return null;
},
index: 0),
generateTextField(
controller: usernameController,
size: screen,
text: 'Username: ',
validatorFunc: (s) {
if (s == null || s.isEmpty) {
return 'Invalid Username';
}
if (s.length < 3) {
return 'Username Not 3 Letters Long';
}
if (s.length > 20) {
return 'Username Too Long';
}
if (!isUsernameValid(s)) {
return 'Letters, Numbers, and ., -, _ Allowed';
}
return null;
},
index: 1),
generateTextField(
controller: emailController,
size: screen,
validatorFunc: (s) {
if (s != null && s.isNotEmpty && !isEmailValid(s)) {
return 'Email entered is invalid';
}
return null;
},
text: 'Email: (optional)',
index: 2),
generateTextField(
controller: passwordController,
size: screen,
validatorFunc: (s) {
if (s != null && s.length < 6) {
return 'Please do a better password (you have to)';
}
return null;
},
text: 'Password:',
index: 3,
isPassword: true),
const SizedBox(height: 30),
AnimatedSwitcher(
duration: const Duration(milliseconds: 300),
child: hasFamilyCode
? Column(
children: [
generateTextField(
controller: familyCodeController,
size: screen,
validatorFunc: (s) {
if (hasFamilyCode) {
if (s == null || s.length != 5) {
return 'Invalid Code';
}
}
return null;
},
text: 'Family Code:',
index: 4,
),
UiButton(
width: screen.width * 0.4,
icon: const Icon(Icons.cancel,
color: Styles.washedStone, size: 20),
onPressed: () {
setState(
() => hasFamilyCode = false,
);
},
text: 'Cancel',
),
],
)
: Padding(
padding: const EdgeInsets.all(8.0),
child: UiButton(
width: screen.width * 0.5 > 400
? 400
: screen.width * 0.5,
text: 'JOIN FAMILY',
// color: Styles.flounderBlue,
onPressed: () {
setState(
() => hasFamilyCode = true,
);
},
),
)),
const Spacer(),
UiButton(
showLoading: true,
onPressed: () => signup(),
text: 'Submit',
color: Styles.seaweedGreen,
),
const Spacer(),
],
),
widget.exitNav,
],
),
);
}
Widget generateTextField({
required String text,
String? label,
required int index,
required TextEditingController controller,
isPassword = false,
required Size size,
required String? Function(String?) validatorFunc,
}) {
return Padding(
padding: const EdgeInsets.all(8.0),
child: Row(
children: [
Padding(
padding: const EdgeInsets.all(8.0),
child: Text(
text,
style: TextStyle(fontSize: size.width < 350 ? 16 : 20),
),
),
const Spacer(),
Container(
decoration: Styles.boxLavenderBubble,
width: size.width * 0.5 > 300 ? 300 : size.width * 0.5,
child: TextFormField(
validator: validatorFunc,
controller: controller,
decoration: Styles.inputLavenderBubble(labelText: label),
obscureText: isPassword,
focusNode: focusNodes[index],
style: const TextStyle(fontSize: 16),
onFieldSubmitted: (_) {
if (index != focusNodes.length - 1) {
focusNodes[index + 1].requestFocus();
}
},
),
),
SizedBox(
width: size.width * 0.05,
),
],
),
);
}
Future signup() async {
try {
if (widget.formKey.currentState != null &&
!widget.formKey.currentState!.validate()) {
return;
}
final data =
await ref.read(apiProvider.notifier).post(path: 'auth/signup', data: {
'name': nameCotroller.text,
'username':
usernameController.text.isEmpty ? null : usernameController.text,
'email': emailController.text.isEmpty ? null : emailController.text,
'password': passwordController.text,
'family_code': familyCodeController.text.isEmpty
? null
: familyCodeController.text.toUpperCase(),
'budget_name': 'Budget'
});
final success = data?['success'] ?? false;
showSnack(
ref: ref,
text: data?['message'] ?? success
? 'Login successful'
: 'Login unsuccessful',
type: !success ? SnackType.error : SnackType.success);
printAmber(data);
// final user = User.fromJson(data?['user']);
// ref.read(tokenProvider.notifier).state =
} catch (err) {
printRed(err);
}
}
}

View File

@ -26,8 +26,8 @@ class _BudgetOverviewScreenState extends ConsumerState<BudgetOverviewScreen> {
final budgetListScrollController = ScrollController();
@override
Widget build(BuildContext context) {
final budgetCategories = ref.watch(Store().budgetCategoriesProvider);
final transactions = ref.watch(Store().transactionsProvider);
final budgetCategories = ref.watch(budgetCategoriesProvider);
final transactions = ref.watch(transactionsProvider);
final screen = BuildMedia(context).size;
double netExpense = 0.0;
double netIncome = 0.0;
@ -45,14 +45,9 @@ class _BudgetOverviewScreenState extends ConsumerState<BudgetOverviewScreen> {
.fold(net, (net, t) => net + t.amount);
budgetCategoryNetMap[bud.id!] = net;
}
return RefreshIndicator(
displacement: 20.0,
onRefresh: () async {
final family = ref.read(Store().familyProvider).valueOrNull;
final _ =
ref.read(Store().dashboardProvider.notifier).fetchDashboard(family);
},
child: Column(
return Stack(
children: [
Column(
children: [
/// TOP HALF, TITLE & OVERVIEW
Container(
@ -65,12 +60,13 @@ class _BudgetOverviewScreenState extends ConsumerState<BudgetOverviewScreen> {
const Spacer(flex: 2),
Text(
formatDate(DateTime.now()),
style:
const TextStyle(fontSize: 16, color: Styles.electricBlue),
style: const TextStyle(
fontSize: 16, color: Styles.electricBlue),
),
const Spacer(),
const Text('MONTHLY',
style: TextStyle(fontSize: 42, color: Styles.electricBlue)),
style:
TextStyle(fontSize: 42, color: Styles.electricBlue)),
const Spacer(flex: 2),
BudgetNetBar(isPositive: true, net: netIncome),
const Spacer(),
@ -118,17 +114,18 @@ class _BudgetOverviewScreenState extends ConsumerState<BudgetOverviewScreen> {
'No budget categories created yet, add some!'),
),
ElevatedButton(
onPressed: ref.watch(
Store().budgetProvider) ==
onPressed:
ref.watch(budgetProvider) ==
null
? null
: () => showDialog(
context: context,
builder: (context) => Dialog(
shape:
Styles.dialogShape,
shape: Styles
.dialogShape,
backgroundColor:
Styles.dialogColor,
Styles
.dialogColor,
child:
const AddBudgetCategoryDialog()),
),
@ -147,8 +144,10 @@ class _BudgetOverviewScreenState extends ConsumerState<BudgetOverviewScreen> {
controller: budgetListScrollController,
thumbVisibility: true,
child: ListView(
physics: const BouncingScrollPhysics(),
controller: budgetListScrollController,
physics:
const BouncingScrollPhysics(),
controller:
budgetListScrollController,
shrinkWrap: true,
children: [
...budgetCategories
@ -169,8 +168,8 @@ class _BudgetOverviewScreenState extends ConsumerState<BudgetOverviewScreen> {
SizedBox(
width: 140,
child: ElevatedButton(
onPressed: ref.watch(Store()
.budgetProvider) ==
onPressed: ref.watch(
budgetProvider) ==
null
? null
: () => showDialog(
@ -276,6 +275,36 @@ class _BudgetOverviewScreenState extends ConsumerState<BudgetOverviewScreen> {
)
],
),
Align(
alignment: Alignment.topRight,
child: Padding(
padding: const EdgeInsets.only(top: 5.0, right: 5.0),
child: IconButton(
icon: const Icon(Icons.loop),
color: Styles.seaweedGreen,
onPressed: () =>
ref.read(dashboardProvider.notifier).fetchDashboard(),
),
),
),
IgnorePointer(
child: AnimatedOpacity(
duration: const Duration(milliseconds: 150),
opacity: ref.watch(loadingStateProvider) ? 0.75 : 0.0,
child: Container(
color: Colors.black12,
height: screen.height,
width: screen.width,
child: const Center(
child: CircularProgressIndicator(
color: Styles.lavender,
strokeWidth: 2.5,
),
),
),
),
)
],
);
}
}

View File

@ -16,7 +16,7 @@ class TransactionsListview extends ConsumerStatefulWidget {
class _TransactionsListviewState extends ConsumerState<TransactionsListview> {
@override
Widget build(BuildContext context) {
final transactions = ref.watch(Store().transactionsProvider);
final transactions = ref.watch(transactionsProvider);
transactions.sort(
(a, b) => b.date.compareTo(a.date),
);

View File

@ -8,6 +8,8 @@ import 'package:rluv/models/budget_category_model.dart';
import '../../../global/api.dart';
import '../../../global/store.dart';
import '../../../global/utils.dart';
import '../../../global/widgets/ui_button.dart';
class AddBudgetCategoryDialog extends ConsumerStatefulWidget {
const AddBudgetCategoryDialog({super.key});
@ -19,8 +21,6 @@ class AddBudgetCategoryDialog extends ConsumerStatefulWidget {
class _AddBudgetCategoryDialogState
extends ConsumerState<AddBudgetCategoryDialog> {
bool loading = false;
bool complete = false;
late final Budget? budget;
final categoryNameController = TextEditingController();
final amountController = TextEditingController();
@ -34,7 +34,7 @@ class _AddBudgetCategoryDialogState
final formKey = GlobalKey<FormState>();
@override
void initState() {
budget = ref.read(Store().budgetProvider);
budget = ref.read(budgetProvider);
WidgetsBinding.instance.addPostFrameCallback((_) {
categoryFocusNode.requestFocus();
});
@ -46,20 +46,10 @@ class _AddBudgetCategoryDialogState
if (budget == null) {
WidgetsBinding.instance.addPostFrameCallback((_) {
Navigator.pop(context);
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('Could not get your budget'),
),
);
});
return Container();
} else if (complete) {
WidgetsBinding.instance.addPostFrameCallback((_) {
Navigator.pop(context);
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('Budget Category Added!'),
),
showSnack(
ref: ref,
text: 'Could not get your budget',
type: SnackType.error,
);
});
return Container();
@ -215,10 +205,20 @@ class _AddBudgetCategoryDialogState
),
),
),
ElevatedButton(
onPressed: () => submitCategory(colors[selectedColorIndex]),
child: const Text('SAVE'),
)
UiButton(
showLoading: true,
color: Styles.lavender,
text: 'SAVE',
onPressed: () =>
submitCategory(colors[selectedColorIndex]).then((_) {
Navigator.pop(context);
showSnack(
ref: ref,
text: 'Budget Category Added!',
type: SnackType.success,
);
}),
),
],
),
),
@ -227,7 +227,6 @@ class _AddBudgetCategoryDialogState
icon: const Icon(Icons.close),
onPressed: () => Navigator.pop(context),
),
if (loading) const Center(child: CircularProgressIndicator()),
],
),
);
@ -238,9 +237,6 @@ class _AddBudgetCategoryDialogState
printPink('Failed validation');
return;
}
setState(
() => loading = true,
);
final newBudget = BudgetCategory(
id: null,
amount: double.parse(amountController.text),
@ -249,17 +245,16 @@ class _AddBudgetCategoryDialogState
name: categoryNameController.text,
);
final budgetData =
await Api().post(path: 'budget_category', data: newBudget.toJson());
final budgetData = await ref
.read(apiProvider.notifier)
.post(path: 'budget_category', data: newBudget.toJson());
final success = budgetData != null ? budgetData['success'] as bool : false;
if (success) {
ref
.read(Store().dashboardProvider.notifier)
.read(dashboardProvider.notifier)
.add({'budget_categories': budgetData});
}
complete = true;
setState(() {
loading = false;
});
} else {
showSnack(ref: ref, text: 'Could not add budget', type: SnackType.error);
}
}
}

View File

@ -2,10 +2,12 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:helpers/helpers/misc_build/build_media.dart';
import 'package:rluv/global/utils.dart';
import '../../../global/api.dart';
import '../../../global/store.dart';
import '../../../global/styles.dart';
import '../../../global/widgets/ui_button.dart';
import '../../../models/budget_category_model.dart';
import '../../../models/transaction_model.dart';
@ -20,8 +22,7 @@ class AddTransactionDialog extends ConsumerStatefulWidget {
}
class _AddTransactionDialogState extends ConsumerState<AddTransactionDialog> {
bool loading = false;
bool complete = false;
late DateTime selectedDate;
late final TextEditingController amountController;
late final TextEditingController memoController;
@ -38,11 +39,13 @@ class _AddTransactionDialogState extends ConsumerState<AddTransactionDialog> {
TextEditingController(text: widget.transaction!.amount.toString());
memoController = TextEditingController(text: widget.transaction!.memo);
transactionType = widget.transaction!.type;
selectedDate = widget.transaction!.date;
} else {
amountController = TextEditingController();
memoController = TextEditingController();
selectedDate = DateTime.now();
}
final categories = ref.read(Store().budgetCategoriesProvider);
final categories = ref.read(budgetCategoriesProvider);
if (categories.isNotEmpty) {
selectedBudgetCategory = categories.first;
}
@ -51,21 +54,8 @@ class _AddTransactionDialogState extends ConsumerState<AddTransactionDialog> {
@override
Widget build(BuildContext context) {
if (complete) {
WidgetsBinding.instance.addPostFrameCallback((_) {
Navigator.pop(context);
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(widget.transaction != null
? 'Transaction updated!'
: 'Transaction added!'),
),
);
});
return Container();
}
final List<BudgetCategory> budgetCategories =
ref.read(Store().budgetCategoriesProvider);
ref.read(budgetCategoriesProvider);
return SizedBox(
width: BuildMedia(context).width * Styles.dialogScreenWidthFactor,
child: budgetCategories.isEmpty
@ -260,9 +250,20 @@ class _AddTransactionDialogState extends ConsumerState<AddTransactionDialog> {
onFieldSubmitted: (_) {},
),
),
ElevatedButton(
onPressed: loading ? null : () => submitTransaction(),
child: const Text('Add'),
UiButton(
showLoading: true,
text: 'ADD',
color: Styles.lavender,
onPressed: () => submitTransaction().then((_) {
Navigator.pop(context);
showSnack(
ref: ref,
text: widget.transaction != null
? 'Transaction updated!'
: 'Transaction added!',
type: SnackType.success,
);
}),
),
],
),
@ -270,12 +271,9 @@ class _AddTransactionDialogState extends ConsumerState<AddTransactionDialog> {
}
Future submitTransaction() async {
setState(() {
loading = true;
});
Map<String, dynamic>? data;
if (widget.transaction != null) {
data = await Api().put(
data = await ref.read(apiProvider.notifier).put(
path: 'transactions',
data: Transaction.copyWith(widget.transaction!, {
'memo': memoController.text.isNotEmpty ? memoController.text : null,
@ -285,7 +283,7 @@ class _AddTransactionDialogState extends ConsumerState<AddTransactionDialog> {
: selectedBudgetCategory.id,
}).toJson());
} else {
data = await Api().post(
data = await ref.read(apiProvider.notifier).post(
path: 'transactions',
data: Transaction(
amount: double.parse(amountController.text),
@ -304,26 +302,17 @@ class _AddTransactionDialogState extends ConsumerState<AddTransactionDialog> {
final success = data != null ? data['success'] as bool : false;
if (success) {
if (widget.transaction != null) {
ref
.read(Store().dashboardProvider.notifier)
.update({'transactions': data});
ref.read(dashboardProvider.notifier).update({'transactions': data});
} else {
ref
.read(Store().dashboardProvider.notifier)
.add({'transactions': data});
ref.read(dashboardProvider.notifier).add({'transactions': data});
}
complete = true;
} else {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(widget.transaction != null
showSnack(
ref: ref,
text: widget.transaction != null
? 'Failed to edit transaction'
: 'Failed to add transaction'),
),
);
}
setState(() {
loading = false;
});
: 'Failed to add transaction',
type: SnackType.error);
}
}
}

View File

@ -14,7 +14,7 @@ class BudgetCategoryBar extends StatefulWidget {
required this.currentAmount,
required this.index,
this.height = 32,
this.innerPadding = 1.5});
this.innerPadding = 2.5});
final int index;
final double currentAmount;
@ -27,6 +27,7 @@ class BudgetCategoryBar extends StatefulWidget {
class _BudgetCategoryBarState extends State<BudgetCategoryBar> {
double percentSpent = 0.0;
@override
void initState() {
Future.delayed(Duration(milliseconds: min(1600, 200 * widget.index)), () {
@ -76,7 +77,7 @@ class _BudgetCategoryBarState extends State<BudgetCategoryBar> {
height: widget.height,
decoration: BoxDecoration(
color: Colors.black,
borderRadius: BorderRadius.circular(14.0),
borderRadius: BorderRadius.circular(13.0),
),
),
Padding(

View File

@ -35,8 +35,8 @@ class _TransactionListItemState extends ConsumerState<TransactionListItem> {
@override
Widget build(BuildContext context) {
final transaction = ref.watch(Store().transactionsProvider)[widget.index];
final budgetCategories = ref.read(Store().budgetCategoriesProvider);
final transaction = ref.watch(transactionsProvider)[widget.index];
final budgetCategories = ref.read(budgetCategoriesProvider);
if (transaction.type == TransactionType.expense) {
budgetCategory = budgetCategories.singleWhere(
(category) => category.id == transaction.budgetCategoryId,

View File

@ -1,8 +1,15 @@
import 'package:dio/dio.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:helpers/helpers/misc_build/build_media.dart';
import 'package:helpers/helpers/print.dart';
import 'package:rluv/global/utils.dart';
import 'package:rluv/models/shared_note.dart';
import '../../../global/api.dart';
import '../../../global/store.dart';
import '../../../global/styles.dart';
import '../../../global/widgets/ui_button.dart';
class SharedNotesScreen extends ConsumerStatefulWidget {
const SharedNotesScreen({super.key, required this.initialData});
@ -15,7 +22,8 @@ class SharedNotesScreen extends ConsumerStatefulWidget {
class _SharedNotesScreenState extends ConsumerState<SharedNotesScreen> {
@override
Widget build(BuildContext context) {
final sharedNotes = ref.watch(Store().sharedNotesProvider);
final screen = BuildMedia(context).size;
final sharedNotes = ref.watch(sharedNotesProvider);
return Column(
children: [
const Padding(
@ -26,26 +34,255 @@ class _SharedNotesScreenState extends ConsumerState<SharedNotesScreen> {
textAlign: TextAlign.center,
),
),
if (sharedNotes.isEmpty) const Text('Add notes to get started:'),
if (sharedNotes.isEmpty) ...[
const Text('Add notes to get started:'),
],
if (sharedNotes.isNotEmpty)
GridView.builder(
SizedBox(
height: screen.height * 0.65,
child: GridView.builder(
itemCount: sharedNotes.length,
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2,
),
itemBuilder: (BuildContext context, int index) {
final note = sharedNotes[index];
return SizedBox(
width: BuildMedia(context).width * 0.4,
final colorBrightness = note.color == null
? Brightness.light
: getBrightness(note.color!);
final textStyle = TextStyle(
fontSize: 16.0,
color: colorBrightness == Brightness.light
? Colors.black54
: Colors.white70,
);
return Padding(
padding: const EdgeInsets.all(8.0),
child: InkWell(
child: Card(
color: note.color ?? Styles.washedStone,
child: SizedBox(
width: screen.width * 0.4,
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Text(note.content),
child: Column(
children: [
FittedBox(
child: Text(note.title,
style: TextStyle(fontSize: 20))),
Flexible(
child: Text(
note.content.length > 80
? "${note.content.substring(0, 75)}..."
: note.content,
style: textStyle,
),
),
],
),
),
),
),
onTap: () {
showModalBottomSheet(
isScrollControlled: true,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(20.0),
),
backgroundColor: Colors.transparent,
context: context,
builder: (BuildContext context) {
return Padding(
padding: EdgeInsets.only(
bottom:
MediaQuery.of(context).viewInsets.bottom),
child: NoteBottomSheet(
index: index,
),
);
});
},
),
);
},
),
),
Padding(
padding: const EdgeInsets.symmetric(vertical: 18.0, horizontal: 12.0),
child: UiButton(
text: 'Add Note',
onPressed: () {
showModalBottomSheet(
isScrollControlled: true,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(20.0),
),
backgroundColor: Colors.transparent,
context: context,
builder: (BuildContext context) {
return Padding(
padding: EdgeInsets.only(
bottom: MediaQuery.of(context).viewInsets.bottom),
child: const NoteBottomSheet(
index: null,
),
);
});
}),
),
],
);
}
}
class NoteBottomSheet extends ConsumerStatefulWidget {
const NoteBottomSheet({super.key, required this.index});
final int? index;
@override
ConsumerState<NoteBottomSheet> createState() => _NoteBottomSheetState();
}
class _NoteBottomSheetState extends ConsumerState<NoteBottomSheet> {
late final SharedNote? oldNote;
late SharedNote newNote;
final titleFocusNode = FocusNode();
final contentFocusNode = FocusNode();
late final TextEditingController titleController;
late final TextEditingController contentController;
@override
void initState() {
super.initState();
if (widget.index == null) {
oldNote = null;
final family = ref.read(familyProvider);
final user = ref.read(userProvider);
newNote = SharedNote(
familyId: family!.id,
createdByUserId: user!.id!,
title: 'Title',
content: '',
tagIds: [],
color: Styles.washedStone,
isMarkdown: false,
);
} else {
oldNote = ref.read(sharedNotesProvider).elementAt(widget.index!);
newNote = SharedNote.copy(oldNote!);
}
titleController = TextEditingController(text: newNote.title);
contentController = TextEditingController(text: newNote.content);
WidgetsBinding.instance.addPostFrameCallback(
(timeStamp) => titleFocusNode.requestFocus(),
);
}
@override
Widget build(BuildContext context) {
final screen = BuildMedia(context).size;
final bottomInset = MediaQuery.of(context).viewInsets.bottom;
return Container(
width: screen.width,
decoration: BoxDecoration(
color: newNote.color ?? Styles.washedStone,
borderRadius: const BorderRadius.only(
topLeft: Radius.circular(20.0), topRight: Radius.circular(20.0)),
boxShadow: const [
BoxShadow(
color: Colors.black26,
spreadRadius: 5.0,
blurRadius: 2.0,
offset: Offset(0, -2))
]),
child: Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
TextField(
style: const TextStyle(fontSize: 18.0),
maxLines: 1,
focusNode: titleFocusNode,
textAlign: TextAlign.left,
controller: titleController,
// decoration: Styles.inputLavenderBubble(),
),
TextField(
style: const TextStyle(fontSize: 18.0),
maxLines: 6,
focusNode: contentFocusNode,
textAlign: TextAlign.left,
controller: contentController,
// decoration: Styles.inputLavenderBubble(),
),
Padding(
padding:
const EdgeInsets.symmetric(vertical: 28.0, horizontal: 36.0),
child: UiButton(
onPressed: !noteChanged(oldNote, newNote)
? null
: () async {
newNote.content = contentController.text;
newNote.title = titleController.text;
try {
Response? res;
if (widget.index == null) {
res = await ref
.read(apiProvider)
.post('shared_notes', data: newNote.toJson());
} else {
res = await ref
.read(apiProvider)
.put('shared_notes', data: newNote.toJson());
}
if (res.data != null && res.data['success']) {
if (widget.index == null) {
ref
.read(dashboardProvider.notifier)
.add({'shared_notes': res.data});
} else {
ref
.read(dashboardProvider.notifier)
.update({'shared_notes': res.data});
}
showSnack(
ref: ref,
text: 'Added note',
type: SnackType.success);
} else {
showSnack(
ref: ref,
text: res.data['message'] ??
'Unexpected error occurred',
type: SnackType.error);
}
} catch (err) {
showSnack(
ref: ref,
text: 'Unexpected error occurred',
type: SnackType.error);
printRed(err);
}
Navigator.pop(context);
},
text: 'Save',
),
),
],
),
),
);
}
bool noteChanged(SharedNote? n, SharedNote m) {
if (n == null) return true;
if (n.content != m.content) return true;
if (n.title != m.content) return true;
if (n.tagIds != m.tagIds) return true;
if (n.color != m.color) return true;
return false;
}
}

View File

@ -1,6 +1,10 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import '../../../global/api.dart';
import '../../../global/store.dart';
import '../../../global/widgets/ui_button.dart';
class SettingsScreen extends ConsumerStatefulWidget {
const SettingsScreen({super.key});
@ -11,9 +15,29 @@ class SettingsScreen extends ConsumerStatefulWidget {
class _SettingsScreenState extends ConsumerState<SettingsScreen> {
@override
Widget build(BuildContext context) {
return const Column(
final user = ref.read(userProvider);
final family = ref.read(familyProvider);
return Column(
children: [
Text('Settings'),
const Text('Settings'),
const SizedBox(height: 20),
Text(user!.name),
Text("Username: ${user.username ?? 'N/A'}"),
Text("Email: ${user.email ?? 'N/A'}"),
Text("Family Code: ${family?.code ?? 'N/A'}"),
const Spacer(),
UiButton(
onPressed: () {
ref.read(jwtProvider.notifier).revokeToken();
// Navigator.pushAndRemoveUntil(
// context,
// MaterialPageRoute(builder: (ctx) => const AccountCreateScreen()),
// (_) => false,
// );
},
text: 'Sign Out',
),
const SizedBox(height: 20),
],
);
}

View File

@ -2,58 +2,104 @@ import 'dart:convert';
import 'package:dio/dio.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:helpers/helpers/print.dart';
import 'package:jwt_decoder/jwt_decoder.dart';
import 'package:rluv/global/store.dart';
class Api {
static final Api _instance = Api._internal();
import '../models/token.dart';
factory Api() {
if (_instance.initDone) return _instance;
_instance.initDone = true;
_instance.dio = Dio();
_instance.dio.options.baseUrl = "http://localhost:8081/";
// _instance.dio.options.baseUrl = "https://rluv.fosscat.com/";
_instance.dio.interceptors.add(
LoggingInterceptor(),
// InterceptorsWrapper(
// onRequest: (RequestOptions options, RequestInterceptorHandler handler) {
// // Do something before request is sent.
// // If you want to resolve the request with custom data,
// // you can resolve a `Response` using `handler.resolve(response)`.
// // If you want to reject the request with a error message,
// // you can reject with a `DioException` using `handler.reject(dioError)`.
// return handler.next(options);
// },
// onResponse: (Response response, ResponseInterceptorHandler handler) {
// if (response.statusCode != null &&
// response.statusCode! < 500 &&
// response.statusCode! >= 400) {
// return handler.reject(DioException.badResponse(
// requestOptions: RequestOptions(),
// response: response,
// statusCode: response.statusCode!));
// }
// // Do something with response data.
// // If you want to reject the request with a error message,
// // you can reject a `DioException` object using `handler.reject(dioError)`.
// return handler.next(response);
// },
// onError: (DioException e, ErrorInterceptorHandler handler) {
// printPink(e);
// // Do something with response error.
// // If you want to resolve the request with some custom data,
// // you can resolve a `Response` object using `handler.resolve(response)`.
// return handler.next(e);
// },
// ),
);
return _instance;
final tokenProvider = StateProvider<Token?>((ref) {
final jwt = ref.watch(jwtProvider);
printLime('Current token: $jwt');
if (jwt == null) return null;
try {
return Token.fromJson(JwtDecoder.decode(jwt));
} catch (_) {
return null;
}
Api._internal();
});
bool initDone = false;
late final Dio dio;
final jwtProvider = StateNotifierProvider<_JwtNotifier, String?>((ref) {
final prefs = ref.watch(prefsProvider);
final jwt = prefs?.getString('jwt');
return _JwtNotifier(ref, jwt);
});
class _JwtNotifier extends StateNotifier<String?> {
_JwtNotifier(this.ref, String? jwt) : super(null) {
if (jwt != null) {
setToken(jwt);
}
}
final StateNotifierProviderRef ref;
void setToken(String jwt) {
state = jwt;
printCyan('Loaded jwt into client: $jwt');
ref.read(prefsProvider)?.setString('jwt', jwt);
}
void revokeToken() {
printCyan('jwt token revoked');
state = null;
ref.read(prefsProvider)?.remove('jwt');
}
}
final apiProvider = StateNotifierProvider<_ApiNotifier, Dio>((ref) {
return _ApiNotifier(ref, Dio());
});
class _ApiNotifier extends StateNotifier<Dio> {
_ApiNotifier(this.ref, this.dio) : super(dio) {
// dio.options.baseUrl = "https://fe7d-136-36-2-234.ngrok-free.app";
// dio.options.baseUrl = "http://localhost:8081/";
dio.options.baseUrl = "https://rluv.fosscat.com/";
dio.interceptors.addAll([
InterceptorsWrapper(onRequest:
(RequestOptions options, RequestInterceptorHandler handler) {
final jwt = ref.read(jwtProvider);
if (jwt != null) {
options.headers['token'] = jwt;
}
return handler.next(options);
}, onResponse: (Response response, ResponseInterceptorHandler handler) {
if (response.statusCode != null) {
if (response.statusCode == 200) {
try {
if ((response.data as Map<String, dynamic>)
.containsKey('success')) {
if (!response.data['success']) return handler.next(response);
}
if ((response.data as Map<String, dynamic>)
.containsKey('token')) {
final jwt = response.data['token'];
if (jwt != null) {
ref.read(jwtProvider.notifier).setToken(jwt);
// ref.read(tokenProvider.notifier).state =
// Token.fromJson(jwtData);
}
}
} catch (err) {
printRed('Error in interceptor for token: $err');
return handler.next(response);
}
}
}
return handler.next(response);
}, onError: (DioException err, ErrorInterceptorHandler handler) {
if (err.response?.statusCode == 403) {
ref.read(jwtProvider.notifier).revokeToken();
}
}),
_LoggingInterceptor(),
]);
}
final Dio dio;
final StateNotifierProviderRef ref;
Future<Map<String, dynamic>?> get(String path) async {
try {
@ -64,7 +110,6 @@ class Api {
}
return null;
} catch (err) {
printRed('Error in get: $err');
return null;
}
}
@ -79,7 +124,6 @@ class Api {
}
return null;
} catch (err) {
printRed('Error in put: $err');
return null;
}
}
@ -94,7 +138,6 @@ class Api {
}
return null;
} catch (err) {
printRed('Error in put: $err');
return null;
}
}
@ -109,14 +152,13 @@ class Api {
}
return null;
} catch (err) {
printRed('Error in delete: $err');
return null;
}
}
}
class LoggingInterceptor extends Interceptor {
LoggingInterceptor();
class _LoggingInterceptor extends Interceptor {
_LoggingInterceptor();
@override
Future onRequest(
@ -134,7 +176,7 @@ class LoggingInterceptor extends Interceptor {
@override
void onError(DioException err, ErrorInterceptorHandler handler) {
logPrint('///*** ERROR RESPONSE ***\\\\\\');
printRed('///*** ERROR RESPONSE ***\\\\\\');
logPrint('URI: ${err.requestOptions.uri}');
if (err.response != null) {
logPrint('STATUS CODE: ${err.response?.statusCode?.toString()}');
@ -167,9 +209,11 @@ class LoggingInterceptor extends Interceptor {
}
}
void printJson(Map<String, dynamic>? s) {
void printJson(dynamic s) {
try {
final data = (s as Map<String, dynamic>?);
if (kDebugMode) {
if (s == null) {
if (data == null) {
printAmber({});
return;
}
@ -177,6 +221,9 @@ class LoggingInterceptor extends Interceptor {
String prettyprint = encoder.convert(s);
printAmber(prettyprint);
}
} catch (_) {
printAmber(s);
}
}
void logPrint(String s) {

View File

@ -1,5 +1,6 @@
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:helpers/helpers/print.dart';
import 'package:rluv/global/api.dart';
@ -12,43 +13,38 @@ import '../models/shared_note.dart';
import '../models/transaction_model.dart';
import '../models/user.dart';
class Store {
static final Store _instance = Store._internal();
bool _initDone = false;
SharedPreferences? prefs;
StateProvider<SharedPreferences?> prefsProvider =
StateProvider<SharedPreferences?>((ref) => null);
factory Store() {
if (_instance._initDone) {
return _instance;
}
_instance._initDone = true;
SharedPreferences.getInstance().then(
(value) => _instance.prefs = value,
);
_instance.dashboardProvider =
StateNotifierProvider<DashBoardStateNotifier, Map<String, dynamic>?>(
// final StateProvider<Token?> tokenProvider = StateProvider<Token?>((ref) {
// // final tokenStr = prefs.getString('jwt');
// // if (tokenStr != null) {
// // return Token.fromJson(jsonDecode(tokenStr));
// // }
// return null;
// });
final Provider<User?> userProvider = Provider<User?>(
(ref) {
final family = ref.watch(_instance.familyProvider).valueOrNull;
return DashBoardStateNotifier(family);
},
);
// _instance.dashboardProvider = FutureProvider<Map<String, dynamic>?>(
// (ref) async {
// final family = await ref.watch(_instance.familyProvider.future);
// return Api().get("dashboard/${family.id}");
// },
// );
_instance.budgetProvider = Provider<Budget?>(
(ref) {
final dash = ref.watch(_instance.dashboardProvider);
final dash = ref.watch(dashboardProvider);
if (dash == null) return null;
final budgetData = dash['budget'] as Map<String, dynamic>?;
if (budgetData == null) return null;
return Budget.fromJson(budgetData);
final userData = dash['user'] as Map<String, dynamic>;
return User.fromJson(userData);
},
);
_instance.budgetCategoriesProvider = Provider<List<BudgetCategory>>((ref) {
final dash = ref.watch(_instance.dashboardProvider);
final Provider<FamilyModel?> familyProvider = Provider<FamilyModel?>(
(ref) {
final dash = ref.watch(dashboardProvider);
if (dash == null) return null;
final familyData = dash['family'] as Map<String, dynamic>;
return FamilyModel.fromJson(familyData);
},
);
final Provider<List<BudgetCategory>> budgetCategoriesProvider =
Provider<List<BudgetCategory>>((ref) {
final dash = ref.watch(dashboardProvider);
if (dash == null) return [];
final categoriesData = dash['budget_categories'] as List<dynamic>;
final categories = categoriesData
@ -56,15 +52,28 @@ class Store {
(e) => BudgetCategory.fromJson(e as Map<String, dynamic>),
)
.toList();
if (_instance.prefs != null) {
final prefs = ref.read(prefsProvider);
final budgetJson = jsonEncode({'budget_categories': categoriesData});
printBlue('updated prefs stored categories');
_instance.prefs!.setString('budget_categories', budgetJson);
}
prefs?.setString('budget_categories', budgetJson);
return categories;
});
_instance.transactionsProvider = Provider<List<Transaction>>((ref) {
final dash = ref.watch(_instance.dashboardProvider);
final Provider<Budget?> budgetProvider = Provider<Budget?>(
(ref) {
final dash = ref.watch(dashboardProvider);
if (dash == null) return null;
final budgetData = dash['budget'] as Map<String, dynamic>?;
if (budgetData == null) return null;
return Budget.fromJson(budgetData);
},
);
final Provider<List<Transaction>> transactionsProvider =
Provider<List<Transaction>>((ref) {
final dash = ref.watch(dashboardProvider);
if (dash == null) return [];
final transactions = dash['transactions'] as List<dynamic>;
return transactions
@ -73,55 +82,51 @@ class Store {
)
.toList();
});
return _instance;
}
Store._internal();
final FutureProvider<User> userProvider = FutureProvider<User>(
final Provider<List<SharedNote>> sharedNotesProvider =
Provider<List<SharedNote>>(
(ref) {
return User(
id: 0,
budgetId: 1,
createdAt: DateTime.now(),
familyId: 1,
lastActivityAt: DateTime.now(),
name: 'TEMP',
updatedAt: DateTime.now(),
);
final dash = ref.watch(dashboardProvider);
if (dash == null) return [];
final sharedNotes = dash['shared_notes'] as List<dynamic>;
return sharedNotes
.map(
(e) => SharedNote.fromJson(e as Map<String, dynamic>),
)
.toList();
},
);
final FutureProvider<FamilyModel> familyProvider =
FutureProvider<FamilyModel>((ref) => FamilyModel(
id: 1,
budgetId: 1,
createdAt: DateTime.now(),
updatedAt: DateTime.now()));
final dashboardProvider =
StateNotifierProvider<DashBoardStateNotifier, Map<String, dynamic>?>(
(ref) {
return DashBoardStateNotifier(ref);
},
);
late final Provider<List<BudgetCategory>> budgetCategoriesProvider;
late final Provider<Budget?> budgetProvider;
late final Provider<List<Transaction>> transactionsProvider;
late final Provider<List<SharedNote>> sharedNotesProvider;
// late final FutureProvider<Map<String, dynamic>?> dashboardProvider;
late final StateNotifierProvider<DashBoardStateNotifier,
Map<String, dynamic>?> dashboardProvider;
void fetchDashboard() {}
}
final loadingStateProvider = StateProvider<bool>(
(ref) => false,
);
class DashBoardStateNotifier extends StateNotifier<Map<String, dynamic>?> {
DashBoardStateNotifier(FamilyModel? family) : super(null) {
fetchDashboard(family);
}
DashBoardStateNotifier(this.ref) : super(null);
Future fetchDashboard(FamilyModel? family) async {
if (family == null) {
printPink('Unable to get dashboard');
StateNotifierProviderRef ref;
Future<void> fetchDashboard() async {
WidgetsBinding.instance.addPostFrameCallback(
(_) => ref.read(loadingStateProvider.notifier).state = true,
);
final token = ref.read(tokenProvider);
if (token?.familyId == null) {
printPink('No token, cannot fetch dashboard');
return;
}
printAmber('Fetching dashboard');
state = await Api().get("dashboard/${family.id}");
state = await ref.read(apiProvider.notifier).get("dashboard");
WidgetsBinding.instance.addPostFrameCallback(
(_) => ref.read(loadingStateProvider.notifier).state = false,
);
}
void update(Map<String, dynamic> data) {
@ -136,6 +141,7 @@ class DashBoardStateNotifier extends StateNotifier<Map<String, dynamic>?> {
switch (key) {
case 'transactions':
case 'budget_categories':
case 'shared_notes':
final subStateList = state![key] as List<dynamic>;
final subStateListObj = subStateList
.map(
@ -171,6 +177,7 @@ class DashBoardStateNotifier extends StateNotifier<Map<String, dynamic>?> {
switch (key) {
case 'transactions':
case 'budget_categories':
case 'shared_noted':
final subStateList = state![key] as List<dynamic>;
final newState = state;
subStateList.add(data.values.first);

View File

@ -2,7 +2,8 @@ import 'package:flutter/material.dart';
class Styles {
// Theme Colors
static const Color purpleNurple = Color(0xffA188A6);
static const Color purpleNurple = Color(0xFFA188A6);
static const Color deepPurpleNurple = Color(0xFF977C9C);
static const Color sunflower = Color(0xffFFEE88);
static const Color electricBlue = Color(0xFF19647E);
static const Color blushingPink = Color(0xFFE78F8E);
@ -10,7 +11,7 @@ class Styles {
static const Color emptyBarGrey = Color(0xFFC8C8C8);
static const Color lavender = Color(0xFFB8B8FF);
static const Color washedStone = Color(0xFFD9D9D9);
static const Color flounderBlue = Color(0xFFA7E2E3);
// Income Colors
static const Color incomeBlue = Color(0xFFB8B8FF);
static const Color incomeGreen = Color(0xFF0FA102);
@ -43,6 +44,10 @@ class Styles {
Color(0xFFFFB563)
];
// Button Styles
static const Color disabledButton = Color(0xFFA8A8A8);
static const Color disabledButtonText = Color(0xFFD9D9D9);
// Widget Styles
static BoxDecoration boxLavenderBubble = BoxDecoration(
color: Styles.lavender,

View File

@ -2,8 +2,11 @@ import 'dart:math';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:helpers/helpers/print.dart';
import 'package:intl/intl.dart';
import 'package:rluv/global/styles.dart';
import 'package:rluv/main.dart';
String formatDate(DateTime time) {
return DateFormat('EEEE, dd MMMM yyyy').format(time);
@ -70,3 +73,59 @@ void setDevicePortraitOrientation() {
DeviceOrientation.portraitDown,
]);
}
enum SnackType { info, success, error }
void showSnack(
{required WidgetRef ref,
required String text,
SnackType type = SnackType.info,
Duration duration = const Duration(seconds: 2)}) {
final messengerKey = ref.read(scaffoldMessengerKeyProvider);
if (messengerKey.currentState == null) {
printPink('Cannot show snackbar, state == null');
return;
}
final color = type == SnackType.info
? Styles.washedStone
: type == SnackType.success
? Styles.seaweedGreen
: Styles.expensesRed;
final textStyle = TextStyle(
fontSize: 16,
color: color,
);
messengerKey.currentState!.showSnackBar(SnackBar(
elevation: 8,
backgroundColor: Styles.deepPurpleNurple,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(20.0), topRight: Radius.circular(20.0)),
),
content: Padding(
padding: const EdgeInsets.all(8.0),
child: Row(
children: [
Padding(
padding: const EdgeInsets.only(right: 14.0),
child: Icon(
type == SnackType.success ? Icons.check_circle : Icons.info,
color: color),
),
Text(text, style: textStyle),
],
),
),
));
}
bool isEmailValid(String email) {
final RegExp regex =
RegExp(r"^[a-zA-Z0-9.a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,6}$");
return regex.hasMatch(email);
}
bool isUsernameValid(String username) {
final RegExp regex = RegExp(r"[a-zA-Z0-9._-]");
return regex.hasMatch(username);
}

View File

@ -1,54 +0,0 @@
import 'package:flutter/material.dart';
import 'package:rluv/global/styles.dart';
class CuteDrawerButton extends StatelessWidget {
const CuteDrawerButton(
{super.key,
required this.text,
required this.color,
required this.onPressed});
final String text;
final Function onPressed;
final Color color;
final double borderRadius = 12.0;
@override
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.all(8.0),
child: InkWell(
borderRadius: BorderRadius.circular(borderRadius),
onTap: () => onPressed(),
child: Container(
decoration: BoxDecoration(
color: color,
boxShadow: const [
BoxShadow(
color: Colors.black26,
blurRadius: 2.0,
spreadRadius: 2.0,
offset: Offset(2.5, 2.5),
)
],
borderRadius: BorderRadius.circular(borderRadius),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Padding(
padding: const EdgeInsets.all(8.0),
child: Text(
text,
style: const TextStyle(
fontSize: 14,
color: Styles.washedStone,
),
),
),
],
),
),
),
);
}
}

View File

@ -0,0 +1,107 @@
import 'package:flutter/material.dart';
import 'package:rluv/global/styles.dart';
import 'package:rluv/global/utils.dart';
class UiButton extends StatefulWidget {
const UiButton({
super.key,
required this.text,
this.color = Styles.deepPurpleNurple,
required this.onPressed,
this.height,
this.width,
this.icon,
this.showLoading = false,
});
final String text;
final Function? onPressed;
final Color color;
final double? width;
final double? height;
final Icon? icon;
final bool showLoading;
@override
State<UiButton> createState() => _UiButtonState();
}
class _UiButtonState extends State<UiButton> {
final double borderRadius = 12.0;
bool loading = false;
@override
Widget build(BuildContext context) {
final computedColor =
widget.onPressed == null ? Styles.disabledButton : widget.color;
final brightness = getBrightness(computedColor);
return SizedBox(
width: widget.width,
height: widget.height,
child: Padding(
padding: const EdgeInsets.all(8.0),
child: InkWell(
borderRadius: BorderRadius.circular(borderRadius),
onTap: widget.onPressed == null || loading
? null
: widget.showLoading
? () async {
setState(() => loading = true);
await widget.onPressed!();
setState(() => loading = false);
}
: () => widget.onPressed!(),
child: Container(
decoration: BoxDecoration(
color: computedColor,
boxShadow: const [
BoxShadow(
color: Colors.black26,
blurRadius: 2.0,
spreadRadius: 2.0,
offset: Offset(2.5, 2.5),
)
],
borderRadius: BorderRadius.circular(borderRadius),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: loading
? [
Padding(
padding: const EdgeInsets.all(4.0),
child: SizedBox(
height: 26,
width: 26,
child: CircularProgressIndicator(
strokeWidth: 2.0,
color: brightness == Brightness.dark
? Styles.lavender
: Styles.electricBlue)),
),
]
: [
if (widget.icon != null) widget.icon!,
Padding(
padding: const EdgeInsets.all(8.0),
child: Text(
widget.text,
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
color: widget.onPressed == null
? Styles.disabledButtonText
: brightness == Brightness.dark
? Styles.washedStone
: Colors.black87,
),
),
),
],
),
),
),
),
);
}
}

View File

@ -1,34 +1,57 @@
import 'package:animated_splash_screen/animated_splash_screen.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:helpers/helpers/misc_build/build_media.dart';
import 'package:rluv/features/account/account_create_screen.dart';
import 'package:rluv/features/budget/screens/budget_overview.dart';
import 'package:rluv/features/notes/screens/notes_screen.dart';
import 'package:rluv/features/settings/screens/settings_screen.dart';
import 'package:rluv/global/store.dart';
import 'package:rluv/global/styles.dart';
import 'package:rluv/global/utils.dart';
import 'package:rluv/global/widgets/drawer_button.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'global/store.dart';
import 'global/api.dart';
import 'global/widgets/ui_button.dart';
void main() async {
final _ = Store().prefs;
runApp(const MyApp());
// await Api().loadToken();
runApp(const ProviderScope(child: MyApp()));
}
class MyApp extends StatelessWidget {
class MyApp extends ConsumerStatefulWidget {
const MyApp({super.key});
@override
ConsumerState<MyApp> createState() => _MyAppState();
}
class _MyAppState extends ConsumerState<MyApp> {
// This widget is the root of your application.
@override
Widget build(BuildContext context) {
return ProviderScope(
child: MaterialApp(
return MaterialApp(
scaffoldMessengerKey: ref.read(scaffoldMessengerKeyProvider),
debugShowCheckedModeBanner: false,
title: 'Flutter Demo',
theme: ThemeData(
primarySwatch: Colors.blue,
),
home: const Home(),
home: AnimatedSplashScreen.withScreenFunction(
curve: Curves.easeInOutCubic,
splashTransition: SplashTransition.scaleTransition,
splashIconSize: 200,
splash: Image.asset('assets/splash_icon.png'),
backgroundColor: Styles.purpleNurple,
duration: 1,
screenFunction: () async {
final prefs = await SharedPreferences.getInstance();
ref.read(prefsProvider.notifier).state = prefs;
Widget nextScreen = const AccountCreateScreen();
if (ref.read(tokenProvider) != null) {
nextScreen = const Home();
}
return nextScreen;
},
),
);
}
@ -47,11 +70,29 @@ class _HomeState extends ConsumerState<Home> {
@override
void initState() {
setDevicePortraitOrientation();
if (!ref.read(loadingStateProvider)) {
ref.read(dashboardProvider.notifier).fetchDashboard();
}
WidgetsBinding.instance.addPostFrameCallback(
(_) {
ref.read(currentHomePageProvider.notifier).state =
const BudgetOverviewScreen(initialData: {});
},
);
super.initState();
}
@override
Widget build(BuildContext context) {
if (ref.watch(tokenProvider) == null) {
WidgetsBinding.instance.addPostFrameCallback((_) {
Navigator.pushAndRemoveUntil(
context,
MaterialPageRoute(builder: (ctx) => const AccountCreateScreen()),
(r) => false,
);
});
}
if (ref.watch(currentHomePageProvider).toString() ==
"BudgetOverviewScreen") {
initData = {};
@ -65,7 +106,7 @@ class _HomeState extends ConsumerState<Home> {
child: Column(
children: [
SizedBox(height: BuildMedia(context).height * 0.15),
CuteDrawerButton(
UiButton(
text: 'Budget',
color: drawerColors[4],
onPressed: () {
@ -77,7 +118,7 @@ class _HomeState extends ConsumerState<Home> {
toggleDrawer();
},
),
CuteDrawerButton(
UiButton(
text: 'Notes',
color: drawerColors[5],
onPressed: () {
@ -90,7 +131,7 @@ class _HomeState extends ConsumerState<Home> {
},
),
const Spacer(),
CuteDrawerButton(
UiButton(
text: 'Settings',
color: drawerColors[0],
onPressed: () {
@ -132,7 +173,7 @@ final scaffoldKeyProvider = Provider<GlobalKey<ScaffoldState>>(
);
final currentHomePageProvider = StateProvider<Widget>(
(ref) => const BudgetOverviewScreen(initialData: {}),
(ref) => Container(),
);
final appBarTitleProvider = Provider<String>(
@ -148,3 +189,7 @@ final appBarTitleProvider = Provider<String>(
}
},
);
final scaffoldMessengerKeyProvider =
Provider<GlobalKey<ScaffoldMessengerState>>(
(ref) => GlobalKey<ScaffoldMessengerState>());

View File

@ -8,6 +8,7 @@ part 'budget.g.dart';
class Budget {
const Budget({
this.id,
required this.familyId,
required this.name,
required this.createdAt,
required this.updatedAt,
@ -15,6 +16,7 @@ class Budget {
});
final int? id;
final int familyId;
final String name;
@JsonKey(fromJson: boolFromJson, toJson: boolToJson)

View File

@ -8,6 +8,7 @@ part of 'budget.dart';
Budget _$BudgetFromJson(Map<String, dynamic> json) => Budget(
id: json['id'] as int?,
familyId: json['family_id'] as int,
name: json['name'] as String,
createdAt: dateFromJson(json['created_at'] as int),
updatedAt: dateFromJson(json['updated_at'] as int),
@ -16,6 +17,7 @@ Budget _$BudgetFromJson(Map<String, dynamic> json) => Budget(
Map<String, dynamic> _$BudgetToJson(Budget instance) => <String, dynamic>{
'id': instance.id,
'family_id': instance.familyId,
'name': instance.name,
'hide': boolToJson(instance.hide),
'created_at': dateToJson(instance.createdAt),

View File

@ -8,13 +8,14 @@ part 'family_model.g.dart';
class FamilyModel {
const FamilyModel({
required this.id,
required this.budgetId,
required this.code,
required this.createdAt,
required this.updatedAt,
this.hide = false,
});
final int id, budgetId;
final int id;
final String? code;
@JsonKey(fromJson: boolFromJson, toJson: boolToJson)
final bool hide;

View File

@ -8,7 +8,7 @@ part of 'family_model.dart';
FamilyModel _$FamilyModelFromJson(Map<String, dynamic> json) => FamilyModel(
id: json['id'] as int,
budgetId: json['budget_id'] as int,
code: json['code'] as String?,
createdAt: dateFromJson(json['created_at'] as int),
updatedAt: dateFromJson(json['updated_at'] as int),
hide: json['hide'] == null ? false : boolFromJson(json['hide'] as int),
@ -17,7 +17,7 @@ FamilyModel _$FamilyModelFromJson(Map<String, dynamic> json) => FamilyModel(
Map<String, dynamic> _$FamilyModelToJson(FamilyModel instance) =>
<String, dynamic>{
'id': instance.id,
'budget_id': instance.budgetId,
'code': instance.code,
'hide': boolToJson(instance.hide),
'created_at': dateToJson(instance.createdAt),
'updated_at': dateToJson(instance.updatedAt),

View File

@ -1,3 +1,4 @@
import 'dart:convert';
import 'dart:ui';
import 'package:json_annotation/json_annotation.dart';
@ -8,27 +9,32 @@ part 'shared_note.g.dart';
@JsonSerializable()
class SharedNote {
const SharedNote({
SharedNote({
this.id,
required this.familyId,
required this.createdByUserId,
required this.content,
required this.title,
this.color,
this.createdAt,
this.updatedAt,
required this.tagIds,
this.isMarkdown = false,
this.hide = false,
});
final int? id;
final int familyId, createdByUserId;
final String content;
String content, title;
@JsonKey(fromJson: _tagIdsFromJson, toJson: _tagIdsToJson)
List<int> tagIds;
@JsonKey(fromJson: optionalColorFromJson, toJson: optionalColorToJson)
final Color? color;
Color? color;
@JsonKey(fromJson: boolFromJson, toJson: boolToJson)
final bool isMarkdown;
bool isMarkdown;
@JsonKey(fromJson: boolFromJson, toJson: boolToJson)
final bool hide;
@ -43,4 +49,20 @@ class SharedNote {
_$SharedNoteFromJson(json);
Map<String, dynamic> toJson() => _$SharedNoteToJson(this);
factory SharedNote.copy(SharedNote note) =>
SharedNote.fromJson(note.toJson());
}
List<int> _tagIdsFromJson(String tagJson) {
final tagsMap = jsonDecode(tagJson) as List<dynamic>;
return tagsMap
.map(
(e) => int.parse(e),
)
.toList();
}
String _tagIdsToJson(List<int> tagIds) {
return jsonEncode(tagIds);
}

View File

@ -11,9 +11,11 @@ SharedNote _$SharedNoteFromJson(Map<String, dynamic> json) => SharedNote(
familyId: json['family_id'] as int,
createdByUserId: json['created_by_user_id'] as int,
content: json['content'] as String,
title: json['title'] as String,
color: optionalColorFromJson(json['color'] as String?),
createdAt: dateFromJson(json['created_at'] as int),
updatedAt: dateFromJson(json['updated_at'] as int),
tagIds: _tagIdsFromJson(json['tag_ids'] as String),
isMarkdown: json['is_markdown'] == null
? false
: boolFromJson(json['is_markdown'] as int),
@ -26,6 +28,8 @@ Map<String, dynamic> _$SharedNoteToJson(SharedNote instance) =>
'family_id': instance.familyId,
'created_by_user_id': instance.createdByUserId,
'content': instance.content,
'title': instance.title,
'tag_ids': _tagIdsToJson(instance.tagIds),
'color': optionalColorToJson(instance.color),
'is_markdown': boolToJson(instance.isMarkdown),
'hide': boolToJson(instance.hide),

41
lib/models/tag.dart Normal file
View File

@ -0,0 +1,41 @@
import 'package:json_annotation/json_annotation.dart';
import '../global/utils.dart';
part 'tag.g.dart';
enum TagType {
note,
}
@JsonSerializable()
class Tag {
const Tag({
this.id,
required this.familyId,
required this.createdByUserId,
required this.name,
required this.type,
this.createdAt,
this.updatedAt,
this.hide = false,
});
final int? id;
final int familyId, createdByUserId;
final String name;
final TagType type;
@JsonKey(fromJson: boolFromJson, toJson: boolToJson)
final bool hide;
@JsonKey(fromJson: dateFromJson, toJson: dateToJson)
final DateTime? createdAt;
@JsonKey(fromJson: dateFromJson, toJson: dateToJson)
final DateTime? updatedAt;
factory Tag.fromJson(Map<String, dynamic> json) => _$TagFromJson(json);
Map<String, dynamic> toJson() => _$TagToJson(this);
}

33
lib/models/tag.g.dart Normal file
View File

@ -0,0 +1,33 @@
// GENERATED CODE - DO NOT MODIFY BY HAND
part of 'tag.dart';
// **************************************************************************
// JsonSerializableGenerator
// **************************************************************************
Tag _$TagFromJson(Map<String, dynamic> json) => Tag(
id: json['id'] as int?,
familyId: json['family_id'] as int,
createdByUserId: json['created_by_user_id'] as int,
name: json['name'] as String,
type: $enumDecode(_$TagTypeEnumMap, json['type']),
createdAt: dateFromJson(json['created_at'] as int),
updatedAt: dateFromJson(json['updated_at'] as int),
hide: json['hide'] == null ? false : boolFromJson(json['hide'] as int),
);
Map<String, dynamic> _$TagToJson(Tag instance) => <String, dynamic>{
'id': instance.id,
'family_id': instance.familyId,
'created_by_user_id': instance.createdByUserId,
'name': instance.name,
'type': _$TagTypeEnumMap[instance.type]!,
'hide': boolToJson(instance.hide),
'created_at': dateToJson(instance.createdAt),
'updated_at': dateToJson(instance.updatedAt),
};
const _$TagTypeEnumMap = {
TagType.note: 'note',
};

27
lib/models/token.dart Normal file
View File

@ -0,0 +1,27 @@
import 'package:json_annotation/json_annotation.dart';
import '../global/utils.dart';
part 'token.g.dart';
@JsonSerializable()
class Token {
const Token({
required this.userId,
required this.familyId,
required this.generatedAt,
required this.expiresAt,
});
final int familyId, userId;
@JsonKey(fromJson: dateFromJson, toJson: dateToJson)
final DateTime generatedAt;
@JsonKey(fromJson: dateFromJson, toJson: dateToJson)
final DateTime expiresAt;
factory Token.fromJson(Map<String, dynamic> json) => _$TokenFromJson(json);
Map<String, dynamic> toJson() => _$TokenToJson(this);
}

21
lib/models/token.g.dart Normal file
View File

@ -0,0 +1,21 @@
// GENERATED CODE - DO NOT MODIFY BY HAND
part of 'token.dart';
// **************************************************************************
// JsonSerializableGenerator
// **************************************************************************
Token _$TokenFromJson(Map<String, dynamic> json) => Token(
userId: json['user_id'] as int,
familyId: json['family_id'] as int,
generatedAt: dateFromJson(json['generated_at'] as int),
expiresAt: dateFromJson(json['expires_at'] as int),
);
Map<String, dynamic> _$TokenToJson(Token instance) => <String, dynamic>{
'family_id': instance.familyId,
'user_id': instance.userId,
'generated_at': dateToJson(instance.generatedAt),
'expires_at': dateToJson(instance.expiresAt),
};

View File

@ -11,6 +11,8 @@ class User {
required this.name,
required this.familyId,
required this.budgetId,
this.email,
this.username,
this.createdAt,
this.updatedAt,
this.lastActivityAt,
@ -20,6 +22,7 @@ class User {
final int? id;
final int familyId, budgetId;
final String name;
final String? username, email;
@JsonKey(fromJson: boolFromJson, toJson: boolToJson)
final bool hide;

View File

@ -11,6 +11,8 @@ User _$UserFromJson(Map<String, dynamic> json) => User(
name: json['name'] as String,
familyId: json['family_id'] as int,
budgetId: json['budget_id'] as int,
email: json['email'] as String?,
username: json['username'] as String?,
createdAt: dateFromJson(json['created_at'] as int),
updatedAt: dateFromJson(json['updated_at'] as int),
lastActivityAt: dateFromJson(json['last_activity_at'] as int),
@ -22,6 +24,8 @@ Map<String, dynamic> _$UserToJson(User instance) => <String, dynamic>{
'family_id': instance.familyId,
'budget_id': instance.budgetId,
'name': instance.name,
'username': instance.username,
'email': instance.email,
'hide': boolToJson(instance.hide),
'created_at': dateToJson(instance.createdAt),
'updated_at': dateToJson(instance.updatedAt),

1
lib/splash_screen.dart Normal file
View File

@ -0,0 +1 @@

View File

@ -6,6 +6,10 @@
#include "generated_plugin_registrant.h"
#include <url_launcher_linux/url_launcher_plugin.h>
void fl_register_plugins(FlPluginRegistry* registry) {
g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
}

View File

@ -3,6 +3,7 @@
#
list(APPEND FLUTTER_PLUGIN_LIST
url_launcher_linux
)
list(APPEND FLUTTER_FFI_PLUGIN_LIST

View File

@ -17,6 +17,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "5.13.0"
animated_splash_screen:
dependency: "direct main"
description:
name: animated_splash_screen
sha256: f45634db6ec4e8cf034c53e03f3bd83898a16fe3c9286bf5510b6831dfcf2124
url: "https://pub.dev"
source: hosted
version: "1.3.0"
archive:
dependency: transitive
description:
name: archive
sha256: "0c8368c9b3f0abbc193b9d6133649a614204b528982bebc7026372d61677ce3a"
url: "https://pub.dev"
source: hosted
version: "3.3.7"
args:
dependency: transitive
description:
@ -169,6 +185,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.0.5"
custom_refresh_indicator:
dependency: "direct main"
description:
name: custom_refresh_indicator
sha256: "65a463f09623f6baf75e45e0c9034e9304810be3f5dfb00a54edde7252f4a524"
url: "https://pub.dev"
source: hosted
version: "2.2.1"
dart_style:
dependency: transitive
description:
@ -222,6 +246,14 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
flutter_highlight:
dependency: transitive
description:
name: flutter_highlight
sha256: "7b96333867aa07e122e245c033b8ad622e4e3a42a1a2372cbb098a2541d8782c"
url: "https://pub.dev"
source: hosted
version: "0.7.0"
flutter_lints:
dependency: "direct dev"
description:
@ -280,6 +312,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.2.3"
highlight:
dependency: transitive
description:
name: highlight
sha256: "5353a83ffe3e3eca7df0abfb72dcf3fa66cc56b953728e7113ad4ad88497cf21"
url: "https://pub.dev"
source: hosted
version: "0.7.0"
http_multi_server:
dependency: transitive
description:
@ -296,6 +336,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.0.2"
icons_launcher:
dependency: "direct dev"
description:
name: icons_launcher
sha256: af05397792f6d82b93375a8a0253b8db0d3f816ef1dd1bf5c35cbab55321d327
url: "https://pub.dev"
source: hosted
version: "2.1.3"
image:
dependency: transitive
description:
name: image
sha256: a72242c9a0ffb65d03de1b7113bc4e189686fc07c7147b8b41811d0dd0e0d9bf
url: "https://pub.dev"
source: hosted
version: "4.0.17"
intl:
dependency: "direct main"
description:
@ -336,6 +392,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "6.6.2"
jwt_decoder:
dependency: "direct main"
description:
name: jwt_decoder
sha256: "54774aebf83f2923b99e6416b4ea915d47af3bde56884eb622de85feabbc559f"
url: "https://pub.dev"
source: hosted
version: "2.0.1"
lints:
dependency: transitive
description:
@ -352,6 +416,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.2.0"
markdown:
dependency: transitive
description:
name: markdown
sha256: acf35edccc0463a9d7384e437c015a3535772e09714cf60e07eeef3a15870dcd
url: "https://pub.dev"
source: hosted
version: "7.1.1"
markdown_widget:
dependency: "direct main"
description:
name: markdown_widget
sha256: "088feae6be2dd527c7dd54e06ad104a3e70505aff2ce14a3b464482551a0e273"
url: "https://pub.dev"
source: hosted
version: "2.2.0"
matcher:
dependency: transitive
description:
@ -392,6 +472,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.0"
page_transition:
dependency: transitive
description:
name: page_transition
sha256: a7694bc120b7064a7f57c336914bb8885acf4f70bb3772c30c2fcfe6a85e43ff
url: "https://pub.dev"
source: hosted
version: "2.0.9"
path:
dependency: transitive
description:
@ -424,6 +512,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.7"
petitparser:
dependency: transitive
description:
name: petitparser
sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750
url: "https://pub.dev"
source: hosted
version: "5.4.0"
platform:
dependency: transitive
description:
@ -440,6 +536,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.4"
pointycastle:
dependency: transitive
description:
name: pointycastle
sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c"
url: "https://pub.dev"
source: hosted
version: "3.7.3"
pool:
dependency: transitive
description:
@ -472,6 +576,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.3.6"
scroll_to_index:
dependency: transitive
description:
name: scroll_to_index
sha256: b707546e7500d9f070d63e5acf74fd437ec7eeeb68d3412ef7b0afada0b4f176
url: "https://pub.dev"
source: hosted
version: "3.0.1"
shared_preferences:
dependency: "direct main"
description:
@ -645,6 +757,78 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.3.2"
universal_io:
dependency: transitive
description:
name: universal_io
sha256: "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad"
url: "https://pub.dev"
source: hosted
version: "2.2.2"
url_launcher:
dependency: transitive
description:
name: url_launcher
sha256: "781bd58a1eb16069412365c98597726cd8810ae27435f04b3b4d3a470bacd61e"
url: "https://pub.dev"
source: hosted
version: "6.1.12"
url_launcher_android:
dependency: transitive
description:
name: url_launcher_android
sha256: "78cb6dea3e93148615109e58e42c35d1ffbf5ef66c44add673d0ab75f12ff3af"
url: "https://pub.dev"
source: hosted
version: "6.0.37"
url_launcher_ios:
dependency: transitive
description:
name: url_launcher_ios
sha256: "9af7ea73259886b92199f9e42c116072f05ff9bea2dcb339ab935dfc957392c2"
url: "https://pub.dev"
source: hosted
version: "6.1.4"
url_launcher_linux:
dependency: transitive
description:
name: url_launcher_linux
sha256: "207f4ddda99b95b4d4868320a352d374b0b7e05eefad95a4a26f57da413443f5"
url: "https://pub.dev"
source: hosted
version: "3.0.5"
url_launcher_macos:
dependency: transitive
description:
name: url_launcher_macos
sha256: "1c4fdc0bfea61a70792ce97157e5cc17260f61abbe4f39354513f39ec6fd73b1"
url: "https://pub.dev"
source: hosted
version: "3.0.6"
url_launcher_platform_interface:
dependency: transitive
description:
name: url_launcher_platform_interface
sha256: bfdfa402f1f3298637d71ca8ecfe840b4696698213d5346e9d12d4ab647ee2ea
url: "https://pub.dev"
source: hosted
version: "2.1.3"
url_launcher_web:
dependency: transitive
description:
name: url_launcher_web
sha256: cc26720eefe98c1b71d85f9dc7ef0cada5132617046369d9dc296b3ecaa5cbb4
url: "https://pub.dev"
source: hosted
version: "2.0.18"
url_launcher_windows:
dependency: transitive
description:
name: url_launcher_windows
sha256: "7967065dd2b5fccc18c653b97958fdf839c5478c28e767c61ee879f4e7882422"
url: "https://pub.dev"
source: hosted
version: "3.0.7"
uuid:
dependency: "direct main"
description:
@ -661,6 +845,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.4"
visibility_detector:
dependency: transitive
description:
name: visibility_detector
sha256: dd5cc11e13494f432d15939c3aa8ae76844c42b723398643ce9addb88a5ed420
url: "https://pub.dev"
source: hosted
version: "0.4.0+2"
watcher:
dependency: transitive
description:
@ -693,6 +885,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.0.1"
xml:
dependency: transitive
description:
name: xml
sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84"
url: "https://pub.dev"
source: hosted
version: "6.3.0"
yaml:
dependency: transitive
description:
@ -702,5 +902,5 @@ packages:
source: hosted
version: "3.1.2"
sdks:
dart: ">=3.0.0-0 <4.0.0"
flutter: ">=3.3.0"
dart: ">=3.0.0 <4.0.0"
flutter: ">=3.10.0"

View File

@ -42,6 +42,10 @@ dependencies:
json_annotation: ^4.8.0
shared_preferences: ^2.1.2
intl: ^0.18.1
markdown_widget: ^2.2.0
custom_refresh_indicator: ^2.2.1
jwt_decoder: ^2.0.1
animated_splash_screen: ^1.3.0
dev_dependencies:
flutter_test:
@ -50,6 +54,7 @@ dev_dependencies:
build_runner: ^2.3.3
json_serializable: ^6.6.0
flutter_lints: ^2.0.0
icons_launcher: ^2.1.3
# For information on the generic Dart part of this file, see the
# following page: https://dart.dev/tools/pub/pubspec
@ -63,9 +68,8 @@ flutter:
uses-material-design: true
# To add assets to your application, add an assets section, like this:
# assets:
# - images/a_dot_burr.jpeg
# - images/a_dot_ham.jpeg
assets:
- assets/
# An image asset can refer to one or more resolution-specific "variants", see
# https://flutter.dev/assets-and-images/#resolution-aware
@ -92,3 +96,13 @@ flutter:
#
# For details regarding fonts from package dependencies,
# see https://flutter.dev/custom-fonts/#from-packages
icons_launcher:
image_path: "assets/app_icon.png"
platforms:
android:
enable: true
adaptive_background_color: "#A188A6"
adaptive_foreground_image: "assets/app_icon1.png"
adaptize_round_image: "assets/app_icon_round.png"
ios:
enable: true