fix error last rebase

app_petty_cash/android/app/src/main/AndroidManifest.xml

@@ -1,9 +1,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <application
-        android:label="app_petty_cash"
+        android:label="PettyCash"
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/launcher_icon"
+        android:usesCleartextTraffic="true"
+        android:requestLegacyExternalStorage="true"
+        >
         <activity
             android:name=".MainActivity"
             android:exported="true"

app_petty_cash/android/app/src/main/res/xml/network_security_config.xml

@@ -0,0 +1,7 @@
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true">
+        <trust-anchors>
+            <certificates src="system" />
+        </trust-anchors>
+    </base-config>
+</network-security-config>

app_petty_cash/lib/app/constant.dart

@@ -18,7 +18,10 @@ class Constant {
   static String baseUrlDevoneReport = "devone.aplikasi.web.id";
 
   static String baseUrlDevone =
-      "http://devone.aplikasi.web.id/one-api-pettycash/pettycash/";
+      "https://devone.aplikasi.web.id/one-api-pettycash/pettycash/";
+  // "http://devone.aplikasi.web.id/one-api-pettycash/pettycash/";
+  static String baseUrlFile =
+      "https://devone.aplikasi.web.id/pettycash-media/attachment/";
 
   // static String baseUrl_appdoctor =
   //     "http://devbandungraya.aplikasi.web.id/one-api/app_doctor/";
@@ -282,6 +285,13 @@ class Constant {
     );
   }
 
+  static TextStyle titleH6_700({required BuildContext context}) {
+    return TextStyle(
+      fontSize: Constant.getActualYPhone(context: context, y: 18),
+      fontWeight: FontWeight.w700,
+    );
+  }
+
   static TextStyle titleH3_700({required BuildContext context}) {
     return TextStyle(
       fontSize: Constant.getActualYPhone(context: context, y: 24),
@@ -353,6 +363,13 @@ class Constant {
     );
   }
 
+  static TextStyle H4_700V3({required BuildContext context}) {
+    return TextStyle(
+      fontSize: Constant.getActualYPhone(context: context, y: 16),
+      fontWeight: FontWeight.w700,
+    );
+  }
+
   static TextStyle titleH5({required BuildContext context}) {
     return TextStyle(
       fontSize: Constant.getActualYPhone(context: context, y: 18),

app_petty_cash/lib/main.dart

@@ -2,10 +2,12 @@ import 'package:flutter/material.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:intl/date_symbol_data_local.dart';
 import 'app/route.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
+  initializeDateFormatting();
   SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
     statusBarIconBrightness:
         Brightness.dark, // this will change the brightness of the icons
@@ -38,8 +40,8 @@ class MyApp extends StatelessWidget {
         },
       ),
       debugShowCheckedModeBanner: false,
-      initialRoute: loginRoute,
-      // initialRoute: splashScreen,
+      // initialRoute: loginRoute,
+      initialRoute: splashScreen,
       // initialRoute: transaksiRoute,
       // initialRoute: reportRoute,
       // initialRoute: testFilePickerRoute,

app_petty_cash/lib/model/info_account_balance.dart

@@ -0,0 +1,21 @@
+class InfoAccountBalanceModel {
+  String? totalAll;
+  String? kredit;
+  String? debit;
+
+  InfoAccountBalanceModel({this.totalAll, this.kredit, this.debit});
+
+  InfoAccountBalanceModel.fromJson(Map<String, dynamic> json) {
+    totalAll = json['total_all'];
+    kredit = json['kredit'];
+    debit = json['debit'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['total_all'] = this.totalAll;
+    data['kredit'] = this.kredit;
+    data['debit'] = this.debit;
+    return data;
+  }
+}

app_petty_cash/lib/model/list_transaksi_model.dart

@@ -0,0 +1,64 @@
+class ListTransaksiHomeModel {
+  String? id;
+  String? tanggaltransaksi;
+  String? tipe;
+  String? kategoriid;
+  String? kategoriname;
+  String? note;
+  String? amount;
+  String? sender;
+  String? imgurl;
+  String? isconfirm;
+  String? tanggalconfirm;
+  String? usertransaksi;
+  String? userconfirm;
+
+  ListTransaksiHomeModel(
+      {this.id,
+      this.tanggaltransaksi,
+      this.tipe,
+      this.kategoriid,
+      this.kategoriname,
+      this.note,
+      this.amount,
+      this.sender,
+      this.imgurl,
+      this.isconfirm,
+      this.tanggalconfirm,
+      this.usertransaksi,
+      this.userconfirm});
+
+  ListTransaksiHomeModel.fromJson(Map<String, dynamic> json) {
+    id = json['id'];
+    tanggaltransaksi = json['tanggaltransaksi'];
+    tipe = json['tipe'];
+    kategoriid = json['kategoriid'];
+    kategoriname = json['kategoriname'];
+    note = json['note'];
+    amount = json['amount'];
+    sender = json['sender'];
+    imgurl = json['imgurl'];
+    isconfirm = json['isconfirm'];
+    tanggalconfirm = json['tanggalconfirm'];
+    usertransaksi = json['usertransaksi'];
+    userconfirm = json['userconfirm'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['id'] = this.id;
+    data['tanggaltransaksi'] = this.tanggaltransaksi;
+    data['tipe'] = this.tipe;
+    data['kategoriid'] = this.kategoriid;
+    data['kategoriname'] = this.kategoriname;
+    data['note'] = this.note;
+    data['amount'] = this.amount;
+    data['sender'] = this.sender;
+    data['imgurl'] = this.imgurl;
+    data['isconfirm'] = this.isconfirm;
+    data['tanggalconfirm'] = this.tanggalconfirm;
+    data['usertransaksi'] = this.usertransaksi;
+    data['userconfirm'] = this.userconfirm;
+    return data;
+  }
+}

app_petty_cash/lib/provider/current_info_account_balance_provider.dart

@@ -0,0 +1,11 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../model/info_account_balance.dart';
+
+final currentInfoAccountBalanceProvider = StateProvider<InfoAccountBalanceModel>(
+  ((ref) => InfoAccountBalanceModel(
+        debit: "0",
+        kredit: "0",
+        totalAll: "0",
+      )),
+);

app_petty_cash/lib/repository/home_repository.dart

@@ -0,0 +1,61 @@
+import 'package:app_petty_cash/model/list_type_model.dart';
+
+import '../app/constant.dart';
+import '../model/info_account_balance.dart';
+import '../model/list_transaksi_model.dart';
+import 'base_repository.dart';
+
+class HomeRepository extends BaseRepository {
+  HomeRepository({required super.dio});
+
+  // list transaksi home
+  Future<List<ListTransaksiHomeModel>> getTransaksiListHome(
+    String companyid,
+  ) async {
+    final service =
+        "${Constant.baseUrlDevone}homescreen/list_transaction/?companyid=$companyid";
+    final resp = await get(
+      // param: {
+      //   "": "",
+      // },
+      service: service,
+    );
+
+    print("url list transaksi home : $service");
+
+    final result = List<ListTransaksiHomeModel>.empty(growable: true);
+    resp['data'].forEach((e) {
+      final model = ListTransaksiHomeModel.fromJson(e);
+      result.add(model);
+    });
+    return result;
+  }
+
+  // info account balance
+  Future<InfoAccountBalanceModel> getInfoAccountBalance(
+    String companyid,
+  ) async {
+    final service =
+        "${Constant.baseUrlDevone}homescreen/list_total/?companyid=$companyid";
+    final resp = await get(
+      // param: {
+      //   "": "",
+      // },
+      service: service,
+    );
+
+    print("url card info account balance home : $service");
+
+    InfoAccountBalanceModel result = InfoAccountBalanceModel(
+      debit: "0",
+      kredit: "0",
+      totalAll: "0",
+    );
+
+    print(resp['data']);
+
+    final model = InfoAccountBalanceModel.fromJson(resp['data']);
+    result = model;
+    return result;
+  }
+}

app_petty_cash/lib/repository/transaksi_repository.dart

@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:app_petty_cash/model/list_type_model.dart';
 
 import '../app/constant.dart';
@@ -57,34 +59,68 @@ class TransaksiRepository extends BaseRepository {
       String catatan,
       String userid,
       String sender,
+      String base64file,
+      String fileName,
+      String fileSize,
+      String fileExtension,
       String url) async {
-    String paramPostInUrl = "";
+    // String paramPostInUrl = "";
+    Map<String, dynamic> prm = {};
     String M_CompanyID = await getCompanyID();
     if (tipe == "DEBIT") {
       sender = "";
-      paramPostInUrl =
-          "?tanggal=$tanggal&tipe=$tipe&kategoriid=$kategoriid&jumlah=$jumlah&catatan=$catatan&url=$url&userid=$userid&sender=$sender";
+      prm = {
+        'tanggal': tanggal,
+        'tipe': tipe,
+        'kategoriid': kategoriid,
+        'jumlah': jumlah,
+        'catatan': catatan,
+        'url': url,
+        'userid': userid,
+        'sender': sender,
+        'companyid': M_CompanyID,
+        'base64File': base64file,
+        'fileName': fileName,
+        'fileSize': fileSize,
+        'fileEkstension': fileExtension
+      };
+
+      // paramPostInUrl =
+      //     "?tanggal=$tanggal&tipe=$tipe&kategoriid=$kategoriid&jumlah=$jumlah&catatan=$catatan&url=$url&userid=$userid&sender=$sender";
     } else {
       if (tipe == "KREDIT") {
         kategoriid = "0";
-        paramPostInUrl =
-            "?tanggal=$tanggal&tipe=$tipe&kategoriid=$kategoriid&jumlah=$jumlah&catatan=$catatan&url=$url&userid=$userid&sender=$sender";
+        prm = {
+          'tanggal': tanggal,
+          'tipe': tipe,
+          'kategoriid': kategoriid,
+          'jumlah': jumlah,
+          'catatan': catatan,
+          'url': url,
+          'userid': userid,
+          'sender': sender,
+          'companyid': M_CompanyID,
+          'fileName': fileName,
+          'fileSize': fileSize,
+          'fileEkstension': fileExtension
+        };
+        // paramPostInUrl =
+        //     "?tanggal=$tanggal&tipe=$tipe&kategoriid=$kategoriid&jumlah=$jumlah&catatan=$catatan&url=$url&userid=$userid&sender=$sender";
       }
     }
 
-    paramPostInUrl += "&companyid=$M_CompanyID";
+    // paramPostInUrl += "&companyid=$M_CompanyID";
     // /?tanggal=2023-12-29&tipe=KREDIT&kategoriid=3&jumlah=5000&catatan=Lakban%20Besar&url=&userid=1&sender=
 
-    final service =
-        "${Constant.baseUrlDevone}transaction/addtransaction/$paramPostInUrl";
-    final resp = await get(
-      // param: {
-      //   "": "",
-      // },
-      service: service,
-    );
+    final service = "${Constant.baseUrlDevone}transaction/addtransaction";
+    final resp = await post(
+        // param: {
+        //   "": "",
+        // },
+        service: service,
+        param: prm);
 
-    print("url insert transaksi : $service");
+    print("prm insert transaksi : ${jsonEncode(prm)}");
 
     // final result = List<ListCategory>.empty(growable: true);
     // resp['data'].forEach((e) {
@@ -127,7 +163,6 @@ class TransaksiRepository extends BaseRepository {
     String id,
     String userid,
   ) async {
-
     final service =
         "${Constant.baseUrlDevone}transaction/deletetransaction/?id=$id&userid=$userid";
     final resp = await get(
@@ -145,7 +180,7 @@ class TransaksiRepository extends BaseRepository {
     //   result.add(model);
     // });
 
-    if(resp['status'] != "OK"){
+    if (resp['status'] != "OK") {
       return resp['message'];
     }
 

app_petty_cash/lib/screen/home/home_screen.dart

@@ -1,17 +1,34 @@
+import 'dart:convert';
+
+import 'package:app_petty_cash/screen/home/info_account_balance_provider.dart';
+import 'package:app_petty_cash/screen/home/list_transaksi_home_provider.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
 import '../../app/constant.dart';
 import '../../app/route.dart';
+import '../../model/info_account_balance.dart';
+import '../../model/list_transaksi_model.dart';
+import '../../provider/current_info_account_balance_provider.dart';
 import '../../provider/current_user_provider.dart';
 import '../../widget/custom_drawer.dart';
+import '../../widget/history_row_atas_widget.dart';
+import '../../widget/sankbar_widget.dart';
 
 class HomeScreen extends HookConsumerWidget {
   const HomeScreen({super.key});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    final M_CompanyID = useState<String>("0");
+    final searchTransaksiHomeLoading = useState<bool>(false);
+    final infoAccountBalanceHomeLoading = useState<bool>(false);
+    final listTransaksiHome = useState<List<ListTransaksiHomeModel>>(
+      List.empty(growable: true),
+    );
+
     useEffect(() {
       WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
         final userID = ref.read(currentUserProvider)?.model.M_UserID ?? "0";
@@ -27,6 +44,80 @@ class HomeScreen extends HookConsumerWidget {
       return () {};
     }, []);
 
+    Future<String> getCompanyID() async {
+      final shared = await SharedPreferences.getInstance();
+      String M_CompanyID = "0";
+
+      if (shared != null) {
+        final bearerString = shared.get(Constant.bearerName).toString();
+        final xmodel = jsonDecode(bearerString);
+        if (xmodel != null) {
+          M_CompanyID = xmodel["model"]["M_CompanyID"];
+        }
+      }
+
+      if (M_CompanyID == "0") {
+        // throw BaseRepositoryException(message: 'Invalid Company ID');
+      }
+
+      return M_CompanyID;
+    }
+
+    useEffect(() {
+      WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
+        M_CompanyID.value = await getCompanyID();
+        // info account balance
+        ref
+            .read(infoAccountBalanceHomeProvider.notifier)
+            .infoAccountBalanceHome(M_CompanyID.value);
+      });
+      return () {};
+    }, []);
+
+    // read provider home
+    ref.listen(
+      listTransaksiHomeProvider,
+      (previous, next) {
+        if (next is ListTransaksiHomeStateLoading) {
+          searchTransaksiHomeLoading.value = true;
+        } else if (next is ListTransaksiHomeStateError) {
+          // print(next.message);
+          searchTransaksiHomeLoading.value = false;
+          SanckbarWidget(context, next.message, snackbarType.error);
+        } else if (next is ListTransaksiHomeStateDone) {
+          // print(jsonEncode(next.model));
+          // print(next.model.length);
+          listTransaksiHome.value = next.model;
+          searchTransaksiHomeLoading.value = false;
+        }
+      },
+    );
+
+    // read provider info account balance
+    ref.listen(
+      infoAccountBalanceHomeProvider,
+      (previous, next) {
+        if (next is InfoAccountBalanceHomeStateLoading) {
+          infoAccountBalanceHomeLoading.value = true;
+        } else if (next is InfoAccountBalanceHomeStateError) {
+          // print(next.message);
+          infoAccountBalanceHomeLoading.value = false;
+          SanckbarWidget(context, next.message, snackbarType.error);
+        } else if (next is InfoAccountBalanceHomeStateDone) {
+          // print(jsonEncode(next.model));
+          // print(next.model.length);
+          // infoAccountBalanceObject.value = next.model;
+          ref.read(currentInfoAccountBalanceProvider.notifier).state =
+              InfoAccountBalanceModel(
+            kredit: next.model.kredit,
+            debit: next.model.debit,
+            totalAll: next.model.totalAll,
+          );
+          infoAccountBalanceHomeLoading.value = false;
+        }
+      },
+    );
+
     return Padding(
       padding: EdgeInsets.only(
         top: Constant.getActualYPhone(context: context, y: 30),
@@ -44,8 +135,258 @@ class HomeScreen extends HookConsumerWidget {
         ),
         drawer: CustomDrawer(),
         body: SafeArea(
-          child: Center(
-            child: Text('Home Screen Content'),
+          child: Padding(
+            padding: EdgeInsets.only(
+              top: Constant.getActualYPhone(context: context, y: 36),
+              left: Constant.getActualXPhone(context: context, x: 34),
+              right: Constant.getActualXPhone(context: context, x: 34),
+            ),
+            child: RefreshIndicator(
+              onRefresh: () async {
+                ref
+                    .read(infoAccountBalanceHomeProvider.notifier)
+                    .infoAccountBalanceHome(M_CompanyID.value);
+              },
+              child: Container(
+                width: Constant.getActualXPhone(context: context, x: 390),
+                height: Constant.getActualYPhone(context: context, y: 844),
+                child: Column(
+                  children: [
+                    Container(
+                      width: Constant.getActualXPhone(context: context, x: 332),
+                      height:
+                          Constant.getActualYPhone(context: context, y: 173),
+                      decoration: BoxDecoration(
+                        // color: Colors.black12,
+                        borderRadius: BorderRadius.circular(20),
+                        image: DecorationImage(
+                          image: AssetImage('images/background_card.png'),
+                          fit: BoxFit.cover,
+                        ),
+                        boxShadow: [
+                          BoxShadow(
+                            color: Color.fromRGBO(145, 158, 171, 0.16),
+                            offset: Offset(0, 24),
+                            blurRadius: 48,
+                          ),
+                        ],
+                      ),
+                      //Isi Card
+                      child: (infoAccountBalanceHomeLoading.value)
+                          ? Center(
+                              child: CircularProgressIndicator(),
+                            )
+                          : Container(
+                              child: Column(
+                                mainAxisAlignment: MainAxisAlignment.center,
+                                children: [
+                                  // Text1 & Text2
+                                  Padding(
+                                    padding: EdgeInsets.only(
+                                      top: Constant.getActualYPhone(
+                                          context: context, y: 17),
+                                      left: Constant.getActualXPhone(
+                                          context: context, x: 81),
+                                      right: Constant.getActualXPhone(
+                                          context: context, x: 81),
+                                    ),
+                                    child: Column(
+                                      children: [
+                                        Text(
+                                          'Account Balance',
+                                          style: Constant.body1(
+                                                  context: context)
+                                              .copyWith(
+                                                  fontWeight: FontWeight.w400,
+                                                  color: Constant.textWhite),
+                                        ),
+                                        Text(
+                                          ref
+                                              .watch(
+                                                  currentInfoAccountBalanceProvider)
+                                              .totalAll
+                                              .toString(),
+                                          style: Constant.H4_700V3(
+                                                  context: context)
+                                              .copyWith(
+                                            color: Constant.textWhite,
+                                          ),
+                                        ),
+                                      ],
+                                    ),
+                                  ),
+
+                                  SizedBox(
+                                    height: Constant.getActualYPhone(
+                                        context: context, y: 27),
+                                  ),
+
+                                  //Debit dan Kredit
+                                  Row(
+                                    mainAxisAlignment:
+                                        MainAxisAlignment.spaceBetween,
+                                    children: [
+                                      // Spasi di sebelah kiri "Check In"
+                                      Expanded(
+                                        child: Padding(
+                                          padding: EdgeInsets.only(
+                                            left: Constant.getActualXPhone(
+                                                context: context, x: 20),
+                                          ),
+                                          child: Column(
+                                            children: [
+                                              Text(
+                                                'Debit',
+                                                style: Constant.body1(
+                                                        context: context)
+                                                    .copyWith(
+                                                        fontWeight:
+                                                            FontWeight.w400,
+                                                        color:
+                                                            Constant.textWhite),
+                                              ),
+                                              Text(
+                                                ref
+                                                    .watch(
+                                                        currentInfoAccountBalanceProvider)
+                                                    .debit
+                                                    .toString(),
+                                                style: Constant.H4_700V3(
+                                                        context: context)
+                                                    .copyWith(
+                                                        color:
+                                                            Constant.textWhite),
+                                              ),
+                                            ],
+                                          ),
+                                        ),
+                                      ),
+
+                                      // SizedBox(
+                                      //   width: Constant.getActualXPhone(
+                                      //       context: context, x: 51),
+                                      // ),
+
+                                      Expanded(
+                                        child: Padding(
+                                          padding: EdgeInsets.only(
+                                            right: Constant.getActualXPhone(
+                                                context: context, x: 28),
+                                          ),
+                                          child: Column(
+                                            children: [
+                                              Text(
+                                                'Credit',
+                                                style: Constant.body1(
+                                                        context: context)
+                                                    .copyWith(
+                                                        fontWeight:
+                                                            FontWeight.w400,
+                                                        color:
+                                                            Constant.textWhite),
+                                              ),
+                                              Text(
+                                                ref
+                                                    .watch(
+                                                        currentInfoAccountBalanceProvider)
+                                                    .kredit
+                                                    .toString(),
+                                                style: Constant.H4_700V3(
+                                                        context: context)
+                                                    .copyWith(
+                                                        color:
+                                                            Constant.textWhite),
+                                              ),
+                                            ],
+                                          ),
+                                        ),
+                                      ),
+                                    ],
+                                  ),
+                                  SizedBox(
+                                    height: Constant.getActualYPhone(
+                                        context: context, y: 17),
+                                  ),
+                                ],
+                              ),
+                            ),
+                    ),
+
+                    SizedBox(
+                      height: Constant.getActualYPhone(context: context, y: 44),
+                    ),
+
+                    Align(
+                      alignment: Alignment.centerLeft,
+                      child: Text(
+                        'Transaksi Terkini',
+                        style: Constant.titleH5_600(context: context)
+                            .copyWith(color: Constant.textBlack),
+                      ),
+                    ),
+
+                    SizedBox(
+                      height: Constant.getActualYPhone(context: context, y: 24),
+                    ),
+
+                    // list transaksi
+                    (searchTransaksiHomeLoading.value)
+                        ? Center(
+                            child: CircularProgressIndicator(),
+                          )
+                        : Container(
+                            child: Expanded(
+                              child: ListView.builder(
+                                itemCount: listTransaksiHome.value.length,
+                                itemBuilder: (context, idx) {
+                                  return Padding(
+                                    padding: EdgeInsets.only(
+                                      bottom: Constant.getActualYPhone(
+                                        context: context,
+                                        y: 10,
+                                      ),
+                                    ),
+                                    child: Card(
+                                      elevation: 2.0,
+                                      child: Padding(
+                                        padding: EdgeInsets.all(10),
+                                        child: Column(
+                                          // crossAxisAlignment: CrossAxisAlignment.start,
+                                          // mainAxisAlignment: MainAxisAlignment.start,
+                                          children: [
+                                            // atas
+                                            HistoryRowAtasWidget(
+                                              icon_category_id:
+                                                  listTransaksiHome
+                                                      .value[idx].kategoriid
+                                                      .toString(),
+                                              icon_category_name:
+                                                  listTransaksiHome
+                                                      .value[idx].kategoriname
+                                                      .toString(),
+                                              amount: listTransaksiHome
+                                                  .value[idx].amount
+                                                  .toString(),
+                                              tglTransaksi: listTransaksiHome
+                                                  .value[idx].tanggaltransaksi
+                                                  .toString(),
+                                              tipe: listTransaksiHome
+                                                  .value[idx].tipe
+                                                  .toString(),
+                                            ),
+                                          ],
+                                        ),
+                                      ),
+                                    ),
+                                  );
+                                },
+                              ),
+                            ),
+                          ),
+                  ],
+                ),
+              ),
+            ),
           ),
         ),
       ),

app_petty_cash/lib/screen/home/info_account_balance_provider.dart

@@ -0,0 +1,75 @@
+import 'package:app_petty_cash/provider/current_info_account_balance_provider.dart';
+import 'package:app_petty_cash/repository/home_repository.dart';
+import 'package:equatable/equatable.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../../model/info_account_balance.dart';
+import '../../provider/dio_provider.dart';
+import '../../repository/base_repository.dart';
+import 'list_transaksi_home_provider.dart';
+
+abstract class InfoAccountBalanceHomeState extends Equatable {
+  final DateTime date;
+  const InfoAccountBalanceHomeState(this.date);
+  @override
+  List<Object?> get props => [date];
+}
+
+class InfoAccountBalanceHomeStateInit extends InfoAccountBalanceHomeState {
+  InfoAccountBalanceHomeStateInit() : super(DateTime.now());
+}
+
+class InfoAccountBalanceHomeStateLoading extends InfoAccountBalanceHomeState {
+  InfoAccountBalanceHomeStateLoading() : super(DateTime.now());
+}
+
+class InfoAccountBalanceHomeStateError extends InfoAccountBalanceHomeState {
+  final String message;
+  InfoAccountBalanceHomeStateError({
+    required this.message,
+  }) : super(DateTime.now());
+}
+
+class InfoAccountBalanceHomeStateDone extends InfoAccountBalanceHomeState {
+  final InfoAccountBalanceModel model;
+  // final String resp;
+  InfoAccountBalanceHomeStateDone({
+    required this.model,
+  }) : super(DateTime.now());
+}
+
+//notifier
+class InfoAccountBalanceHomeNotifier
+    extends StateNotifier<InfoAccountBalanceHomeState> {
+  final Ref ref;
+  InfoAccountBalanceHomeNotifier({
+    required this.ref,
+  }) : super(InfoAccountBalanceHomeStateInit());
+
+  void infoAccountBalanceHome(
+    String companyid,
+  ) async {
+    try {
+      state = InfoAccountBalanceHomeStateLoading();
+      final dio = ref.read(dioProvider);
+      final resp = await HomeRepository(dio: dio).getInfoAccountBalance(
+        companyid,
+      );
+      state = InfoAccountBalanceHomeStateDone(model: resp);
+      // list transaksi home
+      ref.read(listTransaksiHomeProvider.notifier).listTransaksiHome(companyid);
+    } catch (e) {
+      if (e is BaseRepositoryException) {
+        state = InfoAccountBalanceHomeStateError(message: e.message.toString());
+      } else {
+        state = InfoAccountBalanceHomeStateError(message: e.toString());
+      }
+    }
+  }
+}
+
+//provider
+final infoAccountBalanceHomeProvider = StateNotifierProvider<
+    InfoAccountBalanceHomeNotifier, InfoAccountBalanceHomeState>(
+  (ref) => InfoAccountBalanceHomeNotifier(ref: ref),
+);

app_petty_cash/lib/screen/home/list_transaksi_home_provider.dart

@@ -0,0 +1,72 @@
+
+import 'package:app_petty_cash/repository/home_repository.dart';
+import 'package:equatable/equatable.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../../model/list_transaksi_model.dart';
+import '../../repository/transaksi_repository.dart';
+import '../../provider/dio_provider.dart';
+import '../../repository/base_repository.dart';
+
+abstract class ListTransaksiHomeState extends Equatable {
+  final DateTime date;
+  const ListTransaksiHomeState(this.date);
+  @override
+  List<Object?> get props => [date];
+}
+
+class ListTransaksiHomeStateInit extends ListTransaksiHomeState {
+  ListTransaksiHomeStateInit() : super(DateTime.now());
+}
+
+class ListTransaksiHomeStateLoading extends ListTransaksiHomeState {
+  ListTransaksiHomeStateLoading() : super(DateTime.now());
+}
+
+class ListTransaksiHomeStateError extends ListTransaksiHomeState {
+  final String message;
+  ListTransaksiHomeStateError({
+    required this.message,
+  }) : super(DateTime.now());
+}
+
+class ListTransaksiHomeStateDone extends ListTransaksiHomeState {
+  final List<ListTransaksiHomeModel> model;
+  // final String resp;
+  ListTransaksiHomeStateDone({
+    required this.model,
+  }) : super(DateTime.now());
+}
+
+//notifier
+class ListTransaksiHomeNotifier extends StateNotifier<ListTransaksiHomeState> {
+  final Ref ref;
+  ListTransaksiHomeNotifier({
+    required this.ref,
+  }) : super(ListTransaksiHomeStateInit());
+
+  void listTransaksiHome(
+    String companyid,
+  ) async {
+    try {
+      state = ListTransaksiHomeStateLoading();
+      final dio = ref.read(dioProvider);
+      final resp = await HomeRepository(dio: dio).getTransaksiListHome(
+        companyid,
+      );
+      state = ListTransaksiHomeStateDone(model: resp);
+    } catch (e) {
+      if (e is BaseRepositoryException) {
+        state = ListTransaksiHomeStateError(message: e.message.toString());
+      } else {
+        state = ListTransaksiHomeStateError(message: e.toString());
+      }
+    }
+  }
+}
+
+//provider
+final listTransaksiHomeProvider =
+    StateNotifierProvider<ListTransaksiHomeNotifier, ListTransaksiHomeState>(
+  (ref) => ListTransaksiHomeNotifier(ref: ref),
+);

app_petty_cash/lib/screen/login/login_screen.dart

@@ -55,22 +55,22 @@ class LoginScreen extends HookConsumerWidget {
       onTap: () => FocusManager.instance.primaryFocus?.unfocus(),
       child: Scaffold(
         resizeToAvoidBottomInset: true,
-        backgroundColor: Constant.backgroundColor,
+        // backgroundColor: Colors.transparent,
         body: SafeArea(
           child: Center(
             child: Container(
               width: Constant.getActualXPhone(context: context, x: 390),
               height: Constant.getActualYPhone(context: context, y: 844),
-              decoration: BoxDecoration(
-                gradient: LinearGradient(
-                  colors: [
-                    Color(0xffdadae6),
-                    Color(0xfff6f7fb),
-                  ],
-                  begin: Alignment.centerLeft,
-                  end: Alignment.centerRight,
-                ),
-              ),
+              // decoration: BoxDecoration(
+              //   gradient: LinearGradient(
+              //     colors: [
+              //       Color(0xffdadae6),
+              //       Color(0xfff6f7fb),
+              //     ],
+              //     begin: Alignment.centerLeft,
+              //     end: Alignment.centerRight,
+              //   ),
+              // ),
               // child: BlockBodyV2(),
               child: LoginFormScreen(),
             ),

app_petty_cash/lib/screen/transaksi/insert_transaksi_provider.dart

@@ -43,15 +43,18 @@ class InsertTransaksiNotifier extends StateNotifier<InsertTransaksiState> {
   }) : super(InsertTransaksiStateInit());
 
   void insertTransaksi(
-    String tanggal,
-    String tipe,
-    String kategoriid,
-    String jumlah,
-    String catatan,
-    String userid,
-    String sender,
-    String url,
-  ) async {
+      {required String tanggal,
+      required String tipe,
+      required String kategoriid,
+      required String jumlah,
+      required String catatan,
+      required String userid,
+      required String sender,
+      required String url,
+      required String base64file,
+      required String fileName,
+      required String fileSize,
+      required String fileExtension}) async {
     try {
       state = InsertTransaksiStateLoading();
       final dio = ref.read(dioProvider);
@@ -63,6 +66,10 @@ class InsertTransaksiNotifier extends StateNotifier<InsertTransaksiState> {
         catatan,
         userid,
         sender,
+        base64file,
+        fileName,
+        fileSize,
+        fileExtension,
         url,
       );
       state = InsertTransaksiStateDone(resp: resp);

app_petty_cash/lib/screen/transaksi/transaksi_pick_date_widget.dart

@@ -3,16 +3,17 @@ import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 
 class TransaksiPickDateWidget extends StatelessWidget {
-  const TransaksiPickDateWidget({
-    super.key,
-    required this.ctrlTglAwal,
-    required this.tglAwal,
-    required this.tglAwalTmp,
-  });
+  const TransaksiPickDateWidget(
+      {super.key,
+      required this.ctrlTglAwal,
+      required this.tglAwal,
+      required this.tglAwalTmp,
+      required this.isLoading});
 
   final TextEditingController ctrlTglAwal;
   final ValueNotifier<DateTime> tglAwal;
   final ValueNotifier<String> tglAwalTmp;
+  final ValueNotifier<bool> isLoading;
 
   @override
   Widget build(BuildContext context) {
@@ -63,35 +64,38 @@ class TransaksiPickDateWidget extends StatelessWidget {
               //         color: Constant.colorIconDate,
               //       ),
             ),
-            onTap: () async {
-              final selectedDateAwal = await showDatePicker(
-                keyboardType: TextInputType.none,
-                // locale: const Locale("en-CA"),
-                // locale: ,
-                context: context,
-                initialEntryMode: DatePickerEntryMode.calendarOnly,
-                firstDate: DateTime(2000),
-                lastDate: DateTime(2100),
+            onTap: !isLoading.value
+                ? () async {
+                    final selectedDateAwal = await showDatePicker(
+                      keyboardType: TextInputType.none,
+                      // locale: const Locale("en-CA"),
+                      // locale: ,
+                      context: context,
+                      initialEntryMode: DatePickerEntryMode.calendarOnly,
+                      firstDate: DateTime(2000),
+                      lastDate: DateTime(2100),
 
-                initialDate:
-                    (ctrlTglAwal.text.isEmpty) ? DateTime.now() : tglAwal.value,
-              );
+                      initialDate: (ctrlTglAwal.text.isEmpty)
+                          ? DateTime.now()
+                          : tglAwal.value,
+                    );
 
-              if (selectedDateAwal != null) {
-                String formattedDate =
-                    DateFormat('dd-MM-yyyy').format(selectedDateAwal);
-                // ctrlTglAwal.text =
-                //     selectedDateAwal.toString().split(' ')[0];
-                ctrlTglAwal.text = formattedDate;
-                tglAwal.value = selectedDateAwal;
-                tglAwalTmp.value = selectedDateAwal.toString();
-              }
+                    if (selectedDateAwal != null) {
+                      String formattedDate =
+                          DateFormat('dd-MM-yyyy').format(selectedDateAwal);
+                      // ctrlTglAwal.text =
+                      //     selectedDateAwal.toString().split(' ')[0];
+                      ctrlTglAwal.text = formattedDate;
+                      tglAwal.value = selectedDateAwal;
+                      tglAwalTmp.value = selectedDateAwal.toString();
+                    }
 
-              if (selectedDateAwal == null) {
-                print('cancel button');
-                return;
-              }
-            },
+                    if (selectedDateAwal == null) {
+                      print('cancel button');
+                      return;
+                    }
+                  }
+                : null,
           ),
         ),
       ],

app_petty_cash/lib/screen/transaksi/transaksi_screen.dart

@@ -2,7 +2,6 @@ import 'dart:convert';
 import 'dart:io' as io;
 import 'dart:io';
 
-import 'package:app_petty_cash/app/app_extension.dart';
 import 'package:app_petty_cash/app/route.dart';
 import 'package:app_petty_cash/model/list_type_model.dart';
 import 'package:app_petty_cash/screen/transaksi/insert_transaksi_provider.dart';
@@ -11,7 +10,6 @@ import 'package:app_petty_cash/screen/transaksi/list_type_provider.dart';
 import 'package:app_petty_cash/screen/transaksi/transaksi_pick_date_widget.dart';
 import 'package:app_petty_cash/screen/transaksi/transaksi_select_kategori_widget.dart';
 import 'package:app_petty_cash/screen/transaksi/transaksi_upload_area_widget.dart';
-import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -19,14 +17,12 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:intl/intl.dart';
-import 'package:mime/mime.dart';
 
 import '../../app/constant.dart';
 import '../../model/list_category_model.dart';
 import '../../provider/current_user_provider.dart';
 import '../../widget/custom_drawer.dart';
 import '../../widget/sankbar_widget.dart';
-import '../login/custom_text_field.dart';
 
 class DummyDropdownTipe {
   final String options;
@@ -58,6 +54,8 @@ class TransaksiScreen extends HookConsumerWidget {
     final fileDataBase64 = useState<String>("");
     final isImage = useState(false);
     final fileEkstension = useState("");
+    final fileSize = useState(0);
+    final fileName = useState("");
 
     String formattedDate = DateFormat('dd-MM-yyyy').format(DateTime.now());
 
@@ -200,15 +198,16 @@ class TransaksiScreen extends HookConsumerWidget {
       // List<int> imageBytes = await fileData.value?.readAsBytes();
       if (fileData.value != null) {
         final bytes = io.File(fileData.value!.path).readAsBytesSync();
-        String base64Image = base64Encode(bytes);
+        String base64Image = base64Encode(await fileData.value!.readAsBytes());
         fileDataBase64.value = base64Image;
         final file = File(fileData.value!.path);
         print(file.lengthSync() / 1000000);
         print(await fileData.value!.length());
+        fileSize.value = await fileData.value!.length();
 
         // await getExternalStorageDirectory();
         // print(await fileData.value!.saveTo(path));
-        print(base64Image);
+        print(fileDataBase64.value);
       }
     }
 
@@ -218,13 +217,25 @@ class TransaksiScreen extends HookConsumerWidget {
         source: ImageSource.camera,
       );
       if (pickedFile != null) {
+        final tmpFile = FilePickerResult([
+          PlatformFile(
+            name: pickedFile.name,
+            size: await pickedFile.length(),
+            path: pickedFile.path,
+          )
+        ]);
         if (await pickedFile.length() > 10000000) {
           SanckbarWidget(context, "File tidak boleh lebih dari 10 MB",
               snackbarType.warning);
         } else {
           fileData.value = pickedFile;
           isImage.value = true;
+          fileEkstension.value = tmpFile.files.single.extension ?? "";
+          DateTime now = new DateTime.now();
+          fileName.value =
+              "IMG-${now.year}${now.month}${now.day}.${tmpFile.files.single.extension ?? ''}";
         }
+
         // final Directory appDocumentsDir =
         //     await getApplicationDocumentsDirectory();
         // print(appDocumentsDir);
@@ -269,13 +280,14 @@ class TransaksiScreen extends HookConsumerWidget {
           SanckbarWidget(context, "File tidak boleh lebih dari 10 MB",
               snackbarType.warning);
         } else {
-          File files = File(result.files.single.path!);
+          // File files = File(result.files.single.path!);
           print(result.files.single.extension);
           XFile fl = XFile(result.files.single.path!);
+          fileName.value = result.files.single.name;
 
           isImage.value = imgExt.contains(result.files.single.extension);
 
-          print("ini xfile");
+          print(result.files.single.name);
           fileData.value = fl;
           await getBase64();
           fileEkstension.value = result.files.single.extension ?? "";
@@ -285,6 +297,69 @@ class TransaksiScreen extends HookConsumerWidget {
       }
     }
 
+    insertTransaksi() {
+      if (selectedListTypeData.value.typeid.toString() == "DEBIT") {
+        ctrlNamaPengirim.text = "";
+        //  validasi form
+        if (ctrlJumlah.text.isEmpty || ctrlCatatan.text.trim().isEmpty) {
+          SanckbarWidget(
+              context, "Jumlah dan catatan harus diisi", snackbarType.warning);
+          return;
+        }
+      } else {
+        if (selectedListTypeData.value.typeid.toString() == "KREDIT") {
+          selectedListCategory.value.categoryid = "0";
+          // validasi form
+          if (ctrlNamaPengirim.text.trim().isEmpty ||
+              ctrlJumlah.text.isEmpty ||
+              ctrlCatatan.text.trim().isEmpty) {
+            SanckbarWidget(
+                context,
+                "Nama pengirim, jumlah dan catatan harus diisi",
+                snackbarType.warning);
+            return;
+          }
+        }
+      }
+
+      DateTime parsedDate = DateFormat('dd-MM-yyyy').parse(
+        ctrlTglAwal.value.text.toString(),
+      );
+      String formattedDateTransaksi =
+          DateFormat('yyyy-MM-dd').format(parsedDate);
+      var param = {
+        "tgltransaksi": formattedDateTransaksi,
+        "typeid": selectedListTypeData.value.typeid.toString(),
+        "categoryid": selectedListCategory.value.categoryid.toString(),
+        "jumlah": ctrlJumlah.value.text.toString(),
+        "catatan": ctrlCatatan.value.text.toString(),
+        // "userid": "1",
+        "userid": userIDLogin,
+        "namapengirim": ctrlNamaPengirim.value.text.toString(),
+        "url": "",
+        // "base64file": fileDataBase64.value,
+        "fileName": fileName.value,
+        "fileExtension": fileEkstension.value,
+        "fileSize": fileSize.value.toString()
+      };
+      print(param);
+      // return;
+      ref.read(insertTransaksiProvider.notifier).insertTransaksi(
+          tanggal: formattedDateTransaksi,
+          tipe: selectedListTypeData.value.typeid.toString(),
+          kategoriid: selectedListCategory.value.categoryid.toString(),
+          jumlah: ctrlJumlah.value.text.toString(),
+          catatan: ctrlCatatan.value.text.toString(),
+          // "1",
+          userid: userIDLogin,
+          sender: ctrlNamaPengirim.value.text.toString(),
+          url: "",
+          base64file: fileDataBase64.value,
+          fileName: fileData.value?.name ?? "",
+          fileExtension: fileEkstension.value,
+          fileSize: fileSize.value.toString());
+    }
+
     return Padding(
       padding: EdgeInsets.only(
         top: Constant.getActualYPhone(context: context, y: 30),
@@ -307,7 +382,7 @@ class TransaksiScreen extends HookConsumerWidget {
             child: Padding(
               padding: EdgeInsets.all(20),
               child: Container(
-                height: MediaQuery.of(context).size.height - 10,
+                // height: MediaQuery.of(context).size.height - 10,
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
@@ -363,9 +438,11 @@ class TransaksiScreen extends HookConsumerWidget {
                     ),
                     // Tanggal Transaksi
                     TransaksiPickDateWidget(
-                        ctrlTglAwal: ctrlTglAwal,
-                        tglAwal: tglAwal,
-                        tglAwalTmp: tglAwalTmp),
+                      ctrlTglAwal: ctrlTglAwal,
+                      tglAwal: tglAwal,
+                      tglAwalTmp: tglAwalTmp,
+                      isLoading: transaksiIsLoading,
+                    ),
 
                     SizedBox(
                       height: Constant.getActualYPhone(context: context, y: 20),
@@ -413,14 +490,16 @@ class TransaksiScreen extends HookConsumerWidget {
                                             value: listTypeData.value[i],
                                             groupValue:
                                                 selectedListTypeData.value,
-                                            onChanged: (ListType? index) {
-                                              if (isMounted()) {
-                                                selectedListTypeData.value =
-                                                    index!;
-                                              } else {
-                                                return;
-                                              }
-                                            },
+                                            onChanged: !transaksiIsLoading.value
+                                                ? (ListType? index) {
+                                                    if (isMounted()) {
+                                                      selectedListTypeData
+                                                          .value = index!;
+                                                    } else {
+                                                      return;
+                                                    }
+                                                  }
+                                                : null,
                                           ),
                                           Text(
                                             listTypeData.value[i].typename ??
@@ -468,6 +547,7 @@ class TransaksiScreen extends HookConsumerWidget {
                               ),
                             )
                           : TransaksiSelectKategoriWidget(
+                              isLoading: transaksiIsLoading,
                               listCategoryData: listCategoryData,
                               selectedListCategory: selectedListCategory),
 
@@ -491,6 +571,7 @@ class TransaksiScreen extends HookConsumerWidget {
                       ),
                       TextField(
                         controller: ctrlNamaPengirim,
+                        readOnly: transaksiIsLoading.value,
                         decoration: InputDecoration(
                           hintStyle:
                               Constant.body2_400(context: context).copyWith(
@@ -534,6 +615,7 @@ class TransaksiScreen extends HookConsumerWidget {
                     TextField(
                       controller: ctrlJumlah,
                       keyboardType: TextInputType.number,
+                      readOnly: transaksiIsLoading.value,
                       decoration: InputDecoration(
                         hintStyle:
                             Constant.body2_400(context: context).copyWith(
@@ -576,6 +658,7 @@ class TransaksiScreen extends HookConsumerWidget {
                     ),
 
                     TextField(
+                      readOnly: transaksiIsLoading.value,
                       controller: ctrlCatatan,
                       maxLines: 4,
                       decoration: InputDecoration(
@@ -610,6 +693,7 @@ class TransaksiScreen extends HookConsumerWidget {
 
                     // Upload File
                     TransaksiUploadAreaWidget(
+                        isLoading: transaksiIsLoading,
                         isImage: isImage,
                         fileData: fileData,
                         fileDataBase64: fileDataBase64,
@@ -619,7 +703,11 @@ class TransaksiScreen extends HookConsumerWidget {
                     // Spacer(),
 
                     Container(
+                      margin: EdgeInsets.only(
+                          top: Constant.getActualYPhone(
+                              context: context, y: 24)),
                       width: Constant.getActualXPhone(context: context, x: 390),
+                      height: Constant.getActualY(context: context, y: 64),
                       child: ElevatedButton(
                         style: ButtonStyle(
                           backgroundColor: MaterialStateColor.resolveWith(
@@ -642,7 +730,7 @@ class TransaksiScreen extends HookConsumerWidget {
                             (transaksiIsLoading.value)
                                 ? SizedBox(
                                     width: Constant.getActualXPhone(
-                                        context: context, x: 24),
+                                        context: context, x: 32),
                                     height: Constant.getActualYPhone(
                                         context: context, y: 32),
                                     child: CircularProgressIndicator(
@@ -658,54 +746,12 @@ class TransaksiScreen extends HookConsumerWidget {
                                   ),
                           ],
                         ),
-                        onPressed: () {
-                          if (selectedListTypeData.value.typeid.toString() ==
-                              "DEBIT") {
-                            ctrlNamaPengirim.text = "";
-                            //  validasi form
-                          } else {
-                            if (selectedListTypeData.value.typeid.toString() ==
-                                "KREDIT") {
-                              selectedListCategory.value.categoryid = "0";
-                              // validasi form
-                            }
-                          }
-
-                          DateTime parsedDate = DateFormat('dd-MM-yyyy').parse(
-                            ctrlTglAwal.value.text.toString(),
-                          );
-                          String formattedDateTransaksi =
-                              DateFormat('yyyy-MM-dd').format(parsedDate);
-                          var param = {
-                            "tgltransaksi": formattedDateTransaksi,
-                            "typeid":
-                                selectedListTypeData.value.typeid.toString(),
-                            "categoryid": selectedListCategory.value.categoryid
-                                .toString(),
-                            "jumlah": ctrlJumlah.value.text.toString(),
-                            "catatan": ctrlCatatan.value.text.toString(),
-                            // "userid": "1",
-                            "userid": userIDLogin,
-                            "namapengirim":
-                                ctrlNamaPengirim.value.text.toString(),
-                            "url": "",
-                          };
-                          print(param);
-                          ref
-                              .read(insertTransaksiProvider.notifier)
-                              .insertTransaksi(
-                                formattedDateTransaksi,
-                                selectedListTypeData.value.typeid.toString(),
-                                selectedListCategory.value.categoryid
-                                    .toString(),
-                                ctrlJumlah.value.text.toString(),
-                                ctrlCatatan.value.text.toString(),
-                                // "1",
-                                userIDLogin,
-                                ctrlNamaPengirim.value.text.toString(),
-                                "",
-                              );
-                        },
+                        onPressed: !transaksiIsLoading.value
+                            ? () {
+                                // transaksiIsLoading.value = true;
+                                insertTransaksi();
+                              }
+                            : null,
                       ),
                     ),
                   ],

app_petty_cash/lib/screen/transaksi/transaksi_select_kategori_widget.dart

@@ -8,10 +8,12 @@ class TransaksiSelectKategoriWidget extends StatelessWidget {
     super.key,
     required this.listCategoryData,
     required this.selectedListCategory,
+    required this.isLoading,
   });
 
   final ValueNotifier<List<ListCategory>> listCategoryData;
   final ValueNotifier<ListCategory> selectedListCategory;
+  final ValueNotifier<bool> isLoading;
 
   @override
   Widget build(BuildContext context) {
@@ -45,12 +47,14 @@ class TransaksiSelectKategoriWidget extends StatelessWidget {
           style: Constant.body1(context: context)
               .copyWith(color: Constant.textBlack, fontWeight: FontWeight.w400),
           value: selectedListCategory.value,
-          onChanged: (ListCategory? newValue) {
-            // if (newValue) {
-            selectedListCategory.value = newValue!;
-            print(selectedListCategory.value.categoryid);
-            // }
-          },
+          onChanged: !isLoading.value
+              ? (ListCategory? newValue) {
+                  // if (newValue) {
+                  selectedListCategory.value = newValue!;
+                  print(selectedListCategory.value.categoryid);
+                  // }
+                }
+              : null,
           buttonStyleData: ButtonStyleData(
             height: Constant.getActualY(context: context, y: 80),
             width: Constant.getActualX(context: context, x: 320),

app_petty_cash/lib/screen/transaksi/transaksi_upload_area_widget.dart

@@ -13,9 +13,11 @@ class TransaksiUploadAreaWidget extends StatelessWidget {
     required this.fileDataBase64,
     required this.pickFile,
     required this.pickImage,
+    required this.isLoading,
   });
 
   final ValueNotifier<bool> isImage;
+  final ValueNotifier<bool> isLoading;
   final ValueNotifier<XFile?> fileData;
   final ValueNotifier<String> fileDataBase64;
   final Function pickImage;
@@ -24,60 +26,63 @@ class TransaksiUploadAreaWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return InkWell(
-      onTap: () {
-        print("tapped");
-        showModalBottomSheet(
-          context: context,
-          builder: (context) {
-            return Container(
-              height: Constant.getActualY(context: context, y: 200),
-              padding: EdgeInsets.all(20),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.spaceAround,
-                crossAxisAlignment: CrossAxisAlignment.center,
-                children: [
-                  Column(
-                    children: [
-                      IconButton(
-                          onPressed: () {
-                            Navigator.pop(context);
-                            pickFile();
-                          },
-                          icon: Icon(
-                            Icons.folder_copy_rounded,
-                            size: 50,
-                            color: Constant.pcBtnBackgroundColor,
-                          )),
-                      Text("Browse a file",
-                          style: Constant.body1(context: context).copyWith(
-                              fontWeight: FontWeight.w600,
-                              color: Constant.textBlack))
-                    ],
-                  ),
-                  Column(
-                    children: [
-                      IconButton(
-                          onPressed: () {
-                            Navigator.pop(context);
-                            pickImage();
-                          },
-                          icon: Icon(
-                            Icons.add_a_photo_rounded,
-                            size: 50,
-                            color: Constant.pcBtnBackgroundColor,
-                          )),
-                      Text("Take a picture",
-                          style: Constant.body1(context: context).copyWith(
-                              fontWeight: FontWeight.w600,
-                              color: Constant.textBlack))
-                    ],
-                  ),
-                ],
-              ),
-            );
-          },
-        );
-      },
+      onTap: !isLoading.value
+          ? () {
+              showModalBottomSheet(
+                context: context,
+                builder: (context) {
+                  return Container(
+                    height: Constant.getActualY(context: context, y: 200),
+                    padding: EdgeInsets.all(20),
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceAround,
+                      crossAxisAlignment: CrossAxisAlignment.center,
+                      children: [
+                        Column(
+                          children: [
+                            IconButton(
+                                onPressed: () {
+                                  Navigator.pop(context);
+                                  pickFile();
+                                },
+                                icon: Icon(
+                                  Icons.folder_copy_rounded,
+                                  size: 50,
+                                  color: Constant.pcBtnBackgroundColor,
+                                )),
+                            Text("Browse a file",
+                                style: Constant.body1(context: context)
+                                    .copyWith(
+                                        fontWeight: FontWeight.w600,
+                                        color: Constant.textBlack))
+                          ],
+                        ),
+                        Column(
+                          children: [
+                            IconButton(
+                                onPressed: () {
+                                  Navigator.pop(context);
+                                  pickImage();
+                                },
+                                icon: Icon(
+                                  Icons.add_a_photo_rounded,
+                                  size: 50,
+                                  color: Constant.pcBtnBackgroundColor,
+                                )),
+                            Text("Take a picture",
+                                style: Constant.body1(context: context)
+                                    .copyWith(
+                                        fontWeight: FontWeight.w600,
+                                        color: Constant.textBlack))
+                          ],
+                        ),
+                      ],
+                    ),
+                  );
+                },
+              );
+            }
+          : null,
       child: Stack(
         alignment: AlignmentDirectional.topEnd,
         children: [
@@ -147,7 +152,7 @@ class TransaksiUploadAreaWidget extends StatelessWidget {
                         )));
             }),
           ),
-          if (fileData.value != null)
+          if (fileData.value != null && !isLoading.value)
             IconButton(
                 onPressed: () {
                   fileData.value = null;

app_petty_cash/lib/widget/custom_drawer.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
@@ -12,9 +13,11 @@ import '../provider/current_user_provider.dart';
 import '../screen/login/logout_provider.dart';
 
 class CustomDrawer extends HookConsumerWidget {
+  // final String userCompany;
   const CustomDrawer({
-    super.key,
-  });
+    Key? key,
+    // required this.userCompany,
+  }) : super(key: key);
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -22,6 +25,26 @@ class CustomDrawer extends HookConsumerWidget {
     final isLoading = useState(false);
     final errorMessage = useState("");
     final successMessage = useState("");
+    final M_CompanyName = useState("-");
+
+    Future<String> getCompanyName() async {
+      final shared = await SharedPreferences.getInstance();
+      String M_CompanyName = "-";
+
+      if (shared != null) {
+        final bearerString = shared.get(Constant.bearerName).toString();
+        final xmodel = jsonDecode(bearerString);
+        if (xmodel != null) {
+          M_CompanyName = xmodel["model"]["M_CompanyName"];
+        }
+      }
+
+      if (M_CompanyName == "0") {
+        // throw BaseRepositoryException(message: 'Invalid Company ID');
+      }
+
+      return M_CompanyName;
+    }
 
     useEffect(() {
       WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
@@ -34,6 +57,7 @@ class CustomDrawer extends HookConsumerWidget {
           //  Navigator.popAndPushNamed(context, loginRoute);
           return;
         }
+        M_CompanyName.value = await getCompanyName();
       });
       return () {};
     }, []);
@@ -56,7 +80,6 @@ class CustomDrawer extends HookConsumerWidget {
           shared.remove(bearerString);
           shared.clear();
           // Navigator.popAndPushNamed(context, loginRoute);
-
           Navigator.of(context)
               .pushNamedAndRemoveUntil(loginRoute, (route) => false);
         }
@@ -69,173 +92,236 @@ class CustomDrawer extends HookConsumerWidget {
     final currentMenu = ref.read(currentPageProvider);
 
     return Drawer(
-      child: ListView(
-        // padding: EdgeInsets.only(
-        //   top: Constant.getActualYPhone(context: context, y: 10),
-        // ),
-        children: [
-          DrawerHeader(
-            decoration: BoxDecoration(
-              color: Colors.blue,
+      elevation: 0,
+      shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.all(Radius.circular(0))),
+      child: Container(
+        child: ListView(
+          // padding: EdgeInsets.only(
+          //   top: Constant.getActualYPhone(context: context, y: 10),
+          // ),
+          children: [
+            Container(
+              //    decoration: BoxDecoration(
+              //   border: Border(bottom: BorderSide(color: Colors.transparent)) // <--- use the global theme to change the dividerColor property
+              // ),
+              child: Image(
+                  image: AssetImage('images/logo_sismedika_landscape.png')),
             ),
-            child: Text(
-              'Drawer Header',
-              style: TextStyle(
-                color: Colors.white,
-                fontSize: 24,
+
+            SizedBox(
+              height: Constant.getActualYPhone(context: context, y: 8),
+            ),
+
+            Padding(
+              padding: EdgeInsets.only(
+                top: Constant.getActualYPhone(context: context, y: 10),
+                bottom: Constant.getActualYPhone(context: context, y: 10),
+                right: Constant.getActualXPhone(context: context, x: 24),
+                left: Constant.getActualXPhone(context: context, x: 24),
+              ),
+              child: Container(
+                width: Constant.getActualXPhone(context: context, x: 300),
               ),
             ),
-          ),
-          ListTile(
-            title: Text(
-              'Home',
-              style: TextStyle(
+
+            // Expanded(
+            //   child: Padding(
+            //     padding: EdgeInsets.only(
+            //       left: Constant.getActualXPhone(context: context, x: 24),
+            //       right: Constant.getActualXPhone(context: context, x: 71),
+            //     ),
+            //     child: Container(
+            //       decoration: BoxDecoration(
+            //         borderRadius: BorderRadius.circular(6),
+            //         color: Constant.textGrey.withOpacity(0.16),
+            //       ),
+            //       child: Padding(
+            //         padding: EdgeInsets.only(
+            //           left: Constant.getActualXPhone(context: context, x: 8),
+            //           right: Constant.getActualXPhone(context: context, x: 8),
+            //         ),
+            //         child: Text(
+            //           M_CompanyName.value,
+            //           style: Constant.body3(context: context).copyWith(
+            //             fontWeight: FontWeight.w700,
+            //             color: Constant.textGreyv2,
+            //             backgroundColor: Constant.textGrey.withOpacity(0.16),
+            //           ),
+            //         ),
+            //       ),
+            //     ),
+            //   ),
+            // ),
+
+            Chip(
+              backgroundColor: Constant.textGrey.withOpacity(0.16),
+              label: Text(
+                M_CompanyName.value,
+                style: TextStyle(
+                  color: Constant.textGreyv2,
+                ),
+              ),
+            ),
+
+            ListTile(
+              leading: Icon(
+                Icons.home,
                 color: (currentMenu == 0)
-                    ? Constant.textWhite
-                    : Constant.textBlack,
+                    ? Constant.pcBtnBackgroundColor
+                    : Constant.textGreyv2,
               ),
-            ),
-            tileColor: (currentMenu == 0)
-                ? Constant.pcBtnBackgroundColor
-                : Colors.transparent,
-            onTap: () {
-              // Handle navigation to Home screen
-              Navigator.pop(context);
-              ref.read(currentPageProvider.state).update((state) => 0);
-              Navigator.pushNamed(context, homeRoute);
-              // Navigator.pushNamed(context, cameraExampleRoute);
-            },
-          ),
-          ListTile(
-            title: Text(
-              'Coba Camera',
-              style: TextStyle(
-                color: (currentMenu == 10)
-                    ? Constant.textWhite
-                    : Constant.textBlack,
+              title: Text(
+                'Home',
+                style: TextStyle(
+                  color: (currentMenu == 0)
+                      ? Constant.pcBtnBackgroundColor
+                      : Constant.textGreyv2,
+                ),
               ),
+              // tileColor: (currentMenu == 0)
+              //     ? Constant.pcBtnBackgroundColor
+              //     : Colors.transparent,
+              onTap: () {
+                // Handle navigation to Home screen
+                Navigator.pop(context);
+                ref.read(currentPageProvider.state).update((state) => 0);
+                Navigator.pushNamed(context, homeRoute);
+              },
             ),
-            tileColor: (currentMenu == 10)
-                ? Constant.pcBtnBackgroundColor
-                : Colors.transparent,
-            onTap: () {
-              // Handle navigation to Home screen
-              Navigator.pop(context);
-              ref.read(currentPageProvider.state).update((state) => 10);
-              // Navigator.pushNamed(context, homeRoute);
-              Navigator.pushNamed(context, cobaCameraRoute);
-            },
-          ),
-          ListTile(
-            title: Text(
-              'Transaksi',
-              style: TextStyle(
+            ListTile(
+              leading: Icon(
+                Icons.money,
                 color: (currentMenu == 1)
-                    ? Constant.textWhite
-                    : Constant.textBlack,
+                    ? Constant.pcBtnBackgroundColor
+                    : Constant.textGreyv2,
               ),
+              title: Text(
+                'Transaksi',
+                style: TextStyle(
+                  color: (currentMenu == 1)
+                      ? Constant.pcBtnBackgroundColor
+                      : Constant.textGreyv2,
+                ),
+              ),
+              // tileColor: (currentMenu == 1)
+              //     ? Constant.pcBtnBackgroundColor
+              //     : Colors.transparent,
+              onTap: () {
+                // Handle navigation to Transaksi screen
+                Navigator.pop(context);
+                ref.read(currentPageProvider.state).update((state) => 1);
+                Navigator.pushNamed(context, transaksiRoute);
+              },
             ),
-            tileColor: (currentMenu == 1)
-                ? Constant.pcBtnBackgroundColor
-                : Colors.transparent,
-            onTap: () {
-              // Handle navigation to Transaksi screen
-              Navigator.pop(context);
-              ref.read(currentPageProvider.state).update((state) => 1);
-              Navigator.pushNamed(context, transaksiRoute);
-            },
-          ),
-          ListTile(
-            title: Text(
-              'History Transaksi',
-              style: TextStyle(
+            ListTile(
+              leading: Icon(
+                Icons.history,
                 color: (currentMenu == 2)
-                    ? Constant.textWhite
-                    : Constant.textBlack,
+                    ? Constant.pcBtnBackgroundColor
+                    : Constant.textGreyv2,
               ),
+              title: Text(
+                'History Transaksi',
+                style: TextStyle(
+                  color: (currentMenu == 2)
+                      ? Constant.pcBtnBackgroundColor
+                      : Constant.textGreyv2,
+                ),
+              ),
+              // tileColor: (currentMenu == 2)
+              //     ? Constant.pcBtnBackgroundColor
+              //     : Colors.transparent,
+              onTap: () {
+                // Handle navigation to User screen
+                Navigator.pop(context);
+                ref.read(currentPageProvider.state).update((state) => 2);
+                Navigator.pushNamed(context, historyTransaksiRoute);
+              },
             ),
-            tileColor: (currentMenu == 2)
-                ? Constant.pcBtnBackgroundColor
-                : Colors.transparent,
-            onTap: () {
-              // Handle navigation to User screen
-              Navigator.pop(context);
-              ref.read(currentPageProvider.state).update((state) => 2);
-              Navigator.pushNamed(context, historyTransaksiRoute);
-            },
-          ),
-          ListTile(
-            title: Text(
-              'Report',
-              style: TextStyle(
+            ListTile(
+              leading: Icon(
+                Icons.feed,
                 color: (currentMenu == 3)
-                    ? Constant.textWhite
-                    : Constant.textBlack,
+                    ? Constant.pcBtnBackgroundColor
+                    : Constant.textGreyv2,
               ),
+              title: Text(
+                'Report',
+                style: TextStyle(
+                  color: (currentMenu == 3)
+                      ? Constant.pcBtnBackgroundColor
+                      : Constant.textGreyv2,
+                ),
+              ),
+              // tileColor: (currentMenu == 3)
+              //     ? Constant.pcBtnBackgroundColor
+              //     : Colors.transparent,
+              onTap: () {
+                // Handle navigation to Transaksi screen
+                Navigator.pop(context);
+                ref.read(currentPageProvider.state).update((state) => 3);
+                Navigator.pushNamed(context, reportRoute);
+              },
             ),
-            tileColor: (currentMenu == 3)
-                ? Constant.pcBtnBackgroundColor
-                : Colors.transparent,
-            onTap: () {
-              // Handle navigation to Transaksi screen
-              Navigator.pop(context);
-              ref.read(currentPageProvider.state).update((state) => 3);
-              Navigator.pushNamed(context, reportRoute);
-            },
-          ),
-          // ListTile(
-          //   title: Text(
-          //     'User',
-          //     style: TextStyle(
-          //       color: (currentMenu == 4)
-          //           ? Constant.textWhite
-          //           : Constant.textBlack,
-          //     ),
-          //   ),
-          //   tileColor: (currentMenu == 4)
-          //       ? Constant.pcBtnBackgroundColor
-          //       : Colors.transparent,
-          //   onTap: () {
-          //     // Handle navigation to User screen
-          //     Navigator.pop(context);
-          //     ref.read(currentPageProvider.state).update((state) => 4);
-          //     Navigator.pushNamed(context, userRoute);
-          //   },
-          // ),
-          // ListTile(
-          //   title: Text(
-          //     'Change Company',
-          //     style: TextStyle(
-          //       color: (currentMenu == 5)
-          //           ? Constant.textWhite
-          //           : Constant.textBlack,
-          //     ),
-          //   ),
-          //   tileColor: (currentMenu == 5)
-          //       ? Constant.pcBtnBackgroundColor
-          //       : Colors.transparent,
-          //   onTap: () {
-          //     // Handle navigation to User screen
-          //     Navigator.pop(context);
-          //     ref.read(currentPageProvider.state).update((state) => 5);
-          //     Navigator.pushNamed(context, changeCompanyRoute);
-          //   },
-          // ),
-          ListTile(
-            title: Text(
-              'Logout',
-              // style: TextStyle(color: Constant.textWhite),
+            // ListTile(
+            //   title: Text(
+            //     'User',
+            //     style: TextStyle(
+            //       color: (currentMenu == 4)
+            //           ? Constant.textWhite
+            //           : Constant.textBlack,
+            //     ),
+            //   ),
+            //   tileColor: (currentMenu == 4)
+            //       ? Constant.pcBtnBackgroundColor
+            //       : Colors.transparent,
+            //   onTap: () {
+            //     // Handle navigation to User screen
+            //     Navigator.pop(context);
+            //     ref.read(currentPageProvider.state).update((state) => 4);
+            //     Navigator.pushNamed(context, userRoute);
+            //   },
+            // ),
+            // ListTile(
+            //   title: Text(
+            //     'Change Company',
+            //     style: TextStyle(
+            //       color: (currentMenu == 5)
+            //           ? Constant.textWhite
+            //           : Constant.textBlack,
+            //     ),
+            //   ),
+            //   tileColor: (currentMenu == 5)
+            //       ? Constant.pcBtnBackgroundColor
+            //       : Colors.transparent,
+            //   onTap: () {
+            //     // Handle navigation to User screen
+            //     Navigator.pop(context);
+            //     ref.read(currentPageProvider.state).update((state) => 5);
+            //     Navigator.pushNamed(context, changeCompanyRoute);
+            //   },
+            // ),
+            ListTile(
+              leading: Icon(
+                Icons.logout,
+                color: Constant.textGreyv2,
+              ),
+              title: Text(
+                'Logout',
+                style: TextStyle(color: Constant.textGreyv2),
+              ),
+              onTap: () {
+                // di set ke 0 lagi
+                ref.read(currentPageProvider.state).update((state) => 0);
+                ref.read(logoutProvider.notifier).logout(
+                      M_UserID: selectedUser?.model.M_UserID ?? "",
+                      M_UserUsername: selectedUser?.model.M_UserUsername ?? "",
+                    );
+              },
             ),
-            onTap: () {
-              // di set ke 0 lagi
-              ref.read(currentPageProvider.state).update((state) => 0);
-              ref.read(logoutProvider.notifier).logout(
-                    M_UserID: selectedUser?.model.M_UserID ?? "",
-                    M_UserUsername: selectedUser?.model.M_UserUsername ?? "",
-                  );
-            },
-          ),
-        ],
+          ],
+        ),
       ),
     );
   }

app_petty_cash/lib/widget/custom_drawer_v1.dart

@@ -0,0 +1,221 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+import '../app/constant.dart';
+import '../app/route.dart';
+import '../provider/current_menu_provider.dart';
+import '../provider/current_user_provider.dart';
+import '../screen/login/logout_provider.dart';
+
+class CustomDrawerV1 extends HookConsumerWidget {
+  const CustomDrawerV1({
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final selectedUser = ref.read(currentUserProvider);
+    final isLoading = useState(false);
+    final errorMessage = useState("");
+    final successMessage = useState("");
+
+    useEffect(() {
+      WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
+        final userID = ref.read(currentUserProvider)?.model.M_UserID ?? "0";
+        if (userID == "0") {
+          //not login
+          Navigator.of(context)
+              .pushNamedAndRemoveUntil(loginRoute, (route) => true);
+
+          //  Navigator.popAndPushNamed(context, loginRoute);
+          return;
+        }
+      });
+      return () {};
+    }, []);
+
+    ref.listen(logoutProvider, (prev, next) async {
+      if (next is LogoutStateLoading) {
+        isLoading.value = true;
+      } else if (next is LogoutStateError) {
+        isLoading.value = false;
+        errorMessage.value = next.message;
+        Timer(const Duration(seconds: 3), () {
+          errorMessage.value = "";
+        });
+      } else if (next is LogoutStateDone) {
+        isLoading.value = false;
+        final shared = await SharedPreferences.getInstance();
+        final bearerString = shared.get(Constant.bearerName).toString();
+        // print(bearerString);
+        if (bearerString.isNotEmpty) {
+          shared.remove(bearerString);
+          shared.clear();
+          // Navigator.popAndPushNamed(context, loginRoute);
+
+          Navigator.of(context)
+              .pushNamedAndRemoveUntil(loginRoute, (route) => false);
+        }
+        Timer(const Duration(seconds: 3), () async {
+          successMessage.value = "";
+        });
+      }
+    });
+
+    final currentMenu = ref.read(currentPageProvider);
+
+    return Drawer(
+      child: ListView(
+        // padding: EdgeInsets.only(
+        //   top: Constant.getActualYPhone(context: context, y: 10),
+        // ),
+        children: [
+          DrawerHeader(
+            decoration: BoxDecoration(
+              color: Colors.blue,
+            ),
+            child: Text(
+              'Drawer Header',
+              style: TextStyle(
+                color: Colors.white,
+                fontSize: 24,
+              ),
+            ),
+          ),
+          ListTile(
+            title: Text(
+              'Home',
+              style: TextStyle(
+                color: (currentMenu == 0)
+                    ? Constant.textWhite
+                    : Constant.textBlack,
+              ),
+            ),
+            tileColor: (currentMenu == 0)
+                ? Constant.pcBtnBackgroundColor
+                : Colors.transparent,
+            onTap: () {
+              // Handle navigation to Home screen
+              Navigator.pop(context);
+              ref.read(currentPageProvider.state).update((state) => 0);
+              Navigator.pushNamed(context, homeRoute);
+            },
+          ),
+          ListTile(
+            title: Text(
+              'Transaksi',
+              style: TextStyle(
+                color: (currentMenu == 1)
+                    ? Constant.textWhite
+                    : Constant.textBlack,
+              ),
+            ),
+            tileColor: (currentMenu == 1)
+                ? Constant.pcBtnBackgroundColor
+                : Colors.transparent,
+            onTap: () {
+              // Handle navigation to Transaksi screen
+              Navigator.pop(context);
+              ref.read(currentPageProvider.state).update((state) => 1);
+              Navigator.pushNamed(context, transaksiRoute);
+            },
+          ),
+          ListTile(
+            title: Text(
+              'History Transaksi',
+              style: TextStyle(
+                color: (currentMenu == 2)
+                    ? Constant.textWhite
+                    : Constant.textBlack,
+              ),
+            ),
+            tileColor: (currentMenu == 2)
+                ? Constant.pcBtnBackgroundColor
+                : Colors.transparent,
+            onTap: () {
+              // Handle navigation to User screen
+              Navigator.pop(context);
+              ref.read(currentPageProvider.state).update((state) => 2);
+              Navigator.pushNamed(context, historyTransaksiRoute);
+            },
+          ),
+          ListTile(
+            title: Text(
+              'Report',
+              style: TextStyle(
+                color: (currentMenu == 3)
+                    ? Constant.textWhite
+                    : Constant.textBlack,
+              ),
+            ),
+            tileColor: (currentMenu == 3)
+                ? Constant.pcBtnBackgroundColor
+                : Colors.transparent,
+            onTap: () {
+              // Handle navigation to Transaksi screen
+              Navigator.pop(context);
+              ref.read(currentPageProvider.state).update((state) => 3);
+              Navigator.pushNamed(context, reportRoute);
+            },
+          ),
+          // ListTile(
+          //   title: Text(
+          //     'User',
+          //     style: TextStyle(
+          //       color: (currentMenu == 4)
+          //           ? Constant.textWhite
+          //           : Constant.textBlack,
+          //     ),
+          //   ),
+          //   tileColor: (currentMenu == 4)
+          //       ? Constant.pcBtnBackgroundColor
+          //       : Colors.transparent,
+          //   onTap: () {
+          //     // Handle navigation to User screen
+          //     Navigator.pop(context);
+          //     ref.read(currentPageProvider.state).update((state) => 4);
+          //     Navigator.pushNamed(context, userRoute);
+          //   },
+          // ),
+          // ListTile(
+          //   title: Text(
+          //     'Change Company',
+          //     style: TextStyle(
+          //       color: (currentMenu == 5)
+          //           ? Constant.textWhite
+          //           : Constant.textBlack,
+          //     ),
+          //   ),
+          //   tileColor: (currentMenu == 5)
+          //       ? Constant.pcBtnBackgroundColor
+          //       : Colors.transparent,
+          //   onTap: () {
+          //     // Handle navigation to User screen
+          //     Navigator.pop(context);
+          //     ref.read(currentPageProvider.state).update((state) => 5);
+          //     Navigator.pushNamed(context, changeCompanyRoute);
+          //   },
+          // ),
+          ListTile(
+            title: Text(
+              'Logout',
+              // style: TextStyle(color: Constant.textWhite),
+            ),
+            onTap: () {
+              // di set ke 0 lagi
+              ref.read(currentPageProvider.state).update((state) => 0);
+              ref.read(logoutProvider.notifier).logout(
+                    M_UserID: selectedUser?.model.M_UserID ?? "",
+                    M_UserUsername: selectedUser?.model.M_UserUsername ?? "",
+                  );
+            },
+          ),
+        ],
+      ),
+    );
+  }
+}

app_petty_cash/lib/widget/history_row_atas_widget.dart

@@ -28,7 +28,44 @@ class HistoryRowAtasWidget extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     // check file exist
-    Future<Widget> checkFileExistence(String fileUrl) async {
+    // Future<Widget> checkFileExistence(String fileUrl) async {
+    //   try {
+    //     final dio = Dio();
+    //     final response = await dio.head(fileUrl);
+    //     if (response.statusCode == 200) {
+    //       return SvgPicture.network(
+    //         fileUrl,
+    //         semanticsLabel: 'Icon pizza',
+    //         // placeholderBuilder: (BuildContext context) => Container(
+    //         //   padding: const EdgeInsets.all(30.0),
+    //         //   child: const CircularProgressIndicator(),
+    //         // ),
+    //       );
+    //     } else {
+    //       return SvgPicture.network(
+    //         'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg',
+    //         semanticsLabel: 'Icon pizza',
+    //         // placeholderBuilder: (BuildContext context) => Container(
+    //         //   padding: const EdgeInsets.all(30.0),
+    //         //   child: const CircularProgressIndicator(),
+    //         // ),
+    //       );
+    //     }
+    //   } catch (e) {
+    //     // print('Error checking file existence: $e');
+    //     return SvgPicture.network(
+    //       'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg',
+    //       semanticsLabel: 'Icon pizza',
+    //       // placeholderBuilder: (BuildContext context) => Container(
+    //       //   padding: const EdgeInsets.all(30.0),
+    //       //   child: const CircularProgressIndicator(),
+    //       // ),
+    //     );
+    //   }
+    // }
+
+    final iconProvider =
+        FutureProvider.family<Widget, String>((ref, fileUrl) async {
       try {
         final dio = Dio();
         final response = await dio.head(fileUrl);
@@ -36,39 +73,26 @@ class HistoryRowAtasWidget extends HookConsumerWidget {
           return SvgPicture.network(
             fileUrl,
             semanticsLabel: 'Icon pizza',
-            placeholderBuilder: (BuildContext context) => Container(
-              padding: const EdgeInsets.all(30.0),
-              child: const CircularProgressIndicator(),
-            ),
           );
         } else {
           return SvgPicture.network(
             'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg',
             semanticsLabel: 'Icon pizza',
-            placeholderBuilder: (BuildContext context) => Container(
-              padding: const EdgeInsets.all(30.0),
-              child: const CircularProgressIndicator(),
-            ),
           );
         }
       } catch (e) {
-        // print('Error checking file existence: $e');
         return SvgPicture.network(
           'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg',
           semanticsLabel: 'Icon pizza',
-          placeholderBuilder: (BuildContext context) => Container(
-            padding: const EdgeInsets.all(30.0),
-            child: const CircularProgressIndicator(),
-          ),
         );
       }
-    }
+    });
 
     // fungsi tanggal
     String formatDateString(String inputDate) {
       try {
         // Parsing tanggal dari string input
-        DateTime date = DateFormat('dd-MM-yyyy').parse(inputDate);
+        DateTime date = DateFormat('dd-MM-yyyy','id').parse(inputDate);
 
         // Format tanggal ke '30 Des 2023'
         String formattedDate = DateFormat('dd MMM yyyy', 'id').format(date);
@@ -82,6 +106,46 @@ class HistoryRowAtasWidget extends HookConsumerWidget {
       }
     }
 
+    Widget getIconUrl(String categoryid) {
+      List<Map<String, String>> iconDataList = [
+        {'categoryid': '1', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'},
+        {'categoryid': '2', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'},
+        {'categoryid': '3', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_3.svg'},
+        {'categoryid': '4', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'},
+        {'categoryid': '5', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_5.svg'},
+        {'categoryid': '6', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_6.svg'},
+        {'categoryid': '7', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'},
+        {'categoryid': '8', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'},
+        {'categoryid': '9', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'},
+        {'categoryid': '10', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'},
+        {'categoryid': '11', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'},
+        {'categoryid': '12', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_12.svg'},
+        {'categoryid': '13', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'},
+      ];
+
+      String urlFix = "";
+
+      for (var i = 0; i < iconDataList.length; i++) {
+        if (iconDataList[i]['categoryid'] == categoryid) {
+          // urlFix =
+          //     "https://devone.aplikasi.web.id/pettycash-media/icon/icon_$icon_category_id.svg";
+
+          urlFix = iconDataList[i]['url'] ?? "https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg";
+        }
+      }
+
+      if (urlFix == "") {
+        urlFix =
+            "https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg";
+      }
+
+      // return urlFix;
+      return SvgPicture.network(
+        urlFix,
+        semanticsLabel: 'Icon category',
+      );
+    }
+
     return Row(
       children: [
         // kiri
@@ -95,22 +159,71 @@ class HistoryRowAtasWidget extends HookConsumerWidget {
             ),
           ),
           // child: Text('s'),
-          child: FutureBuilder<Widget>(
-            future: checkFileExistence(
-                'https://devone.aplikasi.web.id/pettycash-media/icon/icon_$icon_category_id.svg'),
-            builder: (context, snapshot) {
-              if (snapshot.connectionState == ConnectionState.waiting) {
-                return CircularProgressIndicator();
-              } else if (snapshot.hasError) {
-                return Icon(
-                  Icons.error,
-                  color: Colors.red,
-                );
-              } else {
-                return snapshot.data ?? Container();
-              }
-            },
-          ),
+          // child: FutureBuilder<Widget>(
+          //   future: checkFileExistence(
+          //     'https://devone.aplikasi.web.id/pettycash-media/icon/icon_$icon_category_id.svg',
+          //   ),
+          //   builder: (context, snapshot) {
+          //     // if (snapshot.connectionState == ConnectionState.waiting) {
+          //     //   // return CircularProgressIndicator();
+          //     //   return Text('');
+          //     // } else if (snapshot.hasError) {
+          //     //   return Icon(
+          //     //     Icons.error,
+          //     //     color: Colors.red,
+          //     //   );
+          //     // } else {
+          //     //   return snapshot.data ?? Container();
+          //     // }
+
+          //     if (snapshot.connectionState == ConnectionState.done) {
+          //       return snapshot.data ?? Container();
+          //     } else if (snapshot.hasError) {
+          //       return Icon(
+          //         Icons.error,
+          //         color: Colors.red,
+          //       );
+          //     } else {
+          //       return Text('');
+          //     }
+          //   },
+          // ),
+          // child: Consumer(
+          //   builder: (context, watch, child) {
+          //     String iconUrl =
+          //         'https://devone.aplikasi.web.id/pettycash-media/icon/icon_$icon_category_id.svg';
+          //     final iconAsyncValue = ref.read(
+          //       iconProvider(
+          //         iconUrl,
+          //       ),
+          //     );
+
+          //     return iconAsyncValue.when(
+          //       loading: () {
+          //         print('loading iconurl : $iconUrl');
+          //         return CircularProgressIndicator();
+          //       },
+          //       error: (error, stackTrace) {
+          //          print('error iconurl : $iconUrl');
+          //         return Icon(
+          //           Icons.error,
+          //           color: Colors.red,
+          //         );
+          //       },
+          //       data: (iconWidget) {
+          //          print('data iconurl : $iconUrl');
+          //         return iconWidget ?? Container();
+          //       }
+          //     );
+          //   },
+          // ),
+
+          // child: SvgPicture.network(
+          //   'https://devone.aplikasi.web.id/pettycash-media/icon/icon_$icon_category_id.svg',
+          //   semanticsLabel: 'Icon pizza',
+          // ),
+
+          child: getIconUrl(icon_category_id),
         ),
 
         // tengah

app_petty_cash/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"
+        }
+    ]
+}

app_petty_cash/pubspec.lock

@@ -1,6 +1,14 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      sha256: "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.4.10"
   args:
     dependency: transitive
     description:
@@ -49,6 +57,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:
@@ -296,6 +328,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:
@@ -368,6 +408,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.17.0"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
+      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"
   lints:
     dependency: transitive
     description:
@@ -552,6 +608,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.8"
+  pointycastle:
+    dependency: transitive
+    description:
+      name: pointycastle
+      sha256: "43ac87de6e10afabc85c445745a7b799e04de84cebaa4fd7bf55a5e1e9604d29"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.7.4"
   riverpod:
     dependency: transitive
     description:
@@ -861,6 +925,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.3.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"

app_petty_cash/pubspec.yaml

@@ -1,4 +1,5 @@
 name: app_petty_cash
+# name: PettyCash
 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.
@@ -51,6 +52,7 @@ dependencies:
   top_snackbar_flutter: ^3.1.0
   url_launcher: ^6.1.13
   flutter_svg: ^2.0.9
+  flutter_launcher_icons: ^0.13.1
   image_picker: ^1.0.7
   video_player: ^2.7.2
   photo_view: ^0.14.0
@@ -71,6 +73,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/logo_apk.png"
+  min_sdk_android: 21 # android min sdk min:16, default 21
+  web:
+    generate: true
+    image_path: "images/logo_apk.png"
+    background_color: "#00FFFFFF"
+    theme_color: "#00FFFFFF"
+  windows:
+    generate: true
+    image_path: "images/logo_apk.png"
+    icon_size: 48 # min:48, max:256, default: 48
+  macos:
+    generate: true
+    image_path: "images/logo_apk.png"
+
 # The following section is specific to Flutter packages.
 flutter:
 

app_petty_cash/web/manifest.json

@@ -3,8 +3,8 @@
     "short_name": "app_petty_cash",
     "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"
         }
     ]
-}
+}