diff --git a/app_petty_cash/android/app/src/main/AndroidManifest.xml b/app_petty_cash/android/app/src/main/AndroidManifest.xml index 9404999..0778a2b 100644 --- a/app_petty_cash/android/app/src/main/AndroidManifest.xml +++ b/app_petty_cash/android/app/src/main/AndroidManifest.xml @@ -1,13 +1,14 @@ + + > + \ No newline at end of file diff --git a/app_petty_cash/lib/app/constant.dart b/app_petty_cash/lib/app/constant.dart index 9c87299..8abf404 100644 --- a/app_petty_cash/lib/app/constant.dart +++ b/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/"; diff --git a/app_petty_cash/lib/repository/transaksi_repository.dart b/app_petty_cash/lib/repository/transaksi_repository.dart index a8fd128..5c90c8f 100644 --- a/app_petty_cash/lib/repository/transaksi_repository.dart +++ b/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 diff --git a/app_petty_cash/lib/screen/home/home_screen.dart b/app_petty_cash/lib/screen/home/home_screen.dart index 13262da..9400a73 100644 --- a/app_petty_cash/lib/screen/home/home_screen.dart +++ b/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, + ), + ), + ), + ), ], ), ], diff --git a/app_petty_cash/lib/screen/transaksi/history_transaksi_screen.dart b/app_petty_cash/lib/screen/transaksi/history_transaksi_screen.dart index 4456d76..accb87b 100644 --- a/app_petty_cash/lib/screen/transaksi/history_transaksi_screen.dart +++ b/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( - mainAxisAlignment: - MainAxisAlignment.end, + Column( children: [ - Text( - 'created : ' + - formatDateString( - listSearchHistory - .value[idx] - .tanggalcreated - .toString(), + Align( + alignment: + Alignment.centerRight, + child: Row( + mainAxisAlignment: + MainAxisAlignment.end, + 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, - style: Constant.body1( - context: context) - .copyWith( - fontWeight: FontWeight.normal, - fontStyle: FontStyle.italic, - color: Constant.textBlack, - fontSize: 14, + Expanded( + child: Container( + child: Text( + ' by : ' + + listSearchHistory + .value[idx] + .usertransaksi + .toString(), + overflow: TextOverflow + .ellipsis, + style: Constant.body1( + context: + context) + .copyWith( + fontWeight: + FontWeight + .normal, + fontStyle: FontStyle + .italic, + color: Constant + .pcBtnBackgroundColor, + fontSize: 14, + ), + ), + ), + ), + ], ), ), ], diff --git a/app_petty_cash/pubspec.lock b/app_petty_cash/pubspec.lock index 21ef0a9..1af8165 100644 --- a/app_petty_cash/pubspec.lock +++ b/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: @@ -893,14 +901,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.17" - web: - dependency: transitive + whatsapp_share: + dependency: "direct main" description: - name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + name: whatsapp_share + sha256: d1884f302a52d9f400bc3d7d4274b77aad83424e08f425351cea8d13b4cb8649 url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "2.0.2" win32: dependency: transitive description: diff --git a/app_petty_cash/pubspec.yaml b/app_petty_cash/pubspec.yaml index 16d731f..8329872 100644 --- a/app_petty_cash/pubspec.yaml +++ b/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: