group peers, fix macos DMG build

.github/workflows/macos_pkg.yml

@@ -14,19 +14,21 @@ defaults:
 jobs:
   build-macos-nightly-artifact:
     name: Nightly Artifact macOS Build
-    runs-on: macos-11
+    runs-on: macos-latest
     if: |
       true
     permissions:
       contents: write
     steps:
       - uses: actions/checkout@v3
 
-      - name: install cliclick
-        run:  brew install cliclick
-
-      - name: install deps
-        run:  brew install git
+      - name: Install Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: |
+            11
+            17
 
       - name: test java1
         run:  |
@@ -39,15 +41,12 @@ jobs:
               $JAVA_HOME/bin/java -version
               $JAVA_HOME/bin/javac -version
               ls -al /usr/local/Cellar/openjdk/
-
       - name: build package
         run:  |
           ls -al
           id
           pwd
-          export JAVA_HOME=$(/usr/libexec/java_home -v17)
           ./gradlew packageDistributionForCurrentOS || cat /Users/runner/work/trifa_material/trifa_material/build/compose/logs/createDistributable/codesign-2*txt
-
       - name: Rename artifact for nightly upload
         if: github.ref == 'refs/heads/master'
         run: |
@@ -69,6 +68,3 @@ jobs:
           replacesArtifacts: true
           token: ${{ secrets.GITHUB_TOKEN }}
           artifacts: "trifa-material_nightly.dmg"
-
-
-

.github/workflows/nightly.yml

@@ -6,11 +6,13 @@ on:
      - 'README.md'
      - 'CHANGELOG.md'
      - '.github/workflows/nightly.yml'
+     - '.github/workflows/macos_pkg.yml'
   pull_request:
     paths-ignore:
      - 'README.md'
      - 'CHANGELOG.md'
      - '.github/workflows/nightly.yml'
+     - '.github/workflows/macos_pkg.yml'
   workflow_dispatch:
     inputs:
       version:
@@ -111,22 +113,24 @@ jobs:
 
   build-macos-nightly-artifact:
     name: Nightly Artifact macOS Build
-    runs-on: macos-11
-    needs: update-nightly-tag
+    runs-on: macos-latest
+    needs: [update-nightly-tag]
     if: |
-      false &&
+      always() &&
       (needs.update-nightly-tag.result == 'success' ||
         needs.update-nightly-tag.result == 'skipped')
     permissions:
       contents: write
     steps:
       - uses: actions/checkout@v3
 
-      - name: install cliclick
-        run:  brew install cliclick
-
-      - name: install deps
-        run:  brew install git
+      - name: Install Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: |
+            11
+            17
 
       - name: test java1
         run:  |
@@ -139,15 +143,12 @@ jobs:
               $JAVA_HOME/bin/java -version
               $JAVA_HOME/bin/javac -version
               ls -al /usr/local/Cellar/openjdk/
-
       - name: build package
         run:  |
           ls -al
           id
           pwd
-          export JAVA_HOME=$(/usr/libexec/java_home -v17)
           ./gradlew packageDistributionForCurrentOS || cat /Users/runner/work/trifa_material/trifa_material/build/compose/logs/createDistributable/codesign-2*txt
-
       - name: Rename artifact for nightly upload
         if: github.event_name == 'push' && github.ref == 'refs/heads/master'
         run: |

build.gradle.kts

@@ -60,6 +60,8 @@ compose.desktop {
 
         buildTypes.release.proguard {
             optimize.set(false)
+            obfuscate.set(false)
+            configurationFiles.from("proguard-rules.pro")
         }
 
         nativeDistributions {

proguard-rules.pro

@@ -0,0 +1,14 @@
+# proguard-rules.pro
+-dontobfuscate
+
+-dontwarn kotlinx.**
+
+-keep class org.jetbrains.skia.** { *; }
+-keep class org.jetbrains.skiko.** { *; }
+
+-dontoptimize
+-dontshrink
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-dontpreverify
+-verbose

src/main/kotlin/Main.kt

@@ -38,6 +38,7 @@ import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.scale
+import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.res.painterResource
@@ -59,22 +60,28 @@ import com.zoffcc.applications.trifa.Log
 import com.zoffcc.applications.trifa.MainActivity.Companion.main_init
 import com.zoffcc.applications.trifa.MainActivity.Companion.tox_friend_by_public_key
 import com.zoffcc.applications.trifa.MainActivity.Companion.tox_friend_get_name
+import com.zoffcc.applications.trifa.MainActivity.Companion.tox_group_get_chat_id
 import com.zoffcc.applications.trifa.PrefsSettings
 import com.zoffcc.applications.trifa.RandomNameGenerator
 import com.zoffcc.applications.trifa.TRIFAGlobals
 import com.zoffcc.applications.trifa.TrifaToxService
+import com.zoffcc.applications.trifa.TrifaToxService.Companion.clear_grouppeers
+import com.zoffcc.applications.trifa.TrifaToxService.Companion.load_grouppeers
 import com.zoffcc.applications.trifa.TrifaToxService.Companion.orma
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.asCoroutineDispatcher
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import org.briarproject.briar.desktop.SettingDetails
 import org.briarproject.briar.desktop.contact.ContactList
 import org.briarproject.briar.desktop.contact.GroupList
+import org.briarproject.briar.desktop.contact.GroupPeerList
 import org.briarproject.briar.desktop.navigation.BriarSidebar
 import org.briarproject.briar.desktop.ui.AboutScreen
 import org.briarproject.briar.desktop.ui.ExplainerChat
@@ -98,13 +105,19 @@ var online_button_color_wrapper = Color.White.toArgb()
 var closing_application = false
 val global_prefs: Preferences = Preferences.userNodeForPackage(com.zoffcc.applications.trifa.PrefsSettings::class.java)
 val TOP_HEADER_SIZE = 56.dp
+val CONTACTITEM_HEIGHT = 50.dp
+val GROUPITEM_HEIGHT = 50.dp
+val GROUP_PEER_HEIGHT = 33.dp
 val SETTINGS_HEADER_SIZE = 56.dp
 val CONTACT_COLUMN_WIDTH = 230.dp
+val GROUPS_COLUMN_WIDTH = 200.dp
+val GROUP_PEER_COLUMN_WIDTH = 180.dp
 val IMAGE_PREVIEW_SIZE = 70f
 val AVATAR_SIZE = 40f
 val MAX_AVATAR_SIZE = 70f
 val ImageloaderDispatcher = Executors.newFixedThreadPool(5).asCoroutineDispatcher()
 var global_semaphore_contactlist_ui = Semaphore(1)
+var global_semaphore_grouppeerlist_ui = Semaphore(1)
 var global_semaphore_grouplist_ui = Semaphore(1)
 var global_semaphore_messagelist_ui = Semaphore(1)
 var global_semaphore_groupmessagelist_ui = Semaphore(1)
@@ -228,6 +241,7 @@ fun App()
                     {
                         UiMode.CONTACTS ->
                         {
+                            val focusRequester = remember { FocusRequester() }
                             val contacts by contactstore.stateFlow.collectAsState()
                             Row(modifier = Modifier.fillMaxWidth()) {
                                 ContactList(contactList = contacts)
@@ -241,16 +255,28 @@ fun App()
                                     //GlobalScope.launch {
                                         load_messages_for_friend(contacts.selectedContactPubkey)
                                     //}
-                                    ChatAppWithScaffold(contactList = contacts, ui_scale = ui_scale)
+                                    ChatAppWithScaffold(focusRequester = focusRequester, contactList = contacts, ui_scale = ui_scale)
+                                    LaunchedEffect(contacts.selectedContactPubkey) {
+                                        focusRequester.requestFocus()
+                                    }
                                 }
                             }
                         }
                         UiMode.GROUPS ->
                         {
+                            val groupfocusRequester = remember { FocusRequester() }
                             val groups by groupstore.stateFlow.collectAsState()
+                            val grouppeers by grouppeerstore.stateFlow.collectAsState()
                             Row(modifier = Modifier.fillMaxWidth()) {
                                 GroupList(groupList = groups)
                                 VerticalDivider()
+                                clear_grouppeers()
+                                if (groups.selectedGroupId != null)
+                                {
+                                    load_grouppeers(groups.selectedGroupId!!)
+                                }
+                                GroupPeerList(grouppeerList = grouppeers)
+                                VerticalDivider()
                                 if (groups.selectedGroupId == null)
                                 {
                                     ExplainerGroup()
@@ -260,7 +286,10 @@ fun App()
                                     //GlobalScope.launch {
                                         load_groupmessages_for_friend(groups.selectedGroupId)
                                     //}
-                                    GroupAppWithScaffold(groupList = groups, ui_scale = ui_scale)
+                                    GroupAppWithScaffold(focusRequester = groupfocusRequester, groupList = groups, ui_scale = ui_scale)
+                                    LaunchedEffect(groups.selectedGroupId) {
+                                        groupfocusRequester.requestFocus()
+                                    }
                                 }
                             }
                         }
@@ -303,6 +332,8 @@ fun load_messages_for_friend(selectedContactPubkey: String?)
                     }
                 }
             }
+            // Thread.sleep(4000)
+            // Log.i(TAG, "LLLLLLLLLLLLLL")
             messagestore.send(MessageAction.ReceiveMessagesBulkWithClear(uimessages, toxk))
         } catch (e: Exception)
         {