Merge branch 'develop'

Author: Jeff Yanta

.github/workflows/prep-dev.yml

@@ -4,6 +4,7 @@ on:
   push:
     tags:
       - 'v[0-9]+.[0-9]+.[0-9]'
+  workflow_dispatch:
 
 jobs:
   sync-branch:

app/src/main/java/com/getcode/view/download/ShareDownloadScreen.kt

@@ -3,11 +3,13 @@ package com.getcode.view.download
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.windowInsetsPadding
@@ -28,6 +30,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
 import com.getcode.LocalDownloadQrCode
 import com.getcode.R
 import com.getcode.theme.CodeTheme
@@ -38,6 +41,8 @@ import com.getcode.ui.components.CodeCircularProgressIndicator
 import com.getcode.ui.components.Row
 import com.getcode.ui.components.SelectionContainer
 import com.getcode.ui.components.rememberSelectionState
+import com.getcode.ui.utils.debugBounds
+import com.getcode.ui.utils.measured
 import com.getcode.ui.utils.rememberedLongClickable
 import com.getcode.util.shareDownloadLink
 
@@ -71,7 +76,9 @@ fun ShareDownloadScreen() {
                 horizontalAlignment = Alignment.CenterHorizontally
             ) {
                 Text(
-                    modifier = Modifier.fillMaxWidth(0.6f),
+                    modifier = Modifier
+                        .fillMaxWidth(0.6f)
+                        .padding(top = CodeTheme.dimens.grid.x15),
                     text = stringResource(R.string.subtitle_scanToDownload),
                     style = CodeTheme.typography.textLarge,
                     textAlign = TextAlign.Center

app/src/main/java/com/getcode/view/main/home/DecorView.kt

@@ -46,7 +46,6 @@ import com.getcode.theme.xxl
 import com.getcode.ui.utils.rememberedClickable
 import com.getcode.ui.components.Pill
 import com.getcode.ui.tips.DefinedTips
-import com.getcode.ui.utils.addIf
 import com.getcode.view.main.home.components.HomeBottom
 import dev.bmcreations.tipkit.LocalTipProvider
 import dev.bmcreations.tipkit.engines.LocalTipsEngine

app/src/main/res/values/strings-localized.xml

@@ -364,5 +364,5 @@
   <string name="title_withdrawKin">Withdraw Kin</string>
   <string name="title_withdrewKin">Withdrew</string>
   <string name="title_yourAccessKey">Your Access Key</string>
-  <string name="tooltip_tapLogo">Tap the logo to share the app download link</string>
+  <string name="tooltip_tapLogo">Tap the Code logo to share the app download link</string>
 </resources>

vendor/tipkit/tipkit-m2/src/main/kotlin/dev/bmcreations/tipkit/TipScaffold.kt

@@ -37,6 +37,7 @@ import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.layout
+import androidx.compose.ui.layout.onPlaced
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalLayoutDirection
@@ -75,7 +76,7 @@ object TipDefaults {
                     shape = TriangleEdge()
                 )
                 .width(CodeTheme.dimens.grid.x3)
-                .height(CodeTheme.dimens.grid.x2)
+                .height(CodeTheme.dimens.grid.x1)
         )
     }
 
@@ -158,7 +159,7 @@ object TipDefaults {
             Column(
                 modifier = Modifier
                     .padding(CodeTheme.dimens.grid.x2)
-                    .widthIn(max = screenWidth * 0.55f),
+                    .widthIn(max = 240.dp),
             ) {
                 TipContents(tip = tip)
             }