change company

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

@@ -15,7 +15,9 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize"
+            android:screenOrientation="portrait"
+            >
             <!-- 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/lib/app/constant.dart

@@ -10,7 +10,10 @@ class Constant {
   static double designWidthPhone = 390;
 
   static String bearerName = "petty-cash";
-  static String version = "1.00";
+  // static String version = "1.00";
+
+  // NOTE VERSI HARUS SAMA DENGAN PUBSPEC.YAML
+  static String version = "1.0.0";
 
   // static String baseUrl = "https://devregonline.pramita.co.id/one-api/xdoc/";
 

app_petty_cash/lib/main.dart

@@ -8,6 +8,9 @@ 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

app_petty_cash/lib/model/company_model.dart

@@ -0,0 +1,21 @@
+class CompanyModel {
+  String? companyid;
+  String? companyname;
+  String? mUserDefaultCompany;
+
+  CompanyModel({this.companyid, this.companyname, this.mUserDefaultCompany});
+
+  CompanyModel.fromJson(Map<String, dynamic> json) {
+    companyid = json['companyid'];
+    companyname = json['companyname'];
+    mUserDefaultCompany = json['M_UserDefaultCompany'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['companyid'] = this.companyid;
+    data['companyname'] = this.companyname;
+    data['M_UserDefaultCompany'] = this.mUserDefaultCompany;
+    return data;
+  }
+}

app_petty_cash/lib/repository/company_repository.dart

@@ -0,0 +1,32 @@
+import 'dart:convert';
+
+import 'package:app_petty_cash/model/company_model.dart';
+import 'package:app_petty_cash/model/list_type_model.dart';
+
+import '../app/constant.dart';
+import '../model/history_transaksi_model.dart';
+import '../model/list_category_model.dart';
+import 'base_repository.dart';
+
+class CompanyRepository extends BaseRepository {
+  CompanyRepository({required super.dio});
+
+  // list company
+  Future<List<CompanyModel>> getListCompany({required String userID}) async {
+    // https: //devone.aplikasi.web.id/one-api-pettycash/pettycash/Usercompany/list_company?M_UserID=2
+    final service =
+        "${Constant.baseUrlDevone}Usercompany/list_company?M_UserID=${userID}";
+    final resp = await get(
+      service: service,
+    );
+
+    print("url list type : $service");
+
+    final result = List<CompanyModel>.empty(growable: true);
+    resp['data'].forEach((e) {
+      final model = CompanyModel.fromJson(e);
+      result.add(model);
+    });
+    return result;
+  }
+}

app_petty_cash/lib/screen/change_company/change_company.dart

@@ -1,6 +1,13 @@
+import 'dart:convert';
+
+import 'package:app_petty_cash/model/auth_model.dart';
+import 'package:app_petty_cash/model/company_model.dart';
+import 'package:app_petty_cash/screen/change_company/list_company_provider.dart';
+import 'package:app_petty_cash/widget/sankbar_widget.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';
@@ -12,6 +19,14 @@ class ChangeCompanyScreen extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    final listCompany = useState<List<CompanyModel>>([
+      CompanyModel(companyid: "1", companyname: "SAS"),
+      CompanyModel(companyid: "2", companyname: "SIM")
+    ]);
+    final isLoading = useState(false);
+    final selectedCompanyID = useState("0");
+    final selectedCompanyName = useState("");
+    final auth = ref.watch(currentUserProvider);
     useEffect(() {
       WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
         final userID = ref.read(currentUserProvider)?.model.M_UserID ?? "0";
@@ -23,9 +38,29 @@ class ChangeCompanyScreen extends HookConsumerWidget {
           //  Navigator.popAndPushNamed(context, loginRoute);
           return;
         }
+        ref.read(ListCompanyProvider.notifier).getListCompany(userID: userID);
       });
       return () {};
     }, []);
+
+    ref.listen(
+      ListCompanyProvider,
+      (previous, next) {
+        if (next is ListCompanyStateLoading) {
+          isLoading.value = true;
+        } else if (next is ListCompanyStateError) {
+          // print(next.message);
+          isLoading.value = false;
+          SanckbarWidget(context, next.message, snackbarType.error);
+        } else if (next is ListCompanyStateDone) {
+          print(jsonEncode(next.model));
+          // print(next.model.length);
+          listCompany.value = next.model;
+          selectedCompanyID.value = auth?.model.M_CompanyID ?? "0";
+          isLoading.value = false;
+        }
+      },
+    );
     return Padding(
       padding: EdgeInsets.only(
         top: Constant.getActualYPhone(context: context, y: 30),
@@ -43,7 +78,131 @@ class ChangeCompanyScreen extends HookConsumerWidget {
           ),
         ),
         drawer: CustomDrawer(),
-        body: Text('Under Construction'),
+        body: SingleChildScrollView(
+          child: Padding(
+            padding: EdgeInsets.all(20),
+            child: isLoading.value
+                ? Container(
+                    height: MediaQuery.of(context).size.height,
+                    child: Center(
+                      child: CircularProgressIndicator(),
+                    ),
+                  )
+                : Column(
+                    children: listCompany.value
+                        .map((e) => Container(
+                              margin: EdgeInsets.only(bottom: 20),
+                              child: InkWell(
+                                onTap: () async {
+                                  selectedCompanyID.value = e.companyid ?? "0";
+                                  selectedCompanyName.value =
+                                      e.companyname ?? "0";
+                                  final shared =
+                                      await SharedPreferences.getInstance();
+                                  final oldData = jsonDecode(
+                                      shared.getString(Constant.bearerName) ??
+                                          "");
+                                  print(oldData['token']);
+
+                                  final newModel = AuthDoctorModel.fromJson(
+                                      oldData['model']);
+                                  newModel.M_CompanyID = e.companyid ?? "0";
+                                  newModel.M_CompanyName = e.companyname ?? "";
+                                  final token = jsonEncode({
+                                    "date": oldData['date'],
+                                    "model": newModel,
+                                    "token": oldData['token']
+                                  });
+                                  final newAuthData = AuthModel(
+                                      token: oldData['token'], model: newModel);
+                                  await shared.setString(
+                                      Constant.bearerName, token);
+                                  ref.read(currentUserProvider.notifier).state =
+                                      newAuthData;
+                                  Navigator.pushNamed(context, homeRoute);
+                                },
+                                child: Card(
+                                  shadowColor:
+                                      selectedCompanyID.value == e.companyid
+                                          ? Constant.bgIconHistory
+                                          : Colors.white,
+                                  surfaceTintColor:
+                                      selectedCompanyID.value == e.companyid
+                                          ? Constant.bgIconHistory
+                                          : Colors.white,
+                                  // elevation: selectedCompanyID.value == e.companyid
+                                  //     ? 0
+                                  //     : 1,
+                                  elevation: 10,
+                                  color: selectedCompanyID.value == e.companyid
+                                      ? Constant.bgIconHistory
+                                      : Colors.white,
+                                  child: Container(
+                                      padding: EdgeInsets.all(20),
+                                      width: MediaQuery.of(context).size.width,
+                                      child: Row(
+                                        children: [
+                                          Expanded(
+                                              flex: 1,
+                                              child: Icon(
+                                                Icons.corporate_fare,
+                                                color:
+                                                    selectedCompanyID.value ==
+                                                            e.companyid
+                                                        ? Constant.textRed
+                                                        : Colors.black,
+                                                size: 30,
+                                              )),
+                                          SizedBox(
+                                            width: 10,
+                                          ),
+                                          Expanded(
+                                            flex: 8,
+                                            child: Text(e.companyname ?? "",
+                                                softWrap: true,
+                                                maxLines: 3,
+                                                // overflow: ,
+                                                style: Constant.body1(
+                                                        context: context)
+                                                    .copyWith(
+                                                        color: selectedCompanyID
+                                                                    .value ==
+                                                                e.companyid
+                                                            ? Constant.textRed
+                                                            : Colors.black,
+                                                        fontSize: 25)),
+                                          ),
+                                        ],
+                                      )),
+                                ),
+                              ),
+                            ))
+                        .toList()
+                    // [
+                    //   Card(
+                    //     shadowColor: Colors.white,
+                    //     // surfaceTintColor: Colors.white,
+                    //     elevation: 0,
+                    //     color: Constant.bgIconHistory,
+                    //     child: Container(
+                    //         padding: EdgeInsets.all(10),
+                    //         width: MediaQuery.of(context).size.width,
+                    //         child: Row(
+                    //           children: [
+                    //             Icon(Icons.corporate_fare),
+                    //             SizedBox(
+                    //               width: 10,
+                    //             ),
+                    //             Text("Company",
+                    //                 style: Constant.body1(context: context)
+                    //                     .copyWith(color: Constant.textRed)),
+                    //           ],
+                    //         )),
+                    //   )
+                    // ],
+                    ),
+          ),
+        ),
       ),
     );
   }

app_petty_cash/lib/screen/change_company/list_company_provider.dart

@@ -0,0 +1,69 @@
+import 'package:app_petty_cash/model/company_model.dart';
+import 'package:app_petty_cash/repository/company_repository.dart';
+
+import '../../model/list_category_model.dart';
+import '../../repository/transaksi_repository.dart';
+import 'package:equatable/equatable.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../../provider/dio_provider.dart';
+import '../../repository/base_repository.dart';
+
+abstract class ListCompanyState extends Equatable {
+  final DateTime date;
+  const ListCompanyState(this.date);
+  @override
+  List<Object?> get props => [date];
+}
+
+class ListCompanyStateInit extends ListCompanyState {
+  ListCompanyStateInit() : super(DateTime.now());
+}
+
+class ListCompanyStateLoading extends ListCompanyState {
+  ListCompanyStateLoading() : super(DateTime.now());
+}
+
+class ListCompanyStateError extends ListCompanyState {
+  final String message;
+  ListCompanyStateError({
+    required this.message,
+  }) : super(DateTime.now());
+}
+
+class ListCompanyStateDone extends ListCompanyState {
+  final List<CompanyModel> model;
+  ListCompanyStateDone({
+    required this.model,
+  }) : super(DateTime.now());
+}
+
+//notifier
+class ListCompanyNotifier extends StateNotifier<ListCompanyState> {
+  final Ref ref;
+  ListCompanyNotifier({
+    required this.ref,
+  }) : super(ListCompanyStateInit());
+
+  void getListCompany({required String userID}) async {
+    try {
+      state = ListCompanyStateLoading();
+      final dio = ref.read(dioProvider);
+      final resp =
+          await CompanyRepository(dio: dio).getListCompany(userID: userID);
+      state = ListCompanyStateDone(model: resp);
+    } catch (e) {
+      if (e is BaseRepositoryException) {
+        state = ListCompanyStateError(message: e.message.toString());
+      } else {
+        state = ListCompanyStateError(message: e.toString());
+      }
+    }
+  }
+}
+
+//provider
+final ListCompanyProvider =
+    StateNotifierProvider<ListCompanyNotifier, ListCompanyState>(
+  (ref) => ListCompanyNotifier(ref: ref),
+);

app_petty_cash/lib/screen/home/home_screen.dart

@@ -28,6 +28,27 @@ class HomeScreen extends HookConsumerWidget {
     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 {
@@ -40,6 +61,7 @@ class HomeScreen extends HookConsumerWidget {
           //  Navigator.popAndPushNamed(context, loginRoute);
           return;
         }
+        M_CompanyName.value = await getCompanyName();
       });
       return () {};
     }, []);
@@ -125,8 +147,12 @@ class HomeScreen extends HookConsumerWidget {
       child: Scaffold(
         appBar: AppBar(
           title: Text(
-            'Home Screen',
-            style: TextStyle(color: Constant.textWhite),
+            // 'Home Screen',
+            M_CompanyName.value,
+            overflow: TextOverflow.ellipsis,
+            style: TextStyle(
+              color: Constant.textWhite,
+            ),
           ),
           backgroundColor: Constant.pcBtnBackgroundColor,
           iconTheme: IconThemeData(

app_petty_cash/lib/screen/login/login_form.dart

@@ -114,7 +114,7 @@ class LoginFormScreen extends HookConsumerWidget {
             ),
             Container(
               width: Constant.getActualXPhone(context: context, x: 390),
-              height: Constant.getActualYPhone(context: context, y: 485),
+              // height: Constant.getActualYPhone(context: context, y: 485),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 mainAxisAlignment: MainAxisAlignment.start,

app_petty_cash/lib/widget/custom_drawer.dart

@@ -158,6 +158,7 @@ class CustomDrawer extends HookConsumerWidget {
               backgroundColor: Constant.textGrey.withOpacity(0.16),
               label: Text(
                 M_CompanyName.value,
+                overflow: TextOverflow.ellipsis,
                 style: TextStyle(
                   color: Constant.textGreyv2,
                 ),
@@ -320,6 +321,18 @@ class CustomDrawer extends HookConsumerWidget {
                     );
               },
             ),
+
+            Spacer(),
+
+            // Versi Aplikasi
+            ListTile(
+              title: Text(
+                'Versi ${Constant.version}',
+                style: Constant.titleH4Login(context: context)
+                    .copyWith(color: Constant.textGrey),
+              ),
+              onTap: () {},
+            ),
           ],
         ),
       ),

app_petty_cash/lib/widget/history_row_atas_widget.dart

@@ -92,7 +92,7 @@ class HistoryRowAtasWidget extends HookConsumerWidget {
     String formatDateString(String inputDate) {
       try {
         // Parsing tanggal dari string input
-        DateTime date = DateFormat('dd-MM-yyyy','id').parse(inputDate);
+        DateTime date = DateFormat('dd-MM-yyyy', 'id').parse(inputDate);
 
         // Format tanggal ke '30 Des 2023'
         String formattedDate = DateFormat('dd MMM yyyy', 'id').format(date);
@@ -108,19 +108,71 @@ class HistoryRowAtasWidget extends HookConsumerWidget {
 
     Widget getIconUrl(String categoryid) {
       List<Map<String, String>> iconDataList = [
-        {'categoryid': '1', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'},
-        {'categoryid': '2', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'},
-        {'categoryid': '3', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_3.svg'},
-        {'categoryid': '4', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'},
-        {'categoryid': '5', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_5.svg'},
-        {'categoryid': '6', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_6.svg'},
-        {'categoryid': '7', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'},
-        {'categoryid': '8', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'},
-        {'categoryid': '9', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'},
-        {'categoryid': '10', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'},
-        {'categoryid': '11', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'},
-        {'categoryid': '12', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_12.svg'},
-        {'categoryid': '13', 'url': 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg'},
+        {
+          '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 = "";
@@ -130,7 +182,8 @@ class HistoryRowAtasWidget extends HookConsumerWidget {
           // 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";
+          urlFix = iconDataList[i]['url'] ??
+              "https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg";
         }
       }
 
@@ -271,21 +324,23 @@ class HistoryRowAtasWidget extends HookConsumerWidget {
               mainAxisAlignment: MainAxisAlignment.end,
               children: [
                 Container(
-                  // width: Constant.getActualXPhone(context: context, x: 32),
-                  height: Constant.getActualYPhone(context: context, y: 19),
+                  width: Constant.getActualXPhone(context: context, x: 80),
+                  height: Constant.getActualYPhone(context: context, y: 24),
                   decoration: BoxDecoration(
                     color: Constant.bgIconHistory,
                     borderRadius: BorderRadius.all(
                       Radius.circular(6.0),
                     ),
                   ),
-                  child: Padding(
-                    padding: EdgeInsets.all(2.0),
+                  child: Align(
+                    alignment: Alignment.center,
                     child: Text(
                       tipe,
                       style: Constant.body1_600(context: context).copyWith(
-                          fontWeight: FontWeight.w600,
-                          color: Constant.pcBtnBackgroundColor),
+                        fontWeight: FontWeight.w600,
+                        color: Constant.pcBtnBackgroundColor,
+                        fontSize: 14,
+                      ),
                     ),
                   ),
                 ),

app_petty_cash/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -9,12 +9,10 @@ import file_selector_macos
 import path_provider_foundation
 import shared_preferences_foundation
 import url_launcher_macos
-import video_player_avfoundation
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
-  FVPVideoPlayerPlugin.register(with: registry.registrar(forPlugin: "FVPVideoPlayerPlugin"))
 }

app_petty_cash/pubspec.lock

@@ -101,10 +101,10 @@ packages:
     dependency: transitive
     description:
       name: cross_file
-      sha256: fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e
+      sha256: "2f9d2cbccb76127ba28528cb3ae2c2326a122446a83de5a056aaa3880d3882c5"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.3+8"
+    version: "0.3.3+7"
   crypto:
     dependency: transitive
     description:
@@ -316,10 +316,10 @@ packages:
     dependency: transitive
     description:
       name: http
-      sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139
+      sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.1.0"
   http_parser:
     dependency: transitive
     description:
@@ -857,10 +857,10 @@ packages:
     dependency: "direct main"
     description:
       name: video_player
-      sha256: fbf28ce8bcfe709ad91b5789166c832cb7a684d14f571a81891858fefb5bb1c2
+      sha256: "74b86e63529cf5885130c639d74cd2f9232e7c8a66cbecbddd1dcb9dbd060d1e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.8.2"
+    version: "2.7.2"
   video_player_android:
     dependency: transitive
     description:
@@ -873,10 +873,10 @@ packages:
     dependency: transitive
     description:
       name: video_player_avfoundation
-      sha256: "309e3962795e761be010869bae65c0b0e45b5230c5cee1bec72197ca7db040ed"
+      sha256: bf1a1322bf68bccd349982ba1f5a41314a3880861fb9a93d25d6d0a2345845f0
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.6"
+    version: "2.4.11"
   video_player_platform_interface:
     dependency: transitive
     description:
@@ -889,10 +889,10 @@ packages:
     dependency: transitive
     description:
       name: video_player_web
-      sha256: "34beb3a07d4331a24f7e7b2f75b8e2b103289038e07e65529699a671b6a6e2cb"
+      sha256: "9c34a243785feca23148bfcd772dbb803d63c9304488177ec4f3f4463802fcb7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.0.17"
   web:
     dependency: transitive
     description:
@@ -934,5 +934,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.2.0 <4.0.0"
-  flutter: ">=3.16.0"
+  dart: ">=3.2.0-194.0.dev <4.0.0"
+  flutter: ">=3.10.0"

app_petty_cash/pubspec.yaml

@@ -76,20 +76,20 @@ dev_dependencies:
 flutter_launcher_icons:
   android: "launcher_icon"
   ios: true
-  image_path: "images/logo_apk.png"
+  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.png"
+    image_path: "images/logo_apk_v2.png"
     background_color: "#00FFFFFF"
     theme_color: "#00FFFFFF"
   windows:
     generate: true
-    image_path: "images/logo_apk.png"
+    image_path: "images/logo_apk_v2.png"
     icon_size: 48 # min:48, max:256, default: 48
   macos:
     generate: true
-    image_path: "images/logo_apk.png"
+    image_path: "images/logo_apk_v2.png"
 
 # The following section is specific to Flutter packages.
 flutter: