Merge branch 'develop' into 2918/home_widget/android

bitmark-inc · Oct 30, 2024 · a9c040c · a9c040c
2 parents 2b81422 + 04fb8e6
commit a9c040c
Show file tree

Hide file tree

Showing 19 changed files with 113 additions and 103 deletions.
diff --git a/.github/workflows/ios-release-appcenter.yaml b/.github/workflows/ios-release-appcenter.yaml
@@ -27,7 +27,7 @@ jobs:
           channel: stable
       - uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: "15.2"
+          xcode-version: "16.1"
 
       - name: Set env
         run: |

diff --git a/.github/workflows/ios-release-testflight.yaml b/.github/workflows/ios-release-testflight.yaml
@@ -22,7 +22,7 @@ jobs:
           channel: stable
       - uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: "15.2"
+          xcode-version: "16.1"
 
       - name: Set env
         run: |

diff --git a/.github/workflows/ios-release-testflight_local_bmvn.yaml b/.github/workflows/ios-release-testflight_local_bmvn.yaml
@@ -22,7 +22,7 @@ jobs:
           channel: stable
       - uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: "15.2"
+          xcode-version: "16.1"
 
       - name: Set env
         run: |
@@ -80,7 +80,8 @@ jobs:
           flutter clean
           flutter pub get
           cd ios/
-          pod install
+          rm Podfile.lock
+          pod install --repo-update
 
       # Encrypt secrets before use
       - name: Encrypt Secrets

diff --git a/assets b/assets
diff --git a/ios/Runner/BeaconConnectService.swift b/ios/Runner/BeaconConnectService.swift
@@ -292,9 +292,9 @@ extension BeaconConnectService {
         .eraseToAnyPublisher()
     }
 
-    private func startOpenChannelListener(completion: @escaping (Result<(), Beacon.Error>) -> Void) {
+    private func startOpenChannelListener(completion: @escaping (Result<(), Error>) -> Void) {
         guard let beaconClient = beaconClient else {
-            completion(.failure(.uninitialized))
+            completion(.failure(Beacon.Error.uninitialized))
             return
         }
 

diff --git a/lib/main.dart b/lib/main.dart
@@ -53,7 +53,7 @@ void main() async {
           ..enableAutoSessionTracking = true
           ..tracesSampleRate = 0.25
           ..attachStacktrace = true
-          ..beforeSend = (SentryEvent event, {dynamic hint}) {
+          ..beforeSend = (SentryEvent event, Hint hint) {
             // Avoid sending events with "level": "debug"
             if (event.level == SentryLevel.debug) {
               // Return null to drop the event

diff --git a/lib/model/ff_exhibition.dart b/lib/model/ff_exhibition.dart
@@ -22,12 +22,12 @@ class Exhibition {
   final String? coverURI;
   final String? thumbnailCoverURI;
   final String mintBlockchain;
-  final AlumniAccount? curator;
-  final List<AlumniAccount>? curators;
-  final List<AlumniAccount>? artists;
+  final AlumniAccount? curatorAlumni;
+  final List<AlumniAccount>? curatorsAlumni;
+  final List<AlumniAccount>? artistsAlumni;
   final List<FFSeries>? series;
   final List<FFContract>? contracts;
-  final AlumniAccount? partner;
+  final AlumniAccount? partnerAlumni;
   final String type;
   final List<Post>? posts;
   final int status;
@@ -46,12 +46,12 @@ class Exhibition {
     required this.status,
     this.coverURI,
     this.thumbnailCoverURI,
-    this.curators,
-    this.artists,
+    this.curatorsAlumni,
+    this.artistsAlumni,
     this.series,
     this.contracts,
-    this.partner,
-    this.curator,
+    this.partnerAlumni,
+    this.curatorAlumni,
     this.posts,
   });
 
@@ -66,10 +66,10 @@ class Exhibition {
         note: json['note'] as String,
         coverURI: json['coverURI'] as String?,
         thumbnailCoverURI: json['thumbnailCoverURI'] as String?,
-        curators: (json['curators'] as List<dynamic>?)
+        curatorsAlumni: (json['curatorsAlumni'] as List<dynamic>?)
             ?.map((e) => AlumniAccount.fromJson(e as Map<String, dynamic>))
             .toList(),
-        artists: (json['artists'] as List<dynamic>?)
+        artistsAlumni: (json['artistsAlumni'] as List<dynamic>?)
             ?.map((e) => AlumniAccount.fromJson(e as Map<String, dynamic>))
             .toList(),
         series: (json['series'] as List<dynamic>?)
@@ -79,13 +79,13 @@ class Exhibition {
             ?.map((e) => FFContract.fromJson(e as Map<String, dynamic>))
             .toList(),
         mintBlockchain: (json['mintBlockchain'] ?? '') as String,
-        partner: json['partner'] == null
+        partnerAlumni: json['partnerAlumni'] == null
             ? null
             : AlumniAccount.fromJson(json['partner'] as Map<String, dynamic>),
         type: json['type'] as String,
-        curator: json['curator'] == null
+        curatorAlumni: json['curatorAlumni'] == null
             ? null
-            : AlumniAccount.fromJson(json['curator'] as Map<String, dynamic>),
+            : AlumniAccount.fromJson(json['curatorAlumni'] as Map<String, dynamic>),
         posts: (json['posts'] as List<dynamic>?)
             ?.map((e) => Post.fromJson(e as Map<String, dynamic>))
             .toList(),
@@ -103,14 +103,14 @@ class Exhibition {
         'note': note,
         'coverURI': coverURI,
         'thumbnailCoverURI': thumbnailCoverURI,
-        'curators': curators?.map((e) => e.toJson()).toList(),
-        'artists': artists?.map((e) => e.toJson()).toList(),
+        'curatorsAlumni': curatorsAlumni?.map((e) => e.toJson()).toList(),
+        'artistsAlumni': artistsAlumni?.map((e) => e.toJson()).toList(),
         'series': series?.map((e) => e.toJson()).toList(),
         'contracts': contracts?.map((e) => e.toJson()).toList(),
         'mintBlockchain': mintBlockchain,
-        'partner': partner?.toJson(),
+        'partnerAlumni': partnerAlumni?.toJson(),
         'type': type,
-        'curator': curator?.toJson(),
+        'curatorAlumni': curatorAlumni?.toJson(),
         'posts': posts?.map((e) => e.toJson()).toList(),
         'status': status,
       };
@@ -130,12 +130,12 @@ class Exhibition {
     String? coverURI,
     String? thumbnailCoverURI,
     String? mintBlockchain,
-    AlumniAccount? curator,
-    List<AlumniAccount>? curators,
-    List<AlumniAccount>? artists,
+    AlumniAccount? curatorAlumni,
+    List<AlumniAccount>? curatorsAlumni,
+    List<AlumniAccount>? artistsAlumni,
     List<FFSeries>? series,
     List<FFContract>? contracts,
-    AlumniAccount? partner,
+    AlumniAccount? partnerAlumni,
     String? type,
     List<Post>? posts,
     int? status,
@@ -152,12 +152,12 @@ class Exhibition {
         coverURI: coverURI ?? this.coverURI,
         thumbnailCoverURI: thumbnailCoverURI ?? this.thumbnailCoverURI,
         mintBlockchain: mintBlockchain ?? this.mintBlockchain,
-        curator: curator ?? this.curator,
-        curators: curators ?? this.curators,
-        artists: artists ?? this.artists,
+        curatorAlumni: curatorAlumni ?? this.curatorAlumni,
+        curatorsAlumni: curatorsAlumni ?? this.curatorsAlumni,
+        artistsAlumni: artistsAlumni ?? this.artistsAlumni,
         series: series ?? this.series,
         contracts: contracts ?? this.contracts,
-        partner: partner ?? this.partner,
+        partnerAlumni: partnerAlumni ?? this.partnerAlumni,
         type: type ?? this.type,
         posts: posts ?? this.posts,
         status: status ?? this.status,

diff --git a/lib/model/ff_series.dart b/lib/model/ff_series.dart
@@ -18,7 +18,7 @@ class FFSeries {
   final int? displayIndex;
   final int? featuringIndex;
   final FFSeriesSettings? settings;
-  final AlumniAccount? artist;
+  final AlumniAccount? artistAlumni;
   final Exhibition? exhibition;
   final DateTime? createdAt;
   final DateTime? updatedAt;
@@ -44,7 +44,7 @@ class FFSeries {
     this.exhibitionID,
     this.metadata,
     this.settings,
-    this.artist,
+    this.artistAlumni,
     this.exhibition,
     this.createdAt,
     this.mintedAt,
@@ -80,9 +80,10 @@ class FFSeries {
             ? null
             : FFSeriesSettings.fromJson(
                 json['settings'] as Map<String, dynamic>),
-        json['artist'] == null
+        json['artistAlumni'] == null
             ? null
-            : AlumniAccount.fromJson(json['artist'] as Map<String, dynamic>),
+            : AlumniAccount.fromJson(
+                json['artistAlumni'] as Map<String, dynamic>),
         json['exhibition'] == null
             ? null
             : Exhibition.fromJson(json['exhibition'] as Map<String, dynamic>),
@@ -131,7 +132,7 @@ class FFSeries {
         'displayIndex': displayIndex,
         'featuringIndex': featuringIndex,
         'settings': settings,
-        'artist': artist,
+        'artistAlumni': artistAlumni,
         'exhibition': exhibition,
         'createdAt': createdAt?.toIso8601String(),
         'updatedAt': updatedAt?.toIso8601String(),
@@ -159,7 +160,7 @@ class FFSeries {
     int? displayIndex,
     int? featuringIndex,
     FFSeriesSettings? settings,
-    AlumniAccount? artist,
+    AlumniAccount? artistAlumni,
     Exhibition? exhibition,
     DateTime? createdAt,
     DateTime? mintedAt,
@@ -185,7 +186,7 @@ class FFSeries {
         exhibitionID ?? this.exhibitionID,
         metadata ?? this.metadata,
         settings ?? this.settings,
-        artist ?? this.artist,
+        artistAlumni ?? this.artistAlumni,
         exhibition ?? this.exhibition,
         createdAt ?? this.createdAt,
         mintedAt ?? this.mintedAt,

diff --git a/lib/screen/feralfile_home/artwork_view.dart b/lib/screen/feralfile_home/artwork_view.dart
@@ -257,7 +257,7 @@ class _SeriesViewState extends State<SeriesView> {
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               Text(
-                series.artist?.displayAlias ?? '',
+                series.artistAlumni?.displayAlias ?? '',
                 style: defaultStyle,
                 overflow: TextOverflow.ellipsis,
               ),

diff --git a/lib/screen/feralfile_series/feralfile_series_page.dart b/lib/screen/feralfile_series/feralfile_series_page.dart
@@ -98,7 +98,7 @@ class _FeralFileSeriesPageState extends State<FeralFileSeriesPage> {
             ? const SizedBox()
             : SeriesTitleView(
                 series: series,
-                artist: series.artist,
+                artist: series.artistAlumni,
                 crossAxisAlignment: CrossAxisAlignment.center),
       );
 

diff --git a/lib/service/feralfile_service.dart b/lib/service/feralfile_service.dart
@@ -303,7 +303,7 @@ class FeralFileServiceImpl extends FeralFileService {
   @override
   Future<String?> getPartnerFullName(String exhibitionId) async {
     final exhibition = await _feralFileApi.getExhibition(exhibitionId);
-    return exhibition.result!.partner?.fullName;
+    return exhibition.result!.partnerAlumni?.fullName;
   }
 
   @override

diff --git a/lib/util/asset_token_ext.dart b/lib/util/asset_token_ext.dart
@@ -771,7 +771,7 @@ extension PostcardExtension on AssetToken {
         final shareMessage = 'postcard_share_message'.tr(namedArgs: {
           'deeplink': sharePostcardResponse.deeplink!,
         });
-        final result = await Share.shareWithResult(shareMessage,
+        final result = await Share.share(shareMessage,
             sharePositionOrigin: sharePositionOrigin);
         if (result.status == ShareResultStatus.success) {
           await Future.delayed(const Duration(milliseconds: 100));

diff --git a/lib/view/artwork_common_widget.dart b/lib/view/artwork_common_widget.dart
@@ -934,15 +934,15 @@ class FFArtworkDetailsMetadataSection extends StatelessWidget {
             title: 'title'.tr(),
             value: artwork.series!.displayTitle,
           ),
-          if (artwork.series!.artist?.alias != null) ...[
+          if (artwork.series!.artistAlumni?.alias != null) ...[
             divider,
             MetaDataItem(
               title: 'artist'.tr(),
-              value: artwork.series!.artist!.displayAlias,
+              value: artwork.series!.artistAlumni!.displayAlias,
               onTap: () async {
-                if (artwork.series!.artist!.slug != null) {
+                if (artwork.series!.artistAlumni!.slug != null) {
                   await injector<NavigationService>()
-                      .openFeralFileArtistPage(artwork.series!.artist!.slug!);
+                      .openFeralFileArtistPage(artwork.series!.artistAlumni!.slug!);
                 }
               },
             ),

diff --git a/lib/view/artwork_title_view.dart b/lib/view/artwork_title_view.dart
@@ -29,14 +29,14 @@ class ArtworkTitleView extends StatelessWidget {
       children: [
         GestureDetector(
           child: Text(
-            artwork.series!.artist?.displayAlias ?? '',
+            artwork.series!.artistAlumni?.displayAlias ?? '',
             style: theme.textTheme.ppMori400White14,
           ),
           onTap: () async => {
-            if (artwork.series?.artist?.slug != null)
+            if (artwork.series?.artistAlumni?.slug != null)
               {
                 injector<NavigationService>()
-                    .openFeralFileArtistPage(artwork.series!.artist!.slug!)
+                    .openFeralFileArtistPage(artwork.series!.artistAlumni!.slug!)
               }
           },
         ),

diff --git a/lib/view/exhibition_detail_preview.dart b/lib/view/exhibition_detail_preview.dart
@@ -28,10 +28,10 @@ class ExhibitionPreview extends StatelessWidget {
     );
 
     final listCurators =
-        (exhibition.curator != null || exhibition.curators != null)
+        (exhibition.curatorAlumni != null || exhibition.curatorsAlumni != null)
             ? exhibition.id == SOURCE_EXHIBITION_ID
-                ? exhibition.curators!
-                : [exhibition.curator!]
+                ? exhibition.curatorsAlumni!
+                : [exhibition.curatorAlumni!]
             : <AlumniAccount>[];
 
     return Container(
@@ -66,7 +66,7 @@ class ExhibitionPreview extends StatelessWidget {
               style: subTitleTextStyle),
           const SizedBox(height: 3),
           FFExhibitionParticipants(
-            listAlumni: exhibition.artists!,
+            listAlumni: exhibition.artistsAlumni!,
             textStyle: participantTextStyle,
           ),
         ],

diff --git a/lib/view/exhibition_item.dart b/lib/view/exhibition_item.dart
@@ -44,10 +44,10 @@ class ExhibitionCard extends StatelessWidget {
     final subTitleStyle = theme.textTheme.ppMori400Grey12;
 
     final listCurators =
-        (exhibition.curator != null || exhibition.curators != null)
+        (exhibition.curatorAlumni != null || exhibition.curatorsAlumni != null)
             ? exhibition.id == SOURCE_EXHIBITION_ID
-                ? exhibition.curators!
-                : [exhibition.curator!]
+                ? exhibition.curatorsAlumni!
+                : [exhibition.curatorAlumni!]
             : <AlumniAccount>[];
 
     return GestureDetector(
@@ -107,7 +107,7 @@ class ExhibitionCard extends StatelessWidget {
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
                       if (exhibition.isSoloExhibition &&
-                          exhibition.artists != null) ...[
+                          exhibition.artistsAlumni != null) ...[
                         RichText(
                           textScaler: MediaQuery.textScalerOf(context),
                           text: TextSpan(
@@ -116,7 +116,7 @@ class ExhibitionCard extends StatelessWidget {
                             children: [
                               TextSpan(text: 'works_by'.tr()),
                               ...exhibitionParticipantSpans(
-                                  [exhibition.artists![0]]),
+                                  [exhibition.artistsAlumni![0]]),
                             ],
                           ),
                         ),

diff --git a/lib/view/ff_artwork_preview.dart b/lib/view/ff_artwork_preview.dart
@@ -57,7 +57,7 @@ class FeralFileArtworkPreview extends StatelessWidget {
                       flex: 5,
                       child: SeriesTitleView(
                         series: payload.artwork.series!,
-                        artist: payload.artwork.series!.artist,
+                        artist: payload.artwork.series!.artistAlumni,
                       ),
                     ),
                     Padding(