diff --git a/analysis_options.yaml b/analysis_options.yaml index e634759..9edf717 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -7,6 +7,9 @@ linter: # Make constructors the first thing in every class sort_constructors_first: true + # pubspec.yaml dependencies sort + sort_pub_dependencies: false + # The new tabs vs. spaces. Choose wisely prefer_single_quotes: true prefer_double_quotes: false diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 2d0901c..d9be792 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -12,8 +12,9 @@ + android:label="Satu" + android:icon="@mipmap/ic_launcher" + android:roundIcon="@mipmap/ic_launcher_rounded"> - + android:gravity="clip_horizontal" + android:src="@mipmap/splash" /> + diff --git a/android/app/src/main/res/drawable/splash.png b/android/app/src/main/res/drawable/splash.png new file mode 100644 index 0000000..fcf8723 Binary files /dev/null and b/android/app/src/main/res/drawable/splash.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index db77bb4..51848a7 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..02e4849 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_rounded.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_rounded.png new file mode 100644 index 0000000..0926874 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_rounded.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/splash.png b/android/app/src/main/res/mipmap-hdpi/splash.png new file mode 100644 index 0000000..fcf8723 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/splash.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 17987b7..1629684 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..43334f1 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_rounded.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_rounded.png new file mode 100644 index 0000000..7bf0755 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_rounded.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/splash.png b/android/app/src/main/res/mipmap-mdpi/splash.png new file mode 100644 index 0000000..fcf8723 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/splash.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 09d4391..d37f264 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..763e825 Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_rounded.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_rounded.png new file mode 100644 index 0000000..2105f60 Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_rounded.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/splash.png b/android/app/src/main/res/mipmap-xhdpi/splash.png new file mode 100644 index 0000000..fcf8723 Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/splash.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index d5f1c8d..63b98d4 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..29036d1 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_rounded.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_rounded.png new file mode 100644 index 0000000..df97509 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_rounded.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/splash.png b/android/app/src/main/res/mipmap-xxhdpi/splash.png new file mode 100644 index 0000000..fcf8723 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/splash.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 4d6372e..80b5200 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..eabb25a Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_rounded.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_rounded.png new file mode 100644 index 0000000..b8ff66f Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_rounded.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/splash.png b/android/app/src/main/res/mipmap-xxxhdpi/splash.png new file mode 100644 index 0000000..fcf8723 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/splash.png differ diff --git a/lib/core/models/auth/auth_response.dart b/lib/core/models/auth/auth_response.dart index ad60eb6..d81cc0e 100644 --- a/lib/core/models/auth/auth_response.dart +++ b/lib/core/models/auth/auth_response.dart @@ -29,7 +29,7 @@ class AuthResponse { authResponseBean.authAt = cast(map['auth_at']); authResponseBean.shard = cast(map['shard']); authResponseBean.message = cast(map['message']); - authResponseBean.operation = map['operation'] as bool; + authResponseBean.operation = map['operation'] as bool? ?? false; authResponseBean.username = cast(map['username']); return authResponseBean; } diff --git a/lib/core/redux/state/user_state.dart b/lib/core/redux/state/user_state.dart index 9288698..58662a5 100644 --- a/lib/core/redux/state/user_state.dart +++ b/lib/core/redux/state/user_state.dart @@ -34,7 +34,7 @@ class UserState { ); } - static UserState? fromJson(dynamic? json) { + static UserState? fromJson(dynamic json) { return json != null ? UserState( auth: AuthResponse.fromMap(json['auth']), @@ -44,7 +44,7 @@ class UserState { dynamic toJson() { return { - "auth": auth != null ? auth!.toJson() : null, + 'auth': auth != null ? auth!.toJson() : null, }; } } diff --git a/lib/views/login/login_view.dart b/lib/views/login/login_view.dart index c68cde1..e6c4d00 100644 --- a/lib/views/login/login_view.dart +++ b/lib/views/login/login_view.dart @@ -35,7 +35,7 @@ class _LoginViewState extends State { @override void initState() { super.initState(); - emailController = TextEditingController(text: 'test11@gmail.com'); + emailController = TextEditingController(); passwordController = TextEditingController(); } diff --git a/pubspec.lock b/pubspec.lock index 8783bfa..6ca0f97 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,7 +7,7 @@ packages: name: _fe_analyzer_shared url: "https://pub.dartlang.org" source: hosted - version: "22.0.0" + version: "30.0.0" ai_barcode: dependency: "direct main" description: @@ -35,7 +35,7 @@ packages: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "1.7.2" + version: "2.7.0" archive: dependency: transitive description: @@ -442,14 +442,14 @@ packages: name: json_annotation url: "https://pub.dartlang.org" source: hosted - version: "4.1.0" + version: "4.3.0" json_serializable: dependency: "direct dev" description: name: json_serializable url: "https://pub.dartlang.org" source: hosted - version: "4.1.4" + version: "6.0.1" lint: dependency: "direct dev" description: @@ -805,6 +805,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.3" + source_helper: + dependency: transitive + description: + name: source_helper + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.0" source_span: dependency: transitive description: @@ -916,7 +923,7 @@ packages: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "6.0.12" + version: "6.0.13" url_launcher_linux: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 569dde5..7c287d3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -41,7 +41,7 @@ dependencies: intl: ^0.17.0 device_info: ^2.0.3 auto_size_text: ^3.0.0 - url_launcher: ^6.0.12 + url_launcher: ^6.0.13 qr_flutter: ^4.0.0 mask_text_input_formatter: ^2.0.0 flutter_screenutil: ^5.0.0+2 @@ -63,7 +63,7 @@ dev_dependencies: flutter_test: sdk: flutter lint: ^1.7.2 - json_serializable: ^4.1.2 + json_serializable: ^6.0.1 # For information on the generic Dart part of this file, see the diff --git a/sorter.yaml b/sorter.yaml new file mode 100644 index 0000000..de2a3a3 --- /dev/null +++ b/sorter.yaml @@ -0,0 +1,37 @@ +ai_barcode: ^3.0.1 +auto_size_text: ^3.0.0 +charset_converter: ^2.0.0 +cupertino_icons: ^1.0.4 +device_info: ^2.0.3 +equatable: ^2.0.3 +esc_pos_bluetooth: ^0.4.1 +esc_pos_utils: ^1.1.0 +flutter: + sdk: flutter +flutter_bluetooth_basic: ^0.1.7 +flutter_redux: ^0.8.2 +flutter_screenutil: ^5.0.0+2 +flutter_svg: ^0.23.0+1 +get_it: ^7.2.0 +grouped_list: ^4.1.0 +http: ^0.13.4 +implicitly_animated_reorderable_list: ^0.4.2 +intl: ^0.17.0 +location_permissions: ^4.0.1 +logger: ^1.1.0 +mask_text_input_formatter: ^2.0.0 +material_design_icons_flutter: ^5.0.6295 +material_floating_search_bar: ^0.3.6 +path_provider: ^2.0.7 +permission_handler: ^8.3.0 +provider: ^6.0.1 +qr_flutter: ^4.0.0 +redux: ^5.0.0 +redux_persist: ^0.9.0 +redux_persist_flutter: ^0.9.0 +redux_thunk: ^0.4.0 +responsive_builder: ^0.4.1 +shared_preferences: ^2.0.8 +sqflite: ^2.0.0+4 +url_launcher: ^6.0.13 +uuid: ^3.0.5