From a3d1a7783e34547b54b30c5f8ea8bce3f542493c Mon Sep 17 00:00:00 2001 From: neon443 <69979447+neon443@users.noreply.github.com> Date: Thu, 30 May 2024 09:49:19 +0100 Subject: [PATCH] Done DiceView, created placeholder PasswordView but not implemented yet, still need to choose a symbol for it aswell --- ContentView.swift | 25 ++++++++++++++++++++++++- DiceView.swift | 12 ++++-------- PasswordView.swift | 18 ++++++++++++++++++ 3 files changed, 46 insertions(+), 9 deletions(-) create mode 100644 PasswordView.swift diff --git a/ContentView.swift b/ContentView.swift index c27b8f3..809dcfd 100644 --- a/ContentView.swift +++ b/ContentView.swift @@ -12,9 +12,32 @@ struct ContentView: View { HStack { Text("Dice") Spacer() - Image(systemName: "die.face.6.fill") + Image(systemName: "die.face.1") + Image(systemName: "die.face.2.fill") + Image(systemName: "die.face.3") + Image(systemName: "die.face.4.fill") + Image(systemName: "die.face.5") + Image(systemName: "die.face.6.fill") } } + NavigationLink { + PasswordView() + } label: { + HStack { + Text("Password") + Spacer() + Image(systemName: "ellipsis.rectangle") + } + } + NavigationLink { + PasswordView() + } label: { + HStack { + Text("Password") + Spacer() + Image(systemName: "rectangle.and.pencil.and.ellipsis") + } + } } .navigationTitle("RNG") .navigationBarTitleDisplayMode(.inline) diff --git a/DiceView.swift b/DiceView.swift index 33b748f..bbaee45 100644 --- a/DiceView.swift +++ b/DiceView.swift @@ -3,6 +3,7 @@ import SwiftUI struct DiceView: View { @State var generated: [Int] = [0] @State var displayDies: [Int] = [] + @State var displayMultiDieMode = "" @State var multiDieMode = "plus" @State var result = 0 @State var resultDescription = "" @@ -19,7 +20,7 @@ struct DiceView: View { } } Section("Multi die mode") { - Picker(selection: $multiDieMode, label: Text("")) { + Picker(selection: $multiDieMode, label: Text("ioug")) { Image(systemName: "plus").tag("plus") Image(systemName: "multiply").tag("multiply") }.pickerStyle(SegmentedPickerStyle()) @@ -41,7 +42,7 @@ struct DiceView: View { .scaledToFit() .frame(width: 50, height: 50) if index != displayDies.count-1 { - Image(systemName: multiDieMode) + Image(systemName: displayMultiDieMode) .resizable() .scaledToFit() .frame(width: 10, height: 10) @@ -55,6 +56,7 @@ struct DiceView: View { Button("Generate") { generated = rngN6DieArr(dies: Int(dies)) displayDies = generated + displayMultiDieMode = multiDieMode result = arrCombine(arr: generated, combineMode: multiDieMode) resultDescription = describeResult(inp: displayDies, combineMode: multiDieMode) } @@ -62,12 +64,6 @@ struct DiceView: View { .bold() .font(.largeTitle) Text(resultDescription) - Button("Test") { - multiDieMode = "multiply" - generated = [2,3] - displayDies = generated - dies = 2 - } } } } diff --git a/PasswordView.swift b/PasswordView.swift new file mode 100644 index 0000000..275050a --- /dev/null +++ b/PasswordView.swift @@ -0,0 +1,18 @@ +// +// PasswordView.swift +// RNG +// +// Created by Nihaal on 30/05/2024. +// + +import SwiftUI + +struct PasswordView: View { + var body: some View { + Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/) + } +} + +#Preview { + PasswordView() +}