diff --git a/app/(application)/(user)/maps/index.tsx b/app/(application)/(user)/maps/index.tsx index 6e61b6f..c8b4573 100644 --- a/app/(application)/(user)/maps/index.tsx +++ b/app/(application)/(user)/maps/index.tsx @@ -1,8 +1,4 @@ -import { BackButton } from "@/components"; -import MapsView from "@/screens/Maps/MapsView"; import MapsView2 from "@/screens/Maps/MapsView2"; -import { Stack } from "expo-router"; -import { Platform, Text, View } from "react-native"; export interface LocationItem { id: string | number; @@ -21,8 +17,8 @@ export default function Maps() { headerLeft: () => , }} /> */} - {Platform.OS === "ios" ? : } - {/* */} + {/* {Platform.OS === "ios" ? : } */} + {/* Map disabled */} ); diff --git a/docs/PODS.back b/docs/PODS.back new file mode 100644 index 0000000..600e3cd --- /dev/null +++ b/docs/PODS.back @@ -0,0 +1,101 @@ +NOTE: + +Untuk Development Selanjutnya: + Sekarang Anda bisa menjalankan: + + 1 # Untuk run iOS dev client + 2 bun run ios + 3 + 4 # Atau dengan Expo + 5 bunx expo run:ios + + Jika di masa depan terjadi error serupa, Anda bisa gunakan command ini: + + 1 cd ios + 2 rm -rf Pods Podfile.lock + 3 pod install + + + +use_modular_headers! + +require File.join(File.dirname(`node --print "require.resolve('expo/package.json')"`), "scripts/autolinking") +require File.join(File.dirname(`node --print "require.resolve('react-native/package.json')"`), "scripts/react_native_pods") + +require 'json' +podfile_properties = JSON.parse(File.read(File.join(__dir__, 'Podfile.properties.json'))) rescue {} + +ENV['RCT_NEW_ARCH_ENABLED'] ||= '0' if podfile_properties['newArchEnabled'] == 'false' +ENV['EX_DEV_CLIENT_NETWORK_INSPECTOR'] ||= podfile_properties['EX_DEV_CLIENT_NETWORK_INSPECTOR'] +ENV['RCT_USE_RN_DEP'] ||= '1' if podfile_properties['ios.buildReactNativeFromSource'] != 'true' && podfile_properties['newArchEnabled'] != 'false' +ENV['RCT_USE_PREBUILT_RNCORE'] ||= '1' if podfile_properties['ios.buildReactNativeFromSource'] != 'true' && podfile_properties['newArchEnabled'] != 'false' +platform :ios, podfile_properties['ios.deploymentTarget'] || '15.1' + +prepare_react_native_project! + +target 'HIPMIBadungConnect' do + use_expo_modules! + + if ENV['EXPO_USE_COMMUNITY_AUTOLINKING'] == '1' + config_command = ['node', '-e', "process.argv=['', '', 'config'];require('@react-native-community/cli').run()"]; + else + config_command = [ + 'npx', + 'expo-modules-autolinking', + 'react-native-config', + '--json', + '--platform', + 'ios' + ] + end + + config = use_native_modules!(config_command) + + use_frameworks! :linkage => podfile_properties['ios.useFrameworks'].to_sym if podfile_properties['ios.useFrameworks'] + use_frameworks! :linkage => ENV['USE_FRAMEWORKS'].to_sym if ENV['USE_FRAMEWORKS'] + + + use_react_native!( + :path => config[:reactNativePath], + :hermes_enabled => podfile_properties['expo.jsEngine'] == nil || podfile_properties['expo.jsEngine'] == 'hermes', + # An absolute path to your application root. + :app_path => "#{Pod::Config.instance.installation_root}/..", + :privacy_file_aggregation_enabled => podfile_properties['apple.privacyManifestAggregationEnabled'] != 'false', + ) + + pod 'Firebase' + pod 'Firebase/Messaging' + + # @generated begin post_installer - expo prebuild (DO NOT MODIFY) sync-4092f82b887b5b9edb84642c2a56984d69b9a403 + post_install do |installer| +# @generated begin @maplibre/maplibre-react-native:post-install - expo prebuild (DO NOT MODIFY) sync-6e76c80af0d70c0003d06822dd59b7c729fca472 + $MLRN.post_install(installer) +# @generated end @maplibre/maplibre-react-native:post-install + + # Fix all script phases with incorrect paths + installer.pods_project.targets.each do |target| + target.build_phases.each do |phase| + next unless phase.respond_to?(:shell_script) + + # Fix duplicated path issue + if phase.shell_script.include?('with-environment.sh') + # Remove any existing path and use proper relative path + phase.shell_script = phase.shell_script.gsub( + %r{(/.*?/node_modules/react-native)+/scripts/xcode/with-environment.sh}, + '${PODS_ROOT}/../../node_modules/react-native/scripts/xcode/with-environment.sh' + ) + end + end + end + + # Standard React Native post install + react_native_post_install( + installer, + config[:reactNativePath], + :mac_catalyst_enabled => false, + :ccache_enabled => podfile_properties['apple.ccacheEnabled'] == 'true', + ) + end + # @generated end post_installer + +end \ No newline at end of file diff --git a/screens/Maps/DrawerMaps.tsx b/screens/Maps/DrawerMaps.tsx new file mode 100644 index 0000000..31ddffa --- /dev/null +++ b/screens/Maps/DrawerMaps.tsx @@ -0,0 +1,125 @@ +import { + DrawerCustom, + DummyLandscapeImage, + Spacing, + StackCustom, + TextCustom, + Grid, + ButtonCustom, +} from "@/components"; +import GridTwoView from "@/components/_ShareComponent/GridTwoView"; +import { ICON_SIZE_SMALL } from "@/constants/constans-value"; +import { openInDeviceMaps } from "@/utils/openInDeviceMaps"; +import { FontAwesome, Ionicons } from "@expo/vector-icons"; +import { router } from "expo-router"; + +interface TypeDrawerMaps { + openDrawer: boolean; + setOpenDrawer: (value: boolean) => void; + selected: { + id: string; + bidangBisnis: string; + nomorTelepon: string; + alamatBisnis: string; + namePin: string; + imageId: string; + portofolioId: string; + latitude: number; + longitude: number; + }; +} + +export default function DrawerMaps({ + openDrawer, + setOpenDrawer, + selected, +}: TypeDrawerMaps) { + return ( + setOpenDrawer(false)} + height={"auto"} + > + + + + + } + rightItem={{selected.namePin}} + /> + + + } + rightItem={{selected.bidangBisnis}} + /> + + + } + rightItem={{selected.nomorTelepon}} + /> + + } + rightItem={{selected.alamatBisnis}} + /> + + + + { + setOpenDrawer(false); + router.push(`/portofolio/${selected.portofolioId}`); + }} + > + Detail + + + + { + openInDeviceMaps({ + latitude: selected.latitude, + longitude: selected.longitude, + title: selected.namePin, + }); + }} + > + Buka Maps + + + + + + ); +} diff --git a/screens/Maps/MapsView2.tsx b/screens/Maps/MapsView2.tsx index df9be3f..a21f522 100644 --- a/screens/Maps/MapsView2.tsx +++ b/screens/Maps/MapsView2.tsx @@ -10,20 +10,8 @@ import { MapView, PointAnnotation, } from "@maplibre/maplibre-react-native"; -import { router, useFocusEffect } from "expo-router"; -import { - DrawerCustom, - DummyLandscapeImage, - Spacing, - StackCustom, - TextCustom, - Grid, - ButtonCustom, -} from "@/components"; -import GridTwoView from "@/components/_ShareComponent/GridTwoView"; -import { ICON_SIZE_SMALL } from "@/constants/constans-value"; -import { openInDeviceMaps } from "@/utils/openInDeviceMaps"; -import { FontAwesome, Ionicons } from "@expo/vector-icons"; +import { useFocusEffect } from "expo-router"; +import DrawerMaps from "./DrawerMaps"; const MAP_STYLE = "https://tiles.openfreemap.org/styles/liberty"; @@ -146,92 +134,11 @@ export default function MapsView2() { - setOpenDrawer(false)} - height={"auto"} - > - - - - - } - rightItem={{selected.namePin}} - /> - - - } - rightItem={{selected.bidangBisnis}} - /> - - - } - rightItem={{selected.nomorTelepon}} - /> - - } - rightItem={{selected.alamatBisnis}} - /> - - - - { - setOpenDrawer(false); - router.push(`/portofolio/${selected.portofolioId}`); - }} - > - Detail - - - - { - openInDeviceMaps({ - latitude: selected.latitude, - longitude: selected.longitude, - title: selected.namePin, - }); - }} - > - Buka Maps - - - - - + ); }