diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index bcdea94..96d1fe2 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -57,10 +57,10 @@ jobs: host: windows-latest flutter_version: '2.10.3' - target: macos - host: macos-11 + host: macos-latest flutter_version: '2.10.3' - target: ios - host: macos-11 + host: macos-latest flutter_version: '3.3.4' - target: android-arm32 host: ubuntu-latest @@ -229,7 +229,7 @@ jobs: cp version.code.txt ../lib/assets/version.txt - name: Upgrade deps version (flutter2 non-mac) - if: steps.check_asset.outputs.skip_build != 'true' && matrix.config.host != 'macos-11' && startsWith(matrix.config.flutter_version, '2') + if: steps.check_asset.outputs.skip_build != 'true' && matrix.config.host != 'macos-latest' && startsWith(matrix.config.flutter_version, '2') run: | sed -i "s/another_xlider: ^1.0.1+2/another_xlider: 1.0.1+2/g" pubspec.yaml sed -i "s/flutter_styled_toast: ^2.0.0/flutter_styled_toast: 2.0.0/g" pubspec.yaml @@ -238,7 +238,7 @@ jobs: flutter pub get - name: Upgrade deps version (flutter2 mac) - if: steps.check_asset.outputs.skip_build != 'true' && matrix.config.host == 'macos-11' && startsWith(matrix.config.flutter_version, '2') + if: steps.check_asset.outputs.skip_build != 'true' && matrix.config.host == 'macos-latest' && startsWith(matrix.config.flutter_version, '2') run: | brew install gnu-sed gsed -i "s/another_xlider: ^1.0.1+2/another_xlider: 1.0.1+2/g" pubspec.yaml diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 8d5eee7..390ad0e 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,12 +1,12 @@ PODS: - - DKImagePickerController/Core (4.3.2): + - DKImagePickerController/Core (4.3.4): - DKImagePickerController/ImageDataManager - DKImagePickerController/Resource - - DKImagePickerController/ImageDataManager (4.3.2) - - DKImagePickerController/PhotoGallery (4.3.2): + - DKImagePickerController/ImageDataManager (4.3.4) + - DKImagePickerController/PhotoGallery (4.3.4): - DKImagePickerController/Core - DKPhotoGallery - - DKImagePickerController/Resource (4.3.2) + - DKImagePickerController/Resource (4.3.4) - DKPhotoGallery (0.0.17): - DKPhotoGallery/Core (= 0.0.17) - DKPhotoGallery/Model (= 0.0.17) @@ -41,9 +41,9 @@ PODS: - Flutter - permission_handler_apple (9.0.4): - Flutter - - SDWebImage (5.12.5): - - SDWebImage/Core (= 5.12.5) - - SDWebImage/Core (5.12.5) + - SDWebImage (5.13.4): + - SDWebImage/Core (= 5.13.4) + - SDWebImage/Core (5.13.4) - SwiftyGif (5.4.3) - TOCropViewController (2.6.1) - uni_links (0.0.1): @@ -90,14 +90,14 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/url_launcher_ios/ios" SPEC CHECKSUMS: - DKImagePickerController: b5eb7f7a388e4643264105d648d01f727110fc3d + DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 file_picker: 817ab1d8cd2da9d2da412a417162deee3500fc95 Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 image_cropper: 60c2789d1f1a78c873235d4319ca0c34a69f2d98 image_picker_ios: b786a5dcf033a8336a657191401bfdf12017dabb permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce - SDWebImage: 0905f1b7760fc8ac4198cae0036600d67478751e + SDWebImage: e5cc87bf736e60f49592f307bdf9e157189298a3 SwiftyGif: 6c3eafd0ce693cad58bb63d2b2fb9bacb8552780 TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863 uni_links: d97da20c7701486ba192624d99bffaaffcfc298a diff --git a/lib/screens/components/ImageReader.dart b/lib/screens/components/ImageReader.dart index cdbfd05..7c2cbff 100644 --- a/lib/screens/components/ImageReader.dart +++ b/lib/screens/components/ImageReader.dart @@ -202,13 +202,8 @@ class _ImageReaderContent extends StatefulWidget { final ImageReaderStruct struct; - const _ImageReaderContent( - this.struct, - this.pagerDirection, - this.pagerType, - this.fullScreenAction, - this.readerSliderPosition, - ); + const _ImageReaderContent(this.struct, this.pagerDirection, this.pagerType, + this.fullScreenAction, this.readerSliderPosition); @override State createState() { @@ -564,7 +559,41 @@ abstract class _ImageReaderContentState extends State<_ImageReaderContent> { !widget.struct.fullScreen) { return Container(); } - return Align( + if (widget.readerSliderPosition == ReaderSliderPosition.RIGHT ) { + return SafeArea( + child: Align( + alignment: Alignment.bottomRight, + child: Material( + color: Colors.transparent, + child: Container( + padding: + const EdgeInsets.only(left: 10, right: 10, top: 4, bottom: 4), + margin: const EdgeInsets.only(bottom: 10), + decoration: const BoxDecoration( + borderRadius: BorderRadius.only( + topLeft: Radius.circular(10), + bottomLeft: Radius.circular(10), + ), + color: Color(0x88000000), + ), + child: GestureDetector( + onTap: () { + widget.struct.onFullScreenChange(!widget.struct.fullScreen); + }, + child: Icon( + widget.struct.fullScreen + ? Icons.fullscreen_exit + : Icons.fullscreen_outlined, + size: 30, + color: Colors.white, + ), + ), + ), + ), + )); + } + return SafeArea( + child: Align( alignment: Alignment.bottomLeft, child: Material( color: Colors.transparent, @@ -593,7 +622,7 @@ abstract class _ImageReaderContentState extends State<_ImageReaderContent> { ), ), ), - ); + )); } Widget _buildTouchOnceControllerAction(Widget child) { diff --git a/pubspec.lock b/pubspec.lock index 1146aa0..2d4e4f2 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -202,7 +202,7 @@ packages: name: image url: "https://pub.dartlang.org" source: hosted - version: "3.2.0" + version: "3.2.2" image_cropper: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 1b92514..39201bb 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -43,7 +43,7 @@ dependencies: flutter_datetime_picker: ^1.5.1 modal_bottom_sheet: ^2.0.0 image_cropper: ^1.5.0 - image_picker: ^0.8.5 + image_picker: ^0.8.6 file_picker: ^5.2.1 crop_image: ^1.0.2 image: ^3.1.3 diff --git a/scripts/bind-ios-arm64.sh b/scripts/bind-ios-arm64.sh index 086858c..748e580 100644 --- a/scripts/bind-ios-arm64.sh +++ b/scripts/bind-ios-arm64.sh @@ -4,4 +4,4 @@ cd "$( cd "$( dirname "$0" )" && pwd )/.." cd go/mobile -gomobile bind -target=ios -o lib/Mobile.xcframework ./ +gomobile bind -iosversion 11.0 -target=ios -o lib/Mobile.xcframework ./ diff --git a/scripts/bind-ios.sh b/scripts/bind-ios.sh index 7f812ac..9406a7e 100644 --- a/scripts/bind-ios.sh +++ b/scripts/bind-ios.sh @@ -4,4 +4,4 @@ cd "$( cd "$( dirname "$0" )" && pwd )/.." cd go/mobile -gomobile bind -target=ios -o lib/Mobile.xcframework ./ +gomobile bind -iosversion 11.0 -target=ios -o lib/Mobile.xcframework ./ diff --git a/scripts/build-ipa.sh b/scripts/build-ipa.sh index 516b4c8..00c7a05 100644 --- a/scripts/build-ipa.sh +++ b/scripts/build-ipa.sh @@ -4,7 +4,7 @@ cd "$( cd "$( dirname "$0" )" && pwd )/.." cd go/mobile go get golang.org/x/mobile/cmd/gobind -gomobile bind -target=ios -o lib/Mobile.xcframework ./ +gomobile bind -iosversion 11.0 -target=ios -o lib/Mobile.xcframework ./ cd ../.. flutter build ios --release --no-codesign