linux cmake fix for arm64 compiling

Reviewed-on: #880
Reviewed-by: Sarah Jamie Lewis <sarah@openprivacy.ca>

.drone.yml

@@ -8,7 +8,7 @@ clone:
 
 steps:
   - name: clone
-    image: openpriv/flutter-desktop:linux-fstable-3.13.4
+    image: openpriv/flutter-desktop:linux-fstable-3.19.3
     environment:
       buildbot_key_b64:
         from_secret: buildbot_key_b64
@@ -24,7 +24,7 @@ steps:
       - git checkout $DRONE_COMMIT
 
   - name: fetch
-    image: openpriv/flutter-desktop:linux-fstable-3.13.4
+    image: openpriv/flutter-desktop:linux-fstable-3.19.3
     volumes:
       - name: deps
         path: /root/.pub-cache
@@ -47,7 +47,7 @@ steps:
   #    #Todo: fix all the lint errors and add `-set_exit_status` above to enforce linting
 
   - name: build-linux
-    image: openpriv/flutter-desktop:linux-fstable-3.13.4
+    image: openpriv/flutter-desktop:linux-fstable-3.19.3
     volumes:
       - name: deps
         path: /root/.pub-cache
@@ -55,14 +55,29 @@ steps:
       - flutter build linux --dart-define BUILD_VER=`cat VERSION` --dart-define BUILD_DATE=`cat COMMIT_DATE`
       - linux/package-release.sh
       - mkdir -p deploy/cwtch
+      - mkdir -p deploy/deb/cwtch/usr
+      - mkdir -p deploy/deb/cwtch/DEBIAN
+      - export VERSION=`cat VERSION | tr -d 'v'`
+      - sed "s|VERSION|$VERSION|g" linux/deb/control  > deploy/deb/cwtch/DEBIAN/control
       - cp -r build/linux/x64/release/bundle/* deploy/cwtch
       - cd deploy
+      - cd cwtch
+      - INSTALL_PREFIX=./../deb/cwtch/usr DESKTOP_PREFIX=/usr/ ./install.sh
+      - cd ..
+      # we depend on tor, get it from the tor project apt repo
+      - rm -r deb/cwtch/usr/lib/cwtch/Tor
       # Tar archives need a few tricks to make this deterministic, see https://reproducible-builds.org/docs/archives/
       - tar --sort=name --mtime=`cat COMMIT_DATE` --owner=0 --group=0 --numeric-owner --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime -czf cwtch-`cat ../VERSION`.tar.gz cwtch
       - rm -r cwtch
+      - cd deb
+      - dpkg-deb --build cwtch
+      - cd ..
+      - mv deb/cwtch.deb cwtch-$VERSION.deb
+      - rm -r deb
+
 
   - name: linux-ui-tests
-    image: openpriv/flutter-desktop:linux-fstable-3.13.4
+    image: openpriv/flutter-desktop:linux-fstable-3.19.3
     volumes:
       - name: deps
         path: /root/.pub-cache
@@ -71,7 +86,7 @@ steps:
       - ./run-tests-headless.sh "01_general|01_tor|02_global_settings|04_profile_mgmt"
 
   - name: test-build-android
-    image: openpriv/flutter-desktop:linux-fstable-3.13.4
+    image: openpriv/flutter-desktop:linux-fstable-3.19.3
     when:
       event: pull_request
     volumes:
@@ -81,7 +96,7 @@ steps:
       - flutter build apk --debug
 
   - name: build-android
-    image: openpriv/flutter-desktop:linux-fstable-3.13.4
+    image: openpriv/flutter-desktop:linux-fstable-3.19.3
     when:
       event: push
     environment:
@@ -105,7 +120,7 @@ steps:
       #- cp build/app/outputs/flutter-apk/app-debug.apk deploy/android
 
   - name: widget-tests
-    image:  openpriv/flutter-desktop:linux-fstable-3.13.4
+    image:  openpriv/flutter-desktop:linux-fstable-3.19.3
     volumes:
       - name: deps
         path: /root/.pub-cache
@@ -114,6 +129,21 @@ steps:
       - flutter test --coverage
       - genhtml coverage/lcov.info -o coverage/html
 
+  - name: upload-nightlies
+    image: openpriv/flutter-desktop:linux-fstable-3.19.3
+    environment:
+      GOGS_ACCOUNT_TOKEN:
+        from_secret: gogs_account_token
+    secrets: [gogs_account_token]
+    volumes:
+      - name: deps
+        path: /root/.pub-cache
+    when:
+        event: push
+        status: [ success ]
+    commands:
+      - ./upload-releases.sh deploy/cwtch-`cat VERSION`.apk application/vnd.android.package-archive cwtch-`cat VERSION`.apk
+
   - name: deploy-buildfiles
     image: kroniak/ssh-client
     pull: if-not-exists
@@ -178,7 +208,7 @@ clone:
 
 steps:
   - name: clone
-    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.13.4
+    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.19.3
     environment:
       buildbot_key_b64:
         from_secret: buildbot_key_b64
@@ -196,7 +226,7 @@ steps:
       - git checkout $Env:DRONE_COMMIT
 
   - name: fetch
-    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.10.2
+    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.19.3
     commands:
       - git describe --tags --abbrev=1 > VERSION
       - git log -1 --format=%cd --date=format:'%Y-%m-%d-%H-%M' > COMMIT_DATE
@@ -204,12 +234,12 @@ steps:
       - .\fetch-libcwtch-go.ps1
 
   - name: build-windows
-    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.13.4
+    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.19.3
     commands:
       - flutter pub get
       - $Env:version += type .\VERSION
       - $Env:commitdate += type .\COMMIT_DATE
-      - $Env:releasedir = "build\\windows\\runner\\Release\\"
+      - $Env:releasedir = "build\\windows\\x64\\runner\\Release\\"
       - flutter build windows --dart-define BUILD_VER=$Env:version --dart-define BUILD_DATE=$Env:commitdate
       - copy windows\libCwtch.dll $Env:releasedir
       # flutter hasn't worked out it's packaging of required dll's so we have to resort to this manual nonsense
@@ -236,7 +266,7 @@ steps:
     commands:
       - $Env:version += type .\VERSION
       - $Env:commitdate += type .\COMMIT_DATE
-      - $Env:releasedir = "build\\windows\\runner\\Release\\"
+      - $Env:releasedir = "build\\windows\\x64\\runner\\Release\\"
       - $Env:zip = 'cwtch-' + $Env:version + '.zip'
       - $Env:zipsha = $Env:zip + '.sha512.txt'
       - $Env:buildname = 'flwtch-' + $Env:commitdate + '-' + $Env:version
@@ -261,7 +291,7 @@ steps:
       - move *.sha512.txt deploy\$Env:builddir
 
   - name: deploy-windows
-    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.13.4
+    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.19.3
     when:
       event: push
       status: [ success ]
@@ -300,7 +330,8 @@ steps:
     commands:
       - mkdir ~/.ssh
       - echo $buildbot_key_b64 > ~/.ssh/id_rsa.b64
-      - base64 -d ~/.ssh/id_rsa.b64 > ~/.ssh/id_rsa
+      - ls -lh ~/.ssh/id_rsa.b64
+      - base64 -d -i ~/.ssh/id_rsa.b64 -o ~/.ssh/id_rsa
       - chmod 400 ~/.ssh/id_rsa
       # force by pass of ssh host key check, less secure
       - ssh-keyscan -H git.openprivacy.ca >> ~/.ssh/known_hosts
@@ -319,20 +350,22 @@ steps:
       - ./fetch-tor-macos.sh
       - echo `git describe --tags --abbrev=1` > VERSION
       - echo `git log -1 --format=%cd --date=format:%G-%m-%d-%H-%M` > COMMIT_DATE
-      - export PATH=$PATH:/Users/Dan/development/flutter/bin
+      - export PATH=$PATH:/Users/drone/development/flutter/bin
       - flutter pub get
       - mkdir deploy
       - ./fetch-libcwtch-go-macos.sh
-      - gem install --user-install cocoapods
+      # Drone builds in container directories and gem seems to have some weird side effects so have to manually re install these locally
+      - gem install --user-install ffi -v 1.15.5 -- --enable-libffi-alloc
+      # currently unneeded to reinstall but was, and may be again? so saving
+      #- gem install --user-install cocoapods -v 1.11.3
 
   - name: build-macos
     commands:
-      - export PATH=$PATH:/Users/Dan/development/flutter/bin
-      - export GEM_HOME=$HOME/.gem
+      - export PATH=$PATH:/Users/drone/bin/flutter/bin
       - export PATH=$GEM_HOME/ruby/2.6.0/bin:$PATH
-      - flutter config --enable-macos-desktop
+      - flutter doctor
       - flutter build macos --dart-define BUILD_VER=`cat VERSION` --dart-define BUILD_DATE=`cat COMMIT_DATE`
-      - export PATH=$PATH:/usr/local/bin #create-dmg
+      - export PATH=$PATH:/opt/homebrew/bin/ #create-dmg
       - macos/package-release.sh
       - mkdir -p deploy
       - mv Cwtch.dmg deploy/Cwtch-`cat VERSION`.dmg
@@ -346,7 +379,7 @@ steps:
       status: [ success ]
     commands:
       - echo $BUILDFILES_KEY > ~/id_rsab64
-      - base64 -d ~/id_rsab64 > ~/id_rsa
+      - base64 -d -i ~/id_rsab64 -o ~/id_rsa
       - chmod 400 ~/id_rsa
       - export DIR=flwtch-`cat COMMIT_DATE`-`cat VERSION`
       - mv deploy $DIR

.gitignore

@@ -3,7 +3,6 @@
 *.log
 *.pyc
 *.swp
-.DS_Store
 .atom/
 .buildlog/
 .history
@@ -36,6 +35,7 @@ test_home
 .pub-cache/
 .pub/
 /build/
+./lib/gen/
 
 # Web related
 lib/generated_plugin_registrant.dart
@@ -59,7 +59,7 @@ package.
 # Compiled Libs
 linux/tor
 linux/libCwtch.so
-android/cwtch/cwtch.aar
+android/app/cwtch/cwtch.aar
 android/app/src/main/jniLibs/*/libtor.so
 *.dylib
 integration_test/gherkin_suite_test.g.dart

LIBCWTCH-GO.version

@@ -1 +1 @@
-2023-09-26-13-15-v0.0.10
+2024-02-26-18-01-v0.0.14

LICENSE

@@ -1,5 +1,5 @@
 MIT License
-Copyright (c) 2021 Open Privacy Research Society
+Copyright (c) 2021-2024 Open Privacy Research Society
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

NSIS-Notes.md

@@ -0,0 +1,8 @@
+# NSIS Notes
+
+## Images
+
+Requires Windows 3 Compatible Bitmaps.
+
+Can convert to the correct format with e.g. `mogrify -compress none -format bmp3 windows/nsis/cwtch_title.bmp
+`

android/app/build.gradle

@@ -1,3 +1,9 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new FileNotFoundException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -21,10 +22,6 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 // key.properties MUST have password placeholders filled in (via drone with secrets) and cwtch-upload.jks file must be added (from drone secret)
 def keystoreProperties = new Properties()
 def keystorePropertiesFile = rootProject.file('key.properties')
@@ -33,7 +30,7 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -54,7 +51,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "im.cwtch.flwtch"
         minSdkVersion 19
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -93,11 +90,11 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation project(':cwtch')
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21" // same as kotlin version in settings.gradle
+    implementation fileTree( dir: 'cwtch')
+    implementation files ('cwtch/cwtch.aar')
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.2"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.2"
-    implementation "com.airbnb.android:lottie:5.2.0"
     implementation "androidx.localbroadcastmanager:localbroadcastmanager:1.0.0"
     implementation "com.android.support.constraint:constraint-layout:2.0.4"
 

android/app/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
     package="im.cwtch.flwtch">
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
@@ -13,7 +13,7 @@
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTop"
-            android:theme="@style/NormalTheme"
+            android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize"
@@ -38,22 +38,30 @@
             android:name="flutterEmbedding"
             android:value="2" />
 
+        <!--Needed to run in background (lol)-->
+        <service
+            android:name="androidx.work.impl.foreground.SystemForegroundService"
+            android:foregroundServiceType="dataSync"
+            tools:node="merge" />
 
     </application>
 
     <!--Needed to access Tor socket-->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
 
-    <!--Needed to run in background (lol)-->
+    <!-- Needed for running in the background -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <!-- As of Android 13 this permission is required -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
 
     <!-- Ability to ask user to exempt app from power management (which can kill it more frequently especially on some devices.
          Allows app to use ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS -->
     <uses-permission-sdk-23 android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
 
-    <!-- TODO when we support sdk 31
+
     <uses-permission-sdk-23 android:name="android.permission.HIDE_OVERLAY_WINDOWS" />
-    -->
+
 
     <!--Needed to check if activity is foregrounded or if messages from the service should be queued-->
     <uses-permission android:name="android.permission.GET_TASKS" />

android/app/src/main/kotlin/im/cwtch/flwtch/FlwtchWorker.kt

@@ -11,6 +11,7 @@ import android.graphics.Color
 import android.net.Uri
 import android.os.Build
 import android.util.Log
+import android.content.pm.ServiceInfo
 import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
@@ -22,6 +23,13 @@ import io.flutter.FlutterInjector
 import org.json.JSONObject
 import java.nio.file.Files
 import java.nio.file.Paths
+import java.io.FileInputStream
+
+
+import java.io.File
+
+
+
 
 class FlwtchWorker(context: Context, parameters: WorkerParameters) :
         CoroutineWorker(context, parameters) {
@@ -137,7 +145,19 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
                                         Log.i(TAG, "notification for " + evt.EventType + " " + handle + " " + conversationId + " " + channelId)
                                         Log.i(TAG, data.toString());
                                         val key = loader.getLookupKeyForAsset(data.getString("picture"))//"assets/profiles/001-centaur.png")
-                                        val fh = applicationContext.assets.open(key)
+                                        var fh : java.io.InputStream? = null;
+                                        try {
+                                            fh = applicationContext.assets.open(key)
+                                        } catch (e: Exception) {
+                                            Log.d("FlwtchWorker->ContactInfo", e.toString() + " :: " + e.getStackTrace());
+                                        }
+
+                                        try {
+                                            val file = File(data.getString("picture"))
+                                            fh = FileInputStream(file)
+                                        } catch (e: Exception) {
+                                            Log.d("FlwtchWorker->ContactInfo", e.toString() + " :: " + e.getStackTrace());
+                                        }
 
                                         val clickIntent = Intent(applicationContext, MainActivity::class.java).also { intent ->
                                             intent.action = Intent.ACTION_RUN
@@ -145,18 +165,21 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
                                             intent.putExtra("ProfileOnion", data.getString("ProfileOnion"))
                                             intent.putExtra("Handle", handle)
                                         }
-
+                                        val image : android.graphics.Bitmap?  = if (fh != null) BitmapFactory.decodeStream(fh ) else null;
                                         val newNotification = NotificationCompat.Builder(applicationContext, channelId)
                                                 .setContentTitle(data.getString("Nick"))
                                                 .setContentText((notificationConversationInfo
                                                         ?: "New Message From %1").replace("%1", data.getString("Nick")))
-                                                .setLargeIcon(BitmapFactory.decodeStream(fh))
+                                                .setLargeIcon(image)
                                                 .setSmallIcon(R.mipmap.knott_transparent)
                                                 .setContentIntent(PendingIntent.getActivity(applicationContext, 1, clickIntent, flags))
                                                 .setAutoCancel(true)
                                                 .build()
 
                                         notificationManager.notify(getNotificationID(data.getString("ProfileOnion"), channelId), newNotification)
+                                        if (fh != null) {
+                                            fh.close()
+                                        }
                                     }
 
                                 }
@@ -292,7 +315,7 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
                 .addAction(android.R.drawable.ic_delete, cancel, PendingIntent.getActivity(applicationContext, 2, cancelIntent, flags))
                 .build()
 
-        return ForegroundInfo(101, notification)
+        return ForegroundInfo(101, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC)
     }
 
     @RequiresApi(Build.VERSION_CODES.O)

android/app/src/main/kotlin/im/cwtch/flwtch/MainActivity.kt

@@ -1,6 +1,5 @@
 package im.cwtch.flwtch
 
-import SplashView
 import android.annotation.TargetApi
 import android.content.BroadcastReceiver
 import android.content.Context
@@ -19,7 +18,6 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import androidx.work.*
 import cwtch.Cwtch
 import io.flutter.embedding.android.FlutterActivity
-import io.flutter.embedding.android.SplashScreen
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugin.common.ErrorLogResult
 import io.flutter.plugin.common.MethodCall
@@ -32,8 +30,6 @@ import java.util.concurrent.TimeUnit
 import kotlinx.coroutines.*
 
 class MainActivity: FlutterActivity() {
-    override fun provideSplashScreen(): SplashScreen? = SplashView()
-
 
     // Channel to get app info
     private val CHANNEL_APP_INFO = "test.flutter.dev/applicationInfo"
@@ -331,8 +327,9 @@ class MainActivity: FlutterActivity() {
                 val conversation: Int = call.argument("conversation") ?: 0
                 val indexI: Int = call.argument("index") ?: 0
                 val count: Int = call.argument("count") ?: 1
+                val ucount : Int = maxOf(1, count) // don't allow negative counts
 
-                result.success(Cwtch.getMessages(profile, conversation.toLong(), indexI.toLong(), count.toLong()))
+                result.success(Cwtch.getMessages(profile, conversation.toLong(), indexI.toLong(), ucount.toLong()))
                 return
             }
             "SendMessage" -> {
@@ -576,9 +573,6 @@ class MainActivity: FlutterActivity() {
                 result.success(Cwtch.searchConversations(profile, pattern))
                 return
             }
-            "ReconnectCwtchForeground" -> {
-                Cwtch.reconnectCwtchForeground()
-            }
             "Shutdown" -> {
                 Cwtch.shutdownCwtch();
             }

android/app/src/main/kotlin/im/cwtch/flwtch/SplashView.kt

@@ -1,15 +0,0 @@
-import android.content.Context
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import im.cwtch.flwtch.R
-import io.flutter.embedding.android.SplashScreen
-
-class SplashView : SplashScreen {
-    override fun createSplashView(context: Context, savedInstanceState: Bundle?): View? =
-            LayoutInflater.from(context).inflate(R.layout.splash_view, null, false)
-
-    override fun transitionToFlutter(onTransitionComplete: Runnable) {
-        onTransitionComplete.run()
-    }
-}

android/app/src/main/res/drawable-v21/launch_background.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="?android:colorBackground" />
+    <item android:drawable="@color/darkGreyPurple" />
 
     <!-- You can insert your own image assets here -->
-    <!-- <item>
+    <item>
         <bitmap
             android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
+            android:src="@mipmap/knott" />
+    </item>
 </layer-list>

android/app/src/main/res/drawable/knott.xml

@@ -0,0 +1,81 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="500dp"
+    android:height="500dp"
+    android:viewportWidth="500"
+    android:viewportHeight="500">
+  <path
+      android:pathData="M436.2,215c-0.6,3 -2,6.4 -4.3,10.4l18.2,18.2c2.4,-4.8 6.2,-13.1 8.2,-22.9c4.1,-20.2 -0.5,-37.1 -13.7,-50.3c-24.2,-24.2 -49.4,-26.4 -81.8,-7.3c-7.8,4.6 -16.1,10.6 -24.6,17.7c-19.5,16.3 -41.3,39.5 -64.9,69.2c15.4,19.4 30.2,36.2 43.8,49.8c6.3,6.3 12.4,12 18.3,17.1l16.2,-16.2c-5.9,-5 -12.1,-10.7 -18.4,-17c-9,-9 -18.5,-19.5 -28.4,-31.2l-2.1,-2.5l2.1,-2.5c18.1,-21.5 35,-38.6 50.1,-50.9c9.6,-7.8 18.6,-13.8 26.7,-17.7c7,-3.4 13.4,-5.3 19,-5.6c2.7,-0.2 6.9,-0.1 12.1,2c5,2.1 10.2,5.8 15.7,11.3c2.1,2.1 5,5.4 6.8,10.4C437.1,202.1 437.5,208 436.2,215L436.2,215z"
+      android:fillColor="#242425"/>
+  <path
+      android:pathData="M340.9,354.7l81.5,-81.5c-4.8,-7.1 -11.1,-14 -14.6,-17.7L327.3,336C332.5,342.4 337.1,348.6 340.9,354.7z"
+      android:fillColor="#242425"/>
+  <path
+      android:pathData="M444.6,329.6c13.2,-13.2 17.8,-30.1 13.7,-50.3c-2.8,-14 -9.1,-24.9 -10.3,-26.9L382.6,187c-6,3.1 -12.5,7.4 -19.4,12.8l50.1,50.1l0,0c4.1,4.3 12.1,13 17.4,21.6c3.2,5.2 5.1,9.7 5.6,13.5c1.2,6.9 0.9,12.7 -0.9,17.9c-1.8,5 -4.8,8.3 -6.8,10.4c-5.9,5.9 -11.3,9.7 -16.7,11.7c-5.5,2 -10,1.8 -13.3,1.4c-4.4,-0.5 -9.2,-2 -14.3,-4.2l-17,17C397.5,355.7 421.5,352.7 444.6,329.6z"
+      android:fillColor="#242425"/>
+  <path
+      android:pathData="M303.1,64.7c5,1.8 8.3,4.8 10.4,6.8c5.9,5.9 9.7,11.3 11.7,16.7c2,5.5 1.8,10 1.4,13.3c-0.5,4.4 -2,9.2 -4.2,14.3l17,17c16.4,-30.3 13.3,-54.4 -9.7,-77.4c-13.2,-13.2 -30.1,-17.8 -50.3,-13.7c-14,2.8 -24.9,9.1 -26.9,10.3L187,117.4c3.1,6 7.4,12.5 12.8,19.4L250,86.7l0,0c4.3,-4.1 13,-12.1 21.6,-17.4c5.2,-3.2 9.7,-5.1 13.5,-5.6C292,62.6 297.9,62.9 303.1,64.7z"
+      android:fillColor="#242425"/>
+  <path
+      android:pathData="M170.4,55.4c-24.2,24.2 -26.4,49.4 -7.3,81.8c4.6,7.8 10.6,16.1 17.7,24.6c16.3,19.5 39.5,41.3 69.2,64.9c19.4,-15.4 36.2,-30.2 49.8,-43.8c6.3,-6.3 12,-12.4 17.1,-18.3l-16.2,-16.2c-5,5.9 -10.7,12.1 -17,18.4c-9,9 -19.5,18.5 -31.2,28.4l-2.5,2.1l-2.5,-2.1c-21.5,-18.1 -38.6,-35 -50.9,-50.1c-7.8,-9.6 -13.8,-18.6 -17.7,-26.7c-3.4,-7 -5.3,-13.4 -5.6,-19c-0.2,-2.7 -0.1,-6.9 2,-12.1c2.1,-5 5.8,-10.2 11.3,-15.7c2.1,-2.1 5.4,-5 10.4,-6.8c5.2,-1.9 11.1,-2.2 18,-0.9l0.1,0c3,0.6 6.4,2 10.4,4.3l18.2,-18.2c-4.8,-2.4 -13.1,-6.2 -23,-8.2C200.5,37.6 183.6,42.2 170.4,55.4z"
+      android:fillColor="#242425"/>
+  <path
+      android:pathData="M273.2,77.6c-7.1,4.8 -14,11.1 -17.7,14.6l80.5,80.5c6.4,-5.2 12.7,-9.7 18.7,-13.6L273.2,77.6z"
+      android:fillColor="#242425"/>
+  <path
+      android:pathData="M55.4,329.6c24.2,24.2 49.4,26.4 81.8,7.3c7.8,-4.6 16.1,-10.6 24.6,-17.7c19.5,-16.3 41.3,-39.5 64.9,-69.2c-15.4,-19.4 -30.2,-36.2 -43.8,-49.8c-6.3,-6.3 -12.4,-12 -18.3,-17.1l-16.2,16.2c5.9,5 12.1,10.7 18.4,17c9,9 18.5,19.5 28.4,31.2l2.1,2.5l-2.1,2.5c-18.1,21.5 -35,38.6 -50.1,50.9c-9.6,7.8 -18.6,13.8 -26.7,17.7c-7,3.4 -13.4,5.3 -19,5.6c-2.7,0.2 -6.9,0.1 -12.1,-2c-5,-2.1 -10.2,-5.8 -15.7,-11.3c-2.1,-2.1 -5,-5.4 -6.8,-10.4c-1.9,-5.2 -2.2,-11.1 -0.9,-18l0,-0.1c0.6,-3 2,-6.4 4.3,-10.4l-18.2,-18.2c-2.4,4.8 -6.2,13.1 -8.2,23C37.6,299.5 42.2,316.4 55.4,329.6z"
+      android:fillColor="#242425"/>
+  <path
+      android:pathData="M86.7,250L86.7,250c-4.1,-4.4 -12,-13.1 -17.3,-21.6c-3.2,-5.2 -5.1,-9.7 -5.6,-13.5c-1.2,-6.9 -0.9,-12.7 0.9,-17.9c1.8,-5 4.8,-8.3 6.8,-10.4c5.9,-5.9 11.3,-9.7 16.7,-11.7c5.5,-2 10,-1.8 13.3,-1.4c4.4,0.5 9.2,2 14.3,4.2l17,-17c-30.3,-16.4 -54.4,-13.3 -77.4,9.7c-13.2,13.2 -17.8,30.1 -13.7,50.3c2.8,14 9.1,24.9 10.3,26.9l65.4,65.4c6,-3.1 12.5,-7.4 19.4,-12.8L86.7,250z"
+      android:fillColor="#242425"/>
+  <path
+      android:pathData="M92.2,244.5l80.5,-80.5c-5.2,-6.4 -9.7,-12.7 -13.6,-18.7l-81.5,81.5C82.4,233.9 88.6,240.8 92.2,244.5z"
+      android:fillColor="#242425"/>
+  <path
+      android:pathData="M329.6,444.6c24.2,-24.2 26.4,-49.4 7.3,-81.8c-4.6,-7.8 -10.6,-16.1 -17.7,-24.6c-16.3,-19.5 -39.5,-41.3 -69.2,-64.9c-19.4,15.4 -36.2,30.2 -49.8,43.8c-6.3,6.3 -12,12.4 -17.1,18.3l16.2,16.2c5,-5.9 10.7,-12.1 17,-18.4c9,-9 19.5,-18.5 31.2,-28.4l2.5,-2.1l2.5,2.1c21.5,18.1 38.6,35 50.9,50.1c7.8,9.6 13.8,18.6 17.7,26.7c3.4,7 5.3,13.4 5.6,19c0.2,2.7 0.1,6.9 -2,12.1c-2.1,5 -5.8,10.2 -11.3,15.7c-2.1,2.1 -5.4,5 -10.4,6.8c-5.2,1.9 -11.1,2.2 -18,0.9l-0.1,0c-3,-0.6 -6.4,-2 -10.4,-4.3l-18.2,18.2c4.7,2.4 13.1,6.1 22.9,8.2C299.4,462.4 316.4,457.8 329.6,444.6z"
+      android:fillColor="#242425"/>
+  <path
+      android:pathData="M244.5,407.8L164,327.3c-6.4,5.2 -12.7,9.7 -18.7,13.6l81.5,81.5C233.9,417.6 240.8,411.4 244.5,407.8z"
+      android:fillColor="#242425"/>
+  <path
+      android:pathData="M483.4,250c2.6,-6.3 5.3,-14 7.1,-22.7c6.3,-30.8 -1.8,-59.2 -22.7,-80.1c-19.7,-19.7 -41.7,-29.7 -65.5,-29.7c-7.5,0 -15.1,1 -22.8,3c2.9,-11.3 3.7,-22.3 2.3,-33.2c-2.5,-19.8 -12.3,-38.3 -29,-55.1C336.6,15.9 315.9,7.4 293,7.4c-6.6,0 -13.4,0.7 -20.2,2.1c-8.7,1.8 -16.5,4.5 -22.7,7.1c-6.3,-2.6 -14.1,-5.3 -22.8,-7.1c-6.9,-1.4 -13.7,-2.1 -20.2,-2.1c-22.9,0 -43.6,8.6 -59.9,24.8c-17.6,17.6 -27.5,37.2 -29.4,58.1c-0.9,9.9 0,19.9 2.7,30.2c-7.7,-2 -15.3,-3 -22.8,-3c-23.8,0 -45.8,10 -65.5,29.7c-20.9,20.9 -28.9,49.3 -22.7,80.1c1.8,8.7 4.5,16.5 7.1,22.7c-2.6,6.3 -5.3,14.1 -7.1,22.8c-6.2,30.8 1.8,59.2 22.7,80.1c19.7,19.7 41.7,29.7 65.5,29.7c0,0 0,0 0,0c7.5,0 15.1,-1 22.8,-3c-2.9,11.3 -3.7,22.3 -2.3,33.2c2.5,19.8 12.3,38.3 29,55.1c16.2,16.2 36.9,24.8 59.8,24.8c0,0 0,0 0,0c6.6,0 13.4,-0.7 20.2,-2.1c8.7,-1.8 16.5,-4.4 22.7,-7.1c6.3,2.6 14,5.3 22.7,7.1c6.9,1.4 13.7,2.1 20.3,2.1c0,0 0,0 0,0c22.9,0 43.6,-8.6 59.9,-24.8c17.6,-17.6 27.5,-37.2 29.4,-58.1c0.9,-9.9 0,-19.9 -2.7,-30.2c7.7,2 15.3,3 22.8,3c0,0 0,0 0,0c23.8,0 45.8,-10 65.5,-29.7c20.9,-20.9 29,-49.3 22.7,-80.1C488.8,264 486.1,256.3 483.4,250z"
+      android:fillColor="#242425"/>
+  <path
+      android:pathData="M170.4,444.6c13.2,13.2 30.1,17.8 50.3,13.7c14,-2.8 24.9,-9.1 26.9,-10.3l65.4,-65.4c-3.1,-6 -7.4,-12.5 -12.8,-19.4L250,413.3l0,0c-4.3,4.1 -13,12.1 -21.6,17.4c-5.2,3.2 -9.7,5.1 -13.5,5.6c-6.9,1.2 -12.7,0.9 -17.9,-0.9c-5,-1.8 -8.3,-4.8 -10.4,-6.8c-5.9,-5.9 -9.7,-11.3 -11.7,-16.7c-2,-5.5 -1.8,-10 -1.4,-13.3c0.5,-4.4 2,-9.2 4.2,-14.3l-17,-17C144.3,397.5 147.3,421.5 170.4,444.6z"
+      android:fillColor="#242425"/>
+  <path
+      android:pathData="M436.2,215c-0.6,3 -2,6.4 -4.3,10.4l18.2,18.2c2.4,-4.8 6.2,-13.1 8.2,-22.9c4.1,-20.2 -0.5,-37.1 -13.7,-50.3c-24.2,-24.2 -49.4,-26.4 -81.8,-7.3c-7.8,4.6 -16.1,10.6 -24.6,17.7c-19.5,16.3 -41.3,39.5 -64.9,69.2c15.4,19.4 30.2,36.2 43.8,49.8c6.3,6.3 12.4,12 18.3,17.1l16.2,-16.2c-5.9,-5 -12.1,-10.7 -18.4,-17c-9,-9 -18.5,-19.5 -28.4,-31.2l-2.1,-2.5l2.1,-2.5c18.1,-21.5 35,-38.6 50.1,-50.9c9.6,-7.8 18.6,-13.8 26.7,-17.7c7,-3.4 13.4,-5.3 19,-5.6c2.7,-0.2 6.9,-0.1 12.1,2c5,2.1 10.2,5.8 15.7,11.3c2.1,2.1 5,5.4 6.8,10.4C437.1,202.1 437.5,208 436.2,215L436.2,215z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M340.9,354.7l81.5,-81.5c-4.8,-7.1 -11.1,-14 -14.6,-17.7L327.3,336C332.5,342.4 337.1,348.6 340.9,354.7z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M444.6,329.6c13.2,-13.2 17.8,-30.1 13.7,-50.3c-2.8,-14 -9.1,-24.9 -10.3,-26.9L382.6,187c-6,3.1 -12.5,7.4 -19.4,12.8l50.1,50.1l0,0c4.1,4.3 12.1,13 17.4,21.6c3.2,5.2 5.1,9.7 5.6,13.5c1.2,6.9 0.9,12.7 -0.9,17.9c-1.8,5 -4.8,8.3 -6.8,10.4c-5.9,5.9 -11.3,9.7 -16.7,11.7c-5.5,2 -10,1.8 -13.3,1.4c-4.4,-0.5 -9.2,-2 -14.3,-4.2l-17,17C397.5,355.7 421.5,352.7 444.6,329.6z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M303.1,64.7c5,1.8 8.3,4.8 10.4,6.8c5.9,5.9 9.7,11.3 11.7,16.7c2,5.5 1.8,10 1.4,13.3c-0.5,4.4 -2,9.2 -4.2,14.3l17,17c16.4,-30.3 13.3,-54.4 -9.7,-77.4c-13.2,-13.2 -30.1,-17.8 -50.3,-13.7c-14,2.8 -24.9,9.1 -26.9,10.3L187,117.4c3.1,6 7.4,12.5 12.8,19.4L250,86.7l0,0c4.3,-4.1 13,-12.1 21.6,-17.4c5.2,-3.2 9.7,-5.1 13.5,-5.6C292,62.6 297.9,62.9 303.1,64.7z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M170.4,55.4c-24.2,24.2 -26.4,49.4 -7.3,81.8c4.6,7.8 10.6,16.1 17.7,24.6c16.3,19.5 39.5,41.3 69.2,64.9c19.4,-15.4 36.2,-30.2 49.8,-43.8c6.3,-6.3 12,-12.4 17.1,-18.3l-16.2,-16.2c-5,5.9 -10.7,12.1 -17,18.4c-9,9 -19.5,18.5 -31.2,28.4l-2.5,2.1l-2.5,-2.1c-21.5,-18.1 -38.6,-35 -50.9,-50.1c-7.8,-9.6 -13.8,-18.6 -17.7,-26.7c-3.4,-7 -5.3,-13.4 -5.6,-19c-0.2,-2.7 -0.1,-6.9 2,-12.1c2.1,-5 5.8,-10.2 11.3,-15.7c2.1,-2.1 5.4,-5 10.4,-6.8c5.2,-1.9 11.1,-2.2 18,-0.9l0.1,0c3,0.6 6.4,2 10.4,4.3l18.2,-18.2c-4.8,-2.4 -13.1,-6.2 -23,-8.2C200.5,37.6 183.6,42.2 170.4,55.4z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M273.2,77.6c-7.1,4.8 -14,11.1 -17.7,14.6l80.5,80.5c6.4,-5.2 12.7,-9.7 18.7,-13.6L273.2,77.6z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M55.4,329.6c24.2,24.2 49.4,26.4 81.8,7.3c7.8,-4.6 16.1,-10.6 24.6,-17.7c19.5,-16.3 41.3,-39.5 64.9,-69.2c-15.4,-19.4 -30.2,-36.2 -43.8,-49.8c-6.3,-6.3 -12.4,-12 -18.3,-17.1l-16.2,16.2c5.9,5 12.1,10.7 18.4,17c9,9 18.5,19.5 28.4,31.2l2.1,2.5l-2.1,2.5c-18.1,21.5 -35,38.6 -50.1,50.9c-9.6,7.8 -18.6,13.8 -26.7,17.7c-7,3.4 -13.4,5.3 -19,5.6c-2.7,0.2 -6.9,0.1 -12.1,-2c-5,-2.1 -10.2,-5.8 -15.7,-11.3c-2.1,-2.1 -5,-5.4 -6.8,-10.4c-1.9,-5.2 -2.2,-11.1 -0.9,-18l0,-0.1c0.6,-3 2,-6.4 4.3,-10.4l-18.2,-18.2c-2.4,4.8 -6.2,13.1 -8.2,23C37.6,299.5 42.2,316.4 55.4,329.6z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M86.7,250L86.7,250c-4.1,-4.4 -12,-13.1 -17.3,-21.6c-3.2,-5.2 -5.1,-9.7 -5.6,-13.5c-1.2,-6.9 -0.9,-12.7 0.9,-17.9c1.8,-5 4.8,-8.3 6.8,-10.4c5.9,-5.9 11.3,-9.7 16.7,-11.7c5.5,-2 10,-1.8 13.3,-1.4c4.4,0.5 9.2,2 14.3,4.2l17,-17c-30.3,-16.4 -54.4,-13.3 -77.4,9.7c-13.2,13.2 -17.8,30.1 -13.7,50.3c2.8,14 9.1,24.9 10.3,26.9l65.4,65.4c6,-3.1 12.5,-7.4 19.4,-12.8L86.7,250z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M92.2,244.5l80.5,-80.5c-5.2,-6.4 -9.7,-12.7 -13.6,-18.7l-81.5,81.5C82.4,233.9 88.6,240.8 92.2,244.5z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M329.6,444.6c24.2,-24.2 26.4,-49.4 7.3,-81.8c-4.6,-7.8 -10.6,-16.1 -17.7,-24.6c-16.3,-19.5 -39.5,-41.3 -69.2,-64.9c-19.4,15.4 -36.2,30.2 -49.8,43.8c-6.3,6.3 -12,12.4 -17.1,18.3l16.2,16.2c5,-5.9 10.7,-12.1 17,-18.4c9,-9 19.5,-18.5 31.2,-28.4l2.5,-2.1l2.5,2.1c21.5,18.1 38.6,35 50.9,50.1c7.8,9.6 13.8,18.6 17.7,26.7c3.4,7 5.3,13.4 5.6,19c0.2,2.7 0.1,6.9 -2,12.1c-2.1,5 -5.8,10.2 -11.3,15.7c-2.1,2.1 -5.4,5 -10.4,6.8c-5.2,1.9 -11.1,2.2 -18,0.9l-0.1,0c-3,-0.6 -6.4,-2 -10.4,-4.3l-18.2,18.2c4.7,2.4 13.1,6.1 22.9,8.2C299.4,462.4 316.4,457.8 329.6,444.6z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M244.5,407.8L164,327.3c-6.4,5.2 -12.7,9.7 -18.7,13.6l81.5,81.5C233.9,417.6 240.8,411.4 244.5,407.8z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M170.4,444.6c13.2,13.2 30.1,17.8 50.3,13.7c14,-2.8 24.9,-9.1 26.9,-10.3l65.4,-65.4c-3.1,-6 -7.4,-12.5 -12.8,-19.4L250,413.3l0,0c-4.3,4.1 -13,12.1 -21.6,17.4c-5.2,3.2 -9.7,5.1 -13.5,5.6c-6.9,1.2 -12.7,0.9 -17.9,-0.9c-5,-1.8 -8.3,-4.8 -10.4,-6.8c-5.9,-5.9 -9.7,-11.3 -11.7,-16.7c-2,-5.5 -1.8,-10 -1.4,-13.3c0.5,-4.4 2,-9.2 4.2,-14.3l-17,-17C144.3,397.5 147.3,421.5 170.4,444.6z"
+      android:fillColor="#FFFFFF"/>
+</vector>

android/app/src/main/res/drawable/launch_background.xml

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@android:color/white" />
+    <item android:drawable="@color/darkGreyPurple" />
 
     <!-- You can insert your own image assets here -->
-    <!-- <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
+    <item android:drawable="@drawable/knott"
+        android:gravity="center"
+        />
 </layer-list>

android/app/src/main/res/layout/splash_view.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.airbnb.lottie.LottieAnimationView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:lottie_autoPlay="true"
-        app:lottie_rawRes="@raw/cwtch_animated_logo_op"
-        app:lottie_loop="true"
-        app:lottie_speed="1.00"
-        app:lottie_enableMergePathsForKitKatAndAbove="true" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/knott"/>
+</adaptive-icon>

android/app/src/main/res/values-v26/styles.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowSplashScreenBackground">@color/darkGreyPurple</item>
+        <item name="android:windowSplashScreenAnimatedIcon">@drawable/knott</item>
+        <item name="android:windowSplashScreenIconBackgroundColor">@color/darkGreyPurple</item>
+    </style>
+
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+
+</resources>

android/app/src/main/res/values/colors.xml

@@ -0,0 +1,5 @@
+<resources>
+    <color name="darkGreyPurple">#281831</color>
+    <color name="testGreen">#00ff00</color>
+    <color name="ic_launcher_background">@color/darkGreyPurple</color>
+</resources>

android/app/src/main/res/values/styles.xml

@@ -1,18 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
-    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
-             Flutter draws its first frame -->
+             the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
+
+
+
+
+
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
          Flutter UI initializes, as well as behind your Flutter UI while its
          running.
-         
+
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
-    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
-</resources>
+</resources>

android/build.gradle

@@ -1,18 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.8.21'
-    repositories {
-        google()
-        // jCenter() no longer exists... https://blog.gradle.org/jcenter-shutdown
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-
-    }
-}
-
 allprojects {
     repositories {
         google()
@@ -28,7 +13,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-//removed due to gradle namespace conflicts that are beyond erinn's mere mortal understanding
-//task clean(type: Delete) {
-//    delete rootProject.buildDir
-//}
+tasks.register("clean", Delete) {
+    delete rootProject.buildDir
+}

android/settings.gradle

@@ -1,11 +1,25 @@
-include ':app', ':cwtch'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "7.4.2" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.21" apply false
+}
+
+include ":app"

assets/themes/cwtch/theme.yml

@@ -0,0 +1,107 @@
+---
+colors:
+  darkGreyPurple: 0x281831
+  deepPurple: 0x422850
+  mauvePurple: 0x8E64A5
+  whiteishPurple: 0xE3DFE4
+  lightGrey: 0x9E9E9E
+  softGreen: 0xA0FFB0
+  softRed: 0xFFA0B0
+  whitePurple: 0xFFFDFF
+  softPurple: 0xFDF3FC
+  purple: 0xDFB9DE
+  brightPurple: 0xD1B0E0  # not in new: portrait badge color
+  darkPurple: 0x350052
+  greyPurple: 0x775F84  # not in new: portrait borders
+  pink: 0xE85DA1  # not in new: active button color
+  hotPink: 0xD20070  # #D01972)
+  softGrey: 0xB3B6B3  # not in new theme: blocked
+themes:
+  name: cwtch
+  dark:
+    colors:
+      background: darkGreyPurple
+      header: darkGreyPurple
+      userBubble: mauvePurple
+      peerBubble: deepPurple
+      font: whiteishPurple
+      settings: whiteishPurple
+      accent: hotPink
+    theme:
+      backgroundHilightElementColor: deepPurple
+      backgroundMainColor: background  # darkGreyPurple
+      backgroundPaneColor: header  # darkGreyPurple
+      defaultButtonColor: accent  # hotPink
+      defaultButtonDisabledColor: lightGrey
+      defaultButtonDisabledTextColor: darkGreyPurple
+      defaultButtonTextColor: whiteishPurple
+      dropShadowColor: mauvePurple
+      hilightElementColor: purple
+      mainTextColor: font  # whiteishPurple
+      messageFromMeBackgroundColor: userBubble  # mauvePurple
+      messageFromMeTextColor: font  # whiteishPurple
+      messageFromOtherBackgroundColor: peerBubble  # deepPurple
+      messageFromOtherTextColor: font  # whiteishPurple
+      portraitBackgroundColor: deepPurple
+      portraitBlockedBorderColor: lightGrey
+      portraitBlockedTextColor: lightGrey
+      portraitContactBadgeColor: hotPink
+      portraitContactBadgeTextColor: whiteishPurple
+      portraitOfflineBorderColor: purple
+      portraitOnlineBorderColor: whiteishPurple
+      portraitProfileBadgeColor: hotPink
+      portraitProfileBadgeTextColor: whiteishPurple
+      scrollbarDefaultColor: purple
+      sendHintTextColor: mauvePurple
+      chatReactionIconColor: mauvePurple
+      textfieldBackgroundColor: deepPurple
+      textfieldBorderColor: deepPurple
+      textfieldErrorColor: hotPink
+      textfieldHintColor: mainTextColor
+      toolbarIconColor: settings  # whiteishPurple
+      topbarColor: header  # darkGreyPurple
+      chatImage: Cwtch.png
+      chatImageColor: peerBubble
+  light:
+    colors:
+      background: whitePurple
+      header: softPurple
+      userBubble: purple
+      peerBubble: softPurple
+      font: 0x281831
+      settings: 0x281831
+      accent: hotPink
+    theme:
+      backgroundHilightElementColor: softPurple
+      backgroundMainColor: background  # whitePurple
+      backgroundPaneColor: background  # whitePurple
+      defaultButtonColor: accent  # hotPink
+      defaultButtonDisabledColor: softGrey
+      defaultButtonTextColor: whitePurple  # ?
+      dropShadowColor: purple
+      hilightElementColor: purple
+      mainTextColor: settings
+      messageFromMeBackgroundColor: userBubble  # brightPurple
+      messageFromMeTextColor: font  # mainTextColor
+      messageFromOtherBackgroundColor: peerBubble  # purple
+      messageFromOtherTextColor: font  # darkPurple
+      portraitBackgroundColor: softPurple
+      portraitBlockedBorderColor: softGrey
+      portraitBlockedTextColor: softGrey
+      portraitContactBadgeColor: accent
+      portraitContactBadgeTextColor: whitePurple
+      portraitOfflineBorderColor: greyPurple
+      portraitOnlineBorderColor: font
+      portraitProfileBadgeColor: accent
+      portraitProfileBadgeTextColor: whitePurple
+      scrollbarDefaultColor: accent
+      sendHintTextColor: purple
+      chatReactionIconColor: purple
+      textfieldBackgroundColor: purple
+      textfieldBorderColor: purple
+      textfieldErrorColor: hotPink
+      textfieldHintColor: font
+      toolbarIconColor: background  # darkPurple
+      topbarColor: header  # softPurple
+      chatImage: Cwtch.png
+      chatImageColor: 0xf1dff0

assets/themes/ghost/theme.yml

@@ -0,0 +1,86 @@
+---
+colors:
+  darkDarkBlue: 0x0E1628
+  darkLightBlue: 0x19243E
+  white: 0xE6E9F4
+  darkBlue: 0x131B2E
+  lighterDarkBlue: 0x19243E
+  lightBlue: 0xC0C8E5
+
+themes:
+  name: ghost
+  dark:
+    colors:
+      background: 0x131B2E
+      header: 0x0E1628
+      userBubble: 0x25355A
+      peerBubble: 0x19243E
+      font: 0xE6E9F4
+      settings: 0xE6E9F4
+      accent: 0xD20070
+      reaction: 0x96A5D4
+    theme:
+      backgroundHilightElementColor: darkDarkBlue
+      backgroundMainColor: background
+      backgroundPaneColor: header
+      defaultButtonColor: accent
+      dropShadowColor: darkBlue
+      mainTextColor: font
+      messageFromMeBackgroundColor: userBubble
+      messageFromMeTextColor: font
+      messageFromOtherBackgroundColor: peerBubble
+      messageFromOtherTextColor: font
+      portraitOfflineBorderColor: 0x96A5D4
+      portraitOnlineBorderColor: font
+      portraitBackgroundColor: background
+      scrollbarDefaultColor: darkLightBlue
+      sendHintTextColor: userBubble
+      textfieldBackgroundColor: peerBubble
+      textfieldBorderColor: userBubble
+      textfieldHintColor: font
+      toolbarIconColor: settings
+      topbarColor: header
+      chatReactionIconColor: reaction
+      chatImage: Ghost.png
+      chatImageColor: userBubble
+      snackbarBackgroundColor: accent
+      snackbarTextColor: 0xE6E9F4
+  light:
+    colors:
+      background: 0xE6E9F4
+      header: 0x96A5D4
+      userBubble: 0x96A5D4
+      peerBubble: 0xC0C8E5
+      font: 0x131B2E
+      settings: 0x131B2E
+      accent: 0xD20070
+      reaction: 0x96A5D4
+    theme:
+      backgroundHilightElementColor: peerBubble
+      backgroundMainColor: background
+      backgroundPaneColor: background
+      defaultButtonColor: accent
+      defaultButtonActiveColor: lighterDarkBlue
+      defaultButtonDisabledColor: userBubble
+      dropShadowColor: darkBlue
+      mainTextColor: settings
+      messageFromMeBackgroundColor: userBubble
+      messageFromMeTextColor: font
+      messageFromOtherBackgroundColor: peerBubble
+      messageFromOtherTextColor: font
+      portraitContactBadgeColor: accent
+      portraitOfflineBorderColor: header
+      portraitOnlineBorderColor: font
+      portraitBackgroundColor: background
+      scrollbarDefaultColor: accent
+      sendHintTextColor: peerBubble
+      textfieldBackgroundColor: peerBubble
+      textfieldBorderColor: userBubble
+      textfieldHintColor: font
+      toolbarIconColor: 0xffffff
+      topbarColor: header
+      chatReactionIconColor: reaction
+      chatImage: Ghost.png
+      chatImageColor: peerBubble
+      snackbarBackgroundColor: accent
+      snackbarTextColor: background

assets/themes/juniper/theme.yml

@@ -0,0 +1,53 @@
+---
+
+themes:
+  name: juniper
+  dark:
+    colors:
+      background: 0x1B1B1B
+      backgroundAlt: 0x494949
+      header: 0x1B1B1B
+      userBubble: 0x373737
+      peerBubble: 0x494949
+      font: 0xFFFFFF
+      settings: 0xFFFDFF
+      accent: 0x9E6A56
+      accentAlt: 0x9E6A56
+    theme:
+      backgroundMainColor: background
+      backgroundPaneColor: header
+      topbarColor: header
+      mainTextColor: font
+      defaultButtonColor: accent
+      textfieldHintColor: mainTextColor
+      toolbarIconColor: settings
+      messageFromMeBackgroundColor: userBubble
+      messageFromMeTextColor: font
+      messageFromOtherBackgroundColor: peerBubble
+      messageFromOtherTextColor: font
+      textfieldBackgroundColor: peerBubble
+      textfieldBorderColor: userBubble
+      backgroundHilightElementColor: accent
+      sendHintTextColor: accentAlt
+      hilightElementColor: accentAlt
+      defaultButtonTextColor: mainTextColor
+      defaultButtonDisabledColor: peerBubble
+      defaultButtonDisabledTextColor: peerBubble
+      textfieldErrorColor: accent
+      scrollbarDefaultColor: accent
+      portraitBackgroundColor: header
+      portraitOnlineBorderColor: font
+      portraitOfflineBorderColor: peerBubble
+      portraitBlockedBorderColor: peerBubble
+      portraitBlockedTextColor: peerBubble
+      portraitContactBadgeColor: accent
+      portraitContactBadgeTextColor: mainTextColor
+      portraitProfileBadgeColor: accent
+      portraitProfileBadgeTextColor: mainTextColor
+      dropShadowColor: accentAlt
+      chatReactionIconColor: accentAlt
+      chatImage: JuniperDark.png
+      chatImageColor: userBubble
+      messageSelectionColor: accent
+      textfieldSelectionColor: accent
+      menuBackgroundColor: accent

assets/themes/mermaid/theme.yml

@@ -0,0 +1,91 @@
+---
+colors:
+  lavender: 0xB194C1
+
+themes:
+  name: mermaid
+  dark:
+    colors:
+      background: 0x15282A
+      header: 0x15282A
+      userBubble: 0x1d5754
+      peerBubble: 0x253D3F
+      font: 0xEDFAFC
+      settings: 0xEDFAFC
+      accent: 0x8E64A5
+      reaction: 0x8E64A5
+    theme:
+      backgroundHilightElementColor: peerBubble
+      backgroundMainColor: background  # darkGreyPurple
+      backgroundPaneColor: header  # darkGreyPurple
+      defaultButtonColor: accent  # hotPink
+      dropShadowColor: lavender
+      mainTextColor: font  # whiteishPurple
+      messageFromMeBackgroundColor: userBubble  # mauvePurple
+      messageFromMeTextColor: font  # whiteishPurple
+      messageFromOtherBackgroundColor: peerBubble  # deepPurple
+      messageFromOtherTextColor: font  # whiteishPurple
+      portraitOfflineBorderColor: userBubble
+      portraitOnlineBorderColor: font
+      portraitContactBadgeColor: accent
+      portraitContactBadgeTextColor: 0xffffff
+      portraitProfileBadgeColor: accent
+      portraitProfileBadgeTextColor: 0xffffff
+      portraitBackgroundColor: background
+      textfieldBackgroundColor: peerBubble
+      textfieldBorderColor: userBubble
+      textfieldHintColor: mainTextColor
+      toolbarIconColor: settings  # whiteishPurple
+      topbarColor: header  # darkGreyPurple
+      sendHintTextColor: userBubble
+      chatReactionIconColor: reaction
+      chatImage: Mermaid.png
+      chatImageColor: peerBubble
+      snackbarBackgroundColor: accent
+      snackbarTextColor: 0xEDFAFC
+      messageSelectionColor: accent
+      textfieldSelectionColor: accent
+      menuBackgroundColor: accent
+  light:
+    colors:
+      background: 0xEDFAFC
+      header: 0x71C1BF
+      userBubble: 0x71C1BF
+      peerBubble: 0xD2EFF3
+      font: 0x15282A
+      settings: 0x15282A
+      accent: 0x8E64A5
+      reaction: 0x71C1BF
+    theme:
+      backgroundHilightElementColor: peerBubble
+      backgroundMainColor: background  # whitePurple
+      backgroundPaneColor: background  # whitePurple
+      defaultButtonColor: accent  # hotPink
+      dropShadowColor: peerBubble
+      mainTextColor: settings
+      messageFromMeBackgroundColor: userBubble  # brightPurple
+      messageFromMeTextColor: font  # mainTextColor
+      messageFromOtherBackgroundColor: peerBubble  # purple
+      messageFromOtherTextColor: font  # darkPurple
+      portraitContactBadgeColor: accent
+      portraitContactBadgeTextColor: 0xffffff
+      portraitProfileBadgeColor: accent
+      portraitProfileBadgeTextColor: 0xffffff
+      portraitOfflineBorderColor: userBubble
+      portraitOnlineBorderColor: font
+      portraitBackgroundColor: background
+      scrollbarDefaultColor: accent
+      textfieldBackgroundColor: peerBubble
+      textfieldBorderColor: userBubble
+      textfieldHintColor: font
+      toolbarIconColor: 0xffffff
+      topbarColor: header  # softPurple
+      sendHintTextColor: userBubble
+      chatReactionIconColor: reaction
+      chatImage: Mermaid.png
+      chatImageColor: peerBubble
+      snackbarBackgroundColor: accent
+      snackbarTextColor: background
+      messageSelectionColor: 0xb1e3ea
+      textfieldSelectionColor: 0xb1e3ea
+      menuBackgroundColor: 0xb1e3ea

assets/themes/midnight/theme.yml

@@ -0,0 +1,77 @@
+---
+
+themes:
+  name: midnight
+  dark:
+    colors:
+      accentGray: 0xE0E0E0
+      background: 0x111111
+      backgroundAlt: 0x494949
+      header: 0x111111
+      userBubble: 0x2D2D2D
+      peerBubble: 0x1B1B1B
+      font: 0xF0F1F1
+      settings: 0xF0F1F1
+      accent: 0xD20070
+      reaction: 0xD20070
+    theme:
+      backgroundHilightElementColor: backgroundAlt
+      backgroundMainColor: background  # darkGreyPurple
+      backgroundPaneColor: header  # darkGreyPurple
+      defaultButtonColor: accent  # hotPink
+      dropShadowColor: accentGray
+      mainTextColor: font  # whiteishPurple
+      messageFromMeBackgroundColor: userBubble  #  mauvePurple
+      messageFromMeTextColor: font  # whiteishPurple
+      messageFromOtherBackgroundColor: peerBubble  # deepPurple
+      messageFromOtherTextColor: font  # whiteishPurple
+      scrollbarDefaultColor: accentGray
+      textfieldBackgroundColor: peerBubble
+      textfieldBorderColor: userBubble
+      textfieldHintColor: mainTextColor
+      portraitOfflineBorderColor: 0x676767
+      portraitOnlineBorderColor: font
+      portraitBackgroundColor: background
+      toolbarIconColor: settings  # whiteishPurple
+      topbarColor: header  # darkGreyPurple
+      sendHintTextColor: userBubble
+      chatReactionIconColor: reaction
+      chatImage: Midnight.png
+      chatImageColor: userBubble
+      snackbarBackgroundColor: accent
+      snackbarTextColor: 0xF0F1F1 
+  light:
+    colors:
+      background: 0xF0F1F1  # Color( 0xFFFDFF)
+      header: 0xE0E0E0
+      userBubble: 0xBABDBE
+      peerBubble: 0xE0E0E0
+      font: 0x111111
+      settings: 0x111111
+      accent: 0xD20070
+      reaction: 0xD20070
+    theme:
+      backgroundHilightElementColor: peerBubble
+      backgroundMainColor: background  # whitePurple
+      backgroundPaneColor: background  # whitePurple
+      defaultButtonColor: accent  # hotPink
+      mainTextColor: settings
+      messageFromMeBackgroundColor: userBubble  # brightPurple
+      messageFromMeTextColor: font  # mainTextColor
+      messageFromOtherBackgroundColor: peerBubble  # purple
+      messageFromOtherTextColor: font  # darkPurple
+      portraitContactBadgeColor: accent
+      portraitOfflineBorderColor: userBubble
+      portraitOnlineBorderColor: font
+      portraitBackgroundColor: background
+      scrollbarDefaultColor: accent
+      textfieldBackgroundColor: userBubble
+      textfieldHintColor: font
+      toolbarIconColor: 0xffffff
+      topbarColor: header  # softPurple
+      sendHintTextColor: userBubble
+      chatReactionIconColor: reaction
+      chatImage: Midnight.png
+      chatImageColor: peerBubble
+      snackbarBackgroundColor: accent
+      snackbarTextColor: background

assets/themes/neon1/theme.yml

@@ -0,0 +1,86 @@
+---
+
+themes:
+  name: neon1
+  dark:
+    colors:
+      background: 0x281831
+      header: 0x281831
+      userBubble: 0x7F00C5
+      peerBubble: 0x422850
+      font: 0xFBF3FF
+      settings: 0x281831
+      accent: 0x56DCD8
+      reaction: 0xD891FF
+    theme:
+      backgroundMainColor: background  # darkGreyPurple
+      backgroundPaneColor: header  # darkGreyPurple
+      defaultButtonColor: accent  # hotPink
+      mainTextColor: 0xFBF3FF  # whiteishPurple
+      messageFromMeBackgroundColor: userBubble  #  mauvePurple
+      messageFromMeTextColor: font  # whiteishPurple
+      messageFromOtherBackgroundColor: peerBubble  # deepPurple
+      messageFromOtherTextColor: font  # whiteishPurple
+      portraitContactBadgeColor: accent
+      portraitContactBadgeTextColor: background
+      portraitProfileBadgeColor: accent
+      portraitProfileBadgeTextColor: background
+      portraitBackgroundColor: background
+      portraitOfflineBorderColor: 0x775F84
+      portraitOnlineBorderColor: font
+      scrollbarDefaultColor: accent
+      textfieldHintColor: mainTextColor
+      toolbarIconColor: settings  # whiteishPurple
+      topbarColor: header  # darkGreyPurple
+      sendHintTextColor: userBubble
+      chatReactionIconColor: reaction
+      defaultButtonTextColor: 0x281831
+      chatImage: Neon1.png
+      chatImageColor: 0x4f3060
+      snackbarBackgroundColor: accent
+      snackbarTextColor: background
+      messageSelectionColor: 0x775F84
+      textfieldSelectionColor: 0x775F84
+      menuBackgroundColor: 0x775F84
+  light:
+    colors:
+      background: 0xFBF3FF
+      header: 0x56DCD8
+      userBubble: 0x56DCD8
+      peerBubble: 0xF5E1FF
+      font: 0x281831
+      settings: 0x281831
+      accent: 0xD891FF
+      reaction: 0xD891FF
+    theme:
+      backgroundMainColor: background  # whitePurple
+      backgroundPaneColor: background  # whitePurple
+      defaultButtonColor: accent  # hotPink
+      dropShadowColor: userBubble
+      mainTextColor: settings
+      messageFromMeBackgroundColor: userBubble  # brightPurple
+      messageFromMeTextColor: font  # mainTextColor
+      messageFromOtherBackgroundColor: peerBubble  # purple
+      messageFromOtherTextColor: font  # darkPurple
+      portraitOfflineBorderColor: 0xeac1ff
+      portraitOnlineBorderColor: font
+      portraitContactBadgeColor: accent
+      portraitContactBadgeTextColor: font
+      portraitProfileBadgeColor: accent
+      portraitProfileBadgeTextColor: font
+      scrollbarDefaultColor: accent
+      textfieldBackgroundColor: peerBubble
+      textfieldBorderColor: userBubble
+      textfieldHintColor: font
+      toolbarIconColor: settings  # darkPurple
+      topbarColor: header  # softPurple
+      sendHintTextColor: 0xeac1ff
+      chatReactionIconColor: reaction
+      chatImage: Neon1.png
+      chatImageColor: 0xeac1ff
+      defaultButtonTextColor: font
+      snackbarBackgroundColor: accent
+      snackbarTextColor: font
+      messageSelectionColor: accent
+      textfieldSelectionColor: accent
+      menuBackgroundColor: accent

assets/themes/neon2/theme.yml

@@ -0,0 +1,83 @@
+---
+
+themes:
+  name: neon2
+  dark:
+    colors:
+      background: 0x281831
+      header: 0x281831
+      userBubble: 0x7F00C5
+      peerBubble: 0x422850
+      font: 0xFBF3FF
+      settings: 0x281831
+      accent: 0x90EE02
+      reaction: 0xD891FF
+    theme:
+      backgroundMainColor: background  # darkGreyPurple
+      backgroundPaneColor: header  # darkGreyPurple
+      defaultButtonColor: accent  # hotPink
+      mainTextColor: font  # whiteishPurple
+      messageFromMeBackgroundColor: userBubble  # mauvePurple
+      messageFromMeTextColor: font  # whiteishPurple
+      messageFromOtherBackgroundColor: peerBubble  # deepPurple
+      messageFromOtherTextColor: font  # whiteishPurple
+      portraitContactBadgeColor: accent
+      portraitContactBadgeTextColor: 0x281831
+      portraitProfileBadgeColor: accent
+      portraitProfileBadgeTextColor: 0x281831
+      scrollbarDefaultColor: accent
+      textfieldHintColor: mainTextColor
+      toolbarIconColor: settings  # whiteishPurple
+      topbarColor: header  # darkGreyPurple
+      sendHintTextColor: userBubble
+      chatReactionIconColor: reaction
+      defaultButtonTextColor: background
+      chatImage: Neon2.png
+      chatImageColor: 0x573569
+      snackbarBackgroundColor: accent
+      snackbarTextColor: background
+      messageSelectionColor: 0x775F84
+      textfieldSelectionColor: 0x775F84
+      menuBackgroundColor: 0x775F84
+  light:
+    colors:
+      paleGreen: 0xE7F6F6
+      background: 0xFBFFF6
+      header: 0x90EE02
+      userBubble: 0x90EE02
+      peerBubble: 0xF3FFE4
+      font: 0x281831
+      settings: 0x281831
+      accent: 0x7F00C5
+      reaction: 0x7F00C5
+    theme:
+      backgroundMainColor: background  # whitePurple
+      backgroundPaneColor: background  # whitePurple
+      defaultButtonColor: accent  # hotPink
+      dropShadowColor: userBubble
+      mainTextColor: settings
+      messageFromMeBackgroundColor: userBubble  # brightPurple
+      messageFromMeTextColor: font  # mainTextColor
+      messageFromOtherBackgroundColor: peerBubble  # purple
+      messageFromOtherTextColor: font  # darkPurple
+      portraitOfflineBorderColor: 0x775F84
+      portraitOnlineBorderColor: font
+      portraitContactBadgeColor: accent
+      portraitContactBadgeTextColor: background
+      portraitProfileBadgeColor: accent
+      portraitProfileBadgeTextColor: background
+      portraitBackgroundColor: background
+      scrollbarDefaultColor: accent
+      textfieldBackgroundColor: paleGreen
+      textfieldBorderColor: peerBubble
+      textfieldHintColor: font
+      toolbarIconColor: background  # darkPurple
+      topbarColor: header  # softPurple
+      chatReactionIconColor: accent
+      chatImage: Neon2.png
+      chatImageColor: 0xd9ffa8
+      snackbarBackgroundColor: accent
+      snackbarTextColor: background
+      messageSelectionColor: 0xd9ffa8
+      textfieldSelectionColor: 0xd9ffa8
+      menuBackgroundColor: 0xd9ffa8

assets/themes/pumpkin/theme.yml

@@ -0,0 +1,84 @@
+---
+
+themes:
+  name: pumpkin
+  dark:
+    colors:
+      background: 0x281831
+      header: 0x281831
+      userBubble: 0x873C14
+      peerBubble: 0x422850
+      font: 0xFFFAF2
+      settings: 0xFFFAF2
+      accent: 0x873C14
+      reaction: 0x873C14
+    theme:
+      backgroundMainColor: background  # darkGreyPurple
+      backgroundPaneColor: header  # darkGreyPurple
+      defaultButtonColor: accent  # hotPink
+      mainTextColor: font  # whiteishPurple
+      messageFromMeBackgroundColor: userBubble  #  mauvePurple
+      messageFromMeTextColor: font  # whiteishPurple
+      messageFromOtherBackgroundColor: peerBubble  # deepPurple
+      messageFromOtherTextColor: font  # whiteishPurple
+      scrollbarDefaultColor: accent
+      portraitContactBadgeColor: accent
+      portraitContactBadgeTextColor: 0xFFFAF2
+      portraitProfileBadgeColor: accent
+      portraitProfileBadgeTextColor: 0xFFFAF2
+      portraitOfflineBorderColor: 0x775F84
+      portraitOnlineBorderColor: font
+      textfieldHintColor: mainTextColor
+      toolbarIconColor: settings  # whiteishPurple
+      topbarColor: header  # darkGreyPurple
+      sendHintTextColor: peerBubble
+      chatReactionIconColor: reaction
+      chatImage: Pumpkin.png
+      chatImageColor: 0x573569
+      snackbarBackgroundColor: accent
+      snackbarTextColor: 0xFFFAF2
+      messageSelectionColor: 0x775F84
+      textfieldSelectionColor: 0x775F84
+      menuBackgroundColor: 0x775F84
+  light:
+    colors:
+      background: 0xFFFAF2
+      header: 0xFF9800
+      userBubble: 0xFF9800
+      peerBubble: 0xFFF3E0
+      font: 0x281831
+      settings: 0x281831
+      accent: 0x422850
+      reaction: 0xFF9800
+    theme:
+      backgroundHilightElementColor: peerBubble
+      backgroundMainColor: background  # whitePurple
+      backgroundPaneColor: background  # whitePurple
+      defaultButtonColor: accent  # hotPink
+      dropShadowColor: peerBubble
+      mainTextColor: settings
+      messageFromMeBackgroundColor: userBubble  # brightPurple
+      messageFromMeTextColor: font  # mainTextColor
+      messageFromOtherBackgroundColor: peerBubble  # purple
+      messageFromOtherTextColor: font  # darkPurple
+      portraitContactBadgeColor: accent
+      portraitContactBadgeTextColor: 0xFFFAF2
+      portraitProfileBadgeColor: accent
+      portraitProfileBadgeTextColor: 0xFFFAF2
+      portraitOfflineBorderColor: 0x775F84
+      portraitOnlineBorderColor: font
+      scrollbarDefaultColor: accent
+      textfieldBackgroundColor: background
+      textfieldBorderColor: userBubble
+      textfieldHintColor:  mainTextColor
+      toolbarIconColor: background  # darkPurple
+      topbarColor: header  # softPurple
+      sendHintTextColor: 0xffd494
+      chatReactionIconColor: reaction
+      chatImage: Pumpkin.png
+      chatImageColor: 0xFFDCA8
+      snackbarBackgroundColor: accent
+      snackbarTextColor: background
+      messageSelectionColor: 0xFFDCA8
+      textfieldSelectionColor: 0xFFDCA8
+      menuBackgroundColor: 0xFFDCA8

assets/themes/vampire/theme.yml

@@ -0,0 +1,85 @@
+---
+
+themes:
+  name: vampire
+  dark:
+    colors:
+      background: 0x27141B
+      header: 0x27141B
+      userBubble: 0x422850
+      peerBubble: 0x502033
+      font: 0xFBF4F7
+      settings: 0xFBF4F7
+      accent: 0x502033
+      reaction: 0xC86B89
+    theme:
+      backgroundMainColor: background  # darkGreyPurple
+      backgroundPaneColor: header  # darkGreyPurple
+      defaultButtonColor: accent  # hotPink
+      mainTextColor: font  # whiteishPurple
+      messageFromMeBackgroundColor: userBubble  #  mauvePurple
+      messageFromMeTextColor: font  # whiteishPurple
+      messageFromOtherBackgroundColor: peerBubble  # deepPurple
+      messageFromOtherTextColor: font  # whiteishPurple
+      portraitContactBadgeColor: 0x863655
+      portraitContactBadgeTextColor: 0xFBF4F7
+      portraitProfileBadgeColor: 0x863655
+      portraitProfileBadgeTextColor: 0xFBF4F7
+      portraitBackgroundColor: peerBubble
+      portraitOfflineBorderColor: 0x863655
+      portraitOnlineBorderColor: font
+      scrollbarDefaultColor: accent
+      textfieldHintColor: mainTextColor
+      toolbarIconColor: settings  # whiteishPurple
+      topbarColor: header  # darkGreyPurple
+      sendHintTextColor: peerBubble
+      chatReactionIconColor: reaction
+      chatImage: Vampire.png
+      chatImageColor: peerBubble
+      snackbarBackgroundColor: accent
+      snackbarTextColor: 0xFBF4F7
+      messageSelectionColor: 0x863655
+      textfieldSelectionColor: 0x863655
+      menuBackgroundColor: 0x863655
+  light:
+    colors:
+      background: 0xFBF4F7
+      header: 0xC86B89
+      userBubble: 0xDA94A9
+      peerBubble: 0xF7EAF0
+      font: 0x27141B
+      settings: 0xFBF4F7
+      accent: 0x502033
+      reaction: 0xDA94A9
+    theme:
+      backgroundMainColor: background  # whitePurple
+      backgroundPaneColor: background  # whitePurple
+      defaultButtonColor: accent  # hotPink
+      dropShadowColor: userBubble
+      mainTextColor: font
+      messageFromMeBackgroundColor: userBubble  # brightPurple
+      messageFromMeTextColor: font  # mainTextColor
+      messageFromOtherBackgroundColor: peerBubble  # purple
+      messageFromOtherTextColor: font  # darkPurple
+      portraitContactBadgeColor: accent
+      portraitContactBadgeTextColor: 0xFBF4F7
+      portraitProfileBadgeColor: accent
+      portraitProfileBadgeTextColor: 0xFBF4F7
+      portraitOfflineBorderColor: 0x775F84
+      portraitOnlineBorderColor: font
+      portraitBackgroundColor: background
+      scrollbarDefaultColor: accent
+      textfieldBackgroundColor: peerBubble
+      textfieldBorderColor: userBubble
+      textfieldHintColor: font
+      toolbarIconColor: settings  # darkPurple
+      topbarColor: header  # softPurple
+      sendHintTextColor: userBubble
+      chatReactionIconColor: reaction
+      chatImage: Vampire.png
+      chatImageColor: 0xE9BFCD
+      snackbarBackgroundColor: accent
+      snackbarTextColor: background
+      messageSelectionColor: header
+      textfieldSelectionColor: header
+      menuBackgroundColor: header

assets/themes/witch/theme.yml

@@ -0,0 +1,86 @@
+---
+
+themes:
+  name: witch
+  dark:
+    colors:
+      background: 0x111b11
+      header: 0x0E1E0E
+      userBubble: 0x3B5132
+      peerBubble: 0x152716
+      font: 0xF1F3EC
+      settings: 0xE3ECD3
+      accent: 0x8E64A5
+      reaction: 0x97AF6E
+    theme:
+      backgroundHilightElementColor: peerBubble
+      backgroundMainColor: background  # darkGreyPurple
+      backgroundPaneColor: header  # darkGreyPurple
+      defaultButtonColor: accent  # hotPink
+      mainTextColor: font  # whiteishPurple
+      messageFromMeBackgroundColor: userBubble  #  mauvePurple
+      messageFromMeTextColor: font  # whiteishPurple
+      messageFromOtherBackgroundColor: peerBubble  # deepPurple
+      messageFromOtherTextColor: font  # whiteishPurple
+      portraitContactBadgeColor: accent
+      portraitContactBadgeTextColor: 0xF1F3EC
+      portraitProfileBadgeColor: accent
+      portraitProfileBadgeTextColor: 0xF1F3EC
+      portraitOfflineBorderColor: 0x355934
+      portraitOnlineBorderColor: font
+      portraitBackgroundColor: peerBubble
+      scrollbarDefaultColor: accent
+      textfieldBackgroundColor: peerBubble
+      textfieldBorderColor: userBubble
+      textfieldHintColor: mainTextColor
+      toolbarIconColor: settings  # whiteishPurple
+      topbarColor: header  # darkGreyPurple
+      chatReactionIconColor: reaction
+      chatImage: Witch.png
+      chatImageColor: 0x1E321D
+      snackbarBackgroundColor: accent
+      snackbarTextColor: 0xF1F3EC
+      messageSelectionColor: accent
+      textfieldSelectionColor: accent
+      menuBackgroundColor: accent
+  light:
+    colors:
+      background: 0xF1F3EC
+      header: 0x97af6e
+      userBubble: 0x97AF6E
+      peerBubble: 0xE3ECD3
+      font: 0x111b11
+      settings: 0x0E1E0E
+      accent: 0x8E64A5
+      reaction: 0x97AF6E
+    theme:
+      backgroundHilightElementColor: peerBubble
+      backgroundMainColor: background  # whitePurple
+      backgroundPaneColor: background  # whitePurple
+      defaultButtonColor: accent  # hotPink
+      mainTextColor: settings
+      messageFromMeBackgroundColor: userBubble  # brightPurple
+      messageFromMeTextColor: font  # mainTextColor
+      messageFromOtherBackgroundColor: peerBubble  # purple
+      messageFromOtherTextColor: font  # darkPurple
+      portraitContactBadgeColor: accent
+      portraitContactBadgeTextColor: 0xF1F3EC
+      portraitProfileBadgeColor: accent
+      portraitProfileBadgeTextColor: 0xF1F3EC
+      portraitOfflineBorderColor: userBubble
+      portraitOnlineBorderColor: font
+      portraitBackgroundColor: background
+      scrollbarDefaultColor: accent
+      textfieldBackgroundColor: background
+      textfieldBorderColor: userBubble
+      textfieldHintColor: font
+      toolbarIconColor: settings  # darkPurple
+      topbarColor: header  # softPurple
+      chatReactionIconColor: reaction
+      chatImage: Witch.png
+      chatImageColor: 0xD0DDBA
+      snackbarBackgroundColor: accent
+      snackbarTextColor: background
+      messageSelectionColor: accent
+      textfieldSelectionColor: accent
+      menuBackgroundColor: accent

fetch-libcwtch-go.sh

@@ -3,6 +3,6 @@
 VERSION=`cat LIBCWTCH-GO.version`
 echo $VERSION
 
-curl --fail  https://build.openprivacy.ca/files/libCwtch-autobindings-$VERSION/android/cwtch.aar --output android/cwtch/cwtch.aar
+curl --fail  https://build.openprivacy.ca/files/libCwtch-autobindings-$VERSION/android/cwtch.aar --output android/app/cwtch/cwtch.aar
 # FIXME...at some point we need to support different linux architectures...for now rely on existing expectations and rename x64 lib
-curl --fail  https://build.openprivacy.ca/files/libCwtch-autobindings-$VERSION/linux/libCwtch.x64.so --output linux/libCwtch.so
+curl --fail  https://build.openprivacy.ca/files/libCwtch-autobindings-$VERSION/linux/libCwtch.x64.so --output linux/libCwtch.so

fetch-tor-macos.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 cd macos
-curl https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-macos-0.4.7.8.tar.gz --output tor.tar.gz
+curl https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-0.4.8.9-macos.tar.gz --output tor.tar.gz
 tar -xzf tor.tar.gz
 chmod a+x Tor/tor.real
 cd ..

fetch-tor-win.ps1

@@ -1,6 +1,6 @@
 
-Invoke-WebRequest -Uri https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-win64-0.4.7.8.zip -OutFile tor.zip
+Invoke-WebRequest -Uri https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-0.4.8.9-win64.zip -OutFile tor.zip
 
-if ((Get-FileHash tor.zip -Algorithm sha512).Hash -ne '5b8f900a37f6e90d7a945b3903d769383c7478042cb43b2105d2374186e1a536f1a4758a2823d1d5be71d53a81dcfd8243293e04f82812d355983df322823cf4' ) { Write-Error 'tor.zip sha512sum mismatch' }
+if ((Get-FileHash tor.zip -Algorithm sha512).Hash -ne 'a1c90d9a2f82df5f3d973e260bbfec76e413417cfa276fb70d1668214e2e607cf65be86a25e30c6f7814261dc154a02568459945f31389ae6a22e03d6d0d3c4c' ) { Write-Error 'tor.zip sha512sum mismatch' }
 
 Expand-Archive -Path tor.zip -DestinationPath Tor

fetch-tor.sh

@@ -1,14 +1,14 @@
 #!/bin/sh
 
 cd linux
-wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-0.4.7.8-linux-x86_64.tar.gz -O tor.tar.gz
+wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-0.4.8.9-linux-x86_64.tar.gz -O tor.tar.gz
 tar -xzf tor.tar.gz
 cd ..
 
 mkdir -p android/app/src/main/jniLibs/arm64-v8a
-wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-0.4.7.10-arm64 -O android/app/src/main/jniLibs/arm64-v8a/libtor.so
+wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-0.4.8.9-android-arm64 -O android/app/src/main/jniLibs/arm64-v8a/libtor.so
 chmod a+x android/app/src/main/jniLibs/arm64-v8a/libtor.so
 
 mkdir -p android/app/src/main/jniLibs/armeabi-v7a
-wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-0.4.7.10-arm7 -O android/app/src/main/jniLibs/armeabi-v7a/libtor.so
+wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-0.4.8.9-android-arm7 -O android/app/src/main/jniLibs/armeabi-v7a/libtor.so
 chmod a+x android/app/src/main/jniLibs/armeabi-v7a/libtor.so

integration_test/features/01_general/02_save_load.feature

@@ -12,9 +12,16 @@ Feature: Settings pane opens and can save settings persistently
     Given I tap the 'OpenSettingsView' button
     And I wait until the text 'Use Light Themes' is present
     When I tap the widget that contains the text "Use Light Themes"
-    And I tap the widget that contains the text "Block Unknown Contacts"
     And I tap the widget that contains the text "Streamer/Presentation Mode"
-    And I tap the widget that contains the text "Enable Experiments"
+    And I expect the switch that contains the text "Streamer/Presentation Mode" to be checked
+    Then I expect the switch that contains the text "Use Light Themes" to be checked
+    When I tap the 'OpenSettingsBehaviour' button
+    And I wait until the text 'Notification Policy' is present
+    When I tap the widget that contains the text "Block Unknown Contacts"
+    And I expect the switch that contains the text "Block Unknown Contacts" to be checked
+    When I tap the 'OpenSettingsExperiments' button
+    And I wait until the text 'Enable Experiments' is present
+    When I tap the widget that contains the text "Enable Experiments"
     Then I wait until the text 'Enable Group Chat' is present
     And I tap the widget that contains the text "Enable Group Chat"
     And I tap the widget that contains the text "Hosting Servers"
@@ -24,9 +31,6 @@ Feature: Settings pane opens and can save settings persistently
     And I wait until the text 'Download Folder' is present
     And I fill the "DownloadFolderPicker" field with "/this/is/a/test"
     And I tap the widget that contains the text "Enable Clickable Links"
-    Then I expect the switch that contains the text "Use Light Themes" to be checked
-    And I expect the switch that contains the text "Block Unknown Contacts" to be checked
-    And I expect the switch that contains the text "Streamer/Presentation Mode" to be checked
     And I expect the switch that contains the text "Enable Experiments" to be checked
     And I expect the switch that contains the text "Enable Group Chat" to be checked
     # Not every version of Cwtch Supports Hosting Servers..
@@ -42,8 +46,14 @@ Feature: Settings pane opens and can save settings persistently
     Given I tap the 'OpenSettingsView' button
     And I wait until the text 'Use Light Themes' is present
     Then I expect the switch that contains the text "Use Light Themes" to be checked
-    And I expect the switch that contains the text "Block Unknown Contacts" to be checked
     And I expect the switch that contains the text "Streamer/Presentation Mode" to be checked
+    When I tap the 'OpenSettingsBehaviour' button
+    And I wait until the text 'Notification Policy' is present
+    And I expect the switch that contains the text "Block Unknown Contacts" to be checked
+    And I expect the switch that contains the text "Block Unknown Contacts" to be checked
+    When I tap the 'OpenSettingsExperiments' button
+    And I wait until the text 'Enable Experiments' is present
+    And I wait until the text 'Enable Experiments' is present
     And I expect the switch that contains the text "Enable Experiments" to be checked
     And I expect the switch that contains the text "Enable Group Chat" to be checked
     # And I expect the switch that contains the text "Hosting Servers" to be checked

integration_test/features/02_global_settings/04_block_unknown.feature

@@ -3,6 +3,8 @@ Feature: Block unknown contacts setting
   Scenario: Carol adds Alice but Alice doesn't see it because Block Unknowns is enabled
     Given I wait until the widget with type 'ProfileMgrView' is present
     Given I tap the 'OpenSettingsView' button
+    And I wait until the text "Behaviour" is present
+    When I tap the 'OpenSettingsBehaviour button
     And I wait until the text "Block Unknown Contacts" is present
     When I tap the widget that contains the text "Block Unknown Contacts"
     Then I expect the switch that contains the text "Block Unknown Contacts" to be checked

integration_test/steps/chat.dart

@@ -1,17 +1,8 @@
-import 'package:cwtch/main.dart';
-import 'package:cwtch/widgets/messagebubble.dart';
-import 'package:cwtch/widgets/profilerow.dart';
 import 'package:cwtch/widgets/quotedmessage.dart';
-import 'package:cwtch/widgets/tor_icon.dart';
-import 'package:cwtch/views/profilemgrview.dart';
 import 'package:flutter_gherkin/flutter_gherkin.dart';
-import 'package:flutter_gherkin/src/flutter/parameters/existence_parameter.dart';
-import 'package:flutter_gherkin/src/flutter/parameters/swipe_direction_parameter.dart';
 import 'package:gherkin/gherkin.dart';
 
-import 'package:flutter/material.dart';
 
-import 'overrides.dart';
 
 StepDefinitionGeneric ExpectReply() {
   return given3<String, String, int, FlutterWorld>(

integration_test/steps/form_elements.dart

@@ -1,10 +1,7 @@
-import 'dart:convert';
 
 import 'package:flutter/material.dart';
-import 'package:flutter_driver/flutter_driver.dart';
 import 'package:flutter_gherkin/flutter_gherkin.dart';
 import 'package:gherkin/gherkin.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 enum SwitchState { checked, unchecked }
 
@@ -17,6 +14,7 @@ class SwitchStateParameter extends CustomParameter<SwitchState> {
             case "unchecked":
               return SwitchState.unchecked;
           }
+          return null;
         });
 }
 

lib/controllers/open_link_modal.dart

@@ -1,6 +1,5 @@
 import 'package:cwtch/themes/opaque.dart';
 import 'package:cwtch/third_party/linkify/linkify.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -38,7 +37,7 @@ void modalOpenLink(BuildContext ctx, LinkableElement link) {
                               final snackBar = SnackBar(
                                 content: Text(
                                   AppLocalizations.of(bcontext)!.copiedToClipboardNotification,
-                                  style: Provider.of<Settings>(bcontext).scaleFonts(defaultTextButtonStyle),
+                                  style: Provider.of<Settings>(bcontext, listen: false).scaleFonts(defaultTextButtonStyle),
                                 ),
                               );
 

lib/cwtch/cwtch.dart

@@ -11,8 +11,10 @@ abstract class Cwtch {
 
   // ignore: non_constant_identifier_names
   Future<void> Start();
-  // ignore: non_constant_identifier_names
-  Future<void> ReconnectCwtchForeground();
+
+  Future<String> getCwtchDir();
+
+  String getAssetsDir();
 
   // ignore: non_constant_identifier_names
   void CreateProfile(String nick, String pass, bool autostart);
@@ -156,4 +158,6 @@ abstract class Cwtch {
   void DeleteServerInfo(String profile, String handle);
   void PublishServerUpdate(String onion);
   Future<void> ConfigureConnections(String onion, bool listen, bool peers, bool servers);
+
+  bool IsLoaded();
 }

lib/cwtch/cwtchNotifier.dart

@@ -3,15 +3,10 @@ import 'package:cwtch/cwtch/cwtch.dart';
 import 'package:cwtch/main.dart';
 import 'package:cwtch/models/appstate.dart';
 import 'package:cwtch/models/contact.dart';
-import 'package:cwtch/models/message.dart';
 import 'package:cwtch/models/profilelist.dart';
-import 'package:cwtch/models/profileservers.dart';
 import 'package:cwtch/models/remoteserver.dart';
 import 'package:cwtch/models/servers.dart';
 import 'package:cwtch/notification_manager.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter/widgets.dart';
-import 'package:provider/provider.dart';
 
 import 'package:cwtch/torstatus.dart';
 
@@ -63,7 +58,14 @@ class CwtchNotifier {
     // EnvironmentConfig.debugLog("NewEvent $type $data");
     switch (type) {
       case "CwtchStarted":
-        flwtchState.cwtch.LoadProfiles(DefaultPassword);
+        if (data["Reload"] == "true" && profileCN.num > 0) {
+          // don't reload...
+          // unless we have loaded no profiles...then there isnt a risk and this
+          // might be a first time (e.g. new apk, existing service)
+        } else {
+          flwtchState.cwtch.LoadProfiles(DefaultPassword);
+        }
+
         appState.SetCwtchInit();
         break;
       case "CwtchStartError":
@@ -193,21 +195,9 @@ class CwtchNotifier {
         var senderImage = data['picture'];
         var isAuto = data['Auto'] == "true";
         String contenthash = data['ContentHash'];
+
         var selectedProfile = appState.selectedProfile == data["ProfileOnion"];
         var selectedConversation = selectedProfile && appState.selectedConversation == identifier;
-        var notification = data["notification"];
-
-        if (selectedConversation && seenMessageCallback != null) {
-          seenMessageCallback!(data["ProfileOnion"]!, identifier, DateTime.now().toUtc());
-        }
-
-        if (notification == "SimpleEvent") {
-          notificationManager.notify(notificationSimple ?? "New Message", "", 0);
-        } else if (notification == "ContactInfo") {
-          var contact = profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier);
-          notificationManager.notify((notificationConversationInfo ?? "New Message from %1").replaceFirst("%1", (contact?.nickname ?? senderHandle.toString())), data["ProfileOnion"], identifier);
-        }
-
         profileCN.getProfile(data["ProfileOnion"])?.newMessage(
               identifier,
               messageID,
@@ -220,6 +210,19 @@ class CwtchNotifier {
               selectedProfile,
               selectedConversation,
             );
+
+        // Now perform the notification logic...
+        var notification = data["notification"];
+        if (selectedConversation && seenMessageCallback != null) {
+          seenMessageCallback!(data["ProfileOnion"]!, identifier, DateTime.now().toUtc());
+        }
+
+        if (notification == "SimpleEvent") {
+          notificationManager.notify(notificationSimple ?? "New Message", "", 0);
+        } else if (notification == "ContactInfo") {
+          var contact = profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier);
+          notificationManager.notify((notificationConversationInfo ?? "New Message from %1").replaceFirst("%1", (contact?.nickname ?? senderHandle.toString())), data["ProfileOnion"], identifier);
+        }
         appState.notifyProfileUnread();
         break;
       case "PeerAcknowledgement":
@@ -254,7 +257,7 @@ class CwtchNotifier {
           var notification = data["notification"];
 
           // Only bother to do anything if we know about the group and the provided index is greater than our current total...
-          if (currentTotal != null && idx >= currentTotal) {
+          if (idx >= currentTotal) {
             // TODO: There are 2 timestamps associated with a new group message - time sent and time received.
             // Sent refers to the time a profile alleges they sent a message
             // Received refers to the time we actually saw the message from the server
@@ -302,6 +305,7 @@ class CwtchNotifier {
         break;
       case "UpdateGlobalSettings":
         settings.handleUpdate(jsonDecode(data["Data"]));
+        appState.settingsLoaded = true;
         break;
       case "UpdatedProfileAttribute":
         if (data["Key"] == "public.profile.name") {
@@ -346,7 +350,7 @@ class CwtchNotifier {
           associatedGroups.forEach((identifier) {
             profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(int.parse(identifier.toString()))!.antispamTickets = count;
           });
-          EnvironmentConfig.debugLog("update server token count for ${associatedGroups}, $count");
+          EnvironmentConfig.debugLog("update server token count for $associatedGroups, $count");
         } catch (e) {
           //  No tokens in data...
         }

lib/cwtch/ffi.dart

@@ -3,7 +3,6 @@ import 'dart:convert';
 import 'dart:ffi';
 import 'dart:io';
 import 'dart:isolate';
-import 'dart:io' show Platform;
 import 'package:cwtch/cwtch/cwtchNotifier.dart';
 import 'package:path/path.dart' as path;
 
@@ -13,7 +12,6 @@ import 'package:cwtch/cwtch/cwtch.dart';
 import '../config.dart';
 
 import "package:path/path.dart" show dirname, join;
-import 'dart:io' show Platform;
 
 /////////////////////
 ///   Cwtch API   ///
@@ -134,6 +132,8 @@ class CwtchFfi implements Cwtch {
   late Isolate cwtchIsolate;
   ReceivePort _receivePort = ReceivePort();
   bool _isL10nInit = false;
+  String _assetsDir = path.join(Directory.current.path, "data", "flutter_assets");
+  String _cwtchDir = "";
 
   static String getLibraryPath() {
     if (Platform.isWindows) {
@@ -168,13 +168,12 @@ class CwtchFfi implements Cwtch {
     String home = "";
     String bundledTor = "";
     Map<String, String> envVars = Platform.environment;
-    String cwtchDir = "";
     if (Platform.isLinux) {
       home = envVars['HOME'] ?? "";
       if (EnvironmentConfig.TEST_MODE) {
-        cwtchDir = envVars['CWTCH_HOME']!;
+        _cwtchDir = envVars['CWTCH_HOME']!;
       } else {
-        cwtchDir = envVars['CWTCH_HOME'] ?? path.join(envVars['HOME']!, ".cwtch");
+        _cwtchDir = envVars['CWTCH_HOME'] ?? path.join(envVars['HOME']!, ".cwtch");
       }
 
       if (await File("linux/Tor/tor").exists()) {
@@ -183,38 +182,44 @@ class CwtchFfi implements Cwtch {
         bundledTor = "lib/Tor/tor";
       } else if (await File(path.join(home, ".local/lib/cwtch/Tor/tor")).exists()) {
         bundledTor = path.join(home, ".local/lib/cwtch/Tor/tor");
+        _assetsDir = path.join(home, ".local", "share", "cwtch", "data", "flutter_assets");
       } else if (await File("/usr/lib/cwtch/Tor/tor").exists()) {
         bundledTor = "/usr/lib/cwtch/Tor/tor";
+        _assetsDir = path.join("usr", "share", "cwtch", "data", "flutter_assets");
       } else {
         bundledTor = "tor";
       }
     } else if (Platform.isWindows) {
-      cwtchDir = envVars['CWTCH_DIR'] ?? path.join(envVars['UserProfile']!, ".cwtch");
+      _cwtchDir = envVars['CWTCH_DIR'] ?? path.join(envVars['UserProfile']!, ".cwtch");
       String currentTor = path.join(Directory.current.absolute.path, "Tor\\Tor\\tor.exe");
       if (await File(currentTor).exists()) {
         bundledTor = currentTor;
+        _assetsDir = path.join(Directory.current.absolute.path, "data", "flutter_assets");
       } else {
         String exeDir = path.dirname(Platform.resolvedExecutable);
         bundledTor = path.join(exeDir, "Tor\\Tor\\tor.exe");
+        _assetsDir = path.join(exeDir, "data", "flutter_assets");
       }
     } else if (Platform.isMacOS) {
-      cwtchDir = envVars['CWTCH_HOME'] ?? path.join(envVars['HOME']!, "Library/Application Support/Cwtch");
-      if (await File("Cwtch.app/Contents/MacOS/Tor/tor.real").exists()) {
-        bundledTor = "Cwtch.app/Contents/MacOS/Tor/tor.real";
-      } else if (await File("/Applications/Cwtch.app/Contents/MacOS/Tor/tor.real").exists()) {
-        bundledTor = "/Applications/Cwtch.app/Contents/MacOS/Tor/tor.real";
-      } else if (await File("/Volumes/Cwtch/Cwtch.app/Contents/MacOS/Tor/tor.real").exists()) {
-        bundledTor = "/Volumes/Cwtch/Cwtch.app/Contents/MacOS/Tor/tor.real";
-      } else if (await File("/Applications/Tor Browser.app/Contents/MacOS/Tor/tor.real").exists()) {
-        bundledTor = "/Applications/Tor Browser.app/Contents/MacOS/Tor/tor.real";
+      _cwtchDir = envVars['CWTCH_HOME'] ?? path.join(envVars['HOME']!, "Library/Application Support/Cwtch");
+      _assetsDir = "/Applications/Cwtch.app/Contents/Frameworks/App.framework/Versions/Current/Resources/flutter_assets/";
+      if (await File("Cwtch.app/Contents/MacOS/Tor/tor").exists()) {
+        bundledTor = "Cwtch.app/Contents/MacOS/Tor/tor";
+        _assetsDir = "Cwtch.app/Contents/Frameworks/App.framework/Versions/Current/Resources/flutter_assets/";
+      } else if (await File("/Applications/Cwtch.app/Contents/MacOS/Tor/tor").exists()) {
+        bundledTor = "/Applications/Cwtch.app/Contents/MacOS/Tor/tor";
+      } else if (await File("/Volumes/Cwtch/Cwtch.app/Contents/MacOS/Tor/tor").exists()) {
+        bundledTor = "/Volumes/Cwtch/Cwtch.app/Contents/MacOS/Tor/tor";
+      } else if (await File("/Applications/Tor Browser.app/Contents/MacOS/Tor/tor").exists()) {
+        bundledTor = "/Applications/Tor Browser.app/Contents/MacOS/Tor/tor";
         print("We couldn't find Tor in the Cwtch app directory, however we can fall back to the Tor Browser binary");
       } else {
         var splitPath = path.split(dirname(Platform.script.path));
         if (splitPath[0] == "/" && splitPath[1] == "Applications") {
           var appName = splitPath[2];
           print("We're running in /Applications in a non standard app name: $appName");
-          if (await File("/Applications/$appName/Contents/MacOS/Tor/tor.real").exists()) {
-            bundledTor = "/Applications/$appName/Contents/MacOS/Tor/tor.real";
+          if (await File("/Applications/$appName/Contents/MacOS/Tor/tor").exists()) {
+            bundledTor = "/Applications/$appName/Contents/MacOS/Tor/tor";
           }
         }
       }
@@ -225,27 +230,27 @@ class CwtchFfi implements Cwtch {
     // if macOs and release build and no profile and is dev profile
     // copy dev profile to release profile
     if (Platform.isMacOS && EnvironmentConfig.BUILD_VER != dev_version) {
-      var devProfileExists = await Directory(path.join(cwtchDir, "dev", "profiles")).exists();
-      var releaseProfileExists = await Directory(path.join(cwtchDir, "profiles")).exists();
+      var devProfileExists = await Directory(path.join(_cwtchDir, "dev", "profiles")).exists();
+      var releaseProfileExists = await Directory(path.join(_cwtchDir, "profiles")).exists();
       if (devProfileExists && !releaseProfileExists) {
         print("MacOS one time dev -> release profile migration...");
-        await Process.run("cp", ["-r", "-p", path.join(cwtchDir, "dev", "profiles"), cwtchDir]);
-        await Process.run("cp", ["-r", "-p", path.join(cwtchDir, "dev", "SALT"), cwtchDir]);
-        await Process.run("cp", ["-r", "-p", path.join(cwtchDir, "dev", "ui.globals"), cwtchDir]);
+        await Process.run("cp", ["-r", "-p", path.join(_cwtchDir, "dev", "profiles"), _cwtchDir]);
+        await Process.run("cp", ["-r", "-p", path.join(_cwtchDir, "dev", "SALT"), _cwtchDir]);
+        await Process.run("cp", ["-r", "-p", path.join(_cwtchDir, "dev", "ui.globals"), _cwtchDir]);
       }
     }
 
     if (EnvironmentConfig.BUILD_VER == dev_version) {
-      cwtchDir = path.join(cwtchDir, "dev");
+      _cwtchDir = path.join(_cwtchDir, "dev");
     }
 
-    print("StartCwtch( cwtchdir: $cwtchDir, torPath: $bundledTor )");
+    print("StartCwtch( cwtchdir: $_cwtchDir, torPath: $bundledTor )");
 
     var startCwtchC = library.lookup<NativeFunction<start_cwtch_function>>("c_StartCwtch");
     // ignore: non_constant_identifier_names
     final StartCwtch = startCwtchC.asFunction<StartCwtchFn>();
 
-    final utf8CwtchDir = cwtchDir.toNativeUtf8();
+    final utf8CwtchDir = _cwtchDir.toNativeUtf8();
     StartCwtch(utf8CwtchDir, utf8CwtchDir.length, bundledTor.toNativeUtf8(), bundledTor.length);
     malloc.free(utf8CwtchDir);
 
@@ -257,17 +262,19 @@ class CwtchFfi implements Cwtch {
     });
   }
 
-  // ignore: non_constant_identifier_names
-  Future<void> ReconnectCwtchForeground() async {
-    var reconnectCwtch = library.lookup<NativeFunction<Void Function()>>("c_ReconnectCwtchForeground");
-    // ignore: non_constant_identifier_names
-    final ReconnectCwtchForeground = reconnectCwtch.asFunction<void Function()>();
-    ReconnectCwtchForeground();
+  String getAssetsDir() {
+    return _assetsDir;
+  }
+
+  Future<String> getCwtchDir() async {
+    return _cwtchDir;
   }
 
   // Called on object being disposed to (presumably on app close) to close the isolate that's listening to libcwtch-go events
   @override
   void dispose() {
+    EnvironmentConfig.debugLog("tearing down cwtch FFI isolate");
+    library.close();
     cwtchIsolate.kill(priority: Isolate.immediate);
   }
 
@@ -1121,4 +1128,11 @@ class CwtchFfi implements Cwtch {
     PublishServerUpdate(utf8profile, utf8profile.length);
     malloc.free(utf8profile);
   }
+
+  @override
+  bool IsLoaded() {
+    bool check = library.providesSymbol("c_UpdateSettings");
+    EnvironmentConfig.debugLog("Checking that the FFI Interface is Correctly Loaded... $check");
+    return check;
+  }
 }

lib/cwtch/gomobile.dart

@@ -30,6 +30,7 @@ class CwtchGomobile implements Cwtch {
   late Future<dynamic> androidLibraryDir;
   late Future<dynamic> androidHomeDirectory;
   String androidHomeDirectoryStr = "";
+  String _cwtchDir = "";
   late CwtchNotifier cwtchNotifier;
   bool _isL10nInit = false;
 
@@ -62,23 +63,27 @@ class CwtchGomobile implements Cwtch {
     appbusEventChannel.setMethodCallHandler(this._handleAppbusEvent);
   }
 
+  String getAssetsDir() {
+    // TODO
+    return "";
+  }
+
+  // Requires Start() to have been run to initialize
+  Future<String> getCwtchDir() async {
+    return _cwtchDir;
+  }
+
   // ignore: non_constant_identifier_names
   Future<void> Start() async {
     print("gomobile.dart: Start()...");
     androidHomeDirectoryStr = (await androidHomeDirectory).path;
-    var cwtchDir = path.join(androidHomeDirectoryStr, ".cwtch");
+    _cwtchDir = path.join(androidHomeDirectoryStr, ".cwtch");
     if (EnvironmentConfig.BUILD_VER == dev_version) {
-      cwtchDir = path.join(cwtchDir, "dev");
+      _cwtchDir = path.join(_cwtchDir, "dev");
     }
     String torPath = path.join(await androidLibraryDir, "libtor.so");
-    print("gomobile.dart: Start invokeMethod Start($cwtchDir, $torPath)...");
-    return cwtchPlatform.invokeMethod("Start", {"appDir": cwtchDir, "torPath": torPath});
-  }
-
-  @override
-  // ignore: non_constant_identifier_names
-  Future<void> ReconnectCwtchForeground() async {
-    cwtchPlatform.invokeMethod("ReconnectCwtchForeground", {});
+    print("gomobile.dart: Start invokeMethod Start($_cwtchDir, $torPath)...");
+    cwtchPlatform.invokeMethod("Start", {"appDir": _cwtchDir, "torPath": torPath});
   }
 
   // Handle libcwtch-go events (received via kotlin) and dispatch to the cwtchNotifier
@@ -469,4 +474,9 @@ class CwtchGomobile implements Cwtch {
   void PublishServerUpdate(String profile) {
     cwtchPlatform.invokeMethod("PublishServerUpdate", {"ProfileOnion": profile});
   }
+
+  @override
+  bool IsLoaded() {
+    return true;
+  }
 }

lib/l10n/custom_material_delegate.dart

@@ -648,4 +648,20 @@ class MaterialLocalizationLu extends MaterialLocalizations {
   @override
   // TODO: implement scanTextButtonLabel
   String get scanTextButtonLabel => throw UnimplementedError();
+
+  @override
+  // TODO: implement lookUpButtonLabel
+  String get lookUpButtonLabel => throw UnimplementedError();
+
+  @override
+  // TODO: implement menuDismissLabel
+  String get menuDismissLabel => throw UnimplementedError();
+
+  @override
+  // TODO: implement searchWebButtonLabel
+  String get searchWebButtonLabel => throw UnimplementedError();
+
+  @override
+  // TODO: implement shareButtonLabel
+  String get shareButtonLabel => throw UnimplementedError();
 }

lib/l10n/intl_cy.arb

@@ -1,6 +1,17 @@
 {
     "@@locale": "cy",
-    "@@last_modified": "2023-09-25T21:29:34+02:00",
+    "@@last_modified": "2024-02-12T08:05:24+01:00",
+    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
+    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
+    "settingsImportThemeButton": "Import Theme",
+    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
+    "settingsImportThemeTitle": "Import Theme",
+    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
+    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
+    "settingThemeOverwriteConfirm": "Confirm",
+    "settingsThemeImagesDescription": "Enable display of images from themes",
+    "settingsThemeImages": "Theme Images",
+    "settingsGroupAbout": "About",
     "localeUzbek": "Uzbek  \/ Oʻzbekcha",
     "profileOfflineAtStart": "Appear Offline at Startup",
     "now": "Now",

lib/l10n/intl_da.arb

@@ -1,6 +1,17 @@
 {
     "@@locale": "da",
-    "@@last_modified": "2023-09-25T21:29:34+02:00",
+    "@@last_modified": "2024-02-12T08:05:24+01:00",
+    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
+    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
+    "settingsImportThemeButton": "Import Theme",
+    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
+    "settingsImportThemeTitle": "Import Theme",
+    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
+    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
+    "settingThemeOverwriteConfirm": "Confirm",
+    "settingsThemeImagesDescription": "Enable display of images from themes",
+    "settingsThemeImages": "Theme Images",
+    "settingsGroupAbout": "About",
     "localeUzbek": "Uzbek  \/ Oʻzbekcha",
     "profileOfflineAtStart": "Appear Offline at Startup",
     "now": "Now",

lib/l10n/intl_de.arb

@@ -1,27 +1,40 @@
 {
     "@@locale": "de",
-    "@@last_modified": "2023-09-25T21:29:34+02:00",
-    "localeUzbek": "Uzbek  \/ Oʻzbekcha",
-    "profileOfflineAtStart": "Appear Offline at Startup",
-    "now": "Now",
-    "xSecondsAgo": "$seconds seconds ago",
-    "xMinutesAgo": "$minutes minutes ago",
-    "xHoursAgo": "$hours hours ago",
-    "xDaysAgo": "$days days ago",
-    "profileAllowUnknownContacts": "Allow Unknown Contacts",
-    "profileBlockUnknownContacts": "Block Unknown Contacts",
-    "profileDisableProfile": "Disable Profile",
-    "profileEnableProfile": "Enable Profile",
-    "profileAppearOnline": "Appear Online",
-    "contactDisconnect": "Disconnect  from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
-    "profileAppearOfflineDescription": "By default, when  Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
-    "profileAppearOffline": "Appear Offline",
+    "@@last_modified": "2024-02-12T08:05:24+01:00",
+    "settingsExperimentsShowPerformanceTitle": "Leistungs-Overlay anzeigen",
+    "settingsExperimentsShowPerformanceDescription": "Zeigt ein Overlay-Diagramm der Renderzeit an.",
+    "defaultScalingText": "Text in Standardgröße (Skalierungsfaktor:",
     "deleteServerConfirmBtn": "Server wirklich löschen",
-    "cannotDeleteServerIfActiveGroups": "There are active groups associated with this Cwtch Server. Please delete them prior to deleting this Cwtch Server entry.",
     "groupsOnThisServerLabel": "Gruppen, in denen ich bin, werden auf diesem Server gehostet",
-    "serverinfoNoGroupInfo": "There are no groups associated with this Cwtch Server.",
-    "preserveHistorySettingDescription": "By default, Cwtch will purge conversation history when Cwtch is shutdown. If this setting is enabled, Cwtch will preserve the conversation history of peer conversations.",
-    "defaultPreserveHistorySetting": "Preserve Conversation History",
+    "profileEnabledDescription": "Starten oder Stoppen des Profils",
+    "defaultPreserveHistorySetting": "Konversationsverlauf bewahren",
+    "preserveHistorySettingDescription": "Standardmäßig löscht Cwtch den Gesprächsverlauf, wenn Cwtch heruntergefahren wird. Wenn diese Einstellung aktiviert ist, bewahrt Cwtch den Gesprächsverlauf von Peer-Unterhaltungen auf.",
+    "serverinfoNoGroupInfo": "Es gibt keine Gruppen, die mit diesem Cwtch Server verbunden sind.",
+    "cannotDeleteServerIfActiveGroups": "Es gibt aktive Gruppen, die mit diesem Cwtch Server verbunden sind. Bitte lösche diese, bevor du diesen Cwtch-Server-Eintrag löschst.",
+    "profileAppearOnline": "Online erscheinen",
+    "profileAppearOffline": "Offline erscheinen",
+    "profileAppearOfflineDescription": "Standardmäßig wird bei aktiviertem Cwtch-Profil automatisch versucht, eine Verbindung zu bekannten Kontakten herzustellen und es werden eingehende Verbindungen zugelassen. Mit dieser Einstellung werden diese Aktionen deaktiviert und du kannst manuell auswählen, mit welchen Kontakten eine Verbindung hergestellt werden soll.",
+    "contactDisconnect": "Trenne die Verbindung mit dem Kontakt (wenn du die Funktion Offline erscheinen nicht aktiviert habst, kann der Kontakt trotzdem eine Verbindung zu dir herstellen)",
+    "profileEnableProfile": "Profil aktivieren",
+    "profileDisableProfile": "Profil deaktivieren",
+    "profileBlockUnknownContacts": "Unbekannte Kontakte blockieren",
+    "profileAllowUnknownContacts": "Unbekannte Kontakte zulassen",
+    "profileOfflineAtStart": "Beim Start offline erscheinen",
+    "xDaysAgo": "vor $days Tagen",
+    "xHoursAgo": "vor $hours Stunden",
+    "xMinutesAgo": "vor $minutes Minuten",
+    "xSecondsAgo": "vor $seconds Sekunden",
+    "now": "Jetzt",
+    "localeUzbek": "Usbekisch \/ Oʻzbekcha",
+    "settingsGroupAbout": "Über",
+    "settingsThemeImages": "Theme Bilder",
+    "settingsThemeImagesDescription": "Aktiviere die Anzeige von Bildern aus Themes",
+    "settingThemeOverwriteConfirm": "Bestätigen",
+    "settingThemeOverwriteQuestion": "Theme $themeName existiert bereits, Überschreiben bestätigen?",
+    "settingsThemeErrorInvalid": "Fehler: Konnte $themeName nicht importieren, theme.yml fehlt, kein Theme-Verzeichnis",
+    "settingsImportThemeTitle": "Theme importieren",
+    "settingsImportThemeDescription": "Wähle das Theme-Verzeichnis aus, das zur Verwendung in Cwtch importiert werden soll",
+    "settingsImportThemeButton": "Theme importieren",
     "retryConnection": "Wiederholen",
     "retryConnectionTooltip": "Cwtch wiederholt die Versuche regelmäßig, aber du kannst Cwtch anweisen, es früher zu versuchen, indem du diese Taste drückst.",
     "localeJa": "Japanisch \/ 日本語",
@@ -29,8 +42,6 @@
     "localeSv": "Schwedisch \/ Svenska",
     "localeSw": "Suaheli \/ Kiswahili",
     "localeUk": "Ukrainisch \/ українською",
-    "profileEnabledDescription": "Starten oder Stoppen des Profils",
-    "defaultScalingText": "Text in Standardgröße (Skalierungsfaktor:",
     "blodeuweddExperimentEnable": "Blodeuwedd Assistent",
     "blodeuweddDescription": "Der Blodeuwedd-Assistent erweitert Cwtch um neue Funktionen wie die Zusammenfassung von Chat-Transkripten und die Übersetzung von Nachrichten über ein lokal gehostetes Sprachmodell.",
     "blodeuweddNotSupported": "Diese Version von Cwtch wurde ohne Unterstützung für den Blodeuwedd-Assistenten kompiliert.",

lib/l10n/intl_el.arb

@@ -1,6 +1,17 @@
 {
     "@@locale": "el",
-    "@@last_modified": "2023-09-25T21:29:34+02:00",
+    "@@last_modified": "2024-02-12T08:05:24+01:00",
+    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
+    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
+    "settingsImportThemeButton": "Import Theme",
+    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
+    "settingsImportThemeTitle": "Import Theme",
+    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
+    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
+    "settingThemeOverwriteConfirm": "Confirm",
+    "settingsThemeImagesDescription": "Enable display of images from themes",
+    "settingsThemeImages": "Theme Images",
+    "settingsGroupAbout": "About",
     "localeUzbek": "Uzbek  \/ Oʻzbekcha",
     "profileOfflineAtStart": "Appear Offline at Startup",
     "now": "Now",

lib/l10n/intl_en.arb

@@ -1,6 +1,17 @@
 {
     "@@locale": "en",
-    "@@last_modified": "2023-09-25T21:29:34+02:00",
+    "@@last_modified": "2024-02-12T08:05:24+01:00",
+    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
+    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
+    "settingThemeOverwriteConfirm": "Confirm",
+    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
+    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
+    "settingsImportThemeTitle": "Import Theme",
+    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
+    "settingsImportThemeButton": "Import Theme",
+    "settingsThemeImagesDescription": "Enable display of images from themes",
+    "settingsThemeImages": "Theme Images",
+    "settingsGroupAbout": "About",
     "localeUzbek": "Uzbek  \/ Oʻzbekcha",
     "profileOfflineAtStart": "Appear Offline at Startup",
     "now": "Now",

lib/l10n/intl_es.arb

@@ -1,62 +1,73 @@
 {
     "@@locale": "es",
-    "@@last_modified": "2023-09-25T21:29:34+02:00",
-    "localeUzbek": "Uzbek  \/ Oʻzbekcha",
-    "profileOfflineAtStart": "Appear Offline at Startup",
-    "now": "Now",
-    "xSecondsAgo": "$seconds seconds ago",
-    "xMinutesAgo": "$minutes minutes ago",
-    "xHoursAgo": "$hours hours ago",
-    "xDaysAgo": "$days days ago",
-    "profileAllowUnknownContacts": "Allow Unknown Contacts",
-    "profileBlockUnknownContacts": "Block Unknown Contacts",
-    "profileDisableProfile": "Disable Profile",
-    "profileEnableProfile": "Enable Profile",
-    "profileAppearOnline": "Appear Online",
-    "contactDisconnect": "Disconnect  from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
-    "profileAppearOfflineDescription": "By default, when  Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
-    "profileAppearOffline": "Appear Offline",
-    "deleteServerConfirmBtn": "Realmente eliminar el servidor",
-    "cannotDeleteServerIfActiveGroups": "There are active groups associated with this Cwtch Server. Please delete them prior to deleting this Cwtch Server entry.",
-    "groupsOnThisServerLabel": "Grupos alojados en este servidor en los que estoy",
-    "serverinfoNoGroupInfo": "There are no groups associated with this Cwtch Server.",
-    "preserveHistorySettingDescription": "By default, Cwtch will purge conversation history when Cwtch is shutdown. If this setting is enabled, Cwtch will preserve the conversation history of peer conversations.",
-    "defaultPreserveHistorySetting": "Preserve Conversation History",
-    "localeUk": "Ukrainian \/ українською",
-    "profileEnabledDescription": "Activate or Deactivate the profile.",
-    "localeSw": "Swahili \/ Kiswahili",
-    "localeSv": "Swedish \/ Svenska",
-    "fontScalingDescription": "Adjust the relative font scaling factor applied to text and widgets.",
-    "defaultScalingText": "Tamaño predeterminado de texto (factor de escala:",
-    "localeJa": "Japanese \/ 日本語",
-    "retryConnectionTooltip": "Cwtch retries peers regularly, but you can tell Cwtch to try sooner by pushing this button.",
-    "retryConnection": "Retry",
-    "availabilityStatusTooltip": "Set your availability status",
-    "profileInfoHint3": "Contacts will be able to see this information in Conversation Settings ",
-    "profileInfoHint2": "You can add up to 3 fields.",
-    "profileInfoHint": "Add some public information about yourself here e.g. blog, websites, brief bio.",
-    "availabilityStatusBusy": "Busy",
-    "availabilityStatusAway": "Away",
-    "availabilityStatusAvailable": "Available",
-    "blodeuweddWarning": "Blodeuwedd uses a local language model and a set of small auxiliary models to power its functionality. These techniques are often very effective they are not without error. \n\nWhile we have taken efforts to minimize the risk, there is still the possibility that Blodeuwedd outputs will be incorrect, hallucinated and\/or offensive.\n\nBecause of that Blodeuwedd requires downloading two additional components separate from Cwtch, the Blodeuwedd Model (or a compatible model) and the Blodeuwedd Runner. \n\nSee https:\/\/docs.cwtch.im\/docs\/settings\/experiments\/blodeuwedd for more information on obtaining these components and setting them up.",
-    "blodeuweddProcessing": "Blodeuwedd is processing...",
-    "blodeuweddTranslate": "Translate Message",
-    "blodeuweddSummarize": "Summarize Conversation",
-    "blodeuweddPath": "The directory where the Blodeuwedd is located on your computer.",
-    "blodeuweddNotSupported": "This version of Cwtch has been compiled without support for the Blodeuwedd Assistant.",
-    "blodeuweddDescription": "The Blodeuwedd assistant adds new features to Cwtch such as chat transcript summarization and message translation via a locally hosted language model.",
-    "blodeuweddExperimentEnable": "Blodeuwedd Assistant",
-    "localeKo": "Korean \/ 한국어",
-    "localeSk": "Slovak \/ Slovák",
-    "profileAutostartDescription": "Controls if the profile will be automatically launched on startup",
-    "profileEnabled": "Enable",
-    "profileAutostartLabel": "Autostart",
-    "localePtBr": "Brazilian Portuguese \/ Português do Brasil",
-    "localeNl": "Dutch \/ Dutch",
-    "experimentQRCodeDescription": "QR Code support allows sharing data (such as profile identity) by QR Codes",
-    "enableExperimentQRCode": "QR Codes",
-    "shareMenuQRCode": "Show QR Code",
-    "shareProfileMenuTooltop": "Share profile via...",
+    "@@last_modified": "2024-02-12T08:05:24+01:00",
+    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
+    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
+    "settingsImportThemeButton": "Import Theme",
+    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
+    "settingsImportThemeTitle": "Import Theme",
+    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
+    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
+    "settingThemeOverwriteConfirm": "Confirm",
+    "settingsThemeImagesDescription": "Enable display of images from themes",
+    "settingsThemeImages": "Theme Images",
+    "settingsGroupAbout": "About",
+    "deleteServerConfirmBtn": "¿Realmente desea borrar el servidor?",
+    "defaultScalingText": "Factor de escala del texto",
+    "groupsOnThisServerLabel": "Grupos alojados en este servidor de Cwtch",
+    "shareMenuQRCode": "Mostrar código QR",
+    "experimentQRCodeDescription": "La compatibilidad con códigos QR permite compartir datos (como la identidad del perfil) mediante códigos QR",
+    "enableExperimentQRCode": "Códigos QR",
+    "localeNl": "Holandés \/ Dutch",
+    "localePtBr": "Portugués brasileño \/ Português do Brasil",
+    "profileAutostartLabel": "Inicio automático",
+    "profileEnabled": "Habilitar",
+    "profileAutostartDescription": "Controla si el perfil se iniciará automáticamente al iniciar Cwtch",
+    "profileEnabledDescription": "Activar o Desactivar el perfil.",
+    "localeSk": "Eslovaco \/ Slovák",
+    "localeKo": "Coreano \/ 한국어",
+    "blodeuweddExperimentEnable": "Asistente Blodeuwedd",
+    "blodeuweddDescription": "El asistente Blodeuwedd agrega nuevas funciones a Cwtch, como el resumen de la transcripción del chat y la traducción de mensajes a través de un modelo de lenguaje alojado localmente.",
+    "blodeuweddNotSupported": "Esta versión de Cwtch se ha compilado sin soporte para Blodeuwedd Assistant.",
+    "blodeuweddPath": "El directorio donde se encuentra Blodeuwedd está en tu computadora.",
+    "blodeuweddSummarize": "Resumir la conversación",
+    "blodeuweddWarning": "Blodeuwedd utiliza un modelo de idioma local y un conjunto de modelos auxiliares para potenciar su funcionalidad. Estas técnicas suelen ser muy efectivas y no están exentas de errores. \n\nSi bien nos hemos esforzado por minimizar el riesgo, todavía existe la posibilidad de que los resultados de Blodeuwedd sean incorrectos, sin-sentido y\/u ofensivos. \n\nDebido a eso, Blodeuwedd requiere descargar dos componentes adicionales separados de Cwtch, el modelo Blodeuwedd (o un modelo compatible) y el Blodeuwedd Runner. \n\nConsulta https:\/\/docs.cwtch.im\/docs\/settings\/experiments\/blodeuwedd para obtener más información sobre cómo obtener estos componentes y configurarlos.",
+    "blodeuweddTranslate": "Traducir mensaje",
+    "blodeuweddProcessing": "Blodeuwedd está procesando...",
+    "availabilityStatusBusy": "Ocupad()",
+    "availabilityStatusAvailable": "Disponible",
+    "availabilityStatusAway": "Ausente",
+    "shareProfileMenuTooltop": "Comparte éste perfil por medio de...",
+    "availabilityStatusTooltip": "Establece tu estado",
+    "profileInfoHint": "Agrega información sobre tí, por ejemplo un blog, sitio web o una breve biografía.",
+    "profileInfoHint2": "Puedes agregar hasta 3 campos.",
+    "profileInfoHint3": "Los contactos podrán ver esta información en la Configuración de la Conversación ",
+    "retryConnection": "Reintentar",
+    "fontScalingDescription": "Ajusta el factor de escala de fuente relativo aplicado al texto y los widgets.",
+    "retryConnectionTooltip": "Cwtch reintenta conectarse a sus pares regularmente, pero puedes decirle a Cwtch que lo intente antes presionando este botón.",
+    "localeJa": "Japonés \/ 日本語",
+    "localeSv": "Sueco \/ Svenska",
+    "localeSw": "Suajili \/ Kiswahili",
+    "localeUk": "Ucraniano \/ українською",
+    "defaultPreserveHistorySetting": "Preservar el historial de conversaciones",
+    "preserveHistorySettingDescription": "De forma predeterminada, Cwtch borrará el historial de conversaciones cuando se cierre Cwtch. Si esta configuración está habilitada, Cwtch preservará el historial de conversaciones de pares.",
+    "serverinfoNoGroupInfo": "No hay grupos asociados co este servidor de Cwtch.",
+    "cannotDeleteServerIfActiveGroups": "Hay grupos activos asociados con este servidor de Cwtch. Elimínalos antes de eliminar esta entrada del servidor de Cwtch.",
+    "profileAppearOffline": "Aparecer sin conexión",
+    "profileAppearOfflineDescription": "De forma predeterminada, cuando el perfil Cwtch está habilitado, intenta conectarse automáticamente para conocer contactos y permite conexiones entrantes. Esta configuración desactiva esas acciones y te permite elegir, manualmente, a qué contactos conectarte.",
+    "contactDisconnect": "Desconectarse del contacto (si no tienes configurado Aparecer sin conexión, es posible que este contacto aún pueda restablecer la conexión contigo)",
+    "profileAppearOnline": "Aparecer en línea",
+    "profileEnableProfile": "Habilitar perfil",
+    "profileDisableProfile": "Deshabilitar perfil",
+    "profileBlockUnknownContacts": "Bloquear contactos desconocidos",
+    "profileAllowUnknownContacts": "Permitir contactos desconocidos",
+    "profileOfflineAtStart": "Aparecer sin conexión al iniciar",
+    "xDaysAgo": "Hace $days días",
+    "xHoursAgo": "Hace $hours horas",
+    "xMinutesAgo": "Hace $minutes minutos",
+    "xSecondsAgo": "Hace $seconds segundos",
+    "now": "Ahora",
+    "localeUzbek": "Uzbeko \/ O'zbekcha",
     "tooltipPinConversation": "Fija la conversación en la parte superior de \"Conversaciones\"",
     "errorDownloadDirectoryDoesNotExist": "No se puede habilitar el uso compartido de archivos porque la carpeta de descarga no se ha configurado o se configuró en una carpeta que no existe.",
     "acquiringTicketsFromServer": "Realizando Desafío Antispam",

lib/l10n/intl_fr.arb

@@ -1,6 +1,17 @@
 {
     "@@locale": "fr",
-    "@@last_modified": "2023-09-25T21:29:34+02:00",
+    "@@last_modified": "2024-02-12T08:05:24+01:00",
+    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
+    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
+    "settingsImportThemeButton": "Import Theme",
+    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
+    "settingsImportThemeTitle": "Import Theme",
+    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
+    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
+    "settingThemeOverwriteConfirm": "Confirm",
+    "settingsThemeImagesDescription": "Enable display of images from themes",
+    "settingsThemeImages": "Theme Images",
+    "settingsGroupAbout": "About",
     "localeUzbek": "Uzbek  \/ Oʻzbekcha",
     "profileOfflineAtStart": "Appear Offline at Startup",
     "now": "Now",

lib/l10n/intl_it.arb

@@ -1,6 +1,17 @@
 {
     "@@locale": "it",
-    "@@last_modified": "2023-09-25T21:29:34+02:00",
+    "@@last_modified": "2024-02-12T08:05:24+01:00",
+    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
+    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
+    "settingsImportThemeButton": "Import Theme",
+    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
+    "settingsImportThemeTitle": "Import Theme",
+    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
+    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
+    "settingThemeOverwriteConfirm": "Confirm",
+    "settingsThemeImagesDescription": "Enable display of images from themes",
+    "settingsThemeImages": "Theme Images",
+    "settingsGroupAbout": "About",
     "localeUzbek": "Uzbek  \/ Oʻzbekcha",
     "profileOfflineAtStart": "Appear Offline at Startup",
     "now": "Now",

lib/l10n/intl_ja.arb

@@ -1,6 +1,17 @@
 {
     "@@locale": "ja",
-    "@@last_modified": "2023-09-25T21:29:34+02:00",
+    "@@last_modified": "2024-02-12T08:05:24+01:00",
+    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
+    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
+    "settingsImportThemeButton": "Import Theme",
+    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
+    "settingsImportThemeTitle": "Import Theme",
+    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
+    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
+    "settingThemeOverwriteConfirm": "Confirm",
+    "settingsThemeImagesDescription": "Enable display of images from themes",
+    "settingsThemeImages": "Theme Images",
+    "settingsGroupAbout": "About",
     "localeUzbek": "Uzbek  \/ Oʻzbekcha",
     "profileOfflineAtStart": "Appear Offline at Startup",
     "now": "Now",

lib/l10n/intl_ko.arb

@@ -1,6 +1,45 @@
 {
     "@@locale": "ko",
-    "@@last_modified": "2023-09-25T21:29:34+02:00",
+    "@@last_modified": "2024-02-12T08:05:24+01:00",
+    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
+    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
+    "sendAnInvitation": "초대를 보냈습니다: ",
+    "sendInvite": "연락처 또는 그룹 초대 보내기",
+    "pasteAddressToAddContact": "Paste a cwtch address, invitation or key bundle here to add a new conversation",
+    "invalidImportString": "잘못된 가져오기 문자열",
+    "settingsImportThemeButton": "Import Theme",
+    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
+    "settingsImportThemeTitle": "Import Theme",
+    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
+    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
+    "settingThemeOverwriteConfirm": "Confirm",
+    "resetTor": "초기화",
+    "torStatus": "Tor 상태",
+    "torVersion": "Tor 버전",
+    "passwordChangeError": "암호 변경 오류: 제공된 암호가 거부되었습니다.",
+    "enterProfilePassword": "프로필을 보려면 암호를 입력하세요.",
+    "todoPlaceholder": "할 일...",
+    "addNewItem": "목록에 새 항목 추가",
+    "addListItem": "새 목록 항목 추가",
+    "networkStatusConnecting": "네트워크 및 연락처에 연결 중...",
+    "networkStatusAttemptingTor": "Tor 네트워크에 연결을 시도 중",
+    "networkStatusDisconnected": "인터넷 연결 끊김, 연결 확인하세요",
+    "viewGroupMembershipTooltip": "그룹 구성원 보기",
+    "defaultScalingText": "글꼴 크기 조정",
+    "experimentsEnabled": "실험 사용",
+    "loadingTor": "tor 로딩 중...",
+    "builddate": "빌드 대상: %2",
+    "version": "버전: %1",
+    "versionTor": "버전 %1 및 tor %2",
+    "settingInterfaceZoom": "확대\/축소 수준",
+    "versionBuilddate": "버전: %1 빌드 대상: %2",
+    "error0ProfilesLoadedForPassword": "해당 비밀번호가 포함된 프로필이 0개 로드되었습니다.",
+    "deleteConfirmText": "삭제",
+    "unblockBtn": "연락처 차단 해제",
+    "savePeerHistoryDescription": "연락처와 연결된 기록을 삭제할지 여부를 결정합니다.",
+    "settingsThemeImagesDescription": "Enable display of images from themes",
+    "settingsThemeImages": "Theme Images",
+    "settingsGroupAbout": "About",
     "localeUzbek": "Uzbek  \/ Oʻzbekcha",
     "profileOfflineAtStart": "Appear Offline at Startup",
     "now": "Now",
@@ -113,7 +152,6 @@
     "server": "서버",
     "peerName": "이름",
     "peerAddress": "주소",
-    "builddate": "Built on: %2",
     "deleteProfileConfirmBtn": "프로필 삭제 확인",
     "deleteConfirmLabel": "DELETE를 입력하여 확인",
     "deleteProfileBtn": "프로필 삭제",
@@ -149,7 +187,6 @@
     "localeSw": "Swahili \/ Kiswahili",
     "localeSv": "Swedish \/ Svenska",
     "fontScalingDescription": "Adjust the relative font scaling factor applied to text and widgets.",
-    "defaultScalingText": "Font Scaling",
     "localeJa": "Japanese \/ 日本語",
     "retryConnectionTooltip": "Cwtch retries peers regularly, but you can tell Cwtch to try sooner by pushing this button.",
     "retryConnection": "Retry",
@@ -373,11 +410,6 @@
     "nickChangeSuccess": "Profile nickname changed successfully",
     "addServerFirst": "You need to add a server before you can create a group",
     "deleteProfileSuccess": "Successfully deleted profile",
-    "sendInvite": "Send a contact or group invite",
-    "resetTor": "Reset",
-    "torStatus": "Tor Status",
-    "torVersion": "Tor Version",
-    "sendAnInvitation": "You sent an invitation for: ",
     "contactSuggestion": "This is a contact suggestion for: ",
     "chatHistoryDefault": "This conversation will be deleted when Cwtch is closed! Message history can be enabled per-conversation via the Settings menu in the upper right.",
     "reallyLeaveThisGroupPrompt": "Are you sure you want to leave this conversation? All messages and attributes will be deleted.",
@@ -385,26 +417,5 @@
     "descriptionBlockUnknownConnections": "If turned on, this option will automatically close connections from Cwtch users that have not been added to your contact list.",
     "descriptionExperimentsGroups": "The group experiment allows Cwtch to connect with untrusted server infrastructure to facilitate communication with more than one contact.",
     "descriptionExperiments": "Cwtch experiments are optional, opt-in features that add additional functionality to Cwtch that may have different privacy considerations than traditional 1:1 metadata resistant chat e.g. group chat, bot integration etc.",
-    "tooltipUnlockProfiles": "Unlock encrypted profiles by entering their password.",
-    "invalidImportString": "Invalid import string",
-    "todoPlaceholder": "Todo...",
-    "addNewItem": "Add a new item to the list",
-    "addListItem": "Add a New List Item",
-    "networkStatusConnecting": "Connecting to network and contacts...",
-    "networkStatusAttemptingTor": "Attempting to connect to Tor network",
-    "networkStatusDisconnected": "Disconnected from the internet, check your connection",
-    "viewGroupMembershipTooltip": "View Group Membership",
-    "loadingTor": "Loading tor...",
-    "version": "Version %1",
-    "versionTor": "Version %1 with tor %2",
-    "experimentsEnabled": "Enable Experiments",
-    "settingInterfaceZoom": "Zoom level",
-    "versionBuilddate": "Version: %1 Built on: %2",
-    "error0ProfilesLoadedForPassword": "0 profiles loaded with that password",
-    "enterProfilePassword": "Enter a password to view your profiles",
-    "deleteConfirmText": "DELETE",
-    "passwordChangeError": "Error changing password: Supplied password rejected",
-    "unblockBtn": "Unblock Contact",
-    "savePeerHistoryDescription": "Determines whether to delete any history associated with the contact.",
-    "pasteAddressToAddContact": "Paste a cwtch address, invitation or key bundle here to add a new conversation"
+    "tooltipUnlockProfiles": "Unlock encrypted profiles by entering their password."
 }

lib/l10n/intl_lb.arb

@@ -1,6 +1,17 @@
 {
     "@@locale": "lb",
-    "@@last_modified": "2023-09-25T21:29:34+02:00",
+    "@@last_modified": "2024-02-12T08:05:24+01:00",
+    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
+    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
+    "settingsImportThemeButton": "Import Theme",
+    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
+    "settingsImportThemeTitle": "Import Theme",
+    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
+    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
+    "settingThemeOverwriteConfirm": "Confirm",
+    "settingsThemeImagesDescription": "Enable display of images from themes",
+    "settingsThemeImages": "Theme Images",
+    "settingsGroupAbout": "About",
     "localeUzbek": "Uzbek  \/ Oʻzbekcha",
     "profileOfflineAtStart": "Appear Offline at Startup",
     "now": "Now",

lib/l10n/intl_nl.arb

@@ -1,6 +1,17 @@
 {
     "@@locale": "nl",
-    "@@last_modified": "2023-09-25T21:29:34+02:00",
+    "@@last_modified": "2024-02-12T08:05:24+01:00",
+    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
+    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
+    "settingsImportThemeButton": "Import Theme",
+    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
+    "settingsImportThemeTitle": "Import Theme",
+    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
+    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
+    "settingThemeOverwriteConfirm": "Confirm",
+    "settingsThemeImagesDescription": "Enable display of images from themes",
+    "settingsThemeImages": "Theme Images",
+    "settingsGroupAbout": "About",
     "localeUzbek": "Uzbek  \/ Oʻzbekcha",
     "profileOfflineAtStart": "Appear Offline at Startup",
     "now": "Now",

lib/l10n/intl_no.arb

@@ -1,6 +1,17 @@
 {
     "@@locale": "no",
-    "@@last_modified": "2023-09-25T21:29:34+02:00",
+    "@@last_modified": "2024-02-12T08:05:24+01:00",
+    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
+    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
+    "settingsImportThemeButton": "Import Theme",
+    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
+    "settingsImportThemeTitle": "Import Theme",
+    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
+    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
+    "settingThemeOverwriteConfirm": "Confirm",
+    "settingsThemeImagesDescription": "Enable display of images from themes",
+    "settingsThemeImages": "Theme Images",
+    "settingsGroupAbout": "About",
     "localeUzbek": "Uzbek  \/ Oʻzbekcha",
     "profileOfflineAtStart": "Appear Offline at Startup",
     "now": "Now",

lib/l10n/intl_pl.arb

@@ -1,6 +1,17 @@
 {
     "@@locale": "pl",
-    "@@last_modified": "2023-09-25T21:29:34+02:00",
+    "@@last_modified": "2024-02-12T08:05:24+01:00",
+    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
+    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
+    "settingsImportThemeButton": "Import Theme",
+    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
+    "settingsImportThemeTitle": "Import Theme",
+    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
+    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
+    "settingThemeOverwriteConfirm": "Confirm",
+    "settingsThemeImagesDescription": "Enable display of images from themes",
+    "settingsThemeImages": "Theme Images",
+    "settingsGroupAbout": "About",
     "localeUzbek": "Uzbek  \/ Oʻzbekcha",
     "profileOfflineAtStart": "Appear Offline at Startup",
     "now": "Now",

lib/l10n/intl_pt.arb

@@ -1,6 +1,17 @@
 {
     "@@locale": "pt",
-    "@@last_modified": "2023-09-25T21:29:34+02:00",
+    "@@last_modified": "2024-02-12T08:05:24+01:00",
+    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
+    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
+    "settingsImportThemeButton": "Import Theme",
+    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
+    "settingsImportThemeTitle": "Import Theme",
+    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
+    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
+    "settingThemeOverwriteConfirm": "Confirm",
+    "settingsThemeImagesDescription": "Enable display of images from themes",
+    "settingsThemeImages": "Theme Images",
+    "settingsGroupAbout": "About",
     "localeUzbek": "Uzbek  \/ Oʻzbekcha",
     "profileOfflineAtStart": "Appear Offline at Startup",
     "now": "Now",

lib/l10n/intl_pt_BR.arb

@@ -1,6 +1,17 @@
 {
     "@@locale": "pt_BR",
-    "@@last_modified": "2023-09-25T21:29:34+02:00",
+    "@@last_modified": "2024-02-12T08:05:24+01:00",
+    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
+    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
+    "settingsImportThemeButton": "Import Theme",
+    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
+    "settingsImportThemeTitle": "Import Theme",
+    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
+    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
+    "settingThemeOverwriteConfirm": "Confirm",
+    "settingsThemeImagesDescription": "Enable display of images from themes",
+    "settingsThemeImages": "Theme Images",
+    "settingsGroupAbout": "About",
     "localeUzbek": "Uzbek  \/ Oʻzbekcha",
     "profileOfflineAtStart": "Appear Offline at Startup",
     "now": "Now",

lib/l10n/intl_ro.arb

@@ -1,6 +1,17 @@
 {
     "@@locale": "ro",
-    "@@last_modified": "2023-09-25T21:29:34+02:00",
+    "@@last_modified": "2024-02-12T08:05:24+01:00",
+    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
+    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
+    "settingsImportThemeButton": "Import Theme",
+    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
+    "settingsImportThemeTitle": "Import Theme",
+    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
+    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
+    "settingThemeOverwriteConfirm": "Confirm",
+    "settingsThemeImagesDescription": "Enable display of images from themes",
+    "settingsThemeImages": "Theme Images",
+    "settingsGroupAbout": "About",
     "localeUzbek": "Uzbek  \/ Oʻzbekcha",
     "profileOfflineAtStart": "Appear Offline at Startup",
     "now": "Now",

lib/l10n/intl_ru.arb

@@ -1,6 +1,17 @@
 {
     "@@locale": "ru",
-    "@@last_modified": "2023-09-25T21:29:34+02:00",
+    "@@last_modified": "2024-02-12T08:05:24+01:00",
+    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
+    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
+    "settingsImportThemeButton": "Import Theme",
+    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
+    "settingsImportThemeTitle": "Import Theme",
+    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
+    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
+    "settingThemeOverwriteConfirm": "Confirm",
+    "settingsThemeImagesDescription": "Enable display of images from themes",
+    "settingsThemeImages": "Theme Images",
+    "settingsGroupAbout": "About",
     "localeUzbek": "Uzbek  \/ Oʻzbekcha",
     "profileOfflineAtStart": "Appear Offline at Startup",
     "now": "Now",

lib/l10n/intl_sk.arb

@@ -1,6 +1,17 @@
 {
     "@@locale": "sk",
-    "@@last_modified": "2023-09-25T21:29:34+02:00",
+    "@@last_modified": "2024-02-12T08:05:24+01:00",
+    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
+    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
+    "settingsImportThemeButton": "Import Theme",
+    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
+    "settingsImportThemeTitle": "Import Theme",
+    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
+    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
+    "settingThemeOverwriteConfirm": "Confirm",
+    "settingsThemeImagesDescription": "Enable display of images from themes",
+    "settingsThemeImages": "Theme Images",
+    "settingsGroupAbout": "About",
     "localeUzbek": "Uzbek  \/ Oʻzbekcha",
     "profileOfflineAtStart": "Appear Offline at Startup",
     "now": "Now",

lib/l10n/intl_sv.arb

@@ -1,6 +1,17 @@
 {
     "@@locale": "sv",
-    "@@last_modified": "2023-09-25T21:29:34+02:00",
+    "@@last_modified": "2024-02-12T08:05:24+01:00",
+    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
+    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
+    "settingsImportThemeButton": "Import Theme",
+    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
+    "settingsImportThemeTitle": "Import Theme",
+    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
+    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
+    "settingThemeOverwriteConfirm": "Confirm",
+    "settingsThemeImagesDescription": "Enable display of images from themes",
+    "settingsThemeImages": "Theme Images",
+    "settingsGroupAbout": "About",
     "localeUzbek": "Uzbek  \/ Oʻzbekcha",
     "profileOfflineAtStart": "Appear Offline at Startup",
     "now": "Now",

lib/l10n/intl_sw.arb

@@ -1,6 +1,17 @@
 {
     "@@locale": "sw",
-    "@@last_modified": "2023-09-25T21:29:34+02:00",
+    "@@last_modified": "2024-02-12T08:05:24+01:00",
+    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
+    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
+    "settingsImportThemeButton": "Import Theme",
+    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
+    "settingsImportThemeTitle": "Import Theme",
+    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
+    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
+    "settingThemeOverwriteConfirm": "Confirm",
+    "settingsThemeImagesDescription": "Enable display of images from themes",
+    "settingsThemeImages": "Theme Images",
+    "settingsGroupAbout": "About",
     "localeUzbek": "Uzbek  \/ Oʻzbekcha",
     "profileOfflineAtStart": "Appear Offline at Startup",
     "now": "Now",

lib/l10n/intl_tr.arb

@@ -1,6 +1,17 @@
 {
     "@@locale": "tr",
-    "@@last_modified": "2023-09-25T21:29:34+02:00",
+    "@@last_modified": "2024-02-12T08:05:24+01:00",
+    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
+    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
+    "settingsImportThemeButton": "Import Theme",
+    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
+    "settingsImportThemeTitle": "Import Theme",
+    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
+    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
+    "settingThemeOverwriteConfirm": "Confirm",
+    "settingsThemeImagesDescription": "Enable display of images from themes",
+    "settingsThemeImages": "Theme Images",
+    "settingsGroupAbout": "About",
     "localeUzbek": "Uzbek  \/ Oʻzbekcha",
     "profileOfflineAtStart": "Appear Offline at Startup",
     "now": "Now",

lib/l10n/intl_uk.arb

@@ -1,6 +1,17 @@
 {
     "@@locale": "uk",
-    "@@last_modified": "2023-09-25T21:29:34+02:00",
+    "@@last_modified": "2024-02-12T08:05:24+01:00",
+    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
+    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
+    "settingsImportThemeButton": "Import Theme",
+    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
+    "settingsImportThemeTitle": "Import Theme",
+    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
+    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
+    "settingThemeOverwriteConfirm": "Confirm",
+    "settingsThemeImagesDescription": "Enable display of images from themes",
+    "settingsThemeImages": "Theme Images",
+    "settingsGroupAbout": "About",
     "localeUzbek": "Uzbek  \/ Oʻzbekcha",
     "profileOfflineAtStart": "Appear Offline at Startup",
     "now": "Now",

lib/l10n/intl_uz.arb

@@ -1,6 +1,17 @@
 {
     "@@locale": "uz",
-    "@@last_modified": "2023-09-25T21:29:34+02:00",
+    "@@last_modified": "2024-02-12T08:05:24+01:00",
+    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
+    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
+    "settingsImportThemeButton": "Import Theme",
+    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
+    "settingsImportThemeTitle": "Import Theme",
+    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
+    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
+    "settingThemeOverwriteConfirm": "Confirm",
+    "settingsThemeImagesDescription": "Enable display of images from themes",
+    "settingsThemeImages": "Theme Images",
+    "settingsGroupAbout": "About",
     "localeUzbek": "Uzbek  \/ Oʻzbekcha",
     "profileOfflineAtStart": "Appear Offline at Startup",
     "now": "Now",

lib/main.dart

@@ -2,7 +2,6 @@ import 'dart:async';
 import 'dart:convert';
 import 'package:cwtch/config.dart';
 import 'package:cwtch/notification_manager.dart';
-import 'package:cwtch/themes/cwtch.dart';
 import 'package:cwtch/views/doublecolview.dart';
 import 'package:cwtch/views/messageview.dart';
 import 'package:flutter/foundation.dart';
@@ -32,9 +31,7 @@ import 'themes/opaque.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:connectivity_plus/connectivity_plus.dart';
 
-import 'package:intl/intl.dart' as intl;
-
-var globalSettings = Settings(Locale("en", ''), CwtchDark());
+var globalSettings = Settings(Locale("en", ''));
 var globalErrorHandler = ErrorHandler();
 var globalTorStatus = TorStatus();
 var globalAppState = AppState();
@@ -79,7 +76,7 @@ class FlwtchState extends State<Flwtch> with WindowListener {
   @override
   initState() {
     print("initState() started, setting up handlers");
-    globalSettings = Settings(Locale("en", ''), CwtchDark());
+    globalSettings = Settings(Locale("en", ''));
     globalErrorHandler = ErrorHandler();
     globalTorStatus = TorStatus();
     globalAppState = AppState();
@@ -106,8 +103,15 @@ class FlwtchState extends State<Flwtch> with WindowListener {
           new CwtchNotifier(profs, globalSettings, globalErrorHandler, globalTorStatus, newDesktopNotificationsManager(_notificationSelectConvo), globalAppState, globalServersList, this);
       cwtch = CwtchFfi(cwtchNotifier);
     }
-    print("initState: invoking cwtch.Start()");
-    cwtch.Start();
+    // Cwtch.start can take time, we don't want it blocking first splash screen draw, so postpone a smidge to let splash render
+    Future.delayed(const Duration(milliseconds: 100), () {
+      print("initState delayed: invoking cwtch.Start()");
+      cwtch.Start().then((v) {
+        cwtch.getCwtchDir().then((dir) {
+          globalSettings.themeloader.LoadThemes(dir);
+        });
+      });
+    });
     print("initState: starting connectivityListener");
     if (EnvironmentConfig.TEST_MODE == false) {
       startConnectivityListener();
@@ -123,7 +127,7 @@ class FlwtchState extends State<Flwtch> with WindowListener {
   // gracefully fails and NOPs, as it's not a required functionality
   startConnectivityListener() async {
     try {
-      connectivityStream = await Connectivity().onConnectivityChanged.listen((ConnectivityResult result) {
+      connectivityStream = Connectivity().onConnectivityChanged.listen((ConnectivityResult result) {
         // Got a new connectivity status!
         if (result == ConnectivityResult.none) {
           connectivityState = ConnectivityState.confirmed_offline;
@@ -156,6 +160,7 @@ class FlwtchState extends State<Flwtch> with WindowListener {
   @override
   Widget build(BuildContext context) {
     globalSettings.initPackageInfo();
+
     return MultiProvider(
       providers: [
         getFlwtchStateProvider(),
@@ -184,7 +189,7 @@ class FlwtchState extends State<Flwtch> with WindowListener {
             title: 'Cwtch',
             showSemanticsDebugger: settings.useSemanticDebugger,
             theme: mkThemeData(settings),
-            home: (!appState.cwtchInit || appState.modalState != ModalState.none) ? SplashView() : ProfileMgrView(),
+            home: (!appState.loaded) ? SplashView() : ProfileMgrView(),
           ),
         );
       },
@@ -247,7 +252,6 @@ class FlwtchState extends State<Flwtch> with WindowListener {
         exit(0);
       }
     }
-    ;
   }
 
   // Invoked via notificationClickChannel by MyBroadcastReceiver in MainActivity.kt

lib/main_test.dart

@@ -1,4 +1,3 @@
-import 'package:cwtch/themes/cwtch.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/material.dart';
@@ -8,16 +7,14 @@ import 'package:glob/list_local_fs.dart';
 import 'config.dart';
 import 'licenses.dart';
 import 'main.dart';
-import 'themes/opaque.dart';
 
 import 'dart:convert';
 import 'dart:io';
-import 'dart:typed_data';
 import "package:flutter_driver/driver_extension.dart";
 import 'package:flutter_test/flutter_test.dart';
 import 'package:glob/glob.dart';
 
-var globalSettings = Settings(Locale("en", ''), CwtchDark());
+var globalSettings = Settings(Locale("en", ''));
 var globalErrorHandler = ErrorHandler();
 
 Future<void> main() async {

lib/models/appstate.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:cwtch/config.dart';
+import 'package:cwtch/main.dart';
 import 'package:flutter/widgets.dart';
 
 enum ModalState { none, storageMigration, shutdown }
@@ -17,6 +18,8 @@ class AppState extends ChangeNotifier {
   bool _unreadMessagesBelow = false;
   bool _disableFilePicker = false;
   bool _focus = true;
+  bool _settingsLoaded = false;
+  bool _themesLoaded = false;
 
   StreamController<bool> _profilesUnreadNotifyControler = StreamController<bool>();
   late Stream<bool> profilesUnreadNotify;
@@ -32,13 +35,13 @@ class AppState extends ChangeNotifier {
 
   void SetAppError(String error) {
     appError = error;
-    EnvironmentConfig.debugLog("App Error: ${appError}");
+    EnvironmentConfig.debugLog("App Error: $appError");
     notifyListeners();
   }
 
   void SetModalState(ModalState newState) {
     modalState = newState;
-    EnvironmentConfig.debugLog("Modal State: ${newState}");
+    EnvironmentConfig.debugLog("Modal State: $newState");
     notifyListeners();
   }
 
@@ -85,6 +88,18 @@ class AppState extends ChangeNotifier {
     notifyListeners();
   }
 
+  set settingsLoaded(bool newVal) {
+    _settingsLoaded = newVal;
+    notifyListeners();
+  }
+
+  set themesLoaded(bool newVal) {
+    _themesLoaded = newVal;
+    notifyListeners();
+  }
+
+  bool get loaded => cwtchInit && _settingsLoaded && globalSettings.themeloader.themes.length > 0 && modalState == ModalState.none;
+
   bool isLandscape(BuildContext c) => MediaQuery.of(c).size.width > MediaQuery.of(c).size.height;
 
   void notifyProfileUnread() {

lib/models/contact.dart

@@ -1,5 +1,3 @@
-import 'dart:ffi';
-
 import 'package:cwtch/main.dart';
 import 'package:cwtch/models/message_draft.dart';
 import 'package:cwtch/models/profile.dart';
@@ -13,7 +11,6 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:provider/provider.dart';
 import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
 
-import 'message.dart';
 import 'messagecache.dart';
 
 enum ConversationNotificationPolicy {
@@ -75,6 +72,8 @@ class ContactInfoState extends ChangeNotifier {
   DateTime _lastRetryTime = DateTime.now();
   DateTime loaded = DateTime.now();
 
+  List<ContactEvent> contactEvents = List.empty(growable: true);
+
   ContactInfoState(
     this.profileOnion,
     this.identifier,
@@ -198,6 +197,7 @@ class ContactInfoState extends ChangeNotifier {
 
   set status(String newVal) {
     this._status = newVal;
+    this.contactEvents.add(ContactEvent("Update Peer Status Received: $newVal"));
     notifyListeners();
   }
 
@@ -486,3 +486,11 @@ class ContactInfoState extends ChangeNotifier {
     }
   }
 }
+
+class ContactEvent {
+  String summary;
+  late DateTime timestamp;
+  ContactEvent(this.summary) {
+    this.timestamp = DateTime.now();
+  }
+}

lib/models/contactlist.dart

@@ -54,7 +54,7 @@ class ContactListState extends ChangeNotifier {
       if (otherGroups != null && otherGroups.isNotEmpty) {
         EnvironmentConfig.debugLog("sharing antispam tickets to new group. FIXME: in Cwtch 1.14");
         var antispamTickets = otherGroups[0].antispamTickets;
-        _contacts.last!.antispamTickets = antispamTickets;
+        _contacts.last.antispamTickets = antispamTickets;
       }
       servers?.addGroup(newContact);
     }
@@ -98,7 +98,7 @@ class ContactListState extends ChangeNotifier {
     notifyListeners();
     //} </todo>
   }
-  
+
   void updateLastMessageReceivedTime(int forIdentifier, DateTime newMessageTime) {
     var contact = getContact(forIdentifier);
     if (contact == null) return;

lib/models/filedownloadprogress.dart

@@ -3,12 +3,22 @@ class FileDownloadProgress {
   int chunksTotal = 1;
   bool complete = false;
   bool gotManifest = false;
-  bool interrupted = false;
+  bool _interrupted = false;
+
+  // we keep track of both an explicit interrupt flag (for when a request fails or is explicitly cancelled)
+  set interrupted(isInterrupted) {
+    this._interrupted = isInterrupted;
+  }
+
+  // but we have a fuzzy get which depends on lastUpdate, if the file isn't complete, but the last update was more
+  // that 30 seconds ago, we consider this download as failed.
+  get interrupted => _interrupted || (DateTime.now().difference(lastUpdate).abs().inSeconds > 30 && !complete);
+
   String? downloadedTo;
   DateTime? timeStart;
   DateTime? timeEnd;
   DateTime? requested;
-  DateTime lastUpdate = DateTime.now();
+  DateTime lastUpdate = DateTime.fromMillisecondsSinceEpoch(0);
 
   FileDownloadProgress(this.chunksTotal, this.timeStart);
 

lib/models/message.dart

@@ -34,7 +34,7 @@ abstract class Message {
 
   Widget getWidget(BuildContext context, Key key, int index);
 
-  Widget getPreviewWidget(BuildContext context);
+  Widget getPreviewWidget(BuildContext context, {BoxConstraints? constraints});
 }
 
 Message compileOverlay(MessageInfo messageInfo) {
@@ -64,6 +64,7 @@ Message compileOverlay(MessageInfo messageInfo) {
 
 abstract class CacheHandler {
   Future<MessageInfo?> get(Cwtch cwtch, String profileOnion, int conversationIdentifier, MessageCache cache);
+  Future<MessageInfo?> sync(Cwtch cwtch, String profileOnion, int conversationIdentifier, MessageCache cache);
 }
 
 class ByIndex implements CacheHandler {
@@ -128,7 +129,8 @@ class ByIndex implements CacheHandler {
       List<dynamic> messagesWrapper = jsonDecode(msgs);
 
       for (; i < messagesWrapper.length; i++) {
-        var messageInfo = messageWrapperToInfo(profileOnion, conversationIdentifier, messagesWrapper[i]);
+        var messageInfo = MessageWrapperToInfo(profileOnion, conversationIdentifier, messagesWrapper[i]);
+        messageInfo.metadata.lastChecked = DateTime.now();
         cache.addIndexed(messageInfo, start + i);
       }
     } catch (e, stacktrace) {
@@ -143,6 +145,13 @@ class ByIndex implements CacheHandler {
   void add(MessageCache cache, MessageInfo messageInfo) {
     cache.addIndexed(messageInfo, index);
   }
+
+  @override
+  Future<MessageInfo?> sync(Cwtch cwtch, String profileOnion, int conversationIdentifier, MessageCache cache) {
+    EnvironmentConfig.debugLog("performing a resync on message ${index}");
+    fetchAndProcess(index, 1, cwtch, profileOnion, conversationIdentifier, cache);
+    return get(cwtch, profileOnion, conversationIdentifier, cache);
+  }
 }
 
 class ById implements CacheHandler {
@@ -172,6 +181,11 @@ class ById implements CacheHandler {
     }
     return fetch(cwtch, profileOnion, conversationIdentifier, cache);
   }
+
+  @override
+  Future<MessageInfo?> sync(Cwtch cwtch, String profileOnion, int conversationIdentifier, MessageCache cache) {
+    return get(cwtch, profileOnion, conversationIdentifier, cache);
+  }
 }
 
 class ByContentHash implements CacheHandler {
@@ -200,6 +214,11 @@ class ByContentHash implements CacheHandler {
     }
     return fetch(cwtch, profileOnion, conversationIdentifier, cache);
   }
+
+  @override
+  Future<MessageInfo?> sync(Cwtch cwtch, String profileOnion, int conversationIdentifier, MessageCache cache) {
+    return get(cwtch, profileOnion, conversationIdentifier, cache);
+  }
 }
 
 List<Message> getReplies(MessageCache cache, int messageIdentifier) {
@@ -257,6 +276,16 @@ Future<Message> messageHandler(BuildContext context, String profileOnion, int co
 
   MessageInfo? messageInfo = await cacheHandler.get(cwtch, profileOnion, conversationIdentifier, cache);
 
+  if (messageInfo != null) {
+    if (messageInfo.metadata.ackd == false) {
+      if (messageInfo.metadata.lastChecked == null || messageInfo.metadata.lastChecked!.difference(DateTime.now()).abs().inSeconds > 30) {
+        messageInfo.metadata.lastChecked = DateTime.now();
+        // NOTE: Only ByIndex lookups will trigger
+        messageInfo = await cacheHandler.sync(cwtch, profileOnion, conversationIdentifier, cache);
+      }
+    }
+  }
+
   if (messageInfo != null) {
     return compileOverlay(messageInfo);
   } else {
@@ -272,14 +301,14 @@ MessageInfo? messageJsonToInfo(String profileOnion, int conversationIdentifier,
       return null;
     }
 
-    return messageWrapperToInfo(profileOnion, conversationIdentifier, messageWrapper);
+    return MessageWrapperToInfo(profileOnion, conversationIdentifier, messageWrapper);
   } catch (e, stacktrace) {
     EnvironmentConfig.debugLog("message handler exception on parse message and cache: " + e.toString() + " " + stacktrace.toString());
     return null;
   }
 }
 
-MessageInfo messageWrapperToInfo(String profileOnion, int conversationIdentifier, dynamic messageWrapper) {
+MessageInfo MessageWrapperToInfo(String profileOnion, int conversationIdentifier, dynamic messageWrapper) {
   // Construct the initial metadata
   var messageID = messageWrapper['ID'];
   var timestamp = DateTime.tryParse(messageWrapper['Timestamp'])!;
@@ -312,6 +341,7 @@ class MessageMetadata extends ChangeNotifier {
 
   final String? signature;
   final String contenthash;
+  DateTime? lastChecked;
 
   dynamic get attributes => this._attributes;
 

lib/models/message_draft.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/cupertino.dart';
-import 'package:flutter/foundation.dart';
 
 /// A "MessageDraft" structure that stores information about in-progress message drafts.
 /// MessageDraft stores text, quoted replies, and attached images.
@@ -50,6 +49,8 @@ class MessageDraft extends ChangeNotifier {
   void clearDraft() {
     this._quotedReference = null;
     this.ctrlCompose.clear();
+    this.ctrlCompose.clearComposing();
+    this.ctrlCompose.text = "";
     this._inviteHandle = null;
     notifyListeners();
   }

lib/models/messagecache.dart

@@ -30,22 +30,27 @@ class LocalIndexMessage {
     this.messageId = messageId;
     this.cacheOnly = cacheOnly;
     this.isLoading = isLoading;
-    if (isLoading) {
-      loader = Completer<void>();
-      loaded = loader.future;
+    loader = Completer<void>();
+    loaded = loader.future;
+    if (!isLoading) {
+      loader.complete(); // complete this
     }
   }
 
   void finishLoad(int messageId) {
     this.messageId = messageId;
-    isLoading = false;
-    loader.complete(true);
+    if (!loader.isCompleted) {
+      isLoading = false;
+      loader.complete(true);
+    }
   }
 
   void failLoad() {
     this.messageId = null;
-    isLoading = false;
-    loader.complete(true);
+    if (!loader.isCompleted) {
+      isLoading = false;
+      loader.complete(true);
+    }
   }
 
   Future<void> waitForLoad() {
@@ -95,7 +100,7 @@ class MessageCache extends ChangeNotifier {
     this._storageMessageCount = newval;
   }
 
-  // On android reconnect, if backend supplied message count > UI message count, add the differnce to the front of the index
+  // On android reconnect, if backend supplied message count > UI message count, add the difference to the front of the index
   void addFrontIndexGap(int count) {
     this._indexUnsynced = count;
   }
@@ -123,8 +128,9 @@ class MessageCache extends ChangeNotifier {
 
   void addNew(String profileOnion, int conversation, int messageID, DateTime timestamp, String senderHandle, String senderImage, bool isAuto, String data, String contenthash) {
     this.cache[messageID] = MessageInfo(MessageMetadata(profileOnion, conversation, messageID, timestamp, senderHandle, senderImage, "", {}, false, false, isAuto, contenthash), data);
+    this.cache[messageID]?.metadata.lastChecked = DateTime.now(); // Don't check straight away...
     this.cacheByIndex.insert(0, LocalIndexMessage(messageID));
-    if (contenthash != null && contenthash != "") {
+    if (contenthash != "") {
       this.cacheByHash[contenthash] = messageID;
     }
   }

lib/models/messages/filemessage.dart

@@ -49,24 +49,27 @@ class FileMessage extends Message {
   }
 
   @override
-  Widget getPreviewWidget(BuildContext context) {
+  Widget getPreviewWidget(BuildContext context, {BoxConstraints? constraints}) {
     return ChangeNotifierProvider.value(
         value: this.metadata,
         builder: (bcontext, child) {
           dynamic shareObj = jsonDecode(this.content);
           if (shareObj == null) {
-            return MessageRow(MalformedBubble(), 0);
+            return MalformedBubble();
           }
           String nameSuggestion = shareObj['f'] as String;
           String rootHash = shareObj['h'] as String;
           String nonce = shareObj['n'] as String;
           int fileSize = shareObj['s'] as int;
           if (!validHash(rootHash, nonce)) {
-            return MessageRow(MalformedBubble(), 0);
+            return MalformedBubble();
           }
           return Container(
-              alignment: Alignment.center,
-              height: 100,
+              padding: EdgeInsets.all(1.0),
+              decoration: BoxDecoration(),
+              clipBehavior: Clip.antiAliasWithSaveLayer,
+              constraints: BoxConstraints(minHeight: 50, maxHeight: 50, minWidth: 50, maxWidth: 300),
+              alignment: Alignment.centerLeft,
               child: FileBubble(
                 nameSuggestion,
                 rootHash,

lib/models/messages/invitemessage.dart

@@ -48,7 +48,7 @@ class InviteMessage extends Message {
   }
 
   @override
-  Widget getPreviewWidget(BuildContext context) {
+  Widget getPreviewWidget(BuildContext context, {BoxConstraints? constraints}) {
     return ChangeNotifierProvider.value(
         value: this.metadata,
         builder: (bcontext, child) {

lib/models/messages/malformedmessage.dart

@@ -18,7 +18,7 @@ class MalformedMessage extends Message {
   }
 
   @override
-  Widget getPreviewWidget(BuildContext context) {
+  Widget getPreviewWidget(BuildContext context, {BoxConstraints? constraints}) {
     return ChangeNotifierProvider.value(
         value: this.metadata,
         builder: (bcontext, child) {

lib/models/messages/quotedmessage.dart

@@ -1,6 +1,5 @@
 import 'dart:convert';
 
-import 'package:cwtch/config.dart';
 import 'package:cwtch/models/message.dart';
 import 'package:cwtch/models/messages/malformedmessage.dart';
 import 'package:cwtch/widgets/malformedbubble.dart';
@@ -11,7 +10,6 @@ import 'package:flutter/widgets.dart';
 import 'package:provider/provider.dart';
 
 import '../../settings.dart';
-import '../../third_party/linkify/flutter_linkify.dart';
 
 class QuotedMessageStructure {
   final String quotedHash;
@@ -30,7 +28,7 @@ class QuotedMessage extends Message {
   QuotedMessage(this.metadata, this.content);
 
   @override
-  Widget getPreviewWidget(BuildContext context) {
+  Widget getPreviewWidget(BuildContext context, {BoxConstraints? constraints}) {
     return ChangeNotifierProvider.value(
         value: this.metadata,
         builder: (bcontext, child) {
@@ -40,7 +38,7 @@ class QuotedMessage extends Message {
             );
             var content = message["body"];
             var formatMessages = Provider.of<Settings>(bcontext).isExperimentEnabled(FormattingExperiment);
-            return compileMessageContentWidget(context, false, content, FocusNode(), formatMessages, false);
+            return compileMessageContentWidget(context, constraints ?? BoxConstraints.loose(MediaQuery.sizeOf(context)), false, content, FocusNode(), formatMessages, false);
           } catch (e) {
             return MalformedBubble();
           }

lib/models/messages/textmessage.dart

@@ -1,17 +1,11 @@
-import 'dart:math';
-
 import 'package:cwtch/models/message.dart';
-import 'package:cwtch/models/messages/malformedmessage.dart';
-import 'package:cwtch/widgets/malformedbubble.dart';
 import 'package:cwtch/widgets/messagebubble.dart';
-import 'package:cwtch/widgets/messageloadingbubble.dart';
 import 'package:cwtch/widgets/messagerow.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:provider/provider.dart';
 
 import '../../settings.dart';
-import '../../third_party/linkify/flutter_linkify.dart';
 import '../../widgets/messageBubbleWidgetHelpers.dart';
 
 class TextMessage extends Message {
@@ -21,13 +15,12 @@ class TextMessage extends Message {
   TextMessage(this.metadata, this.content);
 
   @override
-  Widget getPreviewWidget(BuildContext context) {
+  Widget getPreviewWidget(BuildContext context, {BoxConstraints? constraints}) {
     return ChangeNotifierProvider.value(
         value: this.metadata,
         builder: (bcontext, child) {
           var formatMessages = Provider.of<Settings>(bcontext).isExperimentEnabled(FormattingExperiment);
-          return compileMessageContentWidget(context, false, content, FocusNode(), formatMessages, false);
-          ;
+          return compileMessageContentWidget(context, constraints ?? BoxConstraints.loose(MediaQuery.sizeOf(context)), false, content, FocusNode(), formatMessages, false);
         });
   }
 

lib/models/profile.dart

@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:math';
 
 import 'package:cwtch/config.dart';
 import 'package:cwtch/models/remoteserver.dart';
@@ -13,8 +14,6 @@ import '../views/contactsview.dart';
 import 'contact.dart';
 import 'contactlist.dart';
 import 'filedownloadprogress.dart';
-import 'message.dart';
-import 'messagecache.dart';
 import 'profileservers.dart';
 
 class ProfileInfoState extends ChangeNotifier {
@@ -36,6 +35,7 @@ class ProfileInfoState extends ChangeNotifier {
   bool _autostart = true;
   bool _enabled = false;
   bool _appearOffline = false;
+  bool _appearOfflineAtStartup = false;
 
   ProfileInfoState({
     required this.onion,
@@ -62,6 +62,7 @@ class ProfileInfoState extends ChangeNotifier {
       this._enabled = true;
     }
     this._appearOffline = appearOffline;
+    this._appearOfflineAtStartup = appearOffline;
     this._encrypted = encrypted;
 
     _contacts.connectServers(this._servers);
@@ -185,6 +186,12 @@ class ProfileInfoState extends ChangeNotifier {
     notifyListeners();
   }
 
+  bool get appearOfflineAtStartup => this._appearOfflineAtStartup;
+  set appearOfflineAtStartup(bool newVal) {
+    this._appearOfflineAtStartup = newVal;
+    notifyListeners();
+  }
+
   bool get appearOffline => this._appearOffline;
   set appearOffline(bool newVal) {
     this._appearOffline = newVal;
@@ -232,7 +239,7 @@ class ProfileInfoState extends ChangeNotifier {
     this._unreadMessages = 0;
     this.replaceServers(serverJson);
 
-    if (contactsJson != null && contactsJson != "" && contactsJson != "null") {
+    if (contactsJson != "" && contactsJson != "null") {
       List<dynamic> contacts = jsonDecode(contactsJson);
       contacts.forEach((contact) {
         var profileContact = this._contacts.getContact(contact["identifier"]);
@@ -240,8 +247,22 @@ class ProfileInfoState extends ChangeNotifier {
         if (profileContact != null) {
           profileContact.status = contact["status"];
 
-          var newCount = contact["numMessages"];
+          var newCount = contact["numMessages"] as int;
           if (newCount != profileContact.totalMessages) {
+            if (newCount < profileContact.totalMessages) {
+              // on Android, when sharing a file the UI may be briefly unloaded for the
+              // OS to display the file management/selection screen. Afterwards a
+              // call to ReconnectCwtchForeground will be made which will refresh all values (including count of numMessages)
+              // **at the same time** the foreground will increment .totalMessages and send a new message to the backend.
+              // This will result in a negative number of messages being calculated here, and an incorrect totalMessage count.
+              // This bug is exacerbated in debug mode, and when multiple files are sent in succession. Both cases result in multiple ReconnectCwtchForeground
+              // events that have the potential to conflict with currentMessageCounts.
+              // Note that *if* a new message came in at the same time, we would be unable to distinguish this case - as such this is specific instance of a more general problem
+              // TODO: A true-fix to this bug is to implement a syncing step in the foreground where totalMessages and inFlightMessages can be distinguished
+              // This requires a change to the backend to confirm submission of an inFlightMessage, which will be implemented in #664
+              EnvironmentConfig.debugLog("Conflicting message counts: $newCount ${profileContact.totalMessages}");
+              newCount = max(newCount, profileContact.totalMessages);
+            }
             profileContact.messageCache.addFrontIndexGap(newCount - profileContact.totalMessages);
           }
           profileContact.totalMessages = newCount;
@@ -360,19 +381,6 @@ class ProfileInfoState extends ChangeNotifier {
       if (this._downloads[fileKey]!.interrupted) {
         return true;
       }
-
-      if (this._downloads[fileKey]!.requested != null) {
-        if (DateTime.now().difference(this._downloads[fileKey]!.requested!) > Duration(minutes: 1)) {
-          this._downloads[fileKey]!.requested = null;
-          this._downloads[fileKey]!.interrupted = true;
-          return true;
-        }
-        if (DateTime.now().difference(this._downloads[fileKey]!.lastUpdate) > Duration(minutes: 1)) {
-          this._downloads[fileKey]!.requested = null;
-          this._downloads[fileKey]!.interrupted = true;
-          return true;
-        }
-      }
     }
     return false;
   }