diff --git a/android/app/build.gradle b/android/app/build.gradle index 4d81f37..1bf9682 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { - applicationId "io.ionic.starter" + applicationId "org.tainacan.mobileapp" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index c2d510a..52a588f 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="org.tainacan.mobileapp"> @@ -38,4 +38,9 @@ + + + + + diff --git a/android/app/src/main/assets/capacitor.config.json b/android/app/src/main/assets/capacitor.config.json index 3d43fd4..c943f0c 100644 --- a/android/app/src/main/assets/capacitor.config.json +++ b/android/app/src/main/assets/capacitor.config.json @@ -1,5 +1,5 @@ { - "appId": "org.tainacan.mobile", + "appId": "org.tainacan.mobileapp", "appName": "Tainacan", "webDir": "dist", "bundledWebRuntime": false diff --git a/android/app/src/main/java/io/ionic/starter/MainActivity.java b/android/app/src/main/java/io/ionic/starter/MainActivity.java index 73e3a98..9749d3c 100644 --- a/android/app/src/main/java/io/ionic/starter/MainActivity.java +++ b/android/app/src/main/java/io/ionic/starter/MainActivity.java @@ -1,4 +1,4 @@ -package io.ionic.starter; +package org.tainacan.mobileapp; import com.getcapacitor.BridgeActivity; diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 1576a86..edd1da5 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -2,6 +2,6 @@ tainacan-mobile tainacan-mobile - io.ionic.starter - io.ionic.starter + org.tainacan.mobileapp + org.tainacan.mobileapp diff --git a/capacitor.config.ts b/capacitor.config.ts index 9e0abb0..6a5af89 100644 --- a/capacitor.config.ts +++ b/capacitor.config.ts @@ -1,7 +1,7 @@ import { CapacitorConfig } from '@capacitor/cli'; const config: CapacitorConfig = { - appId: 'org.tainacan.mobile', + appId: 'org.tainacan.mobileapp', appName: 'Tainacan', webDir: 'dist', bundledWebRuntime: false diff --git a/src/components/lists/ItemsList.vue b/src/components/lists/ItemsList.vue index 3727f7e..cdb4328 100644 --- a/src/components/lists/ItemsList.vue +++ b/src/components/lists/ItemsList.vue @@ -41,7 +41,7 @@ export default { const thumbnailPlaceholder = computed (() => require('../../assets/placeholder_square_small.png')); const openItemEdition = function(item: any) { - wpStore.openInAppBrowser('?page=tainacan_admin&mobileAppMode=true&itemEditionMode=true#/collections/' + item.collection_id + '/items/' + item.id + '/edit'); + wpStore.openInAppBrowser('?page=tainacan_admin&mobileAppMode=true#/collections/' + item.collection_id + '/items/' + item.id + '/edit'); wpStore.listenEventInAppBrowser((event: InAppBrowserEvent) => { if (event && event.data && diff --git a/src/pages/CollectionPage.vue b/src/pages/CollectionPage.vue index 6f3e6a6..eb9235e 100644 --- a/src/pages/CollectionPage.vue +++ b/src/pages/CollectionPage.vue @@ -138,15 +138,23 @@ export default defineComponent({ icon: documentsOutline, data: 'multiple-items', handler: () => { - console.log('Vários iteeeens') - }, - }, - { - text: actionSheetLabels.value.button2, - icon: documentAttachOutline, - data: 'multiple-attachments', - handler: () => { - console.log('Item com vários anexos') + wpStore.openInAppBrowser('?page=tainacan_admin&mobileAppMode=true#/collections/' + props.id + '/bulk-add'); + wpStore.listenEventInAppBrowser((event: InAppBrowserEvent) => { + if (event && + event.data && + ( + ( + event.data.type === 'item_updated' && + event.data.item && + event.data.item.status !== 'auto-draft' + ) + || event.data.type === 'exited_from_navigation' + ) + ) { + wpStore.hideInAppBrowser(); + loadItemsByCollection({}, true); + } + }); }, }, { @@ -154,7 +162,7 @@ export default defineComponent({ icon: documentOutline, data: 'single item', handler: () => { - wpStore.openInAppBrowser('?page=tainacan_admin&mobileAppMode=true&itemEditionMode=true#/collections/' + props.id + '/items/new'); + wpStore.openInAppBrowser('?page=tainacan_admin&mobileAppMode=true#/collections/' + props.id + '/items/new'); wpStore.listenEventInAppBrowser((event: InAppBrowserEvent) => { if (event && event.data && @@ -216,15 +224,16 @@ export default defineComponent({