diff --git a/Mobile/patrolin/skripsi/android/app/src/main/AndroidManifest.xml b/Mobile/patrolin/skripsi/android/app/src/main/AndroidManifest.xml index 95d1dd3..1f7a9a9 100644 --- a/Mobile/patrolin/skripsi/android/app/src/main/AndroidManifest.xml +++ b/Mobile/patrolin/skripsi/android/app/src/main/AndroidManifest.xml @@ -1,9 +1,9 @@ + android:icon="@mipmap/launcher_icon"> CFBundleInfoDictionaryVersion 6.0 CFBundleName - skripsi + Patrol.In CFBundlePackageType APPL CFBundleShortVersionString diff --git a/Mobile/patrolin/skripsi/lib/config/api.dart b/Mobile/patrolin/skripsi/lib/config/api.dart index a36d3ac..6791c69 100644 --- a/Mobile/patrolin/skripsi/lib/config/api.dart +++ b/Mobile/patrolin/skripsi/lib/config/api.dart @@ -2,5 +2,6 @@ class Api { // static const baseUrl = 'https://skripsinaja.000webhostapp.com/'; // static const baseUrl = 'http://192.168.200.3/patrolin/'; // static const baseUrl = 'http://192.168.1.4/patrolin/'; - static const baseUrl = 'http://192.168.1.4/testing/'; + // static const baseUrl = 'http://192.168.1.4/testing/'; + static const baseUrl = 'https://patrolin.kakandatech.com/'; } diff --git a/Mobile/patrolin/skripsi/lib/view/home_page.dart b/Mobile/patrolin/skripsi/lib/view/home_page.dart index 9e76fd5..871b39d 100644 --- a/Mobile/patrolin/skripsi/lib/view/home_page.dart +++ b/Mobile/patrolin/skripsi/lib/view/home_page.dart @@ -49,7 +49,7 @@ class _HomePageState extends State { showSelectedLabels: true, items: const [ BottomNavigationBarItem( - icon: Icon(Icons.home), + icon: Icon(Icons.home_outlined), label: 'Home', ), BottomNavigationBarItem( diff --git a/Mobile/patrolin/skripsi/lib/view/login_page.dart b/Mobile/patrolin/skripsi/lib/view/login_page.dart index 027cc41..de12bad 100644 --- a/Mobile/patrolin/skripsi/lib/view/login_page.dart +++ b/Mobile/patrolin/skripsi/lib/view/login_page.dart @@ -47,83 +47,72 @@ class _LoginPageState extends State { Widget build(BuildContext context) { return Scaffold( body: SafeArea( - child: Stack(children: [ - Padding( - padding: EdgeInsets.only(left: 20.w, right: 20.w), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Image.asset('assets/logo.png'), - SizedBox( - height: 20.h, - ), - Text( - 'Patrol.In', - style: robotoBesarHitam.copyWith( - decoration: TextDecoration.underline, - decorationColor: blackColor, - decorationThickness: 1), - ), - SizedBox( - height: 20.h, - ), - CustTextField( - controller: usernameController, - hint: 'Masukkan Username', - ), - SizedBox( - height: 20.h, - ), - CustTextFieldPreffSuff( - controller: passwordController, - hint: 'Masukkan Password', - ), - SizedBox( - height: 40.h, - ), - CustButton( - onTap: () { - // Navigator.push( - // context, - // MaterialPageRoute( - // builder: (context) => const HomePage())); - login(); - }, - text: 'LOGIN', - backgroundColor: primaryColor, - width: 120.w, - height: 40.h), - SizedBox(height: 20.h), - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - 'Belum Memiliki Akun?', - style: robotoSedangHitam, - ), - SizedBox(width: 8.w), - InkWell( + child: SingleChildScrollView( + child: Stack(children: [ + Padding( + padding: EdgeInsets.only(left: 20.w, right: 20.w), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Image.asset('assets/icon2.png'), + CustTextField( + controller: usernameController, + hint: 'Masukkan Username', + ), + SizedBox( + height: 20.h, + ), + CustTextFieldPreffSuff( + controller: passwordController, + hint: 'Masukkan Password', + ), + SizedBox( + height: 40.h, + ), + CustButton( onTap: () { - Get.to(const RegisterPage()); + // Navigator.push( + // context, + // MaterialPageRoute( + // builder: (context) => const HomePage())); + login(); }, - child: Text( - 'Mendaftar', - style: - robotoSedangHitam.copyWith(color: Colors.blue[400]), + text: 'LOGIN', + backgroundColor: primaryColor, + width: 120.w, + height: 40.h), + SizedBox(height: 20.h), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + 'Belum Memiliki Akun?', + style: robotoSedangHitam, ), - ), - ], - ), - ], + SizedBox(width: 8.w), + InkWell( + onTap: () { + Get.to(const RegisterPage()); + }, + child: Text( + 'Mendaftar', + style: robotoSedangHitam.copyWith( + color: Colors.blue[400]), + ), + ), + ], + ), + ], + ), ), - ), - Obx(() { - if (cLogin.loading) { - return showCustomLoadingDialog(context); - } - return const SizedBox.shrink(); - }), - ]), + Obx(() { + if (cLogin.loading) { + return showCustomLoadingDialog(context); + } + return const SizedBox.shrink(); + }), + ]), + ), ), ); } diff --git a/Mobile/patrolin/skripsi/lib/view/patroli_page.dart b/Mobile/patrolin/skripsi/lib/view/patroli_page.dart index 725894d..67670ca 100644 --- a/Mobile/patrolin/skripsi/lib/view/patroli_page.dart +++ b/Mobile/patrolin/skripsi/lib/view/patroli_page.dart @@ -37,33 +37,7 @@ class _PatroliPageState extends State { padding: EdgeInsets.fromLTRB(10.w, 10.w, 10.w, 60.w), child: Column( children: [ - Image.asset('assets/logo.png', height: 120.w, width: 120.w), - SizedBox(height: 8.h), - Text( - 'Patrol.In', - style: robotoBesarHitam.copyWith( - decoration: TextDecoration.underline, - decorationColor: blackColor, - decorationThickness: 1), - ), - // SingleChildScrollView( - // scrollDirection: Axis.horizontal, - // child: Row( - // children: [ - // const StatisticCard(judul: 'Total Daerah', isi: '16'), - // SizedBox(width: 12.w), - // const StatisticCard( - // judul: 'Tingkat Kriminal Rendah', isi: '5'), - // SizedBox(width: 12.w), - // const StatisticCard( - // judul: 'Tingkat Kriminal Sedang', isi: '7'), - // SizedBox(width: 12.w), - // const StatisticCard( - // judul: 'Tingkat Kriminal Tinggi', isi: '4'), - // ], - // ), - // ), - SizedBox(height: 16.h), + Image.asset('assets/icon2.png', height: 200.w, width: 200.w), Text('Riwayat Testing', style: robotoBesarHitam.copyWith(fontWeight: FontWeight.bold)), const Divider(), diff --git a/Mobile/patrolin/skripsi/lib/view/profile_page.dart b/Mobile/patrolin/skripsi/lib/view/profile_page.dart index f007b68..2bfeae3 100644 --- a/Mobile/patrolin/skripsi/lib/view/profile_page.dart +++ b/Mobile/patrolin/skripsi/lib/view/profile_page.dart @@ -32,16 +32,7 @@ class _ProfilePageState extends State { padding: EdgeInsets.fromLTRB(10.w, 10.w, 10.w, 60.w), child: Column( children: [ - Image.asset('assets/logo.png', height: 120.w, width: 120.w), - SizedBox(height: 8.h), - Text( - 'Patrol.In', - style: robotoBesarHitam.copyWith( - decoration: TextDecoration.underline, - decorationColor: blackColor, - decorationThickness: 1), - ), - SizedBox(height: 16.h), + Image.asset('assets/icon2.png', height: 200.w, width: 200.w), Container( decoration: BoxDecoration( color: secondaryColor, diff --git a/Mobile/patrolin/skripsi/lib/view/splashscreen.dart b/Mobile/patrolin/skripsi/lib/view/splashscreen.dart index 9f9cacc..311ca2b 100644 --- a/Mobile/patrolin/skripsi/lib/view/splashscreen.dart +++ b/Mobile/patrolin/skripsi/lib/view/splashscreen.dart @@ -37,7 +37,7 @@ class _SplashScreenState extends State { @override Widget build(BuildContext context) { return Scaffold( - body: Center(child: Image.asset('assets/logo.png')), + body: Center(child: Image.asset('assets/icon2.png')), ); } } diff --git a/Mobile/patrolin/skripsi/pubspec.lock b/Mobile/patrolin/skripsi/pubspec.lock index 7b67f65..4f8621d 100644 --- a/Mobile/patrolin/skripsi/pubspec.lock +++ b/Mobile/patrolin/skripsi/pubspec.lock @@ -1,6 +1,22 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + archive: + dependency: transitive + description: + name: archive + sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d + url: "https://pub.dev" + source: hosted + version: "3.6.1" + args: + dependency: transitive + description: + name: args + sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" + url: "https://pub.dev" + source: hosted + version: "2.5.0" async: dependency: transitive description: @@ -25,6 +41,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: @@ -102,6 +134,14 @@ packages: description: flutter source: sdk version: "0.0.0" + 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: @@ -168,6 +208,22 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.2" + image: + dependency: transitive + description: + name: image + sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8" + url: "https://pub.dev" + source: hosted + version: "4.2.0" + json_annotation: + dependency: transitive + description: + name: json_annotation + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" + url: "https://pub.dev" + source: hosted + version: "4.9.0" lints: dependency: transitive description: @@ -256,6 +312,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.2.1" + petitparser: + dependency: transitive + description: + name: petitparser + sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 + url: "https://pub.dev" + source: hosted + version: "6.0.2" platform: dependency: transitive description: @@ -421,6 +485,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.4" + xml: + dependency: transitive + description: + name: xml + sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 + url: "https://pub.dev" + source: hosted + version: "6.5.0" + yaml: + dependency: transitive + description: + name: yaml + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + url: "https://pub.dev" + source: hosted + version: "3.1.2" sdks: dart: ">=3.2.0 <4.0.0" flutter: ">=3.16.0" diff --git a/Mobile/patrolin/skripsi/pubspec.yaml b/Mobile/patrolin/skripsi/pubspec.yaml index e2b83d5..51e47ed 100644 --- a/Mobile/patrolin/skripsi/pubspec.yaml +++ b/Mobile/patrolin/skripsi/pubspec.yaml @@ -42,6 +42,7 @@ dependencies: get: ^4.6.6 d_info: ^0.2.0 d_view: ^0.0.5 + flutter_launcher_icons: "^0.13.1" dev_dependencies: flutter_test: @@ -54,6 +55,12 @@ dev_dependencies: # rules and activating additional ones. flutter_lints: ^2.0.0 +flutter_launcher_icons: + android: "launcher_icon" + ios: true + image_path: "assets/icon.png" + min_sdk_android: 21 + # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec