Skip to content

Consolidate text field components and improve GemTextField #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DRadmir merged 3 commits into from
Apr 11, 2026
Merged

Consolidate text field components and improve GemTextField #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92df805
Consolidate text field components and improve GemTextField
DRadmir Apr 10, 2026
9c3964d
Merge branch 'main' of github.com:gemwalletcom/wallet into 38-consoli…
DRadmir Apr 11, 2026
d8ccc7c
Match Android floating label behavior to iOS layout
DRadmir Apr 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
129 changes: 0 additions & 129 deletions android/app/src/main/kotlin/com/gemwallet/android/ui/components/PhraseField.kt
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions android/features/add_asset/presents/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ dependencies {
implementation(project(":ui"))
implementation(project(":features:add_asset:viewmodels"))
implementation(project(":features:recipient:viewmodels"))
implementation(project(":features:recipient:presents"))

implementation(libs.hilt.android)
implementation(libs.hilt.navigation.compose)
Expand Down
1 change: 1 addition & 0 deletions .../presents/src/main/kotlin/com/gemwallet/android/features/add_asset/views/AddAssetScene.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ import com.gemwallet.android.ui.theme.space24
import com.gemwallet.android.ui.theme.defaultPadding
import com.gemwallet.android.ui.theme.sceneContentPadding
import com.gemwallet.android.features.add_asset.viewmodels.models.TokenSearchState
import com.gemwallet.android.features.recipient.presents.components.AddressChainField
import com.wallet.core.primitives.Asset
import com.wallet.core.primitives.BlockExplorerLink
import uniffi.gemstone.DocsUrl
Expand Down
127 changes: 0 additions & 127 deletions ...sents/src/main/kotlin/com/gemwallet/android/features/add_asset/views/AddressChainField.kt
View file
Open in desktop

This file was deleted.

44 changes: 1 addition & 43 deletions .../kotlin/com/gemwallet/android/features/recipient/presents/components/AddressChainField.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,8 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.CheckCircle
import androidx.compose.material.icons.filled.Clear
import androidx.compose.material.icons.filled.ContentPaste
import androidx.compose.material.icons.filled.Error
import androidx.compose.material.icons.filled.QrCodeScanner
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
Expand All @@ -31,6 +27,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.gemwallet.android.features.recipient.viewmodel.AddressChainViewModel
import com.gemwallet.android.ui.components.GemTextField
import com.gemwallet.android.ui.components.clipboard.getPlainText
import com.gemwallet.android.ui.components.fields.TransferTextFieldActions
import com.gemwallet.android.ui.components.progress.CircularProgressIndicator16
import com.gemwallet.android.ui.theme.paddingHalfSmall
import com.gemwallet.android.ui.theme.paddingSmall
Expand Down Expand Up @@ -129,42 +126,3 @@ fun ColumnScope.AddressChainField(
}
}
}

@Composable
fun TransferTextFieldActions(
value: String,
paste: (() -> Unit)? = null,
qrScanner: (() -> Unit)? = null,
onClean: () -> Unit
) {
if (value.isNotEmpty()) {
IconButton(onClick = onClean) {
Icon(
imageVector = Icons.Default.Clear,
contentDescription = "clear",
tint = MaterialTheme.colorScheme.onSurface,
)
}
return
}
Row {
if (paste != null) {
IconButton(onClick = paste) {
Icon(
imageVector = Icons.Default.ContentPaste,
contentDescription = "paste",
tint = MaterialTheme.colorScheme.onSurface,
)
}
}
if (qrScanner != null) {
IconButton(onClick = qrScanner) {
Icon(
imageVector = Icons.Default.QrCodeScanner,
contentDescription = "scan_address",
tint = MaterialTheme.colorScheme.onSurface,
)
}
}
}
}
Loading