diff --git a/android/app/src/main/kotlin/im/cwtch/flwtch/FlwtchWorker.kt b/android/app/src/main/kotlin/im/cwtch/flwtch/FlwtchWorker.kt
index e70c1c4e..9f4f8247 100644
--- a/android/app/src/main/kotlin/im/cwtch/flwtch/FlwtchWorker.kt
+++ b/android/app/src/main/kotlin/im/cwtch/flwtch/FlwtchWorker.kt
@@ -87,7 +87,7 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
.setContentTitle(data.getString("Nick"))
.setContentText("New message")//todo: translate
.setLargeIcon(BitmapFactory.decodeStream(fh))
- .setSmallIcon(R.mipmap.knott)
+ .setSmallIcon(R.mipmap.knott_transparent)
.setContentIntent(PendingIntent.getActivity(applicationContext, 1, clickIntent, PendingIntent.FLAG_UPDATE_CURRENT))
.setAutoCancel(true)
.build()
@@ -240,7 +240,7 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
.setContentTitle(title)
.setTicker(title)
.setContentText(progress)
- .setSmallIcon(R.mipmap.knott)
+ .setSmallIcon(R.mipmap.knott_transparent)
.setOngoing(true)
// Add the cancel action to the notification which can
// be used to cancel the worker
diff --git a/android/app/src/main/res/mipmap-hdpi/knott.png b/android/app/src/main/res/mipmap-hdpi/knott.png
index 709c741c..d10505eb 100644
Binary files a/android/app/src/main/res/mipmap-hdpi/knott.png and b/android/app/src/main/res/mipmap-hdpi/knott.png differ
diff --git a/android/app/src/main/res/mipmap-hdpi/knott_transparent.png b/android/app/src/main/res/mipmap-hdpi/knott_transparent.png
new file mode 100644
index 00000000..c4f35ba1
Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/knott_transparent.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/knott.png b/android/app/src/main/res/mipmap-mdpi/knott.png
index f7a20fbc..51f2c215 100644
Binary files a/android/app/src/main/res/mipmap-mdpi/knott.png and b/android/app/src/main/res/mipmap-mdpi/knott.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/knott_transparent.png b/android/app/src/main/res/mipmap-mdpi/knott_transparent.png
new file mode 100644
index 00000000..5c4a5597
Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/knott_transparent.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/knott.png b/android/app/src/main/res/mipmap-xhdpi/knott.png
index 2c29fa07..71697224 100644
Binary files a/android/app/src/main/res/mipmap-xhdpi/knott.png and b/android/app/src/main/res/mipmap-xhdpi/knott.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/knott_transparent.png b/android/app/src/main/res/mipmap-xhdpi/knott_transparent.png
new file mode 100644
index 00000000..7932ec6d
Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/knott_transparent.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/knott.png b/android/app/src/main/res/mipmap-xxhdpi/knott.png
index fc2101d0..912bb2ad 100644
Binary files a/android/app/src/main/res/mipmap-xxhdpi/knott.png and b/android/app/src/main/res/mipmap-xxhdpi/knott.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/knott_transparent.png b/android/app/src/main/res/mipmap-xxhdpi/knott_transparent.png
new file mode 100644
index 00000000..f8d47142
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/knott_transparent.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/knott.png b/android/app/src/main/res/mipmap-xxxhdpi/knott.png
index f741dbbf..9940b76c 100644
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/knott.png and b/android/app/src/main/res/mipmap-xxxhdpi/knott.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/knott_transparent.png b/android/app/src/main/res/mipmap-xxxhdpi/knott_transparent.png
new file mode 100644
index 00000000..c0772478
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/knott_transparent.png differ
diff --git a/assets/core/knott-transparent.svg b/assets/core/knott-transparent.svg
new file mode 100644
index 00000000..b95115a6
--- /dev/null
+++ b/assets/core/knott-transparent.svg
@@ -0,0 +1,132 @@
+
+
diff --git a/assets/core/knott-white.png b/assets/core/knott-white.png
index d30bc363..e50812f7 100644
Binary files a/assets/core/knott-white.png and b/assets/core/knott-white.png differ
diff --git a/assets/core/knott-white.svg b/assets/core/knott-white.svg
new file mode 100644
index 00000000..bf0f670f
--- /dev/null
+++ b/assets/core/knott-white.svg
@@ -0,0 +1,99 @@
+
+
+
diff --git a/cwtch.png b/cwtch.png
index d30bc363..e50812f7 100644
Binary files a/cwtch.png and b/cwtch.png differ
diff --git a/lib/views/addeditprofileview.dart b/lib/views/addeditprofileview.dart
index 46d9d6d4..c75d68b6 100644
--- a/lib/views/addeditprofileview.dart
+++ b/lib/views/addeditprofileview.dart
@@ -155,13 +155,12 @@ class _AddEditProfileViewState extends State {
SizedBox(
height: 20,
),
- Flexible(
- child: Padding(
- padding: EdgeInsets.symmetric(horizontal: 24),
- child: Text(
- usePassword ? AppLocalizations.of(context)!.encryptedProfileDescription : AppLocalizations.of(context)!.plainProfileDescription,
- textAlign: TextAlign.center,
- )))
+ Padding(
+ padding: EdgeInsets.symmetric(horizontal: 24),
+ child: Text(
+ usePassword ? AppLocalizations.of(context)!.encryptedProfileDescription : AppLocalizations.of(context)!.plainProfileDescription,
+ textAlign: TextAlign.center,
+ ))
])),
SizedBox(
height: 20,
diff --git a/lib/views/profilemgrview.dart b/lib/views/profilemgrview.dart
index 36f91df4..8e4aa65e 100644
--- a/lib/views/profilemgrview.dart
+++ b/lib/views/profilemgrview.dart
@@ -39,7 +39,6 @@ class _ProfileMgrViewState extends State {
return Consumer(
// Prevents Android back button from closing the app on the profile manager screen
// (which would shutdown connections and all kinds of other expensive to generate things)
- // TODO pop up a dialogue regarding closing the app?
builder: (context, settings, child) => WillPopScope(
onWillPop: () async {
_modalShutdown();
@@ -49,14 +48,9 @@ class _ProfileMgrViewState extends State {
backgroundColor: settings.theme.backgroundMainColor(),
appBar: AppBar(
title: Row(children: [
- Image(
- image: AssetImage("assets/core/knott-white.png"),
- filterQuality: FilterQuality.medium,
- isAntiAlias: true,
- width: 32,
- height: 32,
- colorBlendMode: BlendMode.dstIn,
- color: Provider.of(context).theme.backgroundHilightElementColor(),
+ Icon(
+ CwtchIcons.cwtch_knott,
+ size: 36,
),
SizedBox(
width: 10,
diff --git a/lib/widgets/messagerow.dart b/lib/widgets/messagerow.dart
index 2f44b85e..c71b7afb 100644
--- a/lib/widgets/messagerow.dart
+++ b/lib/widgets/messagerow.dart
@@ -44,6 +44,9 @@ class MessageRowState extends State {
Widget wdgIcons = Visibility(
visible: this.showMenu,
maintainSize: true,
+ maintainAnimation: true,
+ maintainState: true,
+ maintainInteractivity: false,
child: IconButton(
tooltip: AppLocalizations.of(context)!.tooltipReplyToThisMessage,
onPressed: () {
diff --git a/linux/cwtch.png b/linux/cwtch.png
index d30bc363..e50812f7 100644
Binary files a/linux/cwtch.png and b/linux/cwtch.png differ
diff --git a/update-icons.sh b/update-icons.sh
index c7131117..d5893055 100755
--- a/update-icons.sh
+++ b/update-icons.sh
@@ -1,31 +1,38 @@
#!/bin/sh
orig=assets/core/knott-white.svg
+transparent=assets/core/knott-transparent.svg
# app icon used in profile manager bar
-inkscape -w 512 -h 512 -e assets/core/knott-white.png $orig
+inkscape -w 512 -h 512 -o assets/core/knott-white.png $orig
+inkscape -w 512 -h 512 -o assets/core/knott-transparent.png transparent
# linux deploy icon
-inkscape -w 512 -h 512 -e linux/cwtch.png $orig
-inkscape -w 512 -h 512 -e cwtch.png $orig
+inkscape -w 512 -h 512 -o linux/cwtch.png $orig
+inkscape -w 512 -h 512 -o cwtch.png $orig
# windows icons
-inkscape -w 256 -h 256 -e windows/runner/resources/knot_256.png $orig
+inkscape -w 256 -h 256 -o windows/runner/resources/knot_256.png $orig
convert windows/runner/resources/knot_256.png windows/runner/resources/knot_256.ico
-inkscape -w 128 -h 128 -e windows/runner/resources/knot_128.png $orig
+inkscape -w 128 -h 128 -o windows/runner/resources/knot_128.png $orig
convert windows/runner/resources/knot_128.png windows/runner/resources/knot_128.ico
-inkscape -w 64 -h 64 -e windows/runner/resources/knot_64.png $orig
+inkscape -w 64 -h 64 -o windows/runner/resources/knot_64.png $orig
convert windows/runner/resources/knot_64.png windows/runner/resources/knot_64.ico
-inkscape -w 48 -h 48 -e windows/runner/resources/knot_48.png $orig
+inkscape -w 48 -h 48 -o windows/runner/resources/knot_48.png $orig
convert windows/runner/resources/knot_48.png windows/runner/resources/knot_48.ico
-inkscape -w 32 -h 32 -e windows/runner/resources/knot_32.png $orig
+inkscape -w 32 -h 32 -o windows/runner/resources/knot_32.png $orig
convert windows/runner/resources/knot_32.png windows/runner/resources/knot_32.ico
-inkscape -w 16 -h 16 -e windows/runner/resources/knot_16.png $orig
+inkscape -w 16 -h 16 -o windows/runner/resources/knot_16.png $orig
convert windows/runner/resources/knot_16.png windows/runner/resources/knot_16.ico
# android icons
-inkscape -w 48 -h 48 -e android/app/src/main/res/mipmap-mdpi/knott.png $orig
-inkscape -w 72 -h 72 -e android/app/src/main/res/mipmap-hdpi/knott.png $orig
-inkscape -w 96 -h 96 -e android/app/src/main/res/mipmap-xhdpi/knott.png $orig
-inkscape -w 144 -h 144 -e android/app/src/main/res/mipmap-xxhdpi/knott.png $orig
-inkscape -w 192 -h 192 -e android/app/src/main/res/mipmap-xxxhdpi/knott.png $orig
+inkscape -w 48 -h 48 -o android/app/src/main/res/mipmap-mdpi/knott_transparent.png $transparent
+inkscape -w 48 -h 48 -o android/app/src/main/res/mipmap-mdpi/knott.png $orig
+inkscape -w 72 -h 72 -o android/app/src/main/res/mipmap-hdpi/knott_transparent.png $transparent
+inkscape -w 72 -h 72 -o android/app/src/main/res/mipmap-hdpi/knott.png $orig
+inkscape -w 96 -h 96 -o android/app/src/main/res/mipmap-xhdpi/knott_transparent.png $transparent
+inkscape -w 96 -h 96 -o android/app/src/main/res/mipmap-xhdpi/knott.png $orig
+inkscape -w 144 -h 144 -o android/app/src/main/res/mipmap-xxhdpi/knott_transparent.png $transparent
+inkscape -w 144 -h 144 -o android/app/src/main/res/mipmap-xxhdpi/knott.png $orig
+inkscape -w 192 -h 192 -o android/app/src/main/res/mipmap-xxxhdpi/knott_transparent.png $transparent
+inkscape -w 192 -h 192 -o android/app/src/main/res/mipmap-xxxhdpi/knott.png $orig
diff --git a/windows/runner/resources/knot_128.ico b/windows/runner/resources/knot_128.ico
index 83c4a834..db28a52f 100644
Binary files a/windows/runner/resources/knot_128.ico and b/windows/runner/resources/knot_128.ico differ
diff --git a/windows/runner/resources/knot_128.png b/windows/runner/resources/knot_128.png
new file mode 100644
index 00000000..92edb0c5
Binary files /dev/null and b/windows/runner/resources/knot_128.png differ
diff --git a/windows/runner/resources/knot_16.ico b/windows/runner/resources/knot_16.ico
index 1d6d926a..bd181c29 100644
Binary files a/windows/runner/resources/knot_16.ico and b/windows/runner/resources/knot_16.ico differ
diff --git a/windows/runner/resources/knot_16.png b/windows/runner/resources/knot_16.png
new file mode 100644
index 00000000..c863cfe9
Binary files /dev/null and b/windows/runner/resources/knot_16.png differ
diff --git a/windows/runner/resources/knot_256.png b/windows/runner/resources/knot_256.png
new file mode 100644
index 00000000..0653366d
Binary files /dev/null and b/windows/runner/resources/knot_256.png differ
diff --git a/windows/runner/resources/knot_32.ico b/windows/runner/resources/knot_32.ico
index 0562ca6f..0c77e1f8 100644
Binary files a/windows/runner/resources/knot_32.ico and b/windows/runner/resources/knot_32.ico differ
diff --git a/windows/runner/resources/knot_32.png b/windows/runner/resources/knot_32.png
new file mode 100644
index 00000000..005998cf
Binary files /dev/null and b/windows/runner/resources/knot_32.png differ
diff --git a/windows/runner/resources/knot_48.ico b/windows/runner/resources/knot_48.ico
index a8bbba08..3227d973 100644
Binary files a/windows/runner/resources/knot_48.ico and b/windows/runner/resources/knot_48.ico differ
diff --git a/windows/runner/resources/knot_48.png b/windows/runner/resources/knot_48.png
new file mode 100644
index 00000000..51f2c215
Binary files /dev/null and b/windows/runner/resources/knot_48.png differ
diff --git a/windows/runner/resources/knot_64.ico b/windows/runner/resources/knot_64.ico
index ddd965d4..88c250c2 100644
Binary files a/windows/runner/resources/knot_64.ico and b/windows/runner/resources/knot_64.ico differ
diff --git a/windows/runner/resources/knot_64.png b/windows/runner/resources/knot_64.png
new file mode 100644
index 00000000..c64cfecd
Binary files /dev/null and b/windows/runner/resources/knot_64.png differ