Formatting
This commit is contained in:
parent
d4e57f493e
commit
fe4726986f
|
@ -24,7 +24,7 @@ LoadAssetThemes() async {
|
|||
themes = await loadYamlThemes();
|
||||
}
|
||||
|
||||
OpaqueThemeType getTheme(String themeId, String mode) {
|
||||
OpaqueThemeType getTheme(String themeId, String mode) {
|
||||
if (themeId == "") {
|
||||
themeId = cwtch_theme;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
@ -95,7 +93,7 @@ class YmlTheme extends OpaqueThemeType {
|
|||
String? getImage(String name) {
|
||||
var val = yml["themes"][mode]["theme"]?[name];
|
||||
if (val != null) {
|
||||
return path.join("assets", "themes", yml["themes"]["name"], val);
|
||||
return path.join("assets", "themes", yml["themes"]["name"], val);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
|
|
@ -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))
|
||||
|
|
Loading…
Reference in New Issue