2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #999 from krille-chan/krille/update-and-clean-up-dependencies

Browse source 
build: Update all dependencies and remove vibrator package
This commit is contained in:
Krille-chan 2024-04-10 09:08:50 +02:00 • committed by GitHub
commit ec85988a83
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 256 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

39
lib/pages/chat/chat_emoji_picker.dart
View file

@ -41,21 +41,30 @@ class ChatEmojiPicker extends StatelessWidget {
onEmojiSelected: controller.onEmojiSelected,
onBackspacePressed: controller.emojiPickerBackspace,
config: Config(
backspaceColor: theme.colorScheme.primary,
bgColor:
Theme.of(context).colorScheme.onInverseSurface,
iconColor:
theme.colorScheme.primary.withOpacity(0.5),
iconColorSelected: theme.colorScheme.primary,
indicatorColor: theme.colorScheme.primary,
noRecents: const NoRecent(),
skinToneDialogBgColor: Color.lerp(
theme.colorScheme.background,
theme.colorScheme.primaryContainer,
0.75,
)!,
skinToneIndicatorColor:
theme.colorScheme.onBackground,
emojiViewConfig: EmojiViewConfig(
noRecents: const NoRecent(),
backgroundColor: Theme.of(context)
.colorScheme
.onInverseSurface,
),
bottomActionBarConfig: const BottomActionBarConfig(
enabled: false,
),
categoryViewConfig: CategoryViewConfig(
backspaceColor: theme.colorScheme.primary,
iconColor:
theme.colorScheme.primary.withOpacity(0.5),
iconColorSelected: theme.colorScheme.primary,
indicatorColor: theme.colorScheme.primary,
),
skinToneConfig: SkinToneConfig(
dialogBackgroundColor: Color.lerp(
theme.colorScheme.background,
theme.colorScheme.primaryContainer,
0.75,
)!,
indicatorColor: theme.colorScheme.onBackground,
),
),
),
StickerPickerDialog(

6
lib/pages/chat/events/map_bubble.dart
View file

@ -32,8 +32,8 @@ class MapBubble extends StatelessWidget {
children: <Widget>[
FlutterMap(
options: MapOptions(
center: LatLng(latitude, longitude),
zoom: zoom,
initialCenter: LatLng(latitude, longitude),
initialZoom: zoom,
),
children: [
TileLayer(
@ -50,7 +50,7 @@ class MapBubble extends StatelessWidget {
point: LatLng(latitude, longitude),
width: 30,
height: 30,
builder: (_) => Transform.translate(
child: Transform.translate(
// No idea why the offset has to be like this, instead of -15
// It has been determined by trying out, though, that this yields
// the tip of the location pin to be static when zooming.

8
lib/pages/dialer/dialer.dart
View file

@ -21,13 +21,13 @@ import 'dart:math';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_foreground_task/flutter_foreground_task.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:flutter_webrtc/flutter_webrtc.dart';
import 'package:just_audio/just_audio.dart';
import 'package:matrix/matrix.dart';
import 'package:vibration/vibration.dart';
import 'package:wakelock_plus/wakelock_plus.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
@ -264,11 +264,7 @@ class MyCallingPage extends State<Calling> {
void _handleCallState(CallState state) {
Logs().v('CallingPage::handleCallState: ${state.toString()}');
if ({CallState.kConnected, CallState.kEnded}.contains(state)) {
try {
Vibration.vibrate(duration: 200);
} catch (e) {
Logs().e('[Dialer] could not vibrate for call updates');
}
HapticFeedback.heavyImpact();
}
if (mounted) {