[Update]: Change design of buttons

lpieri · Mar 13, 2021 · 29c9ca4 · 29c9ca4
1 parent 16d02db
commit 29c9ca4
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 10 deletions.
diff --git a/Meep/Meep/Menu/KeysView.swift b/Meep/Meep/Menu/KeysView.swift
@@ -45,15 +45,22 @@ struct KeysView: View {
  HStack(alignment: .center) {
  Text(touch.name)
  Spacer()
- Button(touch.touch, action: {
+ Button(action: {
  changeKey(touch: touch.slug)
+ }, label: {
+ Text(touch.touch)
+ .frame(width: 200, height: .none, alignment: .center)
+ .padding(.all, 8)
+ .foregroundColor(.white)
+ .background(Color.gray)
+ .cornerRadius(40)
  }).font(.title)
  }
  })
  if changeTouch {
  Text(self.textAlert)
  }
- }.frame(width: 400, height: .none, alignment: .center)
+ }.frame(width: 600, height: .none, alignment: .center)
  .buttonStyle(PlainButtonStyle())
  Spacer()
 

diff --git a/Meep/Meep/Menu/LanguageView.swift b/Meep/Meep/Menu/LanguageView.swift
@@ -48,21 +48,46 @@ struct LanguageView: View {
  menuData.lang = "fr"
  UserDefaults.standard.setValue("fr", forKey: "Lang")
  self.en.toggle()
- }, label: {Text("Français")}).buttonStyle(PlainButtonStyle())
- if !en {
- Image(systemName: "checkmark")
- }
+ }, label: {
+ HStack(alignment: .center, spacing: 15) {
+ Text("Français")
+ if !en {
+ Image(systemName: "checkmark")
+ } else {
+ Image(systemName: "multiply")
+ }
+ }.font(.title)
+ .frame(width: 150, height: .none, alignment: .center)
+ .padding(.all, 8)
+ .foregroundColor(.white)
+ .background(Color.gray)
+ .cornerRadius(40)
+ })
+ .buttonStyle(PlainButtonStyle())
+
  }
 
  HStack(alignment: .center) {
  Button(action: {
  menuData.lang = "en"
  UserDefaults.standard.setValue("en", forKey: "Lang")
  self.en.toggle()
- }, label: {Text("English")}).buttonStyle(PlainButtonStyle())
- if en {
- Image(systemName: "checkmark")
- }
+ }, label: {
+ HStack(alignment: .center, spacing: 15) {
+ Text("English")
+ if en {
+ Image(systemName: "checkmark")
+ } else {
+ Image(systemName: "multiply")
+ }
+ }.font(.title)
+ .frame(width: 150, height: .none, alignment: .center)
+ .padding(.all, 8)
+ .foregroundColor(.white)
+ .background(Color.gray)
+ .cornerRadius(40)
+ })
+ .buttonStyle(PlainButtonStyle())
  }
  }.frame(width: 400, height: .none, alignment: .center)