Skip to content

set sticker width and height to kMaxWidth #949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
crossle merged 2 commits into from
Nov 8, 2022
Merged

set sticker width and height to kMaxWidth #949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4306ac
set sticker width and height to kMaxWidth
boyan01 Nov 8, 2022
b01bccc
fix warning
boyan01 Nov 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions lib/utils/dp_utils.dart
View file
Open in desktop

This file was deleted.

45 changes: 3 additions & 42 deletions lib/widgets/message/item/sticker_message.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_hooks/flutter_hooks.dart';

import '../../../utils/dp_utils.dart';
import '../../../utils/extension/extension.dart';
import '../../../utils/hook.dart';
import '../../interactive_decorated_box.dart';
Expand Down Expand Up @@ -86,49 +85,11 @@ class StickerMessageWidget extends HookWidget {
keys: [messageAssetUrl, stickerId],
).data;

final assetWidth = stickerData?.assetWidth;
final assetHeight = stickerData?.assetHeight;
final assetType = stickerData?.assetType;

double width;
double height;
if (assetWidth == null || assetHeight == null) {
height = kMaxWidth;
width = kMaxWidth;
} else if (assetWidth * 2 < dpToPx(context, 48) ||
assetHeight * 2 < dpToPx(context, 48)) {
if (assetWidth < assetHeight) {
if (dpToPx(context, 48) * assetHeight / assetWidth >
dpToPx(context, kMaxWidth)) {
height = kMaxWidth;
width = kMaxWidth * assetWidth / assetHeight;
} else {
width = 48;
height = assetHeight * 48 / assetWidth;
}
} else {
if (dpToPx(context, 48) * assetWidth / assetHeight >
dpToPx(context, kMaxWidth)) {
width = kMaxWidth;
height = kMaxWidth * assetHeight / assetWidth;
} else {
height = 48;
width = assetWidth * 48 / assetHeight;
}
}
} else if (assetWidth * 2 < dpToPx(context, kMaxWidth) ||
assetHeight * 2 > dpToPx(context, kMaxWidth)) {
if (assetWidth > assetHeight) {
width = kMaxWidth;
height = kMaxWidth * assetHeight / assetWidth;
} else {
height = kMaxWidth;
width = kMaxWidth * assetWidth / assetHeight;
}
} else {
width = pxToDp(context, assetWidth * 2);
height = pxToDp(context, assetHeight * 2);
}
const width = kMaxWidth;
const height = kMaxWidth;

final placeholder = Container(
width: width,
height: height,
Expand Down
15 changes: 0 additions & 15 deletions lib/widgets/user/pin_verification_dialog.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,19 +290,4 @@ class _PinInputLayoutState extends State<PinInputLayout>
TextInputControl? oldControl, TextInputControl? newControl) {
// TODO: implement didChangeInputControl
}

@override
void insertTextPlaceholder(Size size) {
// TODO: implement insertTextPlaceholder
}

@override
void removeTextPlaceholder() {
// TODO: implement removeTextPlaceholder
}

@override
void showToolbar() {
// TODO: implement showToolbar
}
}