whattheduck: Don't show Disney images on iOS

ducksmanager · Nov 7, 2024 · d7f6026 · d7f6026
1 parent b74ce04
commit d7f6026
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 40 deletions.
diff --git a/apps/whattheduck/android/app/build.gradle b/apps/whattheduck/android/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "net.ducksmanager.whattheduck"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 127
-        versionName "3.0.18"
+        versionCode 128
+        versionName "3.0.19"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

diff --git a/apps/whattheduck/android/capacitor.settings.gradle b/apps/whattheduck/android/capacitor.settings.gradle
@@ -36,7 +36,7 @@ include ':capawesome-capacitor-file-picker'
 project(':capawesome-capacitor-file-picker').projectDir = new File('../../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capawesome/capacitor-file-picker/android')
 
 include ':capgo-capacitor-updater'
-project(':capgo-capacitor-updater').projectDir = new File('../../../node_modules/.pnpm/@[email protected].10_@[email protected]/node_modules/@capgo/capacitor-updater/android')
+project(':capgo-capacitor-updater').projectDir = new File('../../../node_modules/.pnpm/@[email protected].16_@[email protected]/node_modules/@capgo/capacitor-updater/android')
 
 include ':sentry-capacitor'
-project(':sentry-capacitor').projectDir = new File('../../../node_modules/.pnpm/@[email protected]_@[email protected]_@sentry+vue@8.36.0_pinia@2.2.5_typescript@5.6.3_ah4uiixu64il2xoqbziw5vapje/node_modules/@sentry/capacitor/android')
+project(':sentry-capacitor').projectDir = new File('../../../node_modules/.pnpm/@[email protected]_@[email protected]_@sentry+vue@8.37.1_pinia@2.2.6_typescript@5.6.3_f6xahmlfcx5uwsnjvx6ykp42sq/node_modules/@sentry/capacitor/android')
diff --git a/apps/whattheduck/ios/App/App.xcodeproj/project.pbxproj b/apps/whattheduck/ios/App/App.xcodeproj/project.pbxproj
@@ -366,15 +366,15 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 127;
+				CURRENT_PROJECT_VERSION = 128;
 				DEVELOPMENT_TEAM = ZHTS8HRVD7;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.1;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.0.18;
+				MARKETING_VERSION = 3.0.19;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = net.ducksmanager.whattheduck;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -390,15 +390,15 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 127;
+				CURRENT_PROJECT_VERSION = 128;
 				DEVELOPMENT_TEAM = ZHTS8HRVD7;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.1;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.0.18;
+				MARKETING_VERSION = 3.0.19;
 				PRODUCT_BUNDLE_IDENTIFIER = net.ducksmanager.whattheduck;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";

diff --git a/apps/whattheduck/ios/App/Podfile b/apps/whattheduck/ios/App/Podfile
@@ -22,8 +22,8 @@ def capacitor_pods
   pod 'CapacitorStatusBar', :path => '../../../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/status-bar'
   pod 'CapawesomeCapacitorAppUpdate', :path => '../../../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capawesome/capacitor-app-update'
   pod 'CapawesomeCapacitorFilePicker', :path => '../../../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capawesome/capacitor-file-picker'
-  pod 'CapgoCapacitorUpdater', :path => '../../../../node_modules/.pnpm/@[email protected].10_@[email protected]/node_modules/@capgo/capacitor-updater'
-  pod 'SentryCapacitor', :path => '../../../../node_modules/.pnpm/@[email protected]_@[email protected]_@sentry+vue@8.36.0_pinia@2.2.5_typescript@5.6.3_ah4uiixu64il2xoqbziw5vapje/node_modules/@sentry/capacitor'
+  pod 'CapgoCapacitorUpdater', :path => '../../../../node_modules/.pnpm/@[email protected].16_@[email protected]/node_modules/@capgo/capacitor-updater'
+  pod 'SentryCapacitor', :path => '../../../../node_modules/.pnpm/@[email protected]_@[email protected]_@sentry+vue@8.37.1_pinia@2.2.6_typescript@5.6.3_f6xahmlfcx5uwsnjvx6ykp42sq/node_modules/@sentry/capacitor'
 end
 
 target 'What The Duck' do

diff --git a/apps/whattheduck/ios/App/Podfile.lock b/apps/whattheduck/ios/App/Podfile.lock
@@ -1,10 +1,10 @@
 PODS:
-  - Alamofire (5.9.1)
+  - Alamofire (5.10.1)
   - Capacitor (6.1.2):
     - CapacitorCordova
   - CapacitorApp (6.0.1):
     - Capacitor
-  - CapacitorCamera (6.0.2):
+  - CapacitorCamera (6.1.0):
     - Capacitor
   - CapacitorClipboard (6.0.1):
     - Capacitor
@@ -27,11 +27,15 @@ PODS:
     - Capacitor
   - CapawesomeCapacitorFilePicker (6.1.0):
     - Capacitor
-  - CapgoCapacitorUpdater (6.3.10):
+  - CapgoCapacitorUpdater (6.3.16):
     - Alamofire
     - Capacitor
     - SSZipArchive
     - Version
+  - Sentry/HybridSDK (8.36.0)
+  - SentryCapacitor (1.0.1):
+    - Capacitor
+    - Sentry/HybridSDK (= 8.36.0)
   - SQLCipher (4.6.0):
     - SQLCipher/standard (= 4.6.0)
   - SQLCipher/common (4.6.0)
@@ -44,7 +48,7 @@ PODS:
 DEPENDENCIES:
   - "Capacitor (from `../../../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/ios`)"
   - "CapacitorApp (from `../../../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/app`)"
-  - "CapacitorCamera (from `../../../../node_modules/.pnpm/@capacitor+camera@6.0.2_@[email protected]/node_modules/@capacitor/camera`)"
+  - "CapacitorCamera (from `../../../../node_modules/.pnpm/@capacitor+camera@6.1.0_@[email protected]/node_modules/@capacitor/camera`)"
   - "CapacitorClipboard (from `../../../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/clipboard`)"
   - "CapacitorCommunityCameraPreview (from `../../../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor-community/camera-preview`)"
   - "CapacitorCommunitySqlite (from `../../../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor-community/sqlite`)"
@@ -55,11 +59,13 @@ DEPENDENCIES:
   - "CapacitorStatusBar (from `../../../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/status-bar`)"
   - "CapawesomeCapacitorAppUpdate (from `../../../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capawesome/capacitor-app-update`)"
   - "CapawesomeCapacitorFilePicker (from `../../../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capawesome/capacitor-file-picker`)"
-  - "CapgoCapacitorUpdater (from `../../../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capgo/capacitor-updater`)"
+  - "CapgoCapacitorUpdater (from `../../../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capgo/capacitor-updater`)"
+  - "SentryCapacitor (from `../../../../node_modules/.pnpm/@[email protected]_@[email protected]_@[email protected][email protected][email protected]_f6xahmlfcx5uwsnjvx6ykp42sq/node_modules/@sentry/capacitor`)"
 
 SPEC REPOS:
   trunk:
     - Alamofire
+    - Sentry
     - SQLCipher
     - SSZipArchive
     - Version
@@ -71,7 +77,7 @@ EXTERNAL SOURCES:
   CapacitorApp:
     :path: "../../../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/app"
   CapacitorCamera:
-    :path: "../../../../node_modules/.pnpm/@capacitor+camera@6.0.2_@[email protected]/node_modules/@capacitor/camera"
+    :path: "../../../../node_modules/.pnpm/@capacitor+camera@6.1.0_@[email protected]/node_modules/@capacitor/camera"
   CapacitorClipboard:
     :path: "../../../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/clipboard"
   CapacitorCommunityCameraPreview:
@@ -93,13 +99,15 @@ EXTERNAL SOURCES:
   CapawesomeCapacitorFilePicker:
     :path: "../../../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capawesome/capacitor-file-picker"
   CapgoCapacitorUpdater:
-    :path: "../../../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capgo/capacitor-updater"
+    :path: "../../../../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capgo/capacitor-updater"
+  SentryCapacitor:
+    :path: "../../../../node_modules/.pnpm/@[email protected]_@[email protected]_@[email protected][email protected][email protected]_f6xahmlfcx5uwsnjvx6ykp42sq/node_modules/@sentry/capacitor"
 
 SPEC CHECKSUMS:
-  Alamofire: f36a35757af4587d8e4f4bfa223ad10be2422b8c
+  Alamofire: 840d2a1ad82355b536ec6ba5f97e5bfa54600ca3
   Capacitor: 679f9673fdf30597493a6362a5d5bf233d46abc2
   CapacitorApp: 0bc633b4eae40a1f32cd2834788fad3bc42da6a1
-  CapacitorCamera: ed022171dbf3853e68eec877b4d78995378af6b7
+  CapacitorCamera: 81ce64062cd82b82cc75a79616fda4bd09d7f643
   CapacitorClipboard: 756cd7e83e8d5d19b0c74f40b57517c287bd5fe2
   CapacitorCommunityCameraPreview: 9319cde1da660b7643833dac20aaa85135bd1441
   CapacitorCommunitySqlite: 47dab3a2d9a9581a0fe7642cf9cffd34c5d5b358
@@ -110,12 +118,14 @@ SPEC CHECKSUMS:
   CapacitorStatusBar: b81d4fb5d4e0064c712018071b3ab4b810b39a63
   CapawesomeCapacitorAppUpdate: 3c05b5c8e42f9c6a88d666093406e9336d9bfdb1
   CapawesomeCapacitorFilePicker: abd66735806935246403855cbe62fee8e299cdc5
-  CapgoCapacitorUpdater: 3742dc0db7b6f1b5d9b495c99e528607ff19358f
+  CapgoCapacitorUpdater: 3414431eb976d68edafd28f2abfee6175aa1b76c
+  Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57
+  SentryCapacitor: 2137257959f06553337c81be4ed0c10acefef58b
   SQLCipher: 30a8e81afa6128e600b17ffa77d0f92fa05ed208
   SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
   Version: de5907f2c5d0f3cf21708db7801d1d5401139486
   ZIPFoundation: b8c29ea7ae353b309bc810586181fd073cb3312c
 
-PODFILE CHECKSUM: 2a6feebb0f192ee28688046c067fcf07f6ee574b
+PODFILE CHECKSUM: 05167ac1ae5094bdf5d1e598ae80868da5e8a3be
 
 COCOAPODS: 1.15.2
diff --git a/apps/whattheduck/src/components/Collection.vue b/apps/whattheduck/src/components/Collection.vue
@@ -2,7 +2,7 @@
   <ion-page id="main-content">
     <ion-buttons slot="end" v-if="componentName === IssueList">
       <CopyListButton />
-      <ViewModesButton />
+      <ViewModesButton v-if="!isIOS" />
     </ion-buttons>
     <ion-header :translucent="true">
       <ion-toolbar>
@@ -63,6 +63,7 @@ const {
   issuecodes,
   currentNavigationItem,
   currentFilter,
+  isIOS
 } = storeToRefs(app());
 
 const { issuecodeDetails } = storeToRefs(coa());

diff --git a/apps/whattheduck/src/components/NavigationDrawer.vue b/apps/whattheduck/src/components/NavigationDrawer.vue
@@ -9,7 +9,7 @@
           <ion-row class="ion-justify-content-center ion-padding"
             ><ion-note class="ion-no-padding">{{ user.username }}</ion-note>
           </ion-row>
-          <ion-row class="ion-padding-vertical">
+          <ion-row class="ion-padding-vertical" v-if="!isIOS">
             <Medal
               v-for="(numberOfPoints, contribution) in points[user.id] || {}"
               :key="contribution"
@@ -77,7 +77,7 @@ import { app } from '~/stores/app';
 import { wtdcollection } from '~/stores/wtdcollection';
 
 const { t } = useI18n();
-const { token, isOffline } = storeToRefs(app());
+const { token, isOffline, isIOS } = storeToRefs(app());
 const collectionStore = wtdcollection();
 const points = computed(() => webStores.users().points);
 

diff --git a/apps/whattheduck/src/components/OwnedIssueCopies.vue b/apps/whattheduck/src/components/OwnedIssueCopies.vue
@@ -1,6 +1,6 @@
 <template>
   <ion-content class="no-padding">
-    <ion-row v-if="!isOfflineMode">
+    <ion-row v-if="!isOfflineMode && !isIOS">
       <ion-col size="12" style="height: 100%"
         ><img v-if="fullUrl" :src="coverUrl" /><ion-text v-else>{{ $t('pas de couverture') }}</ion-text>
         <ion-chip v-if="issuecodes.length > 1"
@@ -77,7 +77,7 @@ const { updateCollectionSingleIssue, updateCollectionMultipleIssues } = wtdcolle
 const { issuesByIssuecode } = storeToRefs(wtdcollection());
 const { fetchCoverUrlsByIssuecodes, fetchIssuecodeDetails } = coa();
 const { issuecodeDetails } = storeToRefs(coa());
-const { isOfflineMode, isCoaView, currentNavigationItem } = storeToRefs(app());
+const { isOfflineMode, isCoaView, currentNavigationItem, isIOS } = storeToRefs(app());
 
 const fullUrl = ref<string | null>();
 

diff --git a/apps/whattheduck/src/stores/app.ts b/apps/whattheduck/src/stores/app.ts
@@ -1,3 +1,4 @@
+import { Capacitor } from '@capacitor/core';
 import { bookmarkOutline, bookmarkSharp } from 'ionicons/icons';
 import { defineStore } from 'pinia';
 
@@ -19,6 +20,7 @@ export const app = defineStore('app', () => {
 
   const isOfflineMode = ref<boolean | 'offline_no_cache'>(false);
   const isOffline = computed(() => isOfflineMode.value !== false);
+  const isIOS = computed(() => Capacitor.getPlatform() === 'ios');
 
   const router = useRouter();
   const route = useRoute();
@@ -196,24 +198,25 @@ export const app = defineStore('app', () => {
   });
 
   return {
-    socket,
+    copyListModes,
+    countrycode,
+    currentFilter,
+    currentIssueViewMode,
+    currentNavigationItem,
+    filters,
     filterText,
-    selectedIssuecodes,
-    isPersistedDataLoaded,
     isCameraPreviewShown,
-    currentNavigationItem,
-    countrycode,
-    publicationcode,
-    issuecodes,
-    token,
-    offlineBannerHeight,
+    isCoaView,
+    isIOS,
     isOffline,
     isOfflineMode,
-    isCoaView,
-    copyListModes,
+    isPersistedDataLoaded,
+    issuecodes,
     issueViewModes,
-    currentIssueViewMode,
-    filters,
-    currentFilter,
+    offlineBannerHeight,
+    publicationcode,
+    selectedIssuecodes,
+    socket,
+    token,
   };
 });