[Homepage] 3. add row transaksi

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

@@ -1,12 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-<uses-permission android:name="android.permission.INTERNET" />
     <application
-        android:label="PettyCash"
+        android:label="app_petty_cash"
         android:name="${applicationName}"
-        android:icon="@mipmap/launcher_icon"
-        android:usesCleartextTraffic="true"
-        android:requestLegacyExternalStorage="true"
-        >
+        android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -14,9 +10,7 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize"
-            android:screenOrientation="portrait"
-            >
+            android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues

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

@@ -1,7 +0,0 @@
-<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

@@ -10,10 +10,7 @@ class Constant {
   static double designWidthPhone = 390;
 
   static String bearerName = "petty-cash";
-  // static String version = "1.00";
-
-  // NOTE VERSI HARUS SAMA DENGAN PUBSPEC.YAML
-  static String version = "1.0.0";
+  static String version = "1.00";
 
   // static String baseUrl = "https://devregonline.pramita.co.id/one-api/xdoc/";
 
@@ -21,7 +18,7 @@ class Constant {
   static String baseUrlDevoneReport = "devone.aplikasi.web.id";
 
   static String baseUrlDevone =
-      "https://devone.aplikasi.web.id/one-api-pettycash/pettycash/";
+      "http://devone.aplikasi.web.id/one-api-pettycash/pettycash/";
 
   // static String baseUrl_appdoctor =
   //     "http://devbandungraya.aplikasi.web.id/one-api/app_doctor/";
@@ -285,13 +282,6 @@ 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),
@@ -363,13 +353,6 @@ 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),
@@ -552,6 +535,14 @@ class Constant {
     );
   }
 
+  //homepage
+  static TextStyle titleH6_700({required BuildContext context}) {
+    return TextStyle(
+      fontSize: Constant.getActualYPhone(context: context, y: 18),
+      fontWeight: FontWeight.w700,
+    );
+  }
+
   // pendaftaran pasien
   static TextStyle titleH5_600({required BuildContext context}) {
     return TextStyle(

app_petty_cash/lib/app/route.dart

@@ -1,3 +1,5 @@
+import 'package:app_petty_cash/screen/home/homepage_screen.dart';
+
 import '../screen/change_company/change_company.dart';
 import 'package:flutter/material.dart';
 
@@ -98,7 +100,8 @@ class AppRoute {
             textScaleFactor: 1.0,
             padding: EdgeInsets.all(0),
           ),
-          child: HomeScreen(),
+          // child: HomeScreen(),
+          child: HomePageScreen(),
         );
       });
     }

app_petty_cash/lib/main.dart

@@ -2,15 +2,10 @@ 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();
-  await SystemChrome.setPreferredOrientations([
-    DeviceOrientation.portraitUp,
-  ]);
   SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
     statusBarIconBrightness:
         Brightness.dark, // this will change the brightness of the icons
@@ -44,10 +39,11 @@ class MyApp extends StatelessWidget {
       ),
       debugShowCheckedModeBanner: false,
       // initialRoute: loginRoute,
-      initialRoute: splashScreen,
+      // initialRoute: splashScreen,
       // initialRoute: transaksiRoute,
       // initialRoute: reportRoute,
       // initialRoute: testFilePickerRoute,
+      initialRoute: homeRoute,
       onGenerateRoute: AppRoute.generateRoute,
     );
   }

app_petty_cash/lib/model/info_account_balance.dart

@@ -1,21 +0,0 @@
-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

@@ -1,64 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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

@@ -1,61 +0,0 @@
-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

@@ -121,34 +121,4 @@ class TransaksiRepository extends BaseRepository {
     });
     return result;
   }
-
-  // delete transaksi
-  Future<String> deleteTransaksi(
-    String id,
-    String userid,
-  ) async {
-
-    final service =
-        "${Constant.baseUrlDevone}transaction/deletetransaction/?id=$id&userid=$userid";
-    final resp = await get(
-      // param: {
-      //   "": "",
-      // },
-      service: service,
-    );
-
-    print("url delete transaksi : $service");
-
-    // final result = List<ListCategory>.empty(growable: true);
-    // resp['data'].forEach((e) {
-    //   final model = ListCategory.fromJson(e);
-    //   result.add(model);
-    // });
-
-    if(resp['status'] != "OK"){
-      return resp['message'];
-    }
-
-    return resp['status'];
-  }
 }

app_petty_cash/lib/screen/home/home_screen.dart

@@ -1,55 +1,17 @@
-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),
-    );
-    final M_CompanyName = useState("-");
-
-    // company name
-    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 {
         final userID = ref.read(currentUserProvider)?.model.M_UserID ?? "0";
@@ -61,85 +23,10 @@ class HomeScreen extends HookConsumerWidget {
           //  Navigator.popAndPushNamed(context, loginRoute);
           return;
         }
-        M_CompanyName.value = await getCompanyName();
       });
       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),
@@ -147,12 +34,8 @@ class HomeScreen extends HookConsumerWidget {
       child: Scaffold(
         appBar: AppBar(
           title: Text(
-            // 'Home Screen',
-            M_CompanyName.value,
-            overflow: TextOverflow.ellipsis,
-            style: TextStyle(
-              color: Constant.textWhite,
-            ),
+            'Home Screen',
+            style: TextStyle(color: Constant.textWhite),
           ),
           backgroundColor: Constant.pcBtnBackgroundColor,
           iconTheme: IconThemeData(
@@ -161,258 +44,8 @@ class HomeScreen extends HookConsumerWidget {
         ),
         drawer: CustomDrawer(),
         body: SafeArea(
-          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(),
-                                            ),
-                                          ],
-                                        ),
-                                      ),
-                                    ),
-                                  );
-                                },
-                              ),
-                            ),
-                          ),
-                  ],
-                ),
-              ),
-            ),
+          child: Center(
+            child: Text('Home Screen Content'),
           ),
         ),
       ),

app_petty_cash/lib/screen/home/homepage_screen.dart

@@ -0,0 +1,279 @@
+import 'package:app_petty_cash/model/history_transaksi_model.dart';
+import 'package:app_petty_cash/widget/homepage_row_transaksi.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+import '../../app/constant.dart';
+import '../../app/route.dart';
+import '../../provider/current_user_provider.dart';
+import '../../widget/custom_drawer.dart';
+
+class HomePageScreen extends HookConsumerWidget {
+  const HomePageScreen({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final listSearchHistory = useState<List<HistoryTransaksiModel>>(
+      List.empty(
+        growable: true,
+      ),
+    );
+
+    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 () {};
+    }, []);
+
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(
+          'Home Screen',
+          style: TextStyle(color: Constant.textWhite),
+        ),
+        backgroundColor: Constant.pcBtnBackgroundColor,
+        iconTheme: IconThemeData(
+          color: Constant.textWhite,
+        ),
+      ),
+      drawer: CustomDrawer(),
+      body: SafeArea(
+        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: 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: 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: Container(
+                              child: Column(
+                            children: [
+                              Text(
+                                'Account Balance',
+                                style: Constant.body1(context: context)
+                                    .copyWith(
+                                        fontWeight: FontWeight.w400,
+                                        color: Constant.textWhite),
+                              ),
+                              Text(
+                                'Rp. 1,440,000',
+                                style: Constant.H4_700V2(context: context)
+                                    .copyWith(
+                                        fontSize: Constant.getActualYPhone(
+                                            context: context, y: 24),
+                                        fontWeight: FontWeight.w600,
+                                        color: Constant.textWhite),
+                              ),
+                            ],
+                          )),
+                        ),
+    
+                        SizedBox(
+                          height: Constant.getActualYPhone(
+                              context: context, y: 27),
+                        ),
+    
+                        //Debit dan Kredit
+                        Row(
+                          mainAxisAlignment: MainAxisAlignment
+                              .center, // Menengahkan secara horizontal
+                          children: [
+                            // Spasi di sebelah kiri "Check In"
+                            Padding(
+                              padding: EdgeInsets.only(
+                                left: Constant.getActualXPhone(
+                                    context: context, x: 20),
+                              ),
+                              child: Container(
+                                child: Column(
+                                  children: [
+                                    Text(
+                                      'Debit',
+                                      style: Constant.body1(context: context)
+                                          .copyWith(
+                                              fontWeight: FontWeight.w400,
+                                              color: Constant.textWhite),
+                                    ),
+                                    Text(
+                                      'Rp. 2,000,000',
+                                      style: Constant.titleH6_700(
+                                              context: context)
+                                          .copyWith(
+                                              color: Constant.textWhite),
+                                    ),
+                                  ],
+                                ),
+                              ),
+                            ),
+    
+                            SizedBox(
+                              width: Constant.getActualXPhone(
+                                  context: context, x: 51),
+                            ),
+    
+                            Padding(
+                              padding: EdgeInsets.only(
+                                right: Constant.getActualXPhone(
+                                    context: context, x: 28),
+                              ),
+                              child: Container(
+                                child: Column(
+                                  children: [
+                                    Text(
+                                      'Credit',
+                                      style: Constant.body1(context: context)
+                                          .copyWith(
+                                              fontWeight: FontWeight.w400,
+                                              color: Constant.textWhite),
+                                    ),
+                                    Text(
+                                      'Rp. 560,000',
+                                      style: Constant.titleH6_700(
+                                              context: context)
+                                          .copyWith(
+                                              color: Constant.textWhite),
+                                    ),
+                                  ],
+                                ),
+                              ),
+                            ),
+                          ],
+                        ),
+                        SizedBox(
+                          height: Constant.getActualYPhone(
+                              context: context, y: 17),
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+                //Card
+                SizedBox(
+                  height: Constant.getActualYPhone(context: context, y: 36),
+                ),
+    
+                SizedBox(
+                  height: Constant.getActualYPhone(context: context, y: 44),
+                ),
+    
+                Padding(
+                  padding: EdgeInsets.only(
+                    left: Constant.getActualXPhone(context: context, x: 20),
+                    right: Constant.getActualXPhone(context: context, x: 20),
+                  ),
+                  child: Container(
+                    // color: Colors.amber,
+                    alignment: Alignment.centerLeft,
+    
+                    child: Column(children: [
+                      Text(
+                        'Transaksi Terkini',
+                        style: Constant.titleH5_600(context: context)
+                            .copyWith(color: Constant.textBlack),
+                      ),
+                      SizedBox(
+                        height:
+                            Constant.getActualYPhone(context: context, y: 24),
+                      ),
+                      // Expanded(
+                      //   child: ListView.builder(
+                      //     itemCount: listSearchHistory.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
+                      //                 HomepageRowTransaksiWidget(
+                      //                   icon_category_id: listSearchHistory
+                      //                       .value[idx].kategoriid
+                      //                       .toString(),
+                      //                   icon_category_name: listSearchHistory
+                      //                       .value[idx].kategoriname
+                      //                       .toString(),
+                      //                   amount: listSearchHistory
+                      //                       .value[idx].amount
+                      //                       .toString(),
+                      //                   tglTransaksi: listSearchHistory
+                      //                       .value[idx].tanggaltransaksi
+                      //                       .toString(),
+                      //                   tipe: listSearchHistory.value[idx].tipe
+                      //                       .toString(),
+                      //                 ),
+                      //               ],
+                      //             ),
+                      //           ),
+                      //         ),
+                      //       );
+                      //     },
+                      //   ),
+                      // ),
+                    ]),
+                  ),
+                )
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

app_petty_cash/lib/screen/home/info_account_balance_provider.dart

@@ -1,75 +0,0 @@
-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

@@ -1,72 +0,0 @@
-
-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: Colors.transparent,
+        backgroundColor: Constant.backgroundColor,
         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/delete_transaksi_provider.dart

@@ -1,84 +0,0 @@
-import 'package:equatable/equatable.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-
-import '../../repository/transaksi_repository.dart';
-import '../../provider/dio_provider.dart';
-import '../../repository/base_repository.dart';
-import 'search_history_transaksi_provider.dart';
-
-abstract class DeleteTransaksiState extends Equatable {
-  final DateTime date;
-  const DeleteTransaksiState(this.date);
-  @override
-  List<Object?> get props => [date];
-}
-
-class DeleteTransaksiStateInit extends DeleteTransaksiState {
-  DeleteTransaksiStateInit() : super(DateTime.now());
-}
-
-class DeleteTransaksiStateLoading extends DeleteTransaksiState {
-  DeleteTransaksiStateLoading() : super(DateTime.now());
-}
-
-class DeleteTransaksiStateError extends DeleteTransaksiState {
-  final String message;
-  DeleteTransaksiStateError({
-    required this.message,
-  }) : super(DateTime.now());
-}
-
-class DeleteTransaksiStateDone extends DeleteTransaksiState {
-  // final List<ListType> model;
-  final String resp;
-  DeleteTransaksiStateDone({
-    required this.resp,
-  }) : super(DateTime.now());
-}
-
-//notifier
-class DeleteTransaksiNotifier extends StateNotifier<DeleteTransaksiState> {
-  final Ref ref;
-  DeleteTransaksiNotifier({
-    required this.ref,
-  }) : super(DeleteTransaksiStateInit());
-
-  void deleteTransaksi(
-    String id,
-    String userid,
-    String companyid,
-    String tglAwal,
-    String tglAkhir,
-    String categoryid,
-  ) async {
-    try {
-      state = DeleteTransaksiStateLoading();
-      final dio = ref.read(dioProvider);
-      final resp = await TransaksiRepository(dio: dio).deleteTransaksi(
-        id,
-        userid,
-      );
-      state = DeleteTransaksiStateDone(resp: resp);
-
-      // search lagi buat get data
-      ref.read(searchHistoryTransaksiProvider.notifier).searchHistoryTransaksi(
-            companyid,
-            tglAwal,
-            tglAkhir,
-            categoryid,
-          );
-    } catch (e) {
-      if (e is BaseRepositoryException) {
-        state = DeleteTransaksiStateError(message: e.message.toString());
-      } else {
-        state = DeleteTransaksiStateError(message: e.toString());
-      }
-    }
-  }
-}
-
-//provider
-final deleteTransaksiProvider =
-    StateNotifierProvider<DeleteTransaksiNotifier, DeleteTransaksiState>(
-  (ref) => DeleteTransaksiNotifier(ref: ref),
-);

app_petty_cash/lib/screen/transaksi/history_transaksi_screen.dart

@@ -1,6 +1,5 @@
 import 'dart:convert';
 
-import 'package:app_petty_cash/screen/transaksi/delete_transaksi_provider.dart';
 import 'package:app_petty_cash/screen/transaksi/search_history_transaksi_provider.dart';
 import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:flutter/material.dart';
@@ -42,8 +41,7 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
       ),
     );
 
-    // String M_CompanyID = "0";
-    final M_CompanyID = useState<String>("0");
+    String M_CompanyID = "0";
     String formattedDate = DateFormat('dd-MM-yyyy').format(DateTime.now());
     final ctrlTglAwal = useTextEditingController(text: formattedDate);
 
@@ -140,27 +138,6 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
       },
     );
 
-    // delete transaksi
-    ref.listen(
-      deleteTransaksiProvider,
-      (previous, next) {
-        if (next is DeleteTransaksiStateLoading) {
-          searchHistoryIsLoading.value = true;
-        } else if (next is DeleteTransaksiStateError) {
-          // print(next.message);
-          searchHistoryIsLoading.value = false;
-          SanckbarWidget(context, next.message, snackbarType.error);
-        } else if (next is DeleteTransaksiStateDone) {
-          // print(jsonEncode(next.model));
-          // print(next.model.length);
-          // listSearchHistory.value = next.model;
-          SanckbarWidget(
-              context, 'Data Berhasil Dihapus', snackbarType.success);
-          searchHistoryIsLoading.value = false;
-        }
-      },
-    );
-
     Future<String> getCompanyID() async {
       final shared = await SharedPreferences.getInstance();
       String M_CompanyID = "0";
@@ -203,7 +180,7 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
         // list category provider
         ref.read(listCategoryProvider.notifier).getListCategory();
 
-        M_CompanyID.value = await getCompanyID();
+        M_CompanyID = await getCompanyID();
 
         DateTime parsedDate = DateFormat('dd-MM-yyyy').parse(
           ctrlTglAwal.value.text.toString(),
@@ -222,100 +199,11 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
         ref
             .read(searchHistoryTransaksiProvider.notifier)
             .searchHistoryTransaksi(
-              M_CompanyID.value,
-              formattedDateAwal,
-              formattedDateAkhir,
-              categoryid,
-            );
+                M_CompanyID, formattedDateAwal, formattedDateAkhir, categoryid);
       });
       return () {};
     }, []);
 
-    // delete alert
-    Future<void> showDeleteConfirmationDialog(
-      BuildContext context,
-      String id,
-      String userid,
-      String companyid,
-      String tglAwal,
-      String tglAkhir,
-      String categoryid,
-    ) async {
-      return showDialog(
-        context: context,
-        builder: (BuildContext context) {
-          return AlertDialog(
-            title: Text('Konfirmasi Hapus'),
-            content: Text('Apakah anda yakin menghapus data ini?'),
-            actions: <Widget>[
-              TextButton(
-                onPressed: () {
-                  Navigator.of(context).pop(); // Tutup dialog
-                },
-                child: Text('Batal'),
-              ),
-              ElevatedButton(
-                onPressed: () {
-                  print('Deleted id $id , userid $userid');
-                  DateTime parsedDate = DateFormat('dd-MM-yyyy').parse(
-                    ctrlTglAwal.value.text.toString(),
-                  );
-                  String formattedDateAwal =
-                      DateFormat('yyyy-MM-dd').format(parsedDate);
-
-                  DateTime parsedDateAkhir = DateFormat('dd-MM-yyyy').parse(
-                    ctrlTglAkhir.value.text.toString(),
-                  );
-                  String formattedDateAkhir =
-                      DateFormat('yyyy-MM-dd').format(parsedDateAkhir);
-                  ref.read(deleteTransaksiProvider.notifier).deleteTransaksi(
-                        id,
-                        userid,
-                        companyid,
-                        formattedDateAwal,
-                        formattedDateAkhir,
-                        categoryid,
-                      );
-                  Navigator.of(context).pop();
-                },
-                child: Text(
-                  'Hapus Data',
-                  style: Constant.body1_600(context: context).copyWith(
-                    fontWeight: FontWeight.w600,
-                    color: Constant.textWhite,
-                  ),
-                ),
-                style: ButtonStyle(
-                  backgroundColor:
-                      MaterialStateColor.resolveWith((st) => Constant.textRed),
-                  shape: MaterialStateProperty.all<RoundedRectangleBorder>(
-                    RoundedRectangleBorder(
-                      borderRadius: BorderRadius.circular(8),
-                      side: BorderSide(
-                        color: Constant.textRed,
-                      ),
-                    ),
-                  ),
-                  shadowColor: MaterialStateProperty.all(Color(0xffff48423d)),
-                  elevation: MaterialStateProperty.all(4.0),
-                ),
-              ),
-            ],
-          );
-        },
-      );
-    }
-
-    void _closeKeyboard() {
-      FocusManager.instance.primaryFocus?.unfocus();
-    }
-
-    final FocusNode focusNodetglAwal = useFocusNode();
-    final tglAwalHasFocus = useState(false);
-
-    final FocusNode focusNodetglAkhir = useFocusNode();
-    final tglAkhirHasFocus = useState(false);
-
     return Padding(
       padding: EdgeInsets.only(
         top: Constant.getActualYPhone(context: context, y: 30),
@@ -350,91 +238,80 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
                     children: [
                       // Tanggal Awal
                       Expanded(
-                        child: GestureDetector(
-                          onTap: () {
-                            focusNodetglAwal.unfocus();
-                            // _closeKeyboard();
-                          },
-                          child: TextField(
-                            enableInteractiveSelection: false,
-                            showCursor: (tglAwalHasFocus.value) ? true : false,
-                            controller: ctrlTglAwal,
-                            decoration: InputDecoration(
-                              hintStyle:
-                                  Constant.body2_400(context: context).copyWith(
-                                color: Constant.textGreyv2,
-                              ),
-                              labelStyle:
-                                  Constant.body2_400(context: context).copyWith(
-                                color: Constant.textGreyv2,
-                              ),
-                              border: OutlineInputBorder(
-                                borderSide: BorderSide(
-                                  color: Colors.orange,
-                                  width: 1,
-                                ),
-                              ),
-                              focusedBorder: OutlineInputBorder(
-                                borderSide: BorderSide(
-                                  color: Constant.textGreyv2,
-                                  width: 1,
-                                ),
-                              ),
-                              labelText: "Tanggal Awal",
-                              hintText: 'Tanggal Awal',
-                              // suffixIcon: isLoadingFilterScope.value
-                              //     ? SizedBox(
-                              //         width: Constant.getActualXPhone(
-                              //           context: context,
-                              //           x: 4,
-                              //         ),
-                              //         height: Constant.getActualYPhone(
-                              //           context: context,
-                              //           y: 4,
-                              //         ),
-                              //         child: CircularProgressIndicator(
-                              //           color: Constant.textRed,
-                              //         ),
-                              //       )
-                              //     : Icon(
-                              //         Icons.calendar_month_sharp,
-                              //         color: Constant.colorIconDate,
-                              //       ),
+                        child: TextField(
+                          controller: ctrlTglAwal,
+                          decoration: InputDecoration(
+                            hintStyle:
+                                Constant.body2_400(context: context).copyWith(
+                              color: Constant.textGreyv2,
                             ),
-                            onTap: () async {
-                              final selectedDateAwal = await showDatePicker(
-                                // 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,
-                              );
-
-                              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;
-                              }
-
-                              // focusNodetglAwal.unfocus();
-                              // _closeKeyboard();
-                            },
+                            labelStyle:
+                                Constant.body2_400(context: context).copyWith(
+                              color: Constant.textGreyv2,
+                            ),
+                            border: OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: Colors.orange,
+                                width: 1,
+                              ),
+                            ),
+                            focusedBorder: OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: Constant.textGreyv2,
+                                width: 1,
+                              ),
+                            ),
+                            labelText: "Tanggal Awal",
+                            hintText: 'Tanggal Awal',
+                            // suffixIcon: isLoadingFilterScope.value
+                            //     ? SizedBox(
+                            //         width: Constant.getActualXPhone(
+                            //           context: context,
+                            //           x: 4,
+                            //         ),
+                            //         height: Constant.getActualYPhone(
+                            //           context: context,
+                            //           y: 4,
+                            //         ),
+                            //         child: CircularProgressIndicator(
+                            //           color: Constant.textRed,
+                            //         ),
+                            //       )
+                            //     : Icon(
+                            //         Icons.calendar_month_sharp,
+                            //         color: Constant.colorIconDate,
+                            //       ),
                           ),
+                          onTap: () async {
+                            final selectedDateAwal = await showDatePicker(
+                              // 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,
+                            );
+
+                            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;
+                            }
+                          },
                         ),
                       ),
 
@@ -444,89 +321,80 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
                       ),
                       // Tanggal Akhir
                       Expanded(
-                        child: GestureDetector(
-                          onTap: () {
-                            focusNodetglAkhir.unfocus();
-                            // _closeKeyboard();
-                          },
-                          child: TextField(
-                            enableInteractiveSelection: false,
-                            showCursor: (tglAwalHasFocus.value) ? true : false,
-                            controller: ctrlTglAkhir,
-                            decoration: InputDecoration(
-                              hintStyle:
-                                  Constant.body2_400(context: context).copyWith(
-                                color: Constant.textGreyv2,
-                              ),
-                              labelStyle:
-                                  Constant.body2_400(context: context).copyWith(
-                                color: Constant.textGreyv2,
-                              ),
-                              border: OutlineInputBorder(
-                                borderSide: BorderSide(
-                                  color: Colors.orange,
-                                  width: 1,
-                                ),
-                              ),
-                              focusedBorder: OutlineInputBorder(
-                                borderSide: BorderSide(
-                                  color: Constant.textGreyv2,
-                                  width: 1,
-                                ),
-                              ),
-                              labelText: "Tanggal Akhir",
-                              hintText: 'Tanggal Akhir',
-                              // suffixIcon: isLoadingFilterScope.value
-                              //     ? SizedBox(
-                              //         width: Constant.getActualXPhone(
-                              //           context: context,
-                              //           x: 4,
-                              //         ),
-                              //         height: Constant.getActualYPhone(
-                              //           context: context,
-                              //           y: 4,
-                              //         ),
-                              //         child: CircularProgressIndicator(
-                              //           color: Constant.textRed,
-                              //         ),
-                              //       )
-                              //     : Icon(
-                              //         Icons.calendar_month_sharp,
-                              //         color: Constant.colorIconDate,
-                              //       ),
+                        child: TextField(
+                          controller: ctrlTglAkhir,
+                          decoration: InputDecoration(
+                            hintStyle:
+                                Constant.body2_400(context: context).copyWith(
+                              color: Constant.textGreyv2,
                             ),
-                            onTap: () async {
-                              final selectedDateAkhir = await showDatePicker(
-                                // locale: const Locale("en-CA"),
-                                // locale: ,
-                                context: context,
-                                initialEntryMode:
-                                    DatePickerEntryMode.calendarOnly,
-                                firstDate: DateTime(2000),
-                                lastDate: DateTime(2100),
-
-                                initialDate: (ctrlTglAkhir.text.isEmpty)
-                                    ? DateTime.now()
-                                    : tglAkhir.value,
-                              );
-
-                              if (selectedDateAkhir != null) {
-                                String formattedDate = DateFormat('dd-MM-yyyy')
-                                    .format(selectedDateAkhir);
-                                // ctrlTglAkhir.text =
-                                //     selectedDateAkhir.toString().split(' ')[0];
-                                ctrlTglAkhir.text = formattedDate;
-                                tglAkhir.value = selectedDateAkhir;
-                                tglAkhirTmp.value =
-                                    selectedDateAkhir.toString();
-                              }
-
-                              if (selectedDateAkhir == null) {
-                                print('cancel button');
-                                return;
-                              }
-                            },
+                            labelStyle:
+                                Constant.body2_400(context: context).copyWith(
+                              color: Constant.textGreyv2,
+                            ),
+                            border: OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: Colors.orange,
+                                width: 1,
+                              ),
+                            ),
+                            focusedBorder: OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: Constant.textGreyv2,
+                                width: 1,
+                              ),
+                            ),
+                            labelText: "Tanggal Akhir",
+                            hintText: 'Tanggal Akhir',
+                            // suffixIcon: isLoadingFilterScope.value
+                            //     ? SizedBox(
+                            //         width: Constant.getActualXPhone(
+                            //           context: context,
+                            //           x: 4,
+                            //         ),
+                            //         height: Constant.getActualYPhone(
+                            //           context: context,
+                            //           y: 4,
+                            //         ),
+                            //         child: CircularProgressIndicator(
+                            //           color: Constant.textRed,
+                            //         ),
+                            //       )
+                            //     : Icon(
+                            //         Icons.calendar_month_sharp,
+                            //         color: Constant.colorIconDate,
+                            //       ),
                           ),
+                          onTap: () async {
+                            final selectedDateAkhir = await showDatePicker(
+                              // locale: const Locale("en-CA"),
+                              // locale: ,
+                              context: context,
+                              initialEntryMode:
+                                  DatePickerEntryMode.calendarOnly,
+                              firstDate: DateTime(2000),
+                              lastDate: DateTime(2100),
+
+                              initialDate: (ctrlTglAkhir.text.isEmpty)
+                                  ? DateTime.now()
+                                  : tglAkhir.value,
+                            );
+
+                            if (selectedDateAkhir != null) {
+                              String formattedDate = DateFormat('dd-MM-yyyy')
+                                  .format(selectedDateAkhir);
+                              // ctrlTglAkhir.text =
+                              //     selectedDateAkhir.toString().split(' ')[0];
+                              ctrlTglAkhir.text = formattedDate;
+                              tglAkhir.value = selectedDateAkhir;
+                              tglAkhirTmp.value = selectedDateAkhir.toString();
+                            }
+
+                            if (selectedDateAkhir == null) {
+                              print('cancel button');
+                              return;
+                            }
+                          },
                         ),
                       ),
                     ],
@@ -720,11 +588,11 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
                           ],
                         ),
                         onPressed: () async {
-                          M_CompanyID.value = await getCompanyID();
+                          M_CompanyID = await getCompanyID();
                           ref
                               .read(searchHistoryTransaksiProvider.notifier)
                               .searchHistoryTransaksi(
-                                M_CompanyID.value,
+                                M_CompanyID,
                                 ctrlTglAwal.text,
                                 ctrlTglAkhir.text,
                                 selectedListCategory.value.categoryid ?? "0",
@@ -886,7 +754,6 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
                                           tipe: listSearchHistory
                                               .value[idx].tipe
                                               .toString(),
-                                          // searchHistoryIsLoading.value
                                         ),
 
                                         // bawah
@@ -907,15 +774,15 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
                                                 ),
                                                 shape: RoundedRectangleBorder(
                                                   side: BorderSide(
-                                                      color: Constant
-                                                          .bgTextChipConfirmed),
+                                                      color:
+                                                          Constant.bgChipConfirmed),
                                                   borderRadius:
                                                       BorderRadius.circular(
                                                     50,
                                                   ),
                                                 ),
-                                                backgroundColor: Constant
-                                                    .bgTextChipConfirmed,
+                                                backgroundColor:
+                                                    Constant.bgChipConfirmed,
                                               ),
                                             ],
                                           ),
@@ -932,28 +799,8 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
                                                 MainAxisAlignment.end,
                                             children: [
                                               InkWell(
-                                                onTap: () async {
-                                                  final userID = ref
-                                                          .read(
-                                                              currentUserProvider)
-                                                          ?.model
-                                                          .M_UserID ??
-                                                      "0";
-                                                  // print('Deleted');
-                                                  showDeleteConfirmationDialog(
-                                                    context,
-                                                    listSearchHistory
-                                                        .value[idx].id
-                                                        .toString(),
-                                                    userID,
-                                                    M_CompanyID.value,
-                                                    ctrlTglAwal.text.toString(),
-                                                    ctrlTglAkhir.text
-                                                        .toString(),
-                                                    selectedListCategory
-                                                        .value.categoryid
-                                                        .toString(),
-                                                  );
+                                                onTap: () {
+                                                  print('Deleted');
                                                 },
                                                 child: Chip(
                                                   label: Text(
@@ -964,8 +811,8 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
                                                   ),
                                                   shape: RoundedRectangleBorder(
                                                     side: BorderSide(
-                                                        color: Constant
-                                                            .bgTextChipDelete),
+                                                        color:
+                                                            Constant.bgTextChipDelete),
                                                     borderRadius:
                                                         BorderRadius.circular(
                                                       50,

app_petty_cash/lib/widget/custom_drawer.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
@@ -13,11 +12,9 @@ import '../provider/current_user_provider.dart';
 import '../screen/login/logout_provider.dart';
 
 class CustomDrawer extends HookConsumerWidget {
-  // final String userCompany;
   const CustomDrawer({
-    Key? key,
-    // required this.userCompany,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -25,26 +22,6 @@ 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 {
@@ -57,7 +34,6 @@ class CustomDrawer extends HookConsumerWidget {
           //  Navigator.popAndPushNamed(context, loginRoute);
           return;
         }
-        M_CompanyName.value = await getCompanyName();
       });
       return () {};
     }, []);
@@ -80,6 +56,7 @@ class CustomDrawer extends HookConsumerWidget {
           shared.remove(bearerString);
           shared.clear();
           // Navigator.popAndPushNamed(context, loginRoute);
+
           Navigator.of(context)
               .pushNamedAndRemoveUntil(loginRoute, (route) => false);
         }
@@ -92,249 +69,152 @@ class CustomDrawer extends HookConsumerWidget {
     final currentMenu = ref.read(currentPageProvider);
 
     return Drawer(
-      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: ListView(
+        // padding: EdgeInsets.only(
+        //   top: Constant.getActualYPhone(context: context, y: 10),
+        // ),
+        children: [
+          DrawerHeader(
+            decoration: BoxDecoration(
+              color: Colors.blue,
             ),
-
-            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),
+            child: Text(
+              'Drawer Header',
+              style: TextStyle(
+                color: Colors.white,
+                fontSize: 24,
               ),
             ),
-
-            // 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,
-                overflow: TextOverflow.ellipsis,
-                style: TextStyle(
-                  color: Constant.textGreyv2,
-                ),
-              ),
-            ),
-
-            ListTile(
-              leading: Icon(
-                Icons.home,
+          ),
+          ListTile(
+            title: Text(
+              'Home',
+              style: TextStyle(
                 color: (currentMenu == 0)
-                    ? Constant.pcBtnBackgroundColor
-                    : Constant.textGreyv2,
+                    ? 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);
-              },
             ),
-            ListTile(
-              leading: Icon(
-                Icons.money,
+            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.pcBtnBackgroundColor
-                    : Constant.textGreyv2,
+                    ? Constant.textWhite
+                    : Constant.textBlack,
               ),
-              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);
-              },
             ),
-            ListTile(
-              leading: Icon(
-                Icons.history,
+            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.pcBtnBackgroundColor
-                    : Constant.textGreyv2,
+                    ? Constant.textWhite
+                    : Constant.textBlack,
               ),
-              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);
-              },
             ),
-            ListTile(
-              leading: Icon(
-                Icons.feed,
+            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.pcBtnBackgroundColor
-                    : Constant.textGreyv2,
+                    ? Constant.textWhite
+                    : Constant.textBlack,
               ),
-              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);
-              },
             ),
-            // 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 ?? "",
-                    );
-              },
+            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),
             ),
-
-            Spacer(),
-
-            // Versi Aplikasi
-            ListTile(
-              title: Text(
-                'Versi ${Constant.version}',
-                style: Constant.titleH4Login(context: context)
-                    .copyWith(color: Constant.textGrey),
-              ),
-              onTap: () {},
-            ),
-          ],
-        ),
+            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

@@ -1,221 +0,0 @@
-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

@@ -3,7 +3,6 @@ import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:intl/intl.dart';
 
 import '../app/constant.dart';
 
@@ -13,7 +12,6 @@ class HistoryRowAtasWidget extends HookConsumerWidget {
   final String amount;
   final String tipe;
   final String tglTransaksi;
-  // final ValueNotifier<bool> searchHistoryIsLoading;
 
   const HistoryRowAtasWidget({
     Key? key,
@@ -22,50 +20,13 @@ class HistoryRowAtasWidget extends HookConsumerWidget {
     required this.amount,
     required this.tipe,
     required this.tglTransaksi,
-    // required this.searchHistoryIsLoading,
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    // check file exist
-    // 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 {
+    // check file exist
+    Future<Widget> checkFileExistence(String fileUrl) async {
       try {
         final dio = Dio();
         final response = await dio.head(fileUrl);
@@ -73,130 +34,32 @@ 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', 'id').parse(inputDate);
-
-        // Format tanggal ke '30 Des 2023'
-        String formattedDate = DateFormat('dd MMM yyyy', 'id').format(date);
-
-        return formattedDate;
-      } catch (e) {
-        // Tangkap kesalahan jika format tanggal tidak sesuai
-        print('Error parsing date: $e');
-        // return 'Format Tanggal Salah';
-        return inputDate;
-      }
-    }
-
-    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(
@@ -212,71 +75,22 @@ 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();
-          //     //   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),
+          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();
+              }
+            },
+          ),
         ),
 
         // tengah
@@ -324,23 +138,21 @@ class HistoryRowAtasWidget extends HookConsumerWidget {
               mainAxisAlignment: MainAxisAlignment.end,
               children: [
                 Container(
-                  width: Constant.getActualXPhone(context: context, x: 80),
-                  height: Constant.getActualYPhone(context: context, y: 24),
+                  // width: Constant.getActualXPhone(context: context, x: 32),
+                  height: Constant.getActualYPhone(context: context, y: 19),
                   decoration: BoxDecoration(
                     color: Constant.bgIconHistory,
                     borderRadius: BorderRadius.all(
                       Radius.circular(6.0),
                     ),
                   ),
-                  child: Align(
-                    alignment: Alignment.center,
+                  child: Padding(
+                    padding: EdgeInsets.all(2.0),
                     child: Text(
                       tipe,
                       style: Constant.body1_600(context: context).copyWith(
-                        fontWeight: FontWeight.w600,
-                        color: Constant.pcBtnBackgroundColor,
-                        fontSize: 14,
-                      ),
+                          fontWeight: FontWeight.w600,
+                          color: Constant.pcBtnBackgroundColor),
                     ),
                   ),
                 ),
@@ -351,7 +163,7 @@ class HistoryRowAtasWidget extends HookConsumerWidget {
                   ),
                 ),
                 Text(
-                  formatDateString(tglTransaksi),
+                  tglTransaksi,
                   style: Constant.body1_600(context: context).copyWith(
                       fontWeight: FontWeight.w600, color: Constant.textGreyv2),
                 ),

app_petty_cash/lib/widget/homepage_row_transaksi.dart

@@ -0,0 +1,177 @@
+import 'package:app_petty_cash/widget/sankbar_widget.dart';
+import 'package:dio/dio.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+import '../app/constant.dart';
+
+class HomepageRowTransaksiWidget extends HookConsumerWidget {
+  final String icon_category_id;
+  final String icon_category_name;
+  final String amount;
+  final String tipe;
+  final String tglTransaksi;
+
+  const HomepageRowTransaksiWidget({
+    Key? key,
+    required this.icon_category_id,
+    required this.icon_category_name,
+    required this.amount,
+    required this.tipe,
+    required this.tglTransaksi,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+
+    // check file exist
+    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(),
+          ),
+        );
+      }
+    }
+
+    return Row(
+      children: [
+        // kiri
+        Container(
+          width: Constant.getActualXPhone(context: context, x: 38),
+          height: Constant.getActualYPhone(context: context, y: 38),
+          decoration: BoxDecoration(
+            color: Color.fromRGBO(241, 90, 41, 0.08),
+            borderRadius: BorderRadius.all(
+              Radius.circular(8.0),
+            ),
+          ),
+          // 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();
+              }
+            },
+          ),
+        ),
+
+        // tengah
+        Expanded(
+          child: Padding(
+            padding: EdgeInsets.only(
+              left: Constant.getActualYPhone(context: context, y: 20),
+            ),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisAlignment: MainAxisAlignment.start,
+              children: [
+                Text(
+                  icon_category_name,
+                  style: Constant.body2_600(context: context).copyWith(
+                    fontWeight: FontWeight.w600,
+                    color: Constant.textBlack,
+                  ),
+                ),
+                SizedBox(
+                  height: Constant.getActualYPhone(
+                    context: context,
+                    y: 8,
+                  ),
+                ),
+                Text(
+                  amount,
+                  style: Constant.body1_600(context: context).copyWith(
+                      fontWeight: FontWeight.w600,
+                      color: Constant.pcBtnBackgroundColor),
+                ),
+              ],
+            ),
+          ),
+        ),
+
+        // kanan
+        Expanded(
+          child: Padding(
+            padding: EdgeInsets.only(
+              right: Constant.getActualYPhone(context: context, y: 8),
+            ),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.end,
+              mainAxisAlignment: MainAxisAlignment.end,
+              children: [
+                Container(
+                  // width: Constant.getActualXPhone(context: context, x: 32),
+                  height: Constant.getActualYPhone(context: context, y: 19),
+                  decoration: BoxDecoration(
+                    color: Constant.bgIconHistory,
+                    borderRadius: BorderRadius.all(
+                      Radius.circular(6.0),
+                    ),
+                  ),
+                  child: Padding(
+                    padding: EdgeInsets.all(2.0),
+                    child: Text(
+                      tipe,
+                      style: Constant.body1_600(context: context).copyWith(
+                          fontWeight: FontWeight.w600,
+                          color: Constant.pcBtnBackgroundColor),
+                    ),
+                  ),
+                ),
+                SizedBox(
+                  height: Constant.getActualYPhone(
+                    context: context,
+                    y: 8,
+                  ),
+                ),
+                Text(
+                  tglTransaksi,
+                  style: Constant.body1_600(context: context).copyWith(
+                      fontWeight: FontWeight.w600, color: Constant.textGreyv2),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}

app_petty_cash/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,68 +1,68 @@
 {
-    "info": {
-        "version": 1,
-        "author": "xcode"
+  "images" : [
+    {
+      "size" : "16x16",
+      "idiom" : "mac",
+      "filename" : "app_icon_16.png",
+      "scale" : "1x"
     },
-    "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"
-        }
-    ]
-}
+    {
+      "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"
+  }
+}

app_petty_cash/pubspec.lock

@@ -1,14 +1,6 @@
 # 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:
@@ -57,22 +49,6 @@ 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:
@@ -85,10 +61,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.1"
+    version: "1.18.0"
   convert:
     dependency: transitive
     description:
@@ -190,14 +166,6 @@ 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:
@@ -264,14 +232,6 @@ 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"
   intl:
     dependency: "direct main"
     description:
@@ -280,22 +240,6 @@ 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:
@@ -308,26 +252,26 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
+      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.15"
+    version: "0.12.16"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.5.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   open_file:
     dependency: "direct main"
     description:
@@ -440,14 +384,6 @@ 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:
@@ -521,18 +457,18 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
   state_notifier:
     dependency: transitive
     description:
@@ -545,10 +481,10 @@ packages:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   string_scanner:
     dependency: transitive
     description:
@@ -569,10 +505,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.1"
+    version: "0.6.1"
   top_snackbar_flutter:
     dependency: "direct main"
     description:
@@ -685,6 +621,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.0"
   win32:
     dependency: transitive
     description:
@@ -709,14 +653,6 @@ 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.0.6 <4.0.0"
+  dart: ">=3.2.0-194.0.dev <4.0.0"
   flutter: ">=3.10.0"

app_petty_cash/pubspec.yaml

@@ -1,5 +1,4 @@
 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.
@@ -52,7 +51,6 @@ dependencies:
   top_snackbar_flutter: ^3.1.0
   url_launcher: ^6.1.13
   flutter_svg: ^2.0.9
-  flutter_launcher_icons: ^0.13.1
 
 dev_dependencies:
   flutter_test:
@@ -68,24 +66,6 @@ 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_v2.png"
-  min_sdk_android: 21 # android min sdk min:16, default 21
-  web:
-    generate: true
-    image_path: "images/logo_apk_v2.png"
-    background_color: "#00FFFFFF"
-    theme_color: "#00FFFFFF"
-  windows:
-    generate: true
-    image_path: "images/logo_apk_v2.png"
-    icon_size: 48 # min:48, max:256, default: 48
-  macos:
-    generate: true
-    image_path: "images/logo_apk_v2.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": "#00FFFFFF",
-    "theme_color": "#00FFFFFF",
+    "background_color": "#0175C2",
+    "theme_color": "#0175C2",
     "description": "A new Flutter project.",
     "orientation": "portrait-primary",
     "prefer_related_applications": false,
@@ -32,4 +32,4 @@
             "purpose": "maskable"
         }
     ]
-}
+}