8c6118342fb1
fix: Finish entry edit card controls (v2.14.58)
- time
- 2026-08-15 01:12 UTC · 2 months ago
- machine
- koh2
- parent
- c99b10bae9bd
↓ peach-android-8c611834.tar.gzatlas at this save
files changed4 files
VERSION+1 −1app/src/main/java/com/peachpasswords/ui/vault/AdditionalUrlsEditor.kt+12 −11app/src/main/java/com/peachpasswords/ui/vault/EntryEditScreen.kt+7 −7app/src/main/java/com/peachpasswords/ui/vault/PasswordHistorySection.kt+10 −14app/src/main/java/com/peachpasswords/ui/vault/AdditionalUrlsEditor.kt+12 −11
@@ -65,6 +65,18 @@6565 modifier = Modifier.fillMaxWidth().padding(vertical = 6.dp),6666 )6767 }68+ if (urls.size < MAX_ADDITIONAL_URLS) {69+ Text(70+ "+ add",71+ color = accent,72+ fontFamily = PeachType.Mono,73+ fontSize = 9.sp,74+ modifier = Modifier75+ .clip(RoundedCornerShape(6.dp))76+ .clickable(onClick = onAdd)77+ .padding(horizontal = PeachSpacing.sm, vertical = 6.dp),78+ )79+ }6880 Text(6981 "×",7082 color = peachColors.T2,@@ -81,16 +93,5 @@8193 }8294 }8395 }84- Box(Modifier.fillMaxWidth().height(1.dp).background(peachColors.T3))85- Text(86- if (urls.size < MAX_ADDITIONAL_URLS) "+ add URL" else "Max $MAX_ADDITIONAL_URLS additional URLs",87- color = if (urls.size < MAX_ADDITIONAL_URLS) accent else peachColors.T2,88- fontFamily = PeachType.Mono,89- fontSize = 11.sp,90- modifier = Modifier91- .clip(RoundedCornerShape(6.dp))92- .clickable(enabled = urls.size < MAX_ADDITIONAL_URLS, onClick = onAdd)93- .padding(horizontal = PeachSpacing.lg, vertical = PeachSpacing.sm),94- )9596 }9697 }app/src/main/java/com/peachpasswords/ui/vault/EntryEditScreen.kt+7 −7
@@ -155,6 +155,13 @@155155 onToggleGenerator = vm::toggleGenerator,156156 joined = true,157157 )158+ PasswordHistorySection(159+ history = f.history,160+ expanded = f.showHistory,161+ onToggle = vm::toggleHistory,162+ onRestore = vm::restorePassword,163+ onCopy = vm::copyHistoryPassword,164+ )158165 }159166 GeneratorDrawer(160167 open = f.generatorOpen,@@ -168,13 +175,6 @@168175 onGenerate = vm::generate,169176 onCopy = vm::copyGenerated,170177 onUse = vm::useGeneratedPassword,171- )172- PasswordHistorySection(173- history = f.history,174- expanded = f.showHistory,175- onToggle = vm::toggleHistory,176- onRestore = vm::restorePassword,177- onCopy = vm::copyHistoryPassword,178178 )179179 OptionalLoginAddLinks(180180 showTotpLink = shouldShowAddTotpLink(f.type, f.showTotp, f.totp),app/src/main/java/com/peachpasswords/ui/vault/PasswordHistorySection.kt+10 −14
@@ -52,20 +52,16 @@5252 onRestore: (String) -> Unit,5353 onCopy: (String) -> Unit,5454 ) {55- Column(Modifier.fillMaxWidth().padding(bottom = PeachSpacing.sm)) {56- PeachFieldStack {57- PasswordHistoryToggle(58- count = history.size,59- expanded = expanded,60- onToggle = onToggle,61- modifier = Modifier.fillMaxWidth().padding(horizontal = PeachSpacing.lg, vertical = PeachSpacing.sm),62- )63- if (expanded) {64- Box(Modifier.fillMaxWidth().height(1.dp).background(peachColors.T3))65- Column(Modifier.fillMaxWidth().padding(horizontal = PeachSpacing.lg, vertical = PeachSpacing.md)) {66- PasswordHistoryList(history = history, onRestore = onRestore, onCopy = onCopy)67- }68- }55+ PasswordHistoryToggle(56+ count = history.size,57+ expanded = expanded,58+ onToggle = onToggle,59+ modifier = Modifier.fillMaxWidth().padding(horizontal = PeachSpacing.lg, vertical = PeachSpacing.sm),60+ )61+ if (expanded) {62+ Box(Modifier.fillMaxWidth().height(1.dp).background(peachColors.T3))63+ Column(Modifier.fillMaxWidth().padding(horizontal = PeachSpacing.lg, vertical = PeachSpacing.md)) {64+ PasswordHistoryList(history = history, onRestore = onRestore, onCopy = onCopy)6965 }7066 }7167 }