mirror of
https://github.com/simplex-chat/simplex-chat.git
synced 2024-12-17 17:20:21 +01:00
ios: digital password (instead of device auth) (#2169)
* ios: digital password (instead of device auth) * set, ask, change password * kind of working, sometimes * ZSTack * fix cancel * update title * fix password showing after settings dismissed * disable button when 16 digits entered * fixes * layout on larger screens * do not disable auth when switching to system if system auth failed, refactor * fix enabling auth via the initial alert * support landscape orientation
This commit is contained in:
committed by
GitHub
parent
1d16a19373
commit
ec6cee1389
@@ -0,0 +1,156 @@
|
||||
//
|
||||
// PasscodeEntry.swift
|
||||
// SimpleX (iOS)
|
||||
//
|
||||
// Created by Evgeny on 10/04/2023.
|
||||
// Copyright © 2023 SimpleX Chat. All rights reserved.
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
|
||||
struct PasscodeEntry: View {
|
||||
@EnvironmentObject var m: ChatModel
|
||||
var width: CGFloat
|
||||
var height: CGFloat
|
||||
@Binding var password: String
|
||||
@State private var showPassword = false
|
||||
|
||||
var body: some View {
|
||||
VStack {
|
||||
passwordView()
|
||||
.padding(.bottom, 4)
|
||||
if width < height * 2 / 3 {
|
||||
verticalPasswordGrid()
|
||||
} else {
|
||||
horizontalPasswordGrid()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ViewBuilder private func passwordView() -> some View {
|
||||
Text(
|
||||
password == ""
|
||||
? " "
|
||||
: splitPassword()
|
||||
)
|
||||
.font(showPassword ? .title2.monospacedDigit() : .body)
|
||||
.onTapGesture {
|
||||
showPassword = !showPassword
|
||||
}
|
||||
.frame(height: 30)
|
||||
}
|
||||
|
||||
private func splitPassword() -> String {
|
||||
let n = password.count < 8 ? 8 : 4
|
||||
return password.enumerated().reduce("") { acc, c in
|
||||
acc
|
||||
+ (showPassword ? String(c.element) : "●")
|
||||
+ ((c.offset + 1) % n == 0 ? " " : "")
|
||||
}
|
||||
}
|
||||
|
||||
private func verticalPasswordGrid() -> some View {
|
||||
let s = width / 3
|
||||
return VStack(spacing: 0) {
|
||||
digitsRow(s, 1, 2, 3)
|
||||
Divider()
|
||||
digitsRow(s, 4, 5, 6)
|
||||
Divider()
|
||||
digitsRow(s, 7, 8, 9)
|
||||
Divider()
|
||||
HStack(spacing: 0) {
|
||||
passwordEdit(s, image: "multiply") {
|
||||
password = ""
|
||||
}
|
||||
Divider()
|
||||
passwordDigit(s, 0)
|
||||
Divider()
|
||||
passwordEdit(s, image: "delete.backward") {
|
||||
if password != "" { password.removeLast() }
|
||||
}
|
||||
}
|
||||
.frame(height: s)
|
||||
}
|
||||
.frame(width: width, height: s * 4 * 0.97)
|
||||
}
|
||||
|
||||
private func horizontalPasswordGrid() -> some View {
|
||||
let s = height / 5
|
||||
return VStack(spacing: 0) {
|
||||
horizontalDigitsRow(s, 1, 2, 3) {
|
||||
passwordEdit(s, image: "multiply") {
|
||||
password = ""
|
||||
}
|
||||
}
|
||||
Divider()
|
||||
horizontalDigitsRow(s, 4, 5, 6) {
|
||||
passwordDigit(s, 0)
|
||||
}
|
||||
Divider()
|
||||
horizontalDigitsRow(s, 7, 8, 9) {
|
||||
passwordEdit(s, image: "delete.backward") {
|
||||
if password != "" { password.removeLast() }
|
||||
}
|
||||
}
|
||||
}
|
||||
.frame(width: s * 4, height: s * 3 * 0.97)
|
||||
}
|
||||
|
||||
private func digitsRow(_ size: CGFloat, _ d1: Int, _ d2: Int, _ d3: Int) -> some View {
|
||||
HStack(spacing: 0) {
|
||||
passwordDigit(size, d1)
|
||||
Divider()
|
||||
passwordDigit(size, d2)
|
||||
Divider()
|
||||
passwordDigit(size, d3)
|
||||
}
|
||||
.frame(height: size * 0.97)
|
||||
}
|
||||
|
||||
private func horizontalDigitsRow<V: View>(_ size: CGFloat, _ d1: Int, _ d2: Int, _ d3: Int, _ button: @escaping () -> V) -> some View {
|
||||
HStack(spacing: 0) {
|
||||
digitsRow(size, d1, d2, d3)
|
||||
Divider()
|
||||
button()
|
||||
}
|
||||
.frame(height: size * 0.97)
|
||||
}
|
||||
|
||||
private func passwordDigit(_ size: CGFloat, _ d: Int) -> some View {
|
||||
let s = String(describing: d)
|
||||
return passwordButton(size) {
|
||||
if password.count < 16 {
|
||||
password = password + s
|
||||
}
|
||||
} label: {
|
||||
Text(s).font(.title)
|
||||
}
|
||||
.disabled(password.count >= 16)
|
||||
}
|
||||
|
||||
private func passwordEdit(_ size: CGFloat, image: String, action: @escaping () -> Void) -> some View {
|
||||
passwordButton(size, action: action) {
|
||||
Image(systemName: image)
|
||||
}
|
||||
}
|
||||
|
||||
private func passwordButton<V: View>(_ size: CGFloat, action: @escaping () -> Void, label: () -> V) -> some View {
|
||||
let h = size * 0.97
|
||||
return Button(action: action) {
|
||||
ZStack {
|
||||
Circle()
|
||||
.frame(width: h, height: h)
|
||||
.foregroundColor(Color(uiColor: .systemBackground))
|
||||
label()
|
||||
}
|
||||
}
|
||||
.foregroundColor(.secondary)
|
||||
.frame(width: size, height: h)
|
||||
}
|
||||
}
|
||||
|
||||
struct PasscodeEntry_Previews: PreviewProvider {
|
||||
static var previews: some View {
|
||||
PasscodeEntry(width: 800, height: 420, password: Binding.constant(""))
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user