Merge pull request 'amalia/04-sept-25' (#35) from amalia/04-sept-25 into join

Reviewed-on: bip/mobile-darmasaba#35

.gitignore

@@ -45,3 +45,5 @@ x.sh
 
 google-services.json
 service-account.json
+GoogleService-Info.plist.bak
+

android/app/build.gradle

@@ -92,8 +92,8 @@ android {
         applicationId 'mobiledarmasaba.app'
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 6
+        versionName "1.0.2"
     }
     signingConfigs {
         debug {

android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+  <uses-permission android:name="android.permission.READ_MEDIA_AUDIO"/>
+  <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
+  <uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
   <uses-permission android:name="android.permission.RECORD_AUDIO"/>
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
   <uses-permission android:name="android.permission.VIBRATE"/>

android/app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-  <string name="app_name">mobile-darmasaba</string>
+  <string name="app_name">Desa+</string>
   <string name="expo_system_ui_user_interface_style" translatable="false">automatic</string>
   <string name="expo_splash_screen_resize_mode" translatable="false">contain</string>
   <string name="expo_splash_screen_status_bar_translucent" translatable="false">false</string>

android/settings.gradle

@@ -31,7 +31,7 @@ extensions.configure(com.facebook.react.ReactSettingsExtension) { ex ->
 }
 expoAutolinking.useExpoModules()
 
-rootProject.name = 'mobile-darmasaba'
+rootProject.name = 'Desa+'
 
 expoAutolinking.useExpoVersionCatalog()
 

app.config.js

@@ -2,12 +2,12 @@ import 'dotenv/config';
 
 export default {
    expo: {
-      name: "mobile-darmasaba",
+      name: "Desa+",
       slug: "mobile-darmasaba",
       version: "1.0.2",
       jsEngine: "jsc",
       orientation: "portrait",
-      icon: "./assets/images/icon.png",
+      icon: "./assets/images/logo-icon-small.png",
       scheme: "myapp",
       userInterfaceStyle: "automatic",
       newArchEnabled: false,
@@ -15,15 +15,16 @@ export default {
          supportsTablet: true,
          bundleIdentifier: "mobiledarmasaba.app",
          infoPlist: {
-            ITSAppUsesNonExemptEncryption: false
+            ITSAppUsesNonExemptEncryption: false,
+            CFBundleDisplayName: "Desa+"
          },
-         googleServicesFile: "./ios/mobiledarmasaba/GoogleService-Info.plist"
+         googleServicesFile: "./ios/Desa/GoogleService-Info.plist"
       },
       android: {
          package: "mobiledarmasaba.app",
          versionCode: 6,
          adaptiveIcon: {
-            foregroundImage: "./assets/images/splash-icon.png",
+            foregroundImage: "./assets/images/logo-icon-small.png",
             backgroundColor: "#ffffff"
          },
          googleServicesFile: "./google-services.json",
@@ -45,7 +46,7 @@ export default {
          [
             "expo-splash-screen",
             {
-               image: "./assets/images/splash-icon.png",
+               image: "./assets/images/logo-icon-small.png",
                imageWidth: 200,
                resizeMode: "contain",
                backgroundColor: "#ffffff"
@@ -58,7 +59,7 @@ export default {
             "@react-native-firebase/app",
             {
                ios: {
-                  googleServicesFile: "./ios/mobiledarmasaba/GoogleService-Info.plist"
+                  googleServicesFile: "./ios/Desa/GoogleService-Info.plist"
                }
             }
          ]

components/auth/viewLogin.tsx

@@ -53,12 +53,14 @@ export default function ViewLogin({ onValidate }: Props) {
          <StatusBar style={Platform.OS === 'ios' ? 'auto' : 'light'} translucent={false} backgroundColor="black" />
          <ToastCustom />
          <View style={[Styles.p20, Styles.h100]}>
-            <View style={{ alignItems: "center", marginVertical: 50 }}>
+            <View style={{ alignItems: "center", marginTop: 70, marginBottom: 50 }}>
                <Image
-                  source={require("../../assets/images/splash-icon.png")}
-                  style={{ width: 130, height: 130 }}
+                  source={require("../../assets/images/logo.png")}
+                  style={[{ width: 300, height: 150 }]}
+                  width={270}
+                  height={110}
                />
-               <Text style={[Styles.textSubtitle]}>PERBEKEL DARMASABA</Text>
+               {/* <Text style={[Styles.textSubtitle2]}>Digitalisasi Desa Transparansi Kerja</Text> */}
             </View>
             <InputForm
                onChange={(val) => {

constants/Styles.ts

@@ -44,6 +44,9 @@ const Styles = StyleSheet.create({
       fontSize: 20,
       fontWeight: 'bold',
    },
+   textSubtitle2: {
+      fontSize: 20,
+   },
    textLink: {
       fontSize: 14,
       color: '#0a7ea4',

ios/Desa.xcodeproj/xcshareddata/xcschemes/Desa.xcscheme

@@ -15,9 +15,9 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
-               BuildableName = "mobiledarmasaba.app"
-               BlueprintName = "mobiledarmasaba"
-               ReferencedContainer = "container:mobiledarmasaba.xcodeproj">
+               BuildableName = "Desa.app"
+               BlueprintName = "Desa"
+               ReferencedContainer = "container:Desa.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -33,9 +33,9 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "00E356ED1AD99517003FC87E"
-               BuildableName = "mobiledarmasabaTests.xctest"
-               BlueprintName = "mobiledarmasabaTests"
-               ReferencedContainer = "container:mobiledarmasaba.xcodeproj">
+               BuildableName = "DesaTests.xctest"
+               BlueprintName = "DesaTests"
+               ReferencedContainer = "container:Desa.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
@@ -55,9 +55,9 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
-            BuildableName = "mobiledarmasaba.app"
-            BlueprintName = "mobiledarmasaba"
-            ReferencedContainer = "container:mobiledarmasaba.xcodeproj">
+            BuildableName = "Desa.app"
+            BlueprintName = "Desa"
+            ReferencedContainer = "container:Desa.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </LaunchAction>
@@ -72,9 +72,9 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
-            BuildableName = "mobiledarmasaba.app"
-            BlueprintName = "mobiledarmasaba"
-            ReferencedContainer = "container:mobiledarmasaba.xcodeproj">
+            BuildableName = "Desa.app"
+            BlueprintName = "Desa"
+            ReferencedContainer = "container:Desa.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </ProfileAction>

ios/Desa.xcworkspace/contents.xcworkspacedata

@@ -2,7 +2,7 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "group:mobiledarmasaba.xcodeproj">
+      location = "group:Desa.xcodeproj">
    </FileRef>
    <FileRef
       location = "group:Pods/Pods.xcodeproj">

ios/Desa/Desa.entitlements

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-  <dict/>
-</plist>
+<dict/>
+</plist>

ios/Desa/Info.plist

@@ -7,7 +7,7 @@
     <key>CFBundleDevelopmentRegion</key>
     <string>$(DEVELOPMENT_LANGUAGE)</string>
     <key>CFBundleDisplayName</key>
-    <string>mobile-darmasaba</string>
+    <string>Desa+</string>
     <key>CFBundleExecutable</key>
     <string>$(EXECUTABLE_NAME)</string>
     <key>CFBundleIdentifier</key>
@@ -19,7 +19,7 @@
     <key>CFBundlePackageType</key>
     <string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.0.0</string>
+    <string>1.0.2</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleURLTypes</key>
@@ -53,6 +53,14 @@
       <key>NSAllowsLocalNetworking</key>
       <true/>
     </dict>
+    <key>NSCameraUsageDescription</key>
+    <string>Allow $(PRODUCT_NAME) to access your camera</string>
+    <key>NSMicrophoneUsageDescription</key>
+    <string>Allow $(PRODUCT_NAME) to access your microphone</string>
+    <key>NSPhotoLibraryAddUsageDescription</key>
+    <string>Allow $(PRODUCT_NAME) to save photos</string>
+    <key>NSPhotoLibraryUsageDescription</key>
+    <string>Allow $(PRODUCT_NAME) to access your photos</string>
     <key>NSUserActivityTypes</key>
     <array>
       <string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>

ios/Podfile

@@ -13,7 +13,7 @@ install! 'cocoapods',
 
 prepare_react_native_project!
 
-target 'mobiledarmasaba' do
+target 'Desa' do
   use_expo_modules!
 
   if ENV['EXPO_USE_COMMUNITY_AUTOLINKING'] == '1'
@@ -27,12 +27,11 @@ target 'mobiledarmasaba' do
       '--platform',
       'ios'
     ]
-
     pod 'FirebaseDatabase', :modular_headers => true
     pod 'FirebaseCore', :modular_headers => true
-   pod 'FirebaseAppCheckInterop', :modular_headers => true
-   pod 'leveldb-library', :modular_headers => true
-   pod 'GoogleUtilities', :modular_headers => true
+    pod 'FirebaseAppCheckInterop', :modular_headers => true
+    pod 'leveldb-library', :modular_headers => true
+    pod 'GoogleUtilities', :modular_headers => true
   end
 
   config = use_native_modules!(config_command)

ios/Podfile.lock

@@ -2730,6 +2730,6 @@ SPEC CHECKSUMS:
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
   Yoga: adb397651e1c00672c12e9495babca70777e411e
 
-PODFILE CHECKSUM: c5fe5ebbeae04f6245009795a1dcd457ba36c8e6
+PODFILE CHECKSUM: 7f3e2b6dc54bdba333a1261a914e9d69e33f503f
 
 COCOAPODS: 1.16.2