[Change Pass] 4. revisi pemberian token ke BE

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

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

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

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <external-path name="external_storage_directory" path="." />
+    <external-path name="external_files" path="."/>
 </resources>

app_petty_cash/lib/app/constant.dart

@@ -13,7 +13,7 @@ class Constant {
   // static String version = "1.00";
 
   // NOTE VERSI HARUS SAMA DENGAN PUBSPEC.YAML
-  static String version = "1.1.0";
+  static String version = "1.1.5";
 
   // static String baseUrl = "https://devregonline.pramita.co.id/one-api/xdoc/";
 

app_petty_cash/lib/repository/auth_repository.dart

@@ -62,11 +62,13 @@ class AuthRepository extends BaseRepository {
   Future<String> changePassword({
     required String userID,
     required String token,
+    required String tokenx,
     required String oldPassword,
     required String newPassword,
     required String confirmPassword,
   }) async {
     final param = {
+      "tokenx": tokenx,
       "token": token,
       "M_UserID": userID,
       "old_password": oldPassword,

app_petty_cash/lib/repository/transaksi_repository.dart

@@ -100,6 +100,7 @@ class TransaksiRepository extends BaseRepository {
           'userid': userid,
           'sender': sender,
           'companyid': M_CompanyID,
+          'base64File': base64file,
           'fileName': fileName,
           'fileSize': fileSize,
           'fileEkstension': fileExtension

app_petty_cash/lib/screen/change_pasword/change_password_provider.dart

@@ -40,7 +40,6 @@ class ChangePasswordStateDone extends ChangePasswordState {
   }) : super(DateTime.now());
 }
 
-
 //notifier
 class ChangePasswordNotifier extends StateNotifier<ChangePasswordState> {
   final Ref ref;
@@ -51,16 +50,21 @@ class ChangePasswordNotifier extends StateNotifier<ChangePasswordState> {
   void postChangePassword({
     required String userID,
     required String userToken,
+    required String userTokenx,
     required String oldPassword,
     required String newPassword,
     required String confirmPassword,
-
+  }) async {
-    }) async {
     try {
       state = ChangePasswordStateLoading();
       final dio = ref.read(dioProvider);
-      final resp =
+      final resp = await AuthRepository(dio: dio).changePassword(
-          await AuthRepository(dio: dio).changePassword(userID: userID,token: userToken, oldPassword: oldPassword, newPassword: newPassword, confirmPassword: confirmPassword);
+          userID: userID,
+          tokenx: userTokenx,
+          token: userToken,
+          oldPassword: oldPassword,
+          newPassword: newPassword,
+          confirmPassword: confirmPassword);
       state = ChangePasswordStateDone(model: resp);
     } catch (e) {
       if (e is BaseRepositoryException) {
@@ -76,4 +80,4 @@ class ChangePasswordNotifier extends StateNotifier<ChangePasswordState> {
 final ChangePasswordProvider =
     StateNotifierProvider<ChangePasswordNotifier, ChangePasswordState>(
   (ref) => ChangePasswordNotifier(ref: ref),
-);
+);

app_petty_cash/lib/screen/change_pasword/change_password_screen.dart

@@ -23,6 +23,7 @@ class ChangePasswordScreen extends HookConsumerWidget {
     //menampung user token jika ada
     final userToken = ref.read(currentUserProvider)?.token ?? "";
     final userID = ref.read(currentUserProvider)?.model.M_UserID ?? "0";
+    final tokenx = ref.read(currentUserProvider)?.token ?? "";
 
     final isLoading = useState(false);
     final obscureText = useState<bool>(true);
@@ -357,6 +358,7 @@ class ChangePasswordScreen extends HookConsumerWidget {
                                   ref
                                       .read(ChangePasswordProvider.notifier)
                                       .postChangePassword(
+                                        userTokenx: tokenx,
                                         userToken: userToken,
                                         userID: userID,
                                         oldPassword: ctrlOldPassword.text,

app_petty_cash/lib/screen/home/home_screen.dart

@@ -430,7 +430,8 @@ class HomeScreen extends HookConsumerWidget {
                                             Align(
                                               alignment: Alignment.centerLeft,
                                               child: Text(
-                                                listTransaksiHome.value[idx].note
+                                                listTransaksiHome
+                                                    .value[idx].note
                                                     .toString(),
                                                 style: Constant.body1(
                                                         context: context)
@@ -446,7 +447,7 @@ class HomeScreen extends HookConsumerWidget {
                                                   context: context, y: 10),
                                             ),
 
-                                            // Tanggal Created align right
+                                            // Tanggal Created and by align right
 
                                             Row(
                                               mainAxisAlignment:
@@ -472,6 +473,30 @@ class HomeScreen extends HookConsumerWidget {
                                                     fontSize: 14,
                                                   ),
                                                 ),
+                                                Expanded(
+                                                  child: Container(
+                                                    child: Text(
+                                                      ' by : ' +
+                                                          listTransaksiHome
+                                                              .value[idx]
+                                                              .usertransaksi
+                                                              .toString(),
+                                                      overflow:
+                                                          TextOverflow.ellipsis,
+                                                      style: Constant.body1(
+                                                              context: context)
+                                                          .copyWith(
+                                                        fontWeight:
+                                                            FontWeight.normal,
+                                                        fontStyle:
+                                                            FontStyle.italic,
+                                                        color: Constant
+                                                            .pcBtnBackgroundColor,
+                                                        fontSize: 14,
+                                                      ),
+                                                    ),
+                                                  ),
+                                                ),
                                               ],
                                             ),
                                           ],

app_petty_cash/lib/screen/transaksi/history_transaksi_screen.dart

@@ -1362,28 +1362,66 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
                                                 ),
                                               ],
                                             ),
-                                          // Tanggal Created align right
+                                          // Tanggal Created dan by align right
 
-                                          Row(
+                                          Column(
-                                            mainAxisAlignment:
-                                                MainAxisAlignment.end,
                                             children: [
-                                              Text(
+                                              Align(
-                                                'created : ' +
+                                                alignment:
-                                                    formatDateString(
+                                                    Alignment.centerRight,
-                                                      listSearchHistory
+                                                child: Row(
-                                                          .value[idx]
+                                                  mainAxisAlignment:
-                                                          .tanggalcreated
+                                                      MainAxisAlignment.end,
-                                                          .toString(),
+                                                  children: [
+                                                    Text(
+                                                      'created : ' +
+                                                          formatDateString(
+                                                            listSearchHistory
+                                                                .value[idx]
+                                                                .tanggalcreated
+                                                                .toString(),
+                                                          ),
+                                                      overflow:
+                                                          TextOverflow.ellipsis,
+                                                      style: Constant.body1(
+                                                              context: context)
+                                                          .copyWith(
+                                                        fontWeight:
+                                                            FontWeight.normal,
+                                                        fontStyle:
+                                                            FontStyle.italic,
+                                                        color:
+                                                            Constant.textBlack,
+                                                        fontSize: 14,
+                                                      ),
                                                     ),
-                                                overflow: TextOverflow.ellipsis,
+                                                    Expanded(
-                                                style: Constant.body1(
+                                                      child: Container(
-                                                        context: context)
+                                                        child: Text(
-                                                    .copyWith(
+                                                          ' by : ' +
-                                                  fontWeight: FontWeight.normal,
+                                                              listSearchHistory
-                                                  fontStyle: FontStyle.italic,
+                                                                  .value[idx]
-                                                  color: Constant.textBlack,
+                                                                  .usertransaksi
-                                                  fontSize: 14,
+                                                                  .toString(),
+                                                          overflow: TextOverflow
+                                                              .ellipsis,
+                                                          style: Constant.body1(
+                                                                  context:
+                                                                      context)
+                                                              .copyWith(
+                                                            fontWeight:
+                                                                FontWeight
+                                                                    .normal,
+                                                            fontStyle: FontStyle
+                                                                .italic,
+                                                            color: Constant
+                                                                .pcBtnBackgroundColor,
+                                                            fontSize: 14,
+                                                          ),
+                                                        ),
+                                                      ),
+                                                    ),
+                                                  ],
                                                 ),
                                               ),
                                             ],

app_petty_cash/pubspec.lock

@@ -278,6 +278,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.4"
+  flutter_share:
+    dependency: "direct main"
+    description:
+      name: flutter_share
+      sha256: ae12c1cea13b35926a109824ffac601531e40cb94ad53eeae58625eceb3eaaaa
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.0"
   flutter_svg:
     dependency: "direct main"
     description:
@@ -901,6 +909,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.3.0"
+  whatsapp_share:
+    dependency: "direct main"
+    description:
+      name: whatsapp_share
+      sha256: d1884f302a52d9f400bc3d7d4274b77aad83424e08f425351cea8d13b4cb8649
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
   win32:
     dependency: transitive
     description:

app_petty_cash/pubspec.yaml

@@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.1.0
+version: 1.1.5
 
 environment:
   sdk: '>=3.0.6 <4.0.0'
@@ -58,6 +58,8 @@ dependencies:
   photo_view: ^0.14.0
   mime: ^1.0.4
   path_provider: ^2.1.2
+  flutter_share: ^2.0.0
+  whatsapp_share: ^2.0.2
 
 dev_dependencies:
   flutter_test: