sindhu/app_petikes
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into add_change_password

Browse Source
This commit is contained in:
Stephen
2024-01-19 15:11:39 +07:00
parent 81733ec865 c67f771d25
commit 6b28794577
8 changed files with 105 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app_petty_cash/android/app/src/main/AndroidManifest.xml
View File

@@ -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"

1
app_petty_cash/android/app/src/main/res/xml/filepaths.xml
View File

@@ -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>

2
app_petty_cash/lib/app/constant.dart
View File

@@ -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/";

1
app_petty_cash/lib/repository/transaksi_repository.dart
View File

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

29
app_petty_cash/lib/screen/home/home_screen.dart
View File

@@ -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,
),
),
),
),
],
),
],

76
app_petty_cash/lib/screen/transaksi/history_transaksi_screen.dart
View File

@@ -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,
),
),
),
),
],
),
),
],

18
app_petty_cash/pubspec.lock
View File

@@ -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:

4
app_petty_cash/pubspec.yaml
View File

@@ -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: