witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

New Linphone styles, changes in Login view

Browse source
This commit is contained in:
benoit.martins 2023-09-28 15:09:05 +02:00 • committed by Benoit Martins
parent fb212eeb9f
commit e0d77cdb06
12 changed files with 530 additions and 182 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Linphone.xcodeproj/project.pbxproj
View file

@ -9,6 +9,8 @@
/* Begin PBXBuildFile section */
2B416B2E7C90375B792A28AE /* Pods_Linphone.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C08FB4788AD667D35BAE64D /* Pods_Linphone.framework */; };
D70C93DE2AC2D0F60063CA3B /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = D70C93DD2AC2D0F60063CA3B /* Localizable.xcstrings */; };
D717071E2AC5922E0037746F /* ColorExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = D717071D2AC5922E0037746F /* ColorExtension.swift */; };
D71707202AC5989C0037746F /* TextExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = D717071F2AC5989C0037746F /* TextExtension.swift */; };
D719ABB72ABC67BF00B41C10 /* LinphoneApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = D719ABB62ABC67BF00B41C10 /* LinphoneApp.swift */; };
D719ABB92ABC67BF00B41C10 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D719ABB82ABC67BF00B41C10 /* ContentView.swift */; };
D719ABBB2ABC67BF00B41C10 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D719ABBA2ABC67BF00B41C10 /* Assets.xcassets */; };
@ -29,6 +31,8 @@
2C08FB4788AD667D35BAE64D /* Pods_Linphone.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Linphone.framework; sourceTree = BUILT_PRODUCTS_DIR; };
BC39A28B26EDB00C91AB7756 /* Pods-Linphone.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Linphone.release.xcconfig"; path = "Target Support Files/Pods-Linphone/Pods-Linphone.release.xcconfig"; sourceTree = "<group>"; };
D70C93DD2AC2D0F60063CA3B /* Localizable.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = Localizable.xcstrings; sourceTree = "<group>"; };
D717071D2AC5922E0037746F /* ColorExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorExtension.swift; sourceTree = "<group>"; };
D717071F2AC5989C0037746F /* TextExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextExtension.swift; sourceTree = "<group>"; };
D719ABB32ABC67BF00B41C10 /* Linphone.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Linphone.app; sourceTree = BUILT_PRODUCTS_DIR; };
D719ABB62ABC67BF00B41C10 /* LinphoneApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinphoneApp.swift; sourceTree = "<group>"; };
D719ABB82ABC67BF00B41C10 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
@ -78,6 +82,15 @@
path = Pods;
sourceTree = "<group>";
};
D717071C2AC591EF0037746F /* utils */ = {
isa = PBXGroup;
children = (
D717071D2AC5922E0037746F /* ColorExtension.swift */,
D717071F2AC5989C0037746F /* TextExtension.swift */,
);
path = utils;
sourceTree = "<group>";
};
D719ABAA2ABC67BF00B41C10 = {
isa = PBXGroup;
children = (
@ -101,6 +114,7 @@
children = (
D719ABC72ABC6FB200B41C10 /* core */,
D719ABC52ABC6EE800B41C10 /* ui */,
D717071C2AC591EF0037746F /* utils */,
D719ABB62ABC67BF00B41C10 /* LinphoneApp.swift */,
D719ABBA2ABC67BF00B41C10 /* Assets.xcassets */,
D719ABBC2ABC67BF00B41C10 /* Linphone.entitlements */,
@ -174,12 +188,12 @@
D7D24D0C2AC1B4C700C6F35B /* Fonts */ = {
isa = PBXGroup;
children = (
D7D24D0F2AC1B4E800C6F35B /* NotoSans-Light.ttf */,
D7D24D0E2AC1B4E800C6F35B /* NotoSans-Regular.ttf */,
D7D24D0D2AC1B4E800C6F35B /* NotoSans-Medium.ttf */,
D7D24D102AC1B4E800C6F35B /* NotoSans-SemiBold.ttf */,
D7D24D112AC1B4E800C6F35B /* NotoSans-Bold.ttf */,
D7D24D122AC1B4E800C6F35B /* NotoSans-ExtraBold.ttf */,
D7D24D0F2AC1B4E800C6F35B /* NotoSans-Light.ttf */,
D7D24D0D2AC1B4E800C6F35B /* NotoSans-Medium.ttf */,
D7D24D0E2AC1B4E800C6F35B /* NotoSans-Regular.ttf */,
D7D24D102AC1B4E800C6F35B /* NotoSans-SemiBold.ttf */,
);
path = Fonts;
sourceTree = "<group>";
@ -305,11 +319,13 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
D71707202AC5989C0037746F /* TextExtension.swift in Sources */,
D719ABB92ABC67BF00B41C10 /* ContentView.swift in Sources */,
D719ABC92ABC6FD700B41C10 /* CoreContext.swift in Sources */,
D719ABCF2ABC779A00B41C10 /* AccountLoginViewModel.swift in Sources */,
D719ABB72ABC67BF00B41C10 /* LinphoneApp.swift in Sources */,
D7A2EDD62AC18115005D90FC /* SharedMainViewModel.swift in Sources */,
D717071E2AC5922E0037746F /* ColorExtension.swift in Sources */,
D719ABCC2ABC769C00B41C10 /* AssistantView.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;

21
Linphone/Assets.xcassets/eye-slash.imageset/Contents.json vendored Normal file
View file

@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "eye-slash.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

1
Linphone/Assets.xcassets/eye-slash.imageset/eye-slash.svg vendored Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" fill="#000000" viewBox="0 0 256 256"><path d="M53.92,34.62A8,8,0,1,0,42.08,45.38L61.32,66.55C25,88.84,9.38,123.2,8.69,124.76a8,8,0,0,0,0,6.5c.35.79,8.82,19.57,27.65,38.4C61.43,194.74,93.12,208,128,208a127.11,127.11,0,0,0,52.07-10.83l22,24.21a8,8,0,1,0,11.84-10.76Zm47.33,75.84,41.67,45.85a32,32,0,0,1-41.67-45.85ZM128,192c-30.78,0-57.67-11.19-79.93-33.25A133.16,133.16,0,0,1,25,128c4.69-8.79,19.66-33.39,47.35-49.38l18,19.75a48,48,0,0,0,63.66,70l14.73,16.2A112,112,0,0,1,128,192Zm6-95.43a8,8,0,0,1,3-15.72,48.16,48.16,0,0,1,38.77,42.64,8,8,0,0,1-7.22,8.71,6.39,6.39,0,0,1-.75,0,8,8,0,0,1-8-7.26A32.09,32.09,0,0,0,134,96.57Zm113.28,34.69c-.42.94-10.55,23.37-33.36,43.8a8,8,0,1,1-10.67-11.92A132.77,132.77,0,0,0,231.05,128a133.15,133.15,0,0,0-23.12-30.77C185.67,75.19,158.78,64,128,64a118.37,118.37,0,0,0-19.36,1.57A8,8,0,1,1,106,49.79,134,134,0,0,1,128,48c34.88,0,66.57,13.26,91.66,38.35,18.83,18.83,27.3,37.62,27.65,38.41A8,8,0,0,1,247.31,131.26Z"></path></svg>
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

21
Linphone/Assets.xcassets/eye.imageset/Contents.json vendored Normal file
View file

@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "eye.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

1
Linphone/Assets.xcassets/eye.imageset/eye.svg vendored Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" fill="#000000" viewBox="0 0 256 256"><path d="M247.31,124.76c-.35-.79-8.82-19.58-27.65-38.41C194.57,61.26,162.88,48,128,48S61.43,61.26,36.34,86.35C17.51,105.18,9,124,8.69,124.76a8,8,0,0,0,0,6.5c.35.79,8.82,19.57,27.65,38.4C61.43,194.74,93.12,208,128,208s66.57-13.26,91.66-38.34c18.83-18.83,27.3-37.61,27.65-38.4A8,8,0,0,0,247.31,124.76ZM128,192c-30.78,0-57.67-11.19-79.93-33.25A133.47,133.47,0,0,1,25,128,133.33,133.33,0,0,1,48.07,97.25C70.33,75.19,97.22,64,128,64s57.67,11.19,79.93,33.25A133.46,133.46,0,0,1,231.05,128C223.84,141.46,192.43,192,128,192Zm0-112a48,48,0,1,0,48,48A48.05,48.05,0,0,0,128,80Zm0,80a32,32,0,1,1,32-32A32,32,0,0,1,128,160Z"></path></svg>
Side by side

After

Width:  |  Height:  |  Size: 725 B

21
Linphone/Assets.xcassets/qr-code.imageset/Contents.json vendored Normal file
View file

@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "qr-code.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

1
Linphone/Assets.xcassets/qr-code.imageset/qr-code.svg vendored Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" fill="#000000" viewBox="0 0 256 256"><path d="M104,40H56A16,16,0,0,0,40,56v48a16,16,0,0,0,16,16h48a16,16,0,0,0,16-16V56A16,16,0,0,0,104,40Zm0,64H56V56h48v48Zm0,32H56a16,16,0,0,0-16,16v48a16,16,0,0,0,16,16h48a16,16,0,0,0,16-16V152A16,16,0,0,0,104,136Zm0,64H56V152h48v48ZM200,40H152a16,16,0,0,0-16,16v48a16,16,0,0,0,16,16h48a16,16,0,0,0,16-16V56A16,16,0,0,0,200,40Zm0,64H152V56h48v48Zm-64,72V144a8,8,0,0,1,16,0v32a8,8,0,0,1-16,0Zm80-16a8,8,0,0,1-8,8H184v40a8,8,0,0,1-8,8H144a8,8,0,0,1,0-16h24V144a8,8,0,0,1,16,0v8h24A8,8,0,0,1,216,160Zm0,32v16a8,8,0,0,1-16,0V192a8,8,0,0,1,16,0Z"></path></svg>
Side by side

After

Width:  |  Height:  |  Size: 654 B

23
Linphone/Localizable.xcstrings
View file

@ -3,6 +3,9 @@
"strings" : {
"" : {
},
" or " : {
},
"%lld Book (Example)" : {
"extractionState" : "manual",
@ -74,19 +77,13 @@
}
}
},
"Core Version is %@" : {
"Forgotten password?" : {
},
"Create & \nlog in account" : {
"Log out" : {
},
"Log out & \ndelete account" : {
},
"Login State : " : {
},
"Looged in" : {
"Not account yet?" : {
},
"password" : {
@ -105,6 +102,12 @@
}
}
}
},
"Register" : {
},
"Scan QR code" : {
},
"TCP" : {
@ -112,7 +115,7 @@
"TLS" : {
},
"Unregistered" : {
"Use SIP Account" : {
},
"username" : {

392
Linphone/ui/assistant/AssistantView.swift
View file

@ -1,180 +1,238 @@
/*
* Copyright (c) 2010-2023 Belledonne Communications SARL.
*
* This file is part of Linphone
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
* Copyright (c) 2010-2023 Belledonne Communications SARL.
*
* This file is part of Linphone
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import SwiftUI
struct AssistantView: View {
@ObservedObject private var coreContext = CoreContext.shared
@ObservedObject var accountLoginViewModel : AccountLoginViewModel
var body: some View {
VStack {
ZStack {
Image("Mountain")
.resizable()
.frame(width: 1080, height: 108)
Text("assistant_account_login")
.font(Font.custom("NotoSans-ExtraBold", size: 20))
.foregroundColor(.white)
}
.padding(.top, 35)
HStack(alignment: .center, spacing: 0) {
VStack(alignment: .leading, spacing: 0) {
Text(String(localized: "username")+"*")
.font(Font.custom("Noto Sans", size: 15)
.weight(.bold))
.padding(.bottom, 5)
TextField("username", text : $accountLoginViewModel.username)
.font(Font.custom("Noto Sans", size: 15))
.disabled(coreContext.loggedIn)
.frame(height: 20)
.padding(.horizontal, 20)
.padding(.vertical, 15)
.frame(maxWidth: .infinity, alignment: .leading)
.background(Color(red: 0.98, green: 0.98, blue: 0.98))
.cornerRadius(60)
.overlay(
RoundedRectangle(cornerRadius: 63)
.inset(by: 0.5)
.stroke(Color(red: 0.93, green: 0.93, blue: 0.93), lineWidth: 1)
)
.padding(.bottom, 15)
Text(String(localized: "password")+"*")
.font(Font.custom("Noto Sans", size: 15)
.weight(.bold))
.padding(.bottom, 5)
SecureInputView(String(localized: "password"), text: $accountLoginViewModel.passwd)
.disabled(coreContext.loggedIn)
.frame(height: 20)
.padding(.horizontal, 20)
.padding(.vertical, 15)
.frame(maxWidth: .infinity, alignment: .leading)
.background(Color(red: 0.98, green: 0.98, blue: 0.98))
.cornerRadius(63)
.overlay(
RoundedRectangle(cornerRadius: 63)
.inset(by: 0.5)
.stroke(Color(red: 0.93, green: 0.93, blue: 0.93), lineWidth: 1)
)
.padding(.bottom, 32)
Button(action: accountLoginViewModel.login) {
Text("assistant_account_login")
.font(Font.custom("NotoSans-ExtraBold", size: 20))
.foregroundColor(.white)
}
.disabled(coreContext.loggedIn)
.padding(.horizontal, 20)
.padding(.vertical, 10)
.frame(maxWidth: .infinity, alignment: .center)
.background(Color(red: 1, green: 0.37, blue: 0))
.cornerRadius(63)
.overlay(
RoundedRectangle(cornerRadius: 63)
.inset(by: 0.5)
.stroke(Color(red: 1, green: 0.37, blue: 0), lineWidth: 1)
)
}
}
.padding(.top, 5)
.padding(.bottom, 20)
VStack {
HStack {
Button(action: {
if (self.coreContext.loggedIn)
{
self.accountLoginViewModel.unregister()
self.accountLoginViewModel.delete()
} else {
self.accountLoginViewModel.login()
}
})
{
Text(coreContext.loggedIn ? "Log out & \ndelete account" : "Create & \nlog in account")
.font(.largeTitle)
.foregroundColor(Color.white)
.frame(width: 220.0, height: 90)
.background(Color.gray)
@ObservedObject private var coreContext = CoreContext.shared
@ObservedObject var accountLoginViewModel : AccountLoginViewModel
@State private var isSecured: Bool = true
@FocusState var isNameFocused:Bool
@FocusState var isPasswordFocused:Bool
var body: some View {
GeometryReader { geometry in
ScrollView(.vertical) {
VStack {
ZStack {
Image("Mountain")
.resizable()
.scaledToFill()
.frame(width: geometry.size.width, height: 100)
.clipped()
Text("assistant_account_login")
.default_text_style_white_800(styleSize: 20)
.padding(.top, 20)
}
.padding(.top, 35)
.padding(.bottom, 10)
VStack(alignment: .leading) {
Text(String(localized: "username")+"*")
.default_text_style_700(styleSize: 15)
.padding(.bottom, -5)
TextField("username", text : $accountLoginViewModel.username)
.default_text_style(styleSize: 15)
.disabled(coreContext.loggedIn)
.frame(height: 25)
.padding(.horizontal, 20)
.padding(.vertical, 15)
.cornerRadius(60)
.overlay(
RoundedRectangle(cornerRadius: 60)
.inset(by: 0.5)
.stroke(isNameFocused ? Color.orange_main_500 : Color.gray_200, lineWidth: 1)
)
.padding(.bottom)
.focused($isNameFocused)
Text(String(localized: "password")+"*")
.default_text_style_700(styleSize: 15)
.padding(.bottom, -5)
ZStack(alignment: .trailing) {
Group {
if isSecured {
SecureField("password", text: $accountLoginViewModel.passwd)
.default_text_style(styleSize: 15)
.frame(height: 25)
.focused($isPasswordFocused)
} else {
TextField("password", text: $accountLoginViewModel.passwd)
.default_text_style(styleSize: 15)
.frame(height: 25)
.focused($isPasswordFocused)
}
}
Button(action: {
isSecured.toggle()
}) {
Image(self.isSecured ? "eye-slash" : "eye")
.renderingMode(.template)
.resizable()
.foregroundStyle(Color.gray_main2_500)
.frame(width: 20, height: 20)
}
}
.disabled(coreContext.loggedIn)
.padding(.horizontal, 20)
.padding(.vertical, 15)
.cornerRadius(60)
.overlay(
RoundedRectangle(cornerRadius: 60)
.inset(by: 0.5)
.stroke(isPasswordFocused ? Color.orange_main_500 : Color.gray_200, lineWidth: 1)
)
.padding(.bottom)
Button(action: {
if (self.coreContext.loggedIn){
self.accountLoginViewModel.unregister()
self.accountLoginViewModel.delete()
} else {
self.accountLoginViewModel.login()
}
}) {
Text(coreContext.loggedIn ? "Log out" : "assistant_account_login")
.default_text_style_white_600(styleSize: 20)
.frame(height: 35)
.frame(maxWidth: .infinity)
}
.padding(.horizontal, 20)
.padding(.vertical, 10)
.background((accountLoginViewModel.username.isEmpty || accountLoginViewModel.passwd.isEmpty) ? Color.orange_main_100 : Color.orange_main_500)
.cornerRadius(60)
.disabled(accountLoginViewModel.username.isEmpty || accountLoginViewModel.passwd.isEmpty)
.padding(.bottom)
Button(action: {
}) {
Text("Forgotten password?")
.underline()
.default_text_style_600(styleSize: 15)
.foregroundStyle(Color.gray_main2_500)
}
.frame(maxWidth: .infinity)
.padding(.bottom, 30)
HStack {
VStack{
Divider()
}
Text(" or ")
.default_text_style(styleSize: 15)
.foregroundStyle(Color.gray_main2_500)
VStack{
Divider()
}
}
.padding(.bottom, 10)
Button(action: {
}) {
HStack {
Image("qr-code")
.renderingMode(.template)
.resizable()
.foregroundStyle(Color.orange_main_500)
.frame(width: 20, height: 20)
Text("Scan QR code")
.default_text_style_orange_600(styleSize: 20)
.frame(height: 35)
}
.frame(maxWidth: .infinity)
}
.padding(.horizontal, 20)
.padding(.vertical, 10)
.cornerRadius(60)
.overlay(
RoundedRectangle(cornerRadius: 60)
.inset(by: 0.5)
.stroke(Color.orange_main_500, lineWidth: 1)
)
.padding(.bottom)
Button(action: {
}) {
Text("Use SIP Account")
.default_text_style_orange_600(styleSize: 20)
.frame(height: 35)
.frame(maxWidth: .infinity)
}
.padding(.horizontal, 20)
.padding(.vertical, 10)
.cornerRadius(60)
.overlay(
RoundedRectangle(cornerRadius: 60)
.inset(by: 0.5)
.stroke(Color.orange_main_500, lineWidth: 1)
)
.padding(.bottom)
HStack(alignment: .center) {
Spacer()
Text("Not account yet?")
.default_text_style(styleSize: 15)
.foregroundStyle(Color.gray_main2_700)
.padding(.horizontal, 10)
Button(action: {
}) {
Text("Register")
.default_text_style_orange_600(styleSize: 20)
.frame(height: 35)
}
.padding(.horizontal, 20)
.padding(.vertical, 10)
.cornerRadius(60)
.overlay(
RoundedRectangle(cornerRadius: 60)
.inset(by: 0.5)
.stroke(Color.orange_main_500, lineWidth: 1)
)
.padding(.horizontal, 10)
Spacer()
}
.padding(.bottom)
}
.padding(.horizontal, 20)
}
HStack {
Text("Login State : ")
.font(.footnote)
Text(coreContext.loggedIn ? "Looged in" : "Unregistered")
.font(.footnote)
.foregroundColor(coreContext.loggedIn ? Color.green : Color.black)
}.padding(.top, 10.0)
}
Group {
Spacer()
Text("Core Version is \(coreContext.coreVersion)")
}
}
.padding()
}
}
}
}
struct AssistantView_Previews: PreviewProvider {
static var previews: some View {
AssistantView(accountLoginViewModel: AccountLoginViewModel())
}
}
struct SecureInputView: View {
@Binding private var text: String
@State private var isSecured: Bool = true
private var title: String
init(_ title: String, text: Binding<String>) {
self.title = title
self._text = text
}
var body: some View {
ZStack(alignment: .trailing) {
Group {
if isSecured {
SecureField(title, text: $text)
.font(Font.custom("Noto Sans", size: 15))
} else {
TextField(title, text: $text)
.font(Font.custom("Noto Sans", size: 15))
}
}.padding(.trailing, 32)
Button(action: {
isSecured.toggle()
}) {
Image(systemName: self.isSecured ? "eye.slash" : "eye")
.accentColor(.gray)
}
}
}
static var previews: some View {
AssistantView(accountLoginViewModel: AccountLoginViewModel())
}
}

2
Linphone/ui/assistant/viewmodel/AccountLoginViewModel.swift
View file

@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import SwiftUI
import linphonesw
import SwiftUI
class AccountLoginViewModel : ObservableObject {

91
Linphone/utils/ColorExtension.swift Normal file
View file

@ -0,0 +1,91 @@
/*
* Copyright (c) 2010-2023 Belledonne Communications SARL.
*
* This file is part of Linphone
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import Foundation
import SwiftUI
extension Color {
static let transparent_color = Color(hex: "#00000000")
static let black = Color(hex: "#000000")
static let white = Color(hex: "#FFFFFF")
static let orange_main_700 = Color(hex: "#B72D00")
static let orange_main_500 = Color(hex: "#FF5E00")
static let orange_main_300 = Color(hex: "#FFB266")
static let orange_main_100 = Color(hex: "#FFEACB")
static let orange_main_100_alpha_50 = Color(hex: "#80FFEACB")
static let gray_main2_800 = Color(hex: "#22334D")
static let gray_main2_800_alpha_65 = Color(hex: "#A622334D")
static let gray_main2_700 = Color(hex: "#364860")
static let gray_main2_600 = Color(hex: "#4E6074")
static let gray_main2_500 = Color(hex: "#6C7A87")
static let gray_main2_400 = Color(hex: "#9AABB5")
static let gray_main2_300 = Color(hex: "#C0D1D9")
static let gray_main2_200 = Color(hex: "#DFECF2")
static let gray_main2_100 = Color(hex: "#EEF6F8")
static let gray_100 = Color(hex: "#F9F9F9")
static let gray_200 = Color(hex: "#EDEDED")
static let gray_300 = Color(hex: "#C9C9C9")
static let gray_400 = Color(hex: "#949494")
static let gray_500 = Color(hex: "#4E4E4E")
static let gray_600 = Color(hex: "#2E3030")
static let gray_900 = Color(hex: "#070707")
static let red_danger_200 = Color(hex: "#F5CCBE")
static let red_danger_500 = Color(hex: "#DD5F5F")
static let red_danger_700 = Color(hex: "#9E3548")
static let green_success_500 = Color(hex: "#4FAE80")
static let green_success_700 = Color(hex: "#377D71")
static let green_success_200 = Color(hex: "#ACF5C1")
static let blue_info_500 = Color(hex: "#4AA8FF")
static let orange_warning_600 = Color(hex: "#DBB820")
static let orange_away = Color(hex: "#FFA645")
init(hex: String) {
let hex = hex.trimmingCharacters(in: CharacterSet.alphanumerics.inverted)
var int: UInt64 = 0
Scanner(string: hex).scanHexInt64(&int)
let a, r, g, b: UInt64
switch hex.count {
case 3: // RGB (12-bit)
(a, r, g, b) = (255, (int >> 8) * 17, (int >> 4 & 0xF) * 17, (int & 0xF) * 17)
case 6: // RGB (24-bit)
(a, r, g, b) = (255, int >> 16, int >> 8 & 0xFF, int & 0xFF)
case 8: // ARGB (32-bit)
(a, r, g, b) = (int >> 24, int >> 16 & 0xFF, int >> 8 & 0xFF, int & 0xFF)
default:
(a, r, g, b) = (1, 1, 1, 0)
}
self.init(
.sRGB,
red: Double(r) / 255,
green: Double(g) / 255,
blue: Double(b) / 255,
opacity: Double(a) / 255
)
}
}

114
Linphone/utils/TextExtension.swift Normal file
View file

@ -0,0 +1,114 @@
/*
* Copyright (c) 2010-2023 Belledonne Communications SARL.
*
* This file is part of Linphone
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import Foundation
import SwiftUI
extension View {
func default_text_style_300(styleSize: CGFloat) -> some View {
self.font(Font.custom("NotoSans-Light", size: styleSize))
.foregroundStyle(Color.gray_main2_600)
}
func default_text_style(styleSize: CGFloat) -> some View {
self.font(Font.custom("NotoSans-Regular", size: styleSize))
.foregroundStyle(Color.gray_main2_600)
}
func default_text_style_500(styleSize: CGFloat) -> some View {
self.font(Font.custom("NotoSans-Medium", size: styleSize))
.foregroundStyle(Color.gray_main2_600)
}
func default_text_style_600(styleSize: CGFloat) -> some View {
self.font(Font.custom("NotoSans-SemiBold", size: styleSize))
.foregroundStyle(Color.gray_main2_600)
}
func default_text_style_700(styleSize: CGFloat) -> some View {
self.font(Font.custom("NotoSans-Bold", size: styleSize))
.foregroundStyle(Color.gray_main2_600)
}
func default_text_style_800(styleSize: CGFloat) -> some View {
self.font(Font.custom("NotoSans-ExtraBold", size: styleSize))
.foregroundStyle(Color.gray_main2_600)
}
func default_text_style_white_300(styleSize: CGFloat) -> some View {
self.font(Font.custom("NotoSans-Light", size: styleSize))
.foregroundStyle(Color.white)
}
func default_text_style_white(styleSize: CGFloat) -> some View {
self.font(Font.custom("NotoSans-Regular", size: styleSize))
.foregroundStyle(Color.white)
}
func default_text_style_white_500(styleSize: CGFloat) -> some View {
self.font(Font.custom("NotoSans-Medium", size: styleSize))
.foregroundStyle(Color.white)
}
func default_text_style_white_600(styleSize: CGFloat) -> some View {
self.font(Font.custom("NotoSans-SemiBold", size: styleSize))
.foregroundStyle(Color.white)
}
func default_text_style_white_700(styleSize: CGFloat) -> some View {
self.font(Font.custom("NotoSans-Bold", size: styleSize))
.foregroundStyle(Color.white)
}
func default_text_style_white_800(styleSize: CGFloat) -> some View {
self.font(Font.custom("NotoSans-ExtraBold", size: styleSize))
.foregroundStyle(Color.white)
}
func default_text_style_orange_300(styleSize: CGFloat) -> some View {
self.font(Font.custom("NotoSans-Light", size: styleSize))
.foregroundStyle(Color.orange_main_500)
}
func default_text_style_orange(styleSize: CGFloat) -> some View {
self.font(Font.custom("NotoSans-Regular", size: styleSize))
.foregroundStyle(Color.orange_main_500)
}
func default_text_style_orange_500(styleSize: CGFloat) -> some View {
self.font(Font.custom("NotoSans-Medium", size: styleSize))
.foregroundStyle(Color.orange_main_500)
}
func default_text_style_orange_600(styleSize: CGFloat) -> some View {
self.font(Font.custom("NotoSans-SemiBold", size: styleSize))
.foregroundStyle(Color.orange_main_500)
}
func default_text_style_orange_700(styleSize: CGFloat) -> some View {
self.font(Font.custom("NotoSans-Bold", size: styleSize))
.foregroundStyle(Color.orange_main_500)
}
func default_text_style_orange_800(styleSize: CGFloat) -> some View {
self.font(Font.custom("NotoSans-ExtraBold", size: styleSize))
.foregroundStyle(Color.orange_main_500)
}
}