Skip to content

Commit 86c8c8c

Browse files
SalintSalint
committed
refactor: update package name, add core/
1 parent 3d9dc13 commit 86c8c8c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+271
-329
lines changed

‎mobile/lib/app.dart‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
2+
import 'package:twoaxis_finance/core/util/theme.dart';
3+
import 'package:twoaxis_finance/ui/onboarding/onboarding.dart';
4+
import 'package:firebase_auth/firebase_auth.dart';
5+
import 'package:flutter/material.dart';
6+
7+
class App extends StatefulWidget {
8+
const App({super.key});
9+
10+
@override
11+
State<App> createState() => _AppState();
12+
}
13+
14+
class _AppState extends State<App> {
15+
bool loggedIn = false;
16+
17+
@override
18+
void initState() {
19+
super.initState();
20+
21+
FirebaseAuth.instance.authStateChanges().listen((User? user) {
22+
setState(() {
23+
loggedIn = (user != null);
24+
});
25+
});
26+
}
27+
28+
@override
29+
Widget build(BuildContext context) {
30+
return MaterialApp(
31+
debugShowCheckedModeBanner: false,
32+
title: "TwoAxis Finance",
33+
theme: ThemeData(
34+
splashFactory: NoSplash.splashFactory,
35+
colorScheme: darkTheme,
36+
useMaterial3: true,
37+
),
38+
home: loggedIn ? const App() : const Onboarding());
39+
}
40+
}

mobile/lib/util/money_format.dart renamed to mobile/lib/core/util/money_format.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'package:flutter/cupertino.dart';
22
import 'package:flutter_bloc/flutter_bloc.dart';
33
import 'package:intl/intl.dart';
44

5-
import 'package:financial_planner_mobile/cubit/currency_cubit.dart';
5+
import 'package:twoaxis_finance/cubit/currency_cubit.dart';
66

77
String formatMoneyWithContext(BuildContext context, num value) {
88
var currency = context.read<CurrencyCubit>().state;

mobile/lib/util/theme.dart renamed to mobile/lib/core/util/theme.dart

File renamed without changes.

mobile/lib/values/spaces.dart renamed to mobile/lib/core/values/spaces.dart

File renamed without changes.

‎mobile/lib/main.dart‎

Lines changed: 16 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
import 'package:cloud_firestore/cloud_firestore.dart';
2-
import 'package:financial_planner_mobile/cubit/assets_cubit.dart';
3-
import 'package:financial_planner_mobile/cubit/balances_cubit.dart';
4-
import 'package:financial_planner_mobile/cubit/bills_cubit.dart';
5-
import 'package:financial_planner_mobile/cubit/budget_cubit.dart';
6-
import 'package:financial_planner_mobile/cubit/currency_cubit.dart';
7-
import 'package:financial_planner_mobile/cubit/expenses_cubit.dart';
8-
import 'package:financial_planner_mobile/cubit/income_cubit.dart';
9-
import 'package:financial_planner_mobile/cubit/liabilities_cubit.dart';
10-
import 'package:financial_planner_mobile/cubit/name_cubit.dart';
11-
import 'package:financial_planner_mobile/cubit/receivables_cubit.dart';
12-
import 'package:financial_planner_mobile/cubit/transactions_cubit.dart';
13-
import 'package:financial_planner_mobile/ui/app/app.dart';
2+
import 'package:twoaxis_finance/cubit/assets_cubit.dart';
3+
import 'package:twoaxis_finance/cubit/balances_cubit.dart';
4+
import 'package:twoaxis_finance/cubit/bills_cubit.dart';
5+
import 'package:twoaxis_finance/cubit/budget_cubit.dart';
6+
import 'package:twoaxis_finance/cubit/currency_cubit.dart';
7+
import 'package:twoaxis_finance/cubit/expenses_cubit.dart';
8+
import 'package:twoaxis_finance/cubit/income_cubit.dart';
9+
import 'package:twoaxis_finance/cubit/liabilities_cubit.dart';
10+
import 'package:twoaxis_finance/cubit/name_cubit.dart';
11+
import 'package:twoaxis_finance/cubit/receivables_cubit.dart';
12+
import 'package:twoaxis_finance/cubit/transactions_cubit.dart';
13+
import 'package:twoaxis_finance/ui/app/app.dart';
1414
import 'package:firebase_core/firebase_core.dart';
1515
import 'package:firebase_auth/firebase_auth.dart';
16-
import 'package:financial_planner_mobile/ui/onboarding/onboarding.dart';
17-
import 'package:financial_planner_mobile/util/theme.dart';
16+
import 'package:twoaxis_finance/ui/onboarding/onboarding.dart';
17+
import 'package:twoaxis_finance/core/util/theme.dart';
1818
import 'package:flutter/foundation.dart';
1919
import 'package:flutter/material.dart';
2020
import 'package:flutter_bloc/flutter_bloc.dart';
21-
import 'package:financial_planner_mobile/firebase_options.dart';
21+
import 'package:twoaxis_finance/firebase_options.dart';
2222

2323
void main() async {
2424
WidgetsFlutterBinding.ensureInitialized();
@@ -68,42 +68,7 @@ void main() async {
6868
create: (context) => CurrencyCubit(),
6969
),
7070
],
71-
child: const FinancialPlanner(),
71+
child: const App(),
7272
),
7373
);
7474
}
75-
76-
class FinancialPlanner extends StatefulWidget {
77-
const FinancialPlanner({super.key});
78-
79-
@override
80-
State<FinancialPlanner> createState() => _FinancialPlannerState();
81-
}
82-
83-
class _FinancialPlannerState extends State<FinancialPlanner> {
84-
bool loggedIn = false;
85-
86-
@override
87-
void initState() {
88-
super.initState();
89-
90-
FirebaseAuth.instance.authStateChanges().listen((User? user) {
91-
setState(() {
92-
loggedIn = (user != null);
93-
});
94-
});
95-
}
96-
97-
@override
98-
Widget build(BuildContext context) {
99-
return MaterialApp(
100-
debugShowCheckedModeBanner: false,
101-
title: "TwoAxis Finance",
102-
theme: ThemeData(
103-
splashFactory: NoSplash.splashFactory,
104-
colorScheme: darkTheme,
105-
useMaterial3: true,
106-
),
107-
home: loggedIn ? const App() : const Onboarding());
108-
}
109-
}

‎mobile/lib/ui/app/account/account.dart‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import 'package:financial_planner_mobile/cubit/name_cubit.dart';
2-
import 'package:financial_planner_mobile/ui/app/account/account_currency.dart';
3-
import 'package:financial_planner_mobile/ui/app/account/account_settings.dart';
4-
import 'package:financial_planner_mobile/ui/app/info/info.dart';
5-
import 'package:financial_planner_mobile/util/theme.dart';
6-
import 'package:financial_planner_mobile/values/spaces.dart';
1+
import 'package:twoaxis_finance/cubit/name_cubit.dart';
2+
import 'package:twoaxis_finance/ui/app/account/account_currency.dart';
3+
import 'package:twoaxis_finance/ui/app/account/account_settings.dart';
4+
import 'package:twoaxis_finance/ui/app/info/info.dart';
5+
import 'package:twoaxis_finance/core/util/theme.dart';
6+
import 'package:twoaxis_finance/core/values/spaces.dart';
77
import 'package:firebase_auth/firebase_auth.dart';
88
import 'package:flutter/material.dart';
99
import 'package:flutter_bloc/flutter_bloc.dart';

‎mobile/lib/ui/app/account/account_currency.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import 'package:firebase_auth/firebase_auth.dart';
33
import 'package:flutter/material.dart';
44
import 'package:flutter_bloc/flutter_bloc.dart';
55

6-
import 'package:financial_planner_mobile/cubit/currency_cubit.dart';
7-
import 'package:financial_planner_mobile/util/theme.dart';
6+
import 'package:twoaxis_finance/cubit/currency_cubit.dart';
7+
import 'package:twoaxis_finance/core/util/theme.dart';
88

99
class AccountCurrency extends StatelessWidget {
1010
const AccountCurrency({super.key});

‎mobile/lib/ui/app/account/account_settings.dart‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import 'package:financial_planner_mobile/ui/common/primary_button.dart';
2-
import 'package:financial_planner_mobile/ui/common/themed_input_field.dart';
3-
import 'package:financial_planner_mobile/ui/onboarding/onboarding.dart';
4-
import 'package:financial_planner_mobile/values/spaces.dart';
1+
import 'package:twoaxis_finance/ui/common/primary_button.dart';
2+
import 'package:twoaxis_finance/ui/common/themed_input_field.dart';
3+
import 'package:twoaxis_finance/ui/onboarding/onboarding.dart';
4+
import 'package:twoaxis_finance/core/values/spaces.dart';
55
import 'package:firebase_auth/firebase_auth.dart';
66
import 'package:flutter/material.dart';
77
import 'package:flutter_bloc/flutter_bloc.dart';
88

9-
import 'package:financial_planner_mobile/cubit/name_cubit.dart';
10-
import 'package:financial_planner_mobile/util/theme.dart';
9+
import 'package:twoaxis_finance/cubit/name_cubit.dart';
10+
import 'package:twoaxis_finance/core/util/theme.dart';
1111

1212
class AccountSettings extends StatefulWidget {
1313
const AccountSettings({super.key});

‎mobile/lib/ui/app/analytics/analytics.dart‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import 'package:financial_planner_mobile/values/spaces.dart';
1+
import 'package:twoaxis_finance/core/values/spaces.dart';
22
import 'package:fl_chart/fl_chart.dart';
33
import 'package:flutter/material.dart';
44
import 'package:flutter_bloc/flutter_bloc.dart';
55

6-
import 'package:financial_planner_mobile/cubit/assets_cubit.dart';
7-
import 'package:financial_planner_mobile/cubit/balances_cubit.dart';
8-
import 'package:financial_planner_mobile/cubit/receivables_cubit.dart';
9-
import 'package:financial_planner_mobile/cubit/transactions_cubit.dart';
10-
import 'package:financial_planner_mobile/util/money_format.dart';
11-
import 'package:financial_planner_mobile/util/theme.dart';
6+
import 'package:twoaxis_finance/cubit/assets_cubit.dart';
7+
import 'package:twoaxis_finance/cubit/balances_cubit.dart';
8+
import 'package:twoaxis_finance/cubit/receivables_cubit.dart';
9+
import 'package:twoaxis_finance/cubit/transactions_cubit.dart';
10+
import 'package:twoaxis_finance/core/util/money_format.dart';
11+
import 'package:twoaxis_finance/core/util/theme.dart';
1212

1313
class AnalyticsPage extends StatelessWidget {
1414
const AnalyticsPage({super.key});

‎mobile/lib/ui/app/app.dart‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
import 'package:cloud_firestore/cloud_firestore.dart';
2-
import 'package:financial_planner_mobile/cubit/assets_cubit.dart';
3-
import 'package:financial_planner_mobile/cubit/balances_cubit.dart';
4-
import 'package:financial_planner_mobile/cubit/bills_cubit.dart';
5-
import 'package:financial_planner_mobile/cubit/budget_cubit.dart';
6-
import 'package:financial_planner_mobile/cubit/currency_cubit.dart';
7-
import 'package:financial_planner_mobile/cubit/expenses_cubit.dart';
8-
import 'package:financial_planner_mobile/cubit/income_cubit.dart';
9-
import 'package:financial_planner_mobile/cubit/liabilities_cubit.dart';
10-
import 'package:financial_planner_mobile/cubit/name_cubit.dart';
11-
import 'package:financial_planner_mobile/cubit/receivables_cubit.dart';
12-
import 'package:financial_planner_mobile/cubit/transactions_cubit.dart';
13-
import 'package:financial_planner_mobile/ui/app/account/account.dart';
14-
import 'package:financial_planner_mobile/ui/app/dashboard/dashboard.dart';
15-
import 'package:financial_planner_mobile/ui/app/money_flow/money_flow.dart';
16-
import 'package:financial_planner_mobile/ui/app/wallet/wallet.dart';
17-
import 'package:financial_planner_mobile/util/theme.dart';
2+
import 'package:twoaxis_finance/cubit/assets_cubit.dart';
3+
import 'package:twoaxis_finance/cubit/balances_cubit.dart';
4+
import 'package:twoaxis_finance/cubit/bills_cubit.dart';
5+
import 'package:twoaxis_finance/cubit/budget_cubit.dart';
6+
import 'package:twoaxis_finance/cubit/currency_cubit.dart';
7+
import 'package:twoaxis_finance/cubit/expenses_cubit.dart';
8+
import 'package:twoaxis_finance/cubit/income_cubit.dart';
9+
import 'package:twoaxis_finance/cubit/liabilities_cubit.dart';
10+
import 'package:twoaxis_finance/cubit/name_cubit.dart';
11+
import 'package:twoaxis_finance/cubit/receivables_cubit.dart';
12+
import 'package:twoaxis_finance/cubit/transactions_cubit.dart';
13+
import 'package:twoaxis_finance/ui/app/account/account.dart';
14+
import 'package:twoaxis_finance/ui/app/dashboard/dashboard.dart';
15+
import 'package:twoaxis_finance/ui/app/money_flow/money_flow.dart';
16+
import 'package:twoaxis_finance/ui/app/wallet/wallet.dart';
17+
import 'package:twoaxis_finance/core/util/theme.dart';
1818
import 'package:firebase_auth/firebase_auth.dart';
1919
import 'package:flutter/material.dart';
2020
import 'package:flutter_bloc/flutter_bloc.dart';

0 commit comments

Comments
 (0)