diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index d8430f4..792f433 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -6,9 +6,9 @@ + android:icon="@mipmap/launcher_icon"> ((ref) => null); \ No newline at end of file diff --git a/lib/provider/current_check_jam_presensi_provider.dart b/lib/provider/current_check_jam_presensi_provider.dart index e03f681..57190a0 100644 --- a/lib/provider/current_check_jam_presensi_provider.dart +++ b/lib/provider/current_check_jam_presensi_provider.dart @@ -1,4 +1,4 @@ -import 'package:absensi_sas_flutter/model/check_presensi_jam_model.dart'; +import 'package:absensi_sas/model/check_presensi_jam_model.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; final currentCheckJamPresensiProvider = StateProvider((ref) => null); \ No newline at end of file diff --git a/lib/repository/auth_repository.dart b/lib/repository/auth_repository.dart index 3344693..baf96e7 100644 --- a/lib/repository/auth_repository.dart +++ b/lib/repository/auth_repository.dart @@ -1,4 +1,4 @@ -import 'package:absensi_sas_flutter/model/logout_response_model.dart'; +import 'package:absensi_sas/model/logout_response_model.dart'; import 'package:google_sign_in/google_sign_in.dart'; import '../model/auth_model.dart'; diff --git a/lib/repository/presensi_repository.dart b/lib/repository/presensi_repository.dart index c08df67..4abec40 100644 --- a/lib/repository/presensi_repository.dart +++ b/lib/repository/presensi_repository.dart @@ -1,5 +1,5 @@ -import 'package:absensi_sas_flutter/model/check_distance_model.dart'; -import 'package:absensi_sas_flutter/model/check_presensi_jam_model.dart'; +import 'package:absensi_sas/model/check_distance_model.dart'; +import 'package:absensi_sas/model/check_presensi_jam_model.dart'; import 'base_repository.dart'; class PresensiRepository extends BaseRepository { diff --git a/lib/screen/home/home_screen.dart b/lib/screen/home/home_screen.dart index 27f3a0a..43008da 100644 --- a/lib/screen/home/home_screen.dart +++ b/lib/screen/home/home_screen.dart @@ -1,4 +1,4 @@ -import 'package:absensi_sas_flutter/app/constant.dart'; +import 'package:absensi_sas/app/constant.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:geocoding/geocoding.dart'; diff --git a/lib/screen/home/home_screen_v1.dart b/lib/screen/home/home_screen_v1.dart index 73718fd..f83bec5 100644 --- a/lib/screen/home/home_screen_v1.dart +++ b/lib/screen/home/home_screen_v1.dart @@ -1,4 +1,4 @@ -import 'package:absensi_sas_flutter/app/constant.dart'; +import 'package:absensi_sas/app/constant.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:geocoding/geocoding.dart'; diff --git a/lib/screen/login/login_provider.dart b/lib/screen/login/login_provider.dart index e65f0a6..de2bac3 100644 --- a/lib/screen/login/login_provider.dart +++ b/lib/screen/login/login_provider.dart @@ -1,6 +1,6 @@ import 'dart:convert'; -import 'package:absensi_sas_flutter/provider/google_login_provider.dart'; +import 'package:absensi_sas/provider/google_login_provider.dart'; import 'package:google_sign_in/google_sign_in.dart'; import 'package:shared_preferences/shared_preferences.dart'; diff --git a/lib/screen/login/login_screen.dart b/lib/screen/login/login_screen.dart index 0f04304..016c3f1 100644 --- a/lib/screen/login/login_screen.dart +++ b/lib/screen/login/login_screen.dart @@ -1,6 +1,6 @@ import 'dart:convert'; -import 'package:absensi_sas_flutter/screen/login/login_provider.dart'; +import 'package:absensi_sas/screen/login/login_provider.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; diff --git a/lib/screen/presensi/check_distance_provider.dart b/lib/screen/presensi/check_distance_provider.dart index ae6d2e2..2c72e68 100644 --- a/lib/screen/presensi/check_distance_provider.dart +++ b/lib/screen/presensi/check_distance_provider.dart @@ -1,5 +1,5 @@ -import 'package:absensi_sas_flutter/provider/current_user_provider.dart'; -import 'package:absensi_sas_flutter/repository/presensi_repository.dart'; +import 'package:absensi_sas/provider/current_user_provider.dart'; +import 'package:absensi_sas/repository/presensi_repository.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; diff --git a/lib/screen/presensi/check_presensi_jam_provider.dart b/lib/screen/presensi/check_presensi_jam_provider.dart index 8d9b785..678ae48 100644 --- a/lib/screen/presensi/check_presensi_jam_provider.dart +++ b/lib/screen/presensi/check_presensi_jam_provider.dart @@ -1,5 +1,5 @@ -import 'package:absensi_sas_flutter/model/check_presensi_jam_model.dart'; -import 'package:absensi_sas_flutter/repository/presensi_repository.dart'; +import 'package:absensi_sas/model/check_presensi_jam_model.dart'; +import 'package:absensi_sas/repository/presensi_repository.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; diff --git a/lib/screen/presensi/presensi_clock_in_provider.dart b/lib/screen/presensi/presensi_clock_in_provider.dart index be04ec2..0e602d6 100644 --- a/lib/screen/presensi/presensi_clock_in_provider.dart +++ b/lib/screen/presensi/presensi_clock_in_provider.dart @@ -1,4 +1,4 @@ -import 'package:absensi_sas_flutter/repository/presensi_repository.dart'; +import '../../repository/presensi_repository.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; diff --git a/lib/screen/presensi/presensi_clock_out_provider.dart b/lib/screen/presensi/presensi_clock_out_provider.dart index b18bef2..e8a94cf 100644 --- a/lib/screen/presensi/presensi_clock_out_provider.dart +++ b/lib/screen/presensi/presensi_clock_out_provider.dart @@ -1,4 +1,4 @@ -import 'package:absensi_sas_flutter/repository/presensi_repository.dart'; +import 'package:absensi_sas/repository/presensi_repository.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; diff --git a/lib/screen/presensi/presensi_screen.dart b/lib/screen/presensi/presensi_screen.dart index 88c50d6..6c35226 100644 --- a/lib/screen/presensi/presensi_screen.dart +++ b/lib/screen/presensi/presensi_screen.dart @@ -1,11 +1,11 @@ import 'dart:convert'; -import 'package:absensi_sas_flutter/provider/current_check_jam_presensi_provider.dart'; -import 'package:absensi_sas_flutter/screen/presensi/check_distance_provider.dart'; -import 'package:absensi_sas_flutter/screen/presensi/check_presensi_jam_provider.dart'; -import 'package:absensi_sas_flutter/screen/presensi/presensi_clock_in_provider.dart'; -import 'package:absensi_sas_flutter/widget/real_date.dart'; -import 'package:absensi_sas_flutter/widget/sankbar_widget.dart'; +import 'package:absensi_sas/provider/current_check_jam_presensi_provider.dart'; +import 'package:absensi_sas/screen/presensi/check_distance_provider.dart'; +import 'package:absensi_sas/screen/presensi/check_presensi_jam_provider.dart'; +import 'package:absensi_sas/screen/presensi/presensi_clock_in_provider.dart'; +import 'package:absensi_sas/widget/real_date.dart'; +import 'package:absensi_sas/widget/sankbar_widget.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:geocoding/geocoding.dart'; diff --git a/lib/screen/presensi/presensi_selfie_screen.dart b/lib/screen/presensi/presensi_selfie_screen.dart index 5067f67..4b32cb6 100644 --- a/lib/screen/presensi/presensi_selfie_screen.dart +++ b/lib/screen/presensi/presensi_selfie_screen.dart @@ -1,9 +1,9 @@ import 'dart:convert'; import 'dart:io'; -import 'package:absensi_sas_flutter/screen/presensi/presensi_clock_in_provider.dart'; -import 'package:absensi_sas_flutter/screen/presensi/presensi_clock_out_provider.dart'; -import 'package:absensi_sas_flutter/widget/custom_drawer.dart'; +import 'package:absensi_sas/screen/presensi/presensi_clock_in_provider.dart'; +import 'package:absensi_sas/screen/presensi/presensi_clock_out_provider.dart'; +import 'package:absensi_sas/widget/custom_drawer.dart'; import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; diff --git a/lib/widget/real_date.dart b/lib/widget/real_date.dart index dea3be5..8c8038f 100644 --- a/lib/widget/real_date.dart +++ b/lib/widget/real_date.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:absensi_sas_flutter/app/constant.dart'; +import 'package:absensi_sas/app/constant.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:intl/intl.dart'; diff --git a/lib/widget/real_time.dart b/lib/widget/real_time.dart index 0397300..1ae00f7 100644 --- a/lib/widget/real_time.dart +++ b/lib/widget/real_time.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:absensi_sas_flutter/app/constant.dart'; +import 'package:absensi_sas/app/constant.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:intl/intl.dart'; diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json index a2ec33f..96d3fee 100644 --- a/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,68 +1,68 @@ { - "images" : [ - { - "size" : "16x16", - "idiom" : "mac", - "filename" : "app_icon_16.png", - "scale" : "1x" + "info": { + "version": 1, + "author": "xcode" }, - { - "size" : "16x16", - "idiom" : "mac", - "filename" : "app_icon_32.png", - "scale" : "2x" - }, - { - "size" : "32x32", - "idiom" : "mac", - "filename" : "app_icon_32.png", - "scale" : "1x" - }, - { - "size" : "32x32", - "idiom" : "mac", - "filename" : "app_icon_64.png", - "scale" : "2x" - }, - { - "size" : "128x128", - "idiom" : "mac", - "filename" : "app_icon_128.png", - "scale" : "1x" - }, - { - "size" : "128x128", - "idiom" : "mac", - "filename" : "app_icon_256.png", - "scale" : "2x" - }, - { - "size" : "256x256", - "idiom" : "mac", - "filename" : "app_icon_256.png", - "scale" : "1x" - }, - { - "size" : "256x256", - "idiom" : "mac", - "filename" : "app_icon_512.png", - "scale" : "2x" - }, - { - "size" : "512x512", - "idiom" : "mac", - "filename" : "app_icon_512.png", - "scale" : "1x" - }, - { - "size" : "512x512", - "idiom" : "mac", - "filename" : "app_icon_1024.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} + "images": [ + { + "size": "16x16", + "idiom": "mac", + "filename": "app_icon_16.png", + "scale": "1x" + }, + { + "size": "16x16", + "idiom": "mac", + "filename": "app_icon_32.png", + "scale": "2x" + }, + { + "size": "32x32", + "idiom": "mac", + "filename": "app_icon_32.png", + "scale": "1x" + }, + { + "size": "32x32", + "idiom": "mac", + "filename": "app_icon_64.png", + "scale": "2x" + }, + { + "size": "128x128", + "idiom": "mac", + "filename": "app_icon_128.png", + "scale": "1x" + }, + { + "size": "128x128", + "idiom": "mac", + "filename": "app_icon_256.png", + "scale": "2x" + }, + { + "size": "256x256", + "idiom": "mac", + "filename": "app_icon_256.png", + "scale": "1x" + }, + { + "size": "256x256", + "idiom": "mac", + "filename": "app_icon_512.png", + "scale": "2x" + }, + { + "size": "512x512", + "idiom": "mac", + "filename": "app_icon_512.png", + "scale": "1x" + }, + { + "size": "512x512", + "idiom": "mac", + "filename": "app_icon_1024.png", + "scale": "2x" + } + ] +} \ No newline at end of file diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png index 82b6f9d..58699bd 100644 Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png index 13b35eb..c26a509 100644 Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png index 0a3f5fa..5f57cf8 100644 Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png index bdb5722..a6a302a 100644 Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png index f083318..dee00e1 100644 Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png index 326c0e7..3ccb6ed 100644 Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png index 2f1632c..c24fa06 100644 Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/pubspec.lock b/pubspec.lock index 0962271..c49342e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -17,6 +17,14 @@ packages: url: "https://pub.dev" source: hosted version: "5.13.0" + archive: + dependency: transitive + description: + name: archive + sha256: "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d" + url: "https://pub.dev" + source: hosted + version: "3.4.10" args: dependency: transitive description: @@ -57,6 +65,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.0" + checked_yaml: + dependency: transitive + description: + name: checked_yaml + sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff + url: "https://pub.dev" + source: hosted + version: "2.0.3" + cli_util: + dependency: transitive + description: + name: cli_util + sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19 + url: "https://pub.dev" + source: hosted + version: "0.4.1" clock: dependency: transitive description: @@ -214,6 +238,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.18.6" + flutter_launcher_icons: + dependency: "direct main" + description: + name: flutter_launcher_icons + sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea" + url: "https://pub.dev" + source: hosted + version: "0.13.1" flutter_lints: dependency: "direct dev" description: @@ -496,6 +528,14 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.2" + image: + dependency: transitive + description: + name: image + sha256: "004a2e90ce080f8627b5a04aecb4cdfac87d2c3f3b520aa291260be5a32c033d" + url: "https://pub.dev" + source: hosted + version: "4.1.4" image_picker: dependency: "direct main" description: @@ -576,6 +616,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.6.7" + json_annotation: + dependency: transitive + description: + name: json_annotation + sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 + url: "https://pub.dev" + source: hosted + version: "4.8.1" latlong2: dependency: "direct main" description: @@ -776,6 +824,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.1.3" + petitparser: + dependency: transitive + description: + name: petitparser + sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 + url: "https://pub.dev" + source: hosted + version: "5.4.0" photo_view: dependency: "direct main" description: @@ -1101,6 +1157,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.4" + xml: + dependency: transitive + description: + name: xml + sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" + url: "https://pub.dev" + source: hosted + version: "6.3.0" yaml: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 20c0f79..8bd71c9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,4 +1,5 @@ -name: absensi_sas_flutter +# name: absensi_sas_flutter +name: absensi_sas description: A new Flutter project. # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. @@ -59,6 +60,7 @@ dependencies: video_player: ^2.7.2 photo_view: ^0.14.0 mime: ^1.0.4 + flutter_launcher_icons: ^0.13.1 dev_dependencies: flutter_test: @@ -74,6 +76,24 @@ dev_dependencies: # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec +flutter_launcher_icons: + android: "launcher_icon" + ios: true + image_path: "images/icon_absensi_app.png" + min_sdk_android: 21 # android min sdk min:16, default 21 + web: + generate: true + image_path: "images/icon_absensi_app.png" + background_color: "#00FFFFFF" + theme_color: "#00FFFFFF" + windows: + generate: true + image_path: "images/icon_absensi_app.png" + icon_size: 48 # min:48, max:256, default: 48 + macos: + generate: true + image_path: "images/icon_absensi_app.png" + # The following section is specific to Flutter packages. flutter: diff --git a/test/widget_test.dart b/test/widget_test.dart index 12766ab..fea9416 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -8,7 +8,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:absensi_sas_flutter/main.dart'; +import 'package:absensi_sas/main.dart'; void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async { diff --git a/web/favicon.png b/web/favicon.png index 8aaa46a..5f57cf8 100644 Binary files a/web/favicon.png and b/web/favicon.png differ diff --git a/web/icons/Icon-192.png b/web/icons/Icon-192.png index b749bfe..2dfad66 100644 Binary files a/web/icons/Icon-192.png and b/web/icons/Icon-192.png differ diff --git a/web/icons/Icon-512.png b/web/icons/Icon-512.png index 88cfd48..3ccb6ed 100644 Binary files a/web/icons/Icon-512.png and b/web/icons/Icon-512.png differ diff --git a/web/icons/Icon-maskable-192.png b/web/icons/Icon-maskable-192.png index eb9b4d7..2dfad66 100644 Binary files a/web/icons/Icon-maskable-192.png and b/web/icons/Icon-maskable-192.png differ diff --git a/web/icons/Icon-maskable-512.png b/web/icons/Icon-maskable-512.png index d69c566..3ccb6ed 100644 Binary files a/web/icons/Icon-maskable-512.png and b/web/icons/Icon-maskable-512.png differ diff --git a/web/manifest.json b/web/manifest.json index a9bed8b..9091aaa 100644 --- a/web/manifest.json +++ b/web/manifest.json @@ -3,8 +3,8 @@ "short_name": "absensi_sas_flutter", "start_url": ".", "display": "standalone", - "background_color": "#0175C2", - "theme_color": "#0175C2", + "background_color": "#00FFFFFF", + "theme_color": "#00FFFFFF", "description": "A new Flutter project.", "orientation": "portrait-primary", "prefer_related_applications": false, @@ -32,4 +32,4 @@ "purpose": "maskable" } ] -} +} \ No newline at end of file diff --git a/windows/runner/resources/app_icon.ico b/windows/runner/resources/app_icon.ico index c04e20c..48e02c0 100644 Binary files a/windows/runner/resources/app_icon.ico and b/windows/runner/resources/app_icon.ico differ