[REFACTOR] resolve merge conflict

.flutter-plugins-dependencies

-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_keyboard_visibility","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_keyboard_visibility-5.0.0\\\\","dependencies":[]},{"name":"flutter_secure_storage","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_secure_storage-3.3.5\\\\","dependencies":[]},{"name":"image_picker","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\image_picker-0.7.4\\\\","dependencies":[]},{"name":"path_provider","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-2.0.1\\\\","dependencies":[]}],"android":[{"name":"flutter_keyboard_visibility","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_keyboard_visibility-5.0.0\\\\","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_plugin_android_lifecycle-2.0.1\\\\","dependencies":[]},{"name":"flutter_secure_storage","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_secure_storage-3.3.5\\\\","dependencies":[]},{"name":"image_picker","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\image_picker-0.7.4\\\\","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"path_provider","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-2.0.1\\\\","dependencies":[]}],"macos":[{"name":"path_provider_macos","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_macos-2.0.0\\\\","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_linux-2.0.0\\\\","dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_windows-2.0.0\\\\","dependencies":[]}],"web":[{"name":"flutter_keyboard_visibility_web","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_keyboard_visibility_web-2.0.0\\\\","dependencies":[]},{"name":"image_picker_for_web","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\image_picker_for_web-2.0.0\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"flutter_keyboard_visibility","dependencies":["flutter_keyboard_visibility_web"]},{"name":"flutter_keyboard_visibility_web","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"flutter_secure_storage","dependencies":[]},{"name":"image_picker","dependencies":["flutter_plugin_android_lifecycle","image_picker_for_web"]},{"name":"image_picker_for_web","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux","path_provider_windows"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2021-05-31 09:50:38.462700","version":"2.0.1"}
\ No newline at end of file
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_keyboard_visibility","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_keyboard_visibility-5.0.0\\\\","dependencies":[]},{"name":"flutter_secure_storage","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_secure_storage-3.3.5\\\\","dependencies":[]},{"name":"image_picker","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\image_picker-0.7.4\\\\","dependencies":[]},{"name":"path_provider","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-2.0.1\\\\","dependencies":[]}],"android":[{"name":"flutter_keyboard_visibility","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_keyboard_visibility-5.0.0\\\\","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_plugin_android_lifecycle-2.0.1\\\\","dependencies":[]},{"name":"flutter_secure_storage","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_secure_storage-3.3.5\\\\","dependencies":[]},{"name":"image_picker","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\image_picker-0.7.4\\\\","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"path_provider","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-2.0.1\\\\","dependencies":[]}],"macos":[{"name":"path_provider_macos","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_macos-2.0.0\\\\","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_linux-2.0.0\\\\","dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_windows-2.0.0\\\\","dependencies":[]}],"web":[{"name":"flutter_keyboard_visibility_web","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_keyboard_visibility_web-2.0.0\\\\","dependencies":[]},{"name":"image_picker_for_web","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\image_picker_for_web-2.0.0\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"flutter_keyboard_visibility","dependencies":["flutter_keyboard_visibility_web"]},{"name":"flutter_keyboard_visibility_web","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"flutter_secure_storage","dependencies":[]},{"name":"image_picker","dependencies":["flutter_plugin_android_lifecycle","image_picker_for_web"]},{"name":"image_picker_for_web","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux","path_provider_windows"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2021-05-31 10:35:50.621617","version":"2.0.1"}
\ No newline at end of file

.packages

@@ -3,7 +3,7 @@
 # 
 # For more info see: https://dart.dev/go/dot-packages-deprecation
 # 
-# Generated by pub on 2021-05-31 06:13:49.587444.
+# Generated by pub on 2021-05-31 10:35:50.367604.
 _fe_analyzer_shared:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/_fe_analyzer_shared-14.0.0/lib/
 analyzer:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/analyzer-0.41.2/lib/
 args:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/args-2.0.0/lib/
@@ -53,6 +53,7 @@ flutter_web_plugins:file:///C:/src/flutter/packages/flutter_web_plugins/lib/
 glob:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/glob-2.0.1/lib/
 google_fonts:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/google_fonts-2.0.0/lib/
 graphs:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/graphs-0.2.0/lib/
+grouped_checkbox:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/grouped_checkbox-1.0.0/lib/
 html:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/html-0.15.0/lib/
 http:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.13.0/lib/
 http_multi_server:file:///C:/src/flutter/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.2.0/lib/

android/local.properties

-sdk.dir=C:\\Users\\Manuel Yoseph Ray\\AppData\\Local\\Android\\sdk
-flutter.sdk=C:\\src\\flutter
+sdk.dir=C:\\Users\\Acer\\AppData\\Local\\Android\\sdk
+flutter.sdk=C:\\flutter\\flutter
 =======
 flutter.buildMode=debug
 flutter.versionName=1.0.0
-flutter.versionCode=1
\ No newline at end of file
+flutter.versionCode=1

ios/Flutter/Generated.xcconfig

 // This is a generated file; do not edit or check into version control.
-FLUTTER_ROOT=/Users/ferdisungkar/flutter
-FLUTTER_APPLICATION_PATH=/Users/ferdisungkar/Desktop/Files/Universitas-Indonesia/Semester-6/PPL/Project/ppl2021-d-slhape
-FLUTTER_TARGET=/Users/ferdisungkar/Desktop/Files/Universitas-Indonesia/Semester-6/PPL/Project/ppl2021-d-slhape/lib/main.dart
+FLUTTER_ROOT=C:\flutter\flutter
+FLUTTER_APPLICATION_PATH=E:\Fasilkom\Semester 6\Proyek Perangkat Lunak\all-agreement\ppl2021-d-slhape
+FLUTTER_TARGET=lib\main.dart
 FLUTTER_BUILD_DIR=build
-SYMROOT=${SOURCE_ROOT}/../build/ios
+SYMROOT=${SOURCE_ROOT}/../build\ios
 FLUTTER_BUILD_NAME=1.0.0
 FLUTTER_BUILD_NUMBER=1
-DART_DEFINES=flutter.inspector.structuredErrors%3Dtrue
 DART_OBFUSCATION=false
-TRACK_WIDGET_CREATION=true
+TRACK_WIDGET_CREATION=false
 TREE_SHAKE_ICONS=false
-PACKAGE_CONFIG=/Users/ferdisungkar/Desktop/Files/Universitas-Indonesia/Semester-6/PPL/Project/ppl2021-d-slhape/.dart_tool/package_config.json
+PACKAGE_CONFIG=.packages

ios/Flutter/flutter_export_environment.sh

 #!/bin/sh
 # This is a generated file; do not edit or check into version control.
-export "FLUTTER_ROOT=/Users/ferdisungkar/flutter"
-export "FLUTTER_APPLICATION_PATH=/Users/ferdisungkar/Desktop/Files/Universitas-Indonesia/Semester-6/PPL/Project/ppl2021-d-slhape"
-export "FLUTTER_TARGET=/Users/ferdisungkar/Desktop/Files/Universitas-Indonesia/Semester-6/PPL/Project/ppl2021-d-slhape/lib/main.dart"
+export "FLUTTER_ROOT=C:\flutter\flutter"
+export "FLUTTER_APPLICATION_PATH=E:\Fasilkom\Semester 6\Proyek Perangkat Lunak\all-agreement\ppl2021-d-slhape"
+export "FLUTTER_TARGET=lib\main.dart"
 export "FLUTTER_BUILD_DIR=build"
-export "SYMROOT=${SOURCE_ROOT}/../build/ios"
+export "SYMROOT=${SOURCE_ROOT}/../build\ios"
 export "FLUTTER_BUILD_NAME=1.0.0"
 export "FLUTTER_BUILD_NUMBER=1"
-export "DART_DEFINES=flutter.inspector.structuredErrors%3Dtrue"
 export "DART_OBFUSCATION=false"
-export "TRACK_WIDGET_CREATION=true"
+export "TRACK_WIDGET_CREATION=false"
 export "TREE_SHAKE_ICONS=false"
-export "PACKAGE_CONFIG=/Users/ferdisungkar/Desktop/Files/Universitas-Indonesia/Semester-6/PPL/Project/ppl2021-d-slhape/.dart_tool/package_config.json"
+export "PACKAGE_CONFIG=.packages"

lib/assets/colors.dart

@@ -24,6 +24,7 @@ const gray5 = Color.fromRGBO(224, 224, 224, 1.0);
 
 // Element Colors
 const red1 = Color.fromRGBO(159, 25, 25, 1.0);
+const formError = Color.fromRGBO(211, 47, 47, 1.0);
 const info = Color.fromRGBO(151, 182, 255, 1.0);
 
 // Color for Akun

pubspec.lock

@@ -338,6 +338,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.0"
+  grouped_checkbox:
+    dependency: "direct main"
+    description:
+      name: grouped_checkbox
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0"
   html:
     dependency: transitive
     description:

pubspec.yaml

@@ -36,6 +36,7 @@ dependencies:
   dotted_border: ^1.0.7
   image_picker: any
   flutter_multi_carousel: ^1.0.0
+  grouped_checkbox: ^1.0.0
   time_formatter: ^1.0.0
   dependencies:
   material_floating_search_bar: ^0.3.4

test/biodata_pendukung_test.dart

@@ -73,7 +73,7 @@ void main() {
 
   // testWidgets('Terdapat 5 icon checklist', (WidgetTester tester) async {
   //   await tester.pumpWidget(MaterialApp(home: DataPendukung()));
-    
+
   //   expect(find.byIcon(Icons.check_outlined), findsNWidgets(5));
   // });
 
@@ -96,39 +96,39 @@ void main() {
   //   expect(find.text('Selanjutnya'), findsOneWidget);
   // });
 
-  test('Field kosong', (){
+  test('Field kosong', () {
     var tes = Validasi.validate('');
-    expect(tes, 'Harus di isi.');
+    expect(tes, 'Harus diisi');
   });
 
-  test('Field tidak kosong', (){
+  test('Field tidak kosong', () {
     var tes = Validasi.validate('apa aja');
     expect(tes, null);
   });
 
-   test('Field email kosong', (){
+  test('Field email kosong', () {
     var tes = ValidasiEmail.validate('');
-    expect(tes, 'Email harus di isi');
+    expect(tes, 'Email harus diisi');
   });
 
-  test('email tidak valid', (){
+  test('email tidak valid', () {
     var tes = ValidasiEmail.validate('asda.scom');
     expect(tes, 'Email tidak valid');
   });
 
-  test('email valid', (){
+  test('email valid', () {
     var tes = ValidasiEmail.validate('asd@as.com');
     expect(tes, null);
   });
 
-  test('Latar belakang valid', (){
+  test('Latar belakang valid', () {
     var tes = ValidasiTempat.validate('SD');
     expect(tes, null);
   });
 
-  test('Field kosong', (){
+  test('Field kosong', () {
     var tes = ValidasiTempat.validate('');
-    expect(tes, 'Harus di isi.');
+    expect(tes, 'Harus diisi');
   });
 
   // testWidgets('Button selanjutnya', (WidgetTester tester) async {
@@ -150,7 +150,7 @@ void main() {
 
   //   expect(find.text("Selanjutnya"), findsOneWidget);
   //   await tester.tap(buttonSelanjutnya);
-  //   await tester.pumpAndSettle();    
+  //   await tester.pumpAndSettle();
   // });
 
   // testWidgets('Button sebelumnya', (WidgetTester tester) async {
@@ -160,6 +160,6 @@ void main() {
 
   //   expect(find.text("Sebelumnya"), findsOneWidget);
   //   await tester.tap(buttonSebelumnya);
-  //   await tester.pumpAndSettle();    
+  //   await tester.pumpAndSettle();
   // });
-}
\ No newline at end of file
+}