Merge pull request 'amalia/12-sept-25' (#38) from amalia/12-sept-25 into join

Reviewed-on: bip/mobile-darmasaba#38
This commit is contained in:
2025-09-12 18:23:44 +08:00
7 changed files with 20 additions and 13 deletions

View File

@@ -39,5 +39,3 @@ app-example
x.ts x.ts
x.sh x.sh
/android
/ios

View File

@@ -0,0 +1,4 @@
kotlin version: 2.0.21
error message: The daemon has terminated unexpectedly on startup attempt #1 with error code: 0. The daemon process output:
1. Kotlin compile daemon is ready

View File

@@ -4,7 +4,7 @@ export default {
expo: { expo: {
name: "Desa+", name: "Desa+",
slug: "mobile-darmasaba", slug: "mobile-darmasaba",
version: "1.0.3", version: "1.0.4",
jsEngine: "jsc", jsEngine: "jsc",
orientation: "portrait", orientation: "portrait",
icon: "./assets/images/logo-icon-small.png", icon: "./assets/images/logo-icon-small.png",
@@ -18,11 +18,11 @@ export default {
ITSAppUsesNonExemptEncryption: false, ITSAppUsesNonExemptEncryption: false,
CFBundleDisplayName: "Desa+" CFBundleDisplayName: "Desa+"
}, },
googleServicesFile: "./ios/Desa/GoogleService-Info.plist" googleServicesFile: process.env.IOS_GOOGLE_SERVICES_FILE
}, },
android: { android: {
package: "mobiledarmasaba.app", package: "mobiledarmasaba.app",
versionCode: 7, versionCode: 8,
adaptiveIcon: { adaptiveIcon: {
foregroundImage: "./assets/images/logo-icon-small.png", foregroundImage: "./assets/images/logo-icon-small.png",
backgroundColor: "#ffffff" backgroundColor: "#ffffff"
@@ -59,7 +59,7 @@ export default {
"@react-native-firebase/app", "@react-native-firebase/app",
{ {
ios: { ios: {
googleServicesFile: "./ios/Desa/GoogleService-Info.plist" googleServicesFile: process.env.IOS_GOOGLE_SERVICES_FILE
} }
} }
] ]

View File

@@ -142,6 +142,7 @@ export default function AddMemberCalendarEvent() {
} }
<ScrollView <ScrollView
showsVerticalScrollIndicator={false} showsVerticalScrollIndicator={false}
style={[Styles.h100]}
> >
{ {
data.length > 0 ? data.length > 0 ?
@@ -153,7 +154,6 @@ export default function AddMemberCalendarEvent() {
style={[Styles.itemSelectModal]} style={[Styles.itemSelectModal]}
onPress={() => { onPress={() => {
!found && onChoose(item.idUser, item.name, item.img) !found && onChoose(item.idUser, item.name, item.img)
onChoose(item.idUser, item.name, item.img)
}} }}
> >
<View style={[Styles.rowItemsCenter]}> <View style={[Styles.rowItemsCenter]}>
@@ -166,7 +166,7 @@ export default function AddMemberCalendarEvent() {
</View> </View>
</View> </View>
{ {
selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'} /> selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} color={'black'} />
} }
</Pressable> </Pressable>
) )

View File

@@ -131,6 +131,7 @@ export default function CreateCalendarAddMember() {
} }
<ScrollView <ScrollView
showsVerticalScrollIndicator={false} showsVerticalScrollIndicator={false}
style={[Styles.h100]}
> >
{ {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 27 KiB

File diff suppressed because one or more lines are too long