Skip to content

Commit eaaa9c6

Browse files
codeyzxcodeyzx
committed
remove unused import & comment
1 parent 7863e7e commit eaaa9c6

38 files changed

+162
-3007
lines changed

‎android/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,5 @@ dependencies {
7171
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
7272
implementation platform('com.google.firebase:firebase-bom:30.4.1')
7373
implementation 'com.google.firebase:firebase-analytics'
74-
implementation 'com.midtrans:uikit:1.33.0-SANDBOX'
74+
implementation 'com.midtrans:uikit:1.32.0-SANDBOX'
7575
}

‎lib/src/features/auth/domain/users.dart‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,3 @@
1-
// import 'package:freezed_annotation/freezed_annotation.dart';
2-
3-
// part 'users.freezed.dart';
4-
// part 'users.g.dart';
5-
6-
// @freezed
7-
// abstract class Users with _$Users {
8-
// const factory Users({
9-
// @JsonKey(name: 'uid') String? uid,
10-
// @JsonKey(name: 'name') String? name,
11-
// @JsonKey(name: 'email') String? email,
12-
// @JsonKey(name: 'photoUrl') String? photoUrl,
13-
// @JsonKey(name: 'roles') String? roles,
14-
// }) = _Users;
15-
16-
// factory Users.fromJson(Map<String, dynamic> json) => _$UsersFromJson(json);
17-
18-
// // factory Users.fromFirestore(
19-
// // DocumentSnapshot<Map<String, dynamic>> snapshot,
20-
// // SnapshotOptions? options,
21-
// // ) {
22-
// // final data = snapshot.data();
23-
// // return Users(
24-
// // name: data?['name'],
25-
// // email: data?['email'],
26-
// // );
27-
// // }
28-
29-
// // Map<String, dynamic> toFirestore() {
30-
// // return {
31-
// // if (name != null) 'name': name,
32-
// // if (email != null) 'email': email,
33-
// // };
34-
// // }
35-
36-
// }
37-
38-
// create class model users
391
class Users {
402
String? uid;
413
String? name;

‎lib/src/features/auth/presentation/auth_controller.dart‎

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
import 'package:cloud_firestore/cloud_firestore.dart';
22
import 'package:firebase_auth/firebase_auth.dart';
3+
import 'package:flutter/widgets.dart';
34
import 'package:flutter_riverpod/flutter_riverpod.dart';
45
import 'package:google_sign_in/google_sign_in.dart';
56
import 'package:logger/logger.dart';
67
import 'package:petscape/src/features/auth/domain/users.dart';
8+
import 'package:petscape/src/features/home/presentation/botnavbar_screen.dart';
9+
import 'package:go_router/go_router.dart';
710

811
class AuthController extends StateNotifier<Users> {
912
AuthController() : super(Users());
1013

11-
Future<void> googleSignIn() async {
14+
Future<void> googleSignIn(BuildContext context) async {
1215
try {
1316
GoogleSignIn googleSignIn = GoogleSignIn(
1417
scopes: [
@@ -38,10 +41,6 @@ class AuthController extends StateNotifier<Users> {
3841
"users": userCredential.user!.uid,
3942
"items": [],
4043
});
41-
// setUsers(
42-
// email: userCredential.user!.email.toString(),
43-
// name: userCredential.user!.displayName.toString(),
44-
// );
4544

4645
final users = Users(
4746
uid: userCredential.user!.uid,
@@ -52,14 +51,11 @@ class AuthController extends StateNotifier<Users> {
5251
);
5352
state = users;
5453
} else {
55-
// setUsers(
56-
// name: checkUsers.data()!['name'],
57-
// email: checkUsers.data()!['email'],
58-
// );
59-
6054
final users = Users.fromJson(checkUsers.data()!);
6155
state = users;
6256
}
57+
if (!mounted) return;
58+
context.goNamed(BotNavBarScreen.routeName);
6359
}
6460
} catch (e) {
6561
Logger().e(e);
@@ -81,23 +77,11 @@ class AuthController extends StateNotifier<Users> {
8177

8278
Future<void> getUsers({required String uid}) async {
8379
var checkUsers = await FirebaseFirestore.instance.collection('users').doc(uid).get();
84-
// setUsers(
85-
// name: checkUsers.data()!['name'],
86-
// email: checkUsers.data()!['email'],
87-
// );
80+
8881
final users = Users.fromJson(checkUsers.data()!);
8982
state = users;
9083
}
9184

92-
// void setUsers({required String name, required String email}) {
93-
// final user = Users(
94-
// name: name,
95-
// email: email,
96-
// );
97-
98-
// state = user;
99-
// }
100-
10185
Future<String> checkUsers() async {
10286
final result = FirebaseAuth.instance.currentUser;
10387
Logger().i(result);

‎lib/src/features/auth/presentation/sign_in_screen.dart‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
66
import 'package:logger/logger.dart';
77
import 'package:petscape/src/features/auth/presentation/auth_controller.dart';
88
import 'package:petscape/src/features/auth/presentation/sign_up_screen.dart';
9-
import 'package:petscape/src/features/home/presentation/botnavbar_screen.dart';
109
import 'package:petscape/src/shared/theme.dart';
1110

1211
class SignInScreen extends ConsumerStatefulWidget {
@@ -57,6 +56,7 @@ class _SignInScreenState extends ConsumerState<SignInScreen> {
5756
),
5857
TextFormField(
5958
controller: _emailController,
59+
enabled: false,
6060
keyboardType: TextInputType.emailAddress,
6161
style: logInput,
6262
decoration: InputDecoration(
@@ -74,6 +74,7 @@ class _SignInScreenState extends ConsumerState<SignInScreen> {
7474
),
7575
TextFormField(
7676
controller: _passwordController,
77+
enabled: false,
7778
style: logInput,
7879
obscureText: true,
7980
enableSuggestions: false,
@@ -152,10 +153,7 @@ class _SignInScreenState extends ConsumerState<SignInScreen> {
152153
child: OutlinedButton(
153154
onPressed: () async {
154155
try {
155-
await ref.read(authControllerProvider.notifier).googleSignIn();
156-
if (mounted) {
157-
context.goNamed(BotNavBarScreen.routeName);
158-
}
156+
await ref.read(authControllerProvider.notifier).googleSignIn(context);
159157
} catch (e) {
160158
Logger().e(e);
161159
}

‎lib/src/features/auth/presentation/sign_up_screen.dart‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
33
import 'package:go_router/go_router.dart';
44
import 'package:hexcolor/hexcolor.dart';
55
import 'package:flutter_screenutil/flutter_screenutil.dart';
6+
import 'package:logger/logger.dart';
7+
import 'package:petscape/src/features/auth/presentation/auth_controller.dart';
68
import 'package:petscape/src/features/auth/presentation/sign_in_screen.dart';
79
import 'package:petscape/src/shared/theme.dart';
810

@@ -53,6 +55,7 @@ class _SignUpScreenState extends ConsumerState<SignUpScreen> {
5355
height: 16.h,
5456
),
5557
TextFormField(
58+
enabled: false,
5659
controller: _emailController,
5760
style: logInput,
5861
decoration: InputDecoration(
@@ -69,6 +72,7 @@ class _SignUpScreenState extends ConsumerState<SignUpScreen> {
6972
height: 20.h,
7073
),
7174
TextFormField(
75+
enabled: false,
7276
controller: _passwordController,
7377
style: logInput,
7478
obscureText: true,
@@ -94,6 +98,7 @@ class _SignUpScreenState extends ConsumerState<SignUpScreen> {
9498
TextFormField(
9599
style: logInput,
96100
obscureText: true,
101+
enabled: false,
97102
enableSuggestions: false,
98103
autocorrect: false,
99104
decoration: InputDecoration(
@@ -155,7 +160,13 @@ class _SignUpScreenState extends ConsumerState<SignUpScreen> {
155160
),
156161
Center(
157162
child: OutlinedButton(
158-
onPressed: () {},
163+
onPressed: () async {
164+
try {
165+
await ref.read(authControllerProvider.notifier).googleSignIn(context);
166+
} catch (e) {
167+
Logger().e(e);
168+
}
169+
},
159170
style: OutlinedButton.styleFrom(
160171
padding: EdgeInsets.only(top: 10.h, bottom: 10.h, left: 20.w),
161172
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(5.r))),

‎lib/src/features/cart/presentation/cart_controller.dart‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,9 @@ class CartController extends StateNotifier<List<Map<Product, int>>> {
1111

1212
Future<String> getToken(Map<String, dynamic> body) async {
1313
var resp = await DioClient().apiCall(
14-
url: 'charge', requestType: RequestType.post,
14+
url: 'charge',
15+
requestType: RequestType.post,
1516
body: body,
16-
// body: body,
17-
// body: {
18-
// "order_id": "ocad3",
19-
// "customers": {"email": "[email protected]", "username": "emirsyah"},
20-
// "url": "https://mazipan.space/cara-fetch-api-di-nodejs",
21-
// "items": [
22-
// {"quantity": 2, "id": "1", "price": 2000, "name": "Es Teh"},
23-
// {"quantity": 3, "id": "2", "price": 8000, "name": "Nasi Goreng"}
24-
// ]
25-
// }
2617
);
2718

2819
String token = resp.data['token'];

0 commit comments

Comments
 (0)