nyne/venera
1
0
Fork 0
mirror of https://github.com/venera-app/venera.git synced 2025-09-27 07:47:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve sharing image & saving image

Browse Source
This commit is contained in:
nyne
2024-11-13 16:08:28 +08:00
parent 9fcc306ee0
commit 6f2bac52e4
3 changed files with 104 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
assets/translation.json
View File

@@ -205,7 +205,8 @@
"Finished": "已完成",
"Updating": "更新中",
"Update Comics Info": "更新漫画信息",
"Create Folder": "新建文件夹"
"Create Folder": "新建文件夹",
"Select an image on screen": "选择屏幕上的图片"
},
"zh_TW": {
"Home": "首頁",
@@ -413,6 +414,7 @@
"Finished": "已完成",
"Updating": "更新中",
"Update Comics Info": "更新漫畫信息",
"Create Folder": "新建文件夾"
"Create Folder": "新建文件夾",
"Select an image on screen": "選擇屏幕上的圖片"
}
}

2
lib/pages/reader/reader.dart
View File

@@ -324,6 +324,8 @@ enum ReaderMode {
bool get isGallery => key.startsWith('gallery');
bool get isContinuous => key.startsWith('continuous');
const ReaderMode(this.key);
static ReaderMode fromKey(String key) {

89
lib/pages/reader/scaffold.dart
View File

@@ -426,7 +426,7 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
}
Widget buildStatusInfo() {
if(appdata.settings['enableClockAndBatteryInfoInReader']) {
if (appdata.settings['enableClockAndBatteryInfoInReader']) {
return Positioned(
bottom: 13,
right: 25,
@@ -451,8 +451,73 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
);
}
Future<Uint8List> _getCurrentImageData() async {
Future<Uint8List?> _getCurrentImageData() async {
var imageKey = context.reader.images![context.reader.page - 1];
var reader = context.reader;
if (context.reader.mode.isContinuous) {
var continuesState =
context.reader._imageViewController as _ContinuousModeState;
var imagesOnScreen =
continuesState.itemPositionsListener.itemPositions.value;
var images = imagesOnScreen
.map((e) => context.reader.images![e.index - 1])
.toList();
String? selected;
await showPopUpWidget(
context,
PopUpWidgetScaffold(
title: "Select an image on screen".tl,
body: GridView.builder(
itemCount: images.length,
itemBuilder: (context, index) {
ImageProvider image;
var imageKey = images[index];
if (imageKey.startsWith('file://')) {
image = FileImage(File(imageKey.replaceFirst("file://", '')));
} else {
image = ReaderImageProvider(
imageKey,
reader.type.comicSource!.key,
reader.cid,
reader.eid,
);
}
return InkWell(
borderRadius: const BorderRadius.all(Radius.circular(16)),
onTap: () {
selected = images[index];
App.rootContext.pop();
},
child: Container(
decoration: BoxDecoration(
borderRadius: const BorderRadius.all(Radius.circular(16)),
border: Border.all(
color: Theme.of(context).colorScheme.outline,
),
),
width: double.infinity,
height: double.infinity,
child: Image(
width: double.infinity,
height: double.infinity,
image: image,
),
),
).padding(const EdgeInsets.all(8));
},
gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
maxCrossAxisExtent: 200,
childAspectRatio: 0.7,
),
),
),
);
if (selected == null) {
return null;
} else {
imageKey = selected!;
}
}
if (imageKey.startsWith("file://")) {
return await File(imageKey.substring(7)).readAsBytes();
} else {
@@ -464,6 +529,9 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
void saveCurrentImage() async {
var data = await _getCurrentImageData();
if (data == null) {
return;
}
var fileType = detectFileType(data);
var filename = "${context.reader.page}${fileType.ext}";
saveFile(data: data, filename: filename);
@@ -471,6 +539,9 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
void share() async {
var data = await _getCurrentImageData();
if (data == null) {
return;
}
var fileType = detectFileType(data);
var filename = "${context.reader.page}${fileType.ext}";
Share.shareFile(
@@ -490,7 +561,7 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
App.rootContext.pop();
}
if (key == "enableTurnPageByVolumeKey") {
if(appdata.settings[key]) {
if (appdata.settings[key]) {
context.reader.handleVolumeEvent();
} else {
context.reader.stopVolumeEvent();
@@ -613,8 +684,9 @@ class _BatteryWidgetState extends State<_BatteryWidget> {
setState(() {
_hasBattery = true;
_timer = Timer.periodic(const Duration(seconds: 1), (timer) {
_battery.batteryLevel.then((level) =>{
if(_batteryLevel != level) {
_battery.batteryLevel.then((level) => {
if (_batteryLevel != level)
{
setState(() {
_batteryLevel = level;
})
@@ -680,9 +752,10 @@ class _BatteryWidgetState extends State<_BatteryWidget> {
size: 16,
color: batteryColor,
// Stroke
shadows: List.generate(9,
shadows: List.generate(
9,
(index) {
if(index == 4) {
if (index == 4) {
return null;
}
double offsetX = (index % 3 - 1) * 0.8;
@@ -729,7 +802,7 @@ class _ClockWidgetState extends State<_ClockWidget> {
_currentTime = _getCurrentTime();
_timer = Timer.periodic(const Duration(seconds: 1), (timer) {
final time = _getCurrentTime();
if(_currentTime != time) {
if (_currentTime != time) {
setState(() {
_currentTime = time;
});