cwtch.im
/
cwtch-ui
10
11
Fork 17
Code Issues 91 Pull Requests 2 Projects 2 Releases 28 Wiki Activity

Fix Image Previews + Make Invitations the correct Size #821

Merged
sarah merged 4 commits from fix-images into trunk 2024-02-13 04:00:17 +00:00
Conversation 0 Commits 4 Files Changed 4 +27 -27
3 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6ba6f76ee1 - Show all commits

7
lib/settings.dart
View File

@ -404,9 +404,12 @@ class Settings extends ChangeNotifier {
// checks experiment settings and file extension for image previews
// (ignores file size; if the user manually accepts the file, assume it's okay to preview)
bool shouldPreview(String path) {
return isExperimentEnabled(ImagePreviewsExperiment) && isImage(path);
}
bool isImage(String path) {
var lpath = path.toLowerCase();
return isExperimentEnabled(ImagePreviewsExperiment) &&
(lpath.endsWith(".jpg") || lpath.endsWith(".jpeg") || lpath.endsWith(".png") || lpath.endsWith(".gif") || lpath.endsWith(".webp") || lpath.endsWith(".bmp"));
return (lpath.endsWith(".jpg") || lpath.endsWith(".jpeg") || lpath.endsWith(".png") || lpath.endsWith(".gif") || lpath.endsWith(".webp") || lpath.endsWith(".bmp"));
}
String get downloadPath => _downloadPath;

42
lib/views/globalsettingsexperimentsview.dart
View File

@ -163,28 +163,28 @@ class _GlobalSettingsExperimentsViewState extends State<GlobalSettingsExperiment
]),
),
Visibility(
visible: Provider.of<FlwtchState>(context, listen: false).cwtch.IsBlodeuweddSupported(),
child: SwitchListTile(
title: Text(AppLocalizations.of(context)!.blodeuweddExperimentEnable),
subtitle: Provider.of<FlwtchState>(context, listen: false).cwtch.IsBlodeuweddSupported()
? Text(AppLocalizations.of(context)!.blodeuweddDescription)
: Text(AppLocalizations.of(context)!.blodeuweddNotSupported),
value: Provider.of<FlwtchState>(context, listen: false).cwtch.IsBlodeuweddSupported() && settings.isExperimentEnabled(BlodeuweddExperiment),
onChanged: Provider.of<FlwtchState>(context, listen: false).cwtch.IsBlodeuweddSupported()
? (bool value) {
if (value) {
settings.enableExperiment(BlodeuweddExperiment);
} else {
settings.disableExperiment(BlodeuweddExperiment);
visible: Provider.of<FlwtchState>(context, listen: false).cwtch.IsBlodeuweddSupported(),
child: SwitchListTile(
title: Text(AppLocalizations.of(context)!.blodeuweddExperimentEnable),
subtitle: Provider.of<FlwtchState>(context, listen: false).cwtch.IsBlodeuweddSupported()
? Text(AppLocalizations.of(context)!.blodeuweddDescription)
: Text(AppLocalizations.of(context)!.blodeuweddNotSupported),
value: Provider.of<FlwtchState>(context, listen: false).cwtch.IsBlodeuweddSupported() && settings.isExperimentEnabled(BlodeuweddExperiment),
onChanged: Provider.of<FlwtchState>(context, listen: false).cwtch.IsBlodeuweddSupported()
? (bool value) {
if (value) {
settings.enableExperiment(BlodeuweddExperiment);
} else {
settings.disableExperiment(BlodeuweddExperiment);
}
saveSettings(context);
}
saveSettings(context);
}
: null,
activeTrackColor: settings.theme.defaultButtonColor,
inactiveTrackColor: settings.theme.defaultButtonDisabledColor,
inactiveThumbColor: settings.theme.defaultButtonDisabledColor,
secondary: Icon(Icons.assistant, color: settings.current().mainTextColor),
)),
: null,
activeTrackColor: settings.theme.defaultButtonColor,
inactiveTrackColor: settings.theme.defaultButtonDisabledColor,
inactiveThumbColor: settings.theme.defaultButtonDisabledColor,
secondary: Icon(Icons.assistant, color: settings.current().mainTextColor),
)),
Visibility(
visible: Provider.of<FlwtchState>(context, listen: false).cwtch.IsBlodeuweddSupported() && settings.isExperimentEnabled(BlodeuweddExperiment),
child: CwtchFolderPicker(

5
lib/widgets/filebubble.dart
View File

@ -94,10 +94,7 @@ class FileBubbleState extends State<FileBubble> {
var isImagePreview = false;
if (path != null) {
var lpath = path.toLowerCase();
if (lpath.endsWith(".jpg") || lpath.endsWith(".jpeg") || lpath.endsWith(".png") || lpath.endsWith(".gif") || lpath.endsWith(".webp") || lpath.endsWith(".bmp")) {
isImagePreview = true;
}
isImagePreview = Provider.of<Settings>(context).isImage(path);
}
if (downloadComplete && path != null) {