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

Formatting

This commit is contained in:
Sarah Jamie Lewis 2024-01-02 10:53:15 -08:00
parent d4e57f493e
commit fe4726986f
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/themes/yamltheme.dart
View File

@ -8,8 +8,6 @@ import 'package:flutter/services.dart';
import 'package:yaml/yaml.dart';
import 'package:path/path.dart' as path;
Future<Map<String, Map<String, OpaqueThemeType>>> loadYamlThemes() async {
final manifestJson = await rootBundle.loadString('AssetManifest.json');
final themesList = json.decode(manifestJson).keys.where((String key) => key.startsWith('assets/themes'));
@ -17,7 +15,7 @@ Future<Map<String, Map<String, OpaqueThemeType>>> loadYamlThemes() async {
Map<String, Map<String, OpaqueThemeType>> themes = Map();
for (String themefile in themesList) {
if (themefile.substring(themefile.length-4) != ".yml") {
if (themefile.substring(themefile.length - 4) != ".yml") {
continue;
}
@ -77,16 +75,16 @@ class YmlTheme extends OpaqueThemeType {
Color? getColor(String name) {
var val = yml["themes"][mode]["theme"][name];
if (! (val is int)) {
if (!(val is int)) {
val = yml["themes"][mode]["theme"][val] ?? val;
}
if (! (val is int)) {
if (!(val is int)) {
val = yml["themes"][mode]?["colors"][val] ?? val;
}
if (! (val is int)) {
if (!(val is int)) {
val = yml["colors"]?[val];
}
if (! (val is int)) {
if (!(val is int)) {
return null;
}
return Color(0xFF000000 + val as int);

4
lib/widgets/messagelist.dart
View File

@ -116,8 +116,8 @@ class _MessageListState extends State<MessageList> {
// Only show broken heart is the contact is offline...
decoration: BoxDecoration(
image: Provider.of<ContactInfoState>(outerContext).isOnline()
? (Provider.of<Settings>(context).theme.chatImage != null) ?
DecorationImage(
? (Provider.of<Settings>(context).theme.chatImage != null)
? DecorationImage(
repeat: ImageRepeat.repeat,
image: AssetImage(Provider.of<Settings>(context).theme.chatImage),
colorFilter: ColorFilter.mode(Provider.of<Settings>(context).theme.hilightElementColor.withOpacity(0.15), BlendMode.srcIn))