From 594770a9bf43e4db259f2ec52cf211b6527ef120 Mon Sep 17 00:00:00 2001 From: Warakorn Sitthirit Date: Mon, 23 Sep 2024 13:50:25 +0700 Subject: [PATCH 1/4] chore: Staging Tentacool --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 71d7613..951001b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_social_sample_app description: Demonstrates how to use the flutter_application_1 plugin. -version: 1.1.48+63 +version: 1.1.49+64 From cc00d3bf994e5b3f65748b3f0190eb5ab74c421d Mon Sep 17 00:00:00 2001 From: Zryte Date: Mon, 23 Sep 2024 13:52:09 +0700 Subject: [PATCH 2/4] Remove gallery_saver from pubspec (#238) Co-authored-by: Zryte --- android/app/build.gradle | 2 +- ios/Runner/AppDelegate.swift | 2 +- pubspec.yaml | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 6496964..4566d75 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" apply plugin: 'com.google.gms.google-services' android { - compileSdkVersion 33 + compileSdkVersion 34 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift index 70693e4..b636303 100644 --- a/ios/Runner/AppDelegate.swift +++ b/ios/Runner/AppDelegate.swift @@ -1,7 +1,7 @@ import UIKit import Flutter -@UIApplicationMain +@main @objc class AppDelegate: FlutterAppDelegate { override func application( _ application: UIApplication, diff --git a/pubspec.yaml b/pubspec.yaml index 71d7613..fe5aa9e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -28,7 +28,6 @@ dependencies: flutter: sdk: flutter flutter_keyboard_visibility: ^5.4.0 - gallery_saver: ^2.3.2 get: ^4.6.3 go_router: ^5.2.4 image_picker: ^0.8.4+10 From 006b97823ed43a92de86ede2d435b63569032b04 Mon Sep 17 00:00:00 2001 From: Warakorn Sitthirit Date: Mon, 23 Sep 2024 13:53:10 +0700 Subject: [PATCH 3/4] Staging Squirtle (#237) * feat: add ads list screen * chore: remove unused comments * feat: add ads settings screen * chore: Increase sample app version to 1.1.49 (64) --------- Co-authored-by: trustratch From 9b8f782ad4e221da2dd5ff221623b717c2206baa Mon Sep 17 00:00:00 2001 From: Zryte Date: Tue, 24 Sep 2024 18:08:00 +0700 Subject: [PATCH 4/4] Fix expanded issue --- lib/core/widget/ad_widget.dart | 142 ++++++++++++++++----------------- 1 file changed, 70 insertions(+), 72 deletions(-) diff --git a/lib/core/widget/ad_widget.dart b/lib/core/widget/ad_widget.dart index 6539529..4ebc3bd 100644 --- a/lib/core/widget/ad_widget.dart +++ b/lib/core/widget/ad_widget.dart @@ -13,89 +13,87 @@ class AdWidget extends StatelessWidget { final themeData = Theme.of(context); return Container( padding: const EdgeInsets.all(16), - child: Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, - children: [ - AdvertiserRowWidget( - advertiserId: amityAd.advertiserId ?? '', - companyName: amityAd.advertiser?.companyName, - advertiserAvatar: amityAd.advertiser?.avatar), - Text( - 'Ad id - ${amityAd.adId}', - style: themeData.textTheme.bodySmall, - ), - Text( - 'Target - ${amityAd.adTarget}', - style: themeData.textTheme.bodySmall, - ), - Text( - 'Placements - ${amityAd.placements}', - style: themeData.textTheme.bodySmall, - ), - Text( - 'Start at - ${amityAd.startAt ?? 'N/A'}', - style: themeData.textTheme.bodySmall, - ), - Text( - 'End at - ${amityAd.endAt ?? 'forever'}', - style: themeData.textTheme.bodySmall, - ), - Text( - 'Name - ${amityAd.name}', - style: themeData.textTheme.titleMedium, - ), - Text( - 'Headline - ${amityAd.headline ?? 'N/A - Headline is not available'}', - style: themeData.textTheme.titleLarge, - ), - Text( - 'Description - ${amityAd.description ?? 'N/A - Description is not available'}', - style: themeData.textTheme.bodyMedium, - ), - Row( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, - children: [ - Container( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + AdvertiserRowWidget( + advertiserId: amityAd.advertiserId ?? '', + companyName: amityAd.advertiser?.companyName, + advertiserAvatar: amityAd.advertiser?.avatar), + Text( + 'Ad id - ${amityAd.adId}', + style: themeData.textTheme.bodySmall, + ), + Text( + 'Target - ${amityAd.adTarget}', + style: themeData.textTheme.bodySmall, + ), + Text( + 'Placements - ${amityAd.placements}', + style: themeData.textTheme.bodySmall, + ), + Text( + 'Start at - ${amityAd.startAt ?? 'N/A'}', + style: themeData.textTheme.bodySmall, + ), + Text( + 'End at - ${amityAd.endAt ?? 'forever'}', + style: themeData.textTheme.bodySmall, + ), + Text( + 'Name - ${amityAd.name}', + style: themeData.textTheme.titleMedium, + ), + Text( + 'Headline - ${amityAd.headline ?? 'N/A - Headline is not available'}', + style: themeData.textTheme.titleLarge, + ), + Text( + 'Description - ${amityAd.description ?? 'N/A - Description is not available'}', + style: themeData.textTheme.bodyMedium, + ), + Row( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Container( + margin: const EdgeInsets.all(4), + color: Colors.blueGrey.withOpacity(.25), + width: 130, + height: 130, + child: (amityAd.image1_1 != null) + ? Image.network( + amityAd.image1_1!.getUrl(AmityImageSize.MEDIUM), + fit: BoxFit.cover, + ) + : const Align( + alignment: Alignment.center, + child: Text( + "1:1 Ad image is not available", + textAlign: TextAlign.center, + ), + ), + ), + Container( margin: const EdgeInsets.all(4), color: Colors.blueGrey.withOpacity(.25), width: 130, height: 130, - child: (amityAd.image1_1 != null) + child: (amityAd.image9_16 != null) ? Image.network( - amityAd.image1_1!.getUrl(AmityImageSize.MEDIUM), - fit: BoxFit.cover, + amityAd.image9_16!.getUrl(AmityImageSize.MEDIUM), + fit: BoxFit.fitWidth, ) : const Align( alignment: Alignment.center, child: Text( - "1:1 Ad image is not available", + "9:16 Ad image is not available", textAlign: TextAlign.center, ), - ), - ), - Container( - margin: const EdgeInsets.all(4), - color: Colors.blueGrey.withOpacity(.25), - width: 130, - height: 130, - child: (amityAd.image9_16 != null) - ? Image.network( - amityAd.image9_16!.getUrl(AmityImageSize.MEDIUM), - fit: BoxFit.fitWidth, - ) - : const Align( - alignment: Alignment.center, - child: Text( - "9:16 Ad image is not available", - textAlign: TextAlign.center, - ), - )) - ]), - ], - ), + )) + ]), + ], ), ); }