android, desktop: updated Compose and changed mac notarization tool (#3303)

* android, desktop: updated Compose and changed mac notarization tool

* imports

* desktop (mac): fix lib building

* imports

---------

Co-authored-by: Avently <avently@local>
Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Modifier.kt

@@ -20,3 +20,5 @@ expect fun Modifier.desktopOnExternalDrag(
   onImage: (Painter) -> Unit = {},
   onText: (String) -> Unit = {}
 ): Modifier
+
+expect fun Modifier.onRightClick(action: () -> Unit): Modifier

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatItemInfoView.kt

@@ -24,6 +24,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
+import chat.simplex.common.platform.onRightClick
 import chat.simplex.common.views.chat.item.ItemAction
 import chat.simplex.common.views.chat.item.MarkdownText
 import chat.simplex.common.views.helpers.*

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIChatFeatureView.kt

@@ -12,7 +12,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
 import chat.simplex.common.model.ChatModel.getChatItemIndexOrNull
-import chat.simplex.common.views.helpers.onRightClick
+import chat.simplex.common.platform.onRightClick
 
 @Composable
 fun CIChatFeatureView(

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/FramedItemView.kt

@@ -20,10 +20,9 @@ import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.*
 import chat.simplex.common.model.*
-import chat.simplex.common.platform.appPlatform
+import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
-import chat.simplex.common.platform.base64ToBitmap
 import chat.simplex.common.views.chat.MEMBER_IMAGE_SIZE
 import chat.simplex.res.MR
 import kotlin.math.min

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ImageFullScreenView.kt

@@ -32,7 +32,12 @@ interface ImageGalleryProvider {
 @Composable
 fun ImageFullScreenView(imageProvider: () -> ImageGalleryProvider, close: () -> Unit) {
   val provider = remember { imageProvider() }
-  val pagerState = rememberPagerState(provider.initialIndex)
+  val pagerState = rememberPagerState(
+    initialPage = provider.initialIndex,
+    initialPageOffsetFraction = 0f
+  ) {
+    provider.totalMediaSize.value
+  }
   val goBack = { provider.onDismiss(pagerState.currentPage); close() }
   BackHandler(onBack = goBack)
   // Pager doesn't ask previous page at initialization step who knows why. By not doing this, prev page is not checked and can be blank,
@@ -138,7 +143,7 @@ fun ImageFullScreenView(imageProvider: () -> ImageGalleryProvider, close: () ->
     }
   }
   if (appPlatform.isAndroid) {
-    HorizontalPager(pageCount = remember { provider.totalMediaSize }.value, state = pagerState) { index -> Content(index) }
+    HorizontalPager(state = pagerState) { index -> Content(index) }
   } else {
     Content(pagerState.currentPage)
   }

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/DefaultDropdownMenu.kt

@@ -11,26 +11,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
 
-expect fun Modifier.onRightClick(action: () -> Unit): Modifier
-
-expect interface DefaultExposedDropdownMenuBoxScope {
-  @Composable
-  open fun DefaultExposedDropdownMenu(
-    expanded: Boolean,
-    onDismissRequest: () -> Unit,
-    modifier: Modifier = Modifier,
-    content: @Composable ColumnScope.() -> Unit
-  )
-}
-
-@Composable
-expect fun DefaultExposedDropdownMenuBox(
-  expanded: Boolean,
-  onExpandedChange: (Boolean) -> Unit,
-  modifier: Modifier = Modifier,
-  content: @Composable DefaultExposedDropdownMenuBoxScope.() -> Unit
-)
-
 @Composable
 fun DefaultDropdownMenu(
   showMenu: MutableState<Boolean>,
@@ -55,7 +35,7 @@ fun DefaultDropdownMenu(
 }
 
 @Composable
-fun DefaultExposedDropdownMenuBoxScope.DefaultExposedDropdownMenu(
+fun ExposedDropdownMenuBoxScope.DefaultExposedDropdownMenu(
   expanded: MutableState<Boolean>,
   modifier: Modifier = Modifier,
   dropdownMenuItems: (@Composable () -> Unit)?
@@ -63,7 +43,7 @@ fun DefaultExposedDropdownMenuBoxScope.DefaultExposedDropdownMenu(
   MaterialTheme(
     shapes = MaterialTheme.shapes.copy(medium = RoundedCornerShape(corner = CornerSize(25.dp)))
   ) {
-    DefaultExposedDropdownMenu(
+    ExposedDropdownMenu(
       modifier = Modifier
         .widthIn(min = 200.dp)
         .background(MaterialTheme.colors.surface)

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ExposedDropDownSettingRow.kt

@@ -29,7 +29,7 @@ fun <T> ExposedDropDownSettingRow(
 ) {
   SettingsActionItemWithContent(icon, title, iconColor = iconTint, disabled = !enabled.value) {
     val expanded = remember { mutableStateOf(false) }
-    DefaultExposedDropdownMenuBox(
+    ExposedDropdownMenuBox(
       expanded = expanded.value,
       onExpandedChange = {
         expanded.value = !expanded.value && enabled.value

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Section.kt

@@ -12,6 +12,7 @@ import dev.icerock.moko.resources.compose.painterResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.*
+import chat.simplex.common.platform.onRightClick
 import chat.simplex.common.platform.windowWidth
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/AdvancedNetworkSettings.kt

@@ -254,7 +254,7 @@ fun IntSettingRow(title: String, selection: MutableState<Int>, values: List<Int>
 
     Text(title)
 
-    DefaultExposedDropdownMenuBox(
+    ExposedDropdownMenuBox(
       expanded = expanded.value,
       onExpandedChange = {
         expanded.value = !expanded.value
@@ -313,7 +313,7 @@ fun TimeoutSettingRow(title: String, selection: MutableState<Long>, values: List
 
     Text(title)
 
-    DefaultExposedDropdownMenuBox(
+    ExposedDropdownMenuBox(
       expanded = expanded.value,
       onExpandedChange = {
         expanded.value = !expanded.value