Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-ios
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-ios
Commits
8bb976df
Commit
8bb976df
authored
1 year ago
by
Alireza Toghyiani
Committed by
Kateryna Kostiuk
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
fix long text issue in account settings
Change-Id: Id1043ae5aa8d4e07a477a62cdb7f855e71ca8a5a
parent
6fe6d36d
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
Ring/Ring/Features/Me/Me/MeViewController.swift
+17
-0
17 additions, 0 deletions
Ring/Ring/Features/Me/Me/MeViewController.swift
with
17 additions
and
0 deletions
Ring/Ring/Features/Me/Me/MeViewController.swift
+
17
−
0
View file @
8bb976df
...
@@ -289,6 +289,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
...
@@ -289,6 +289,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
case
.
autoRegistration
:
case
.
autoRegistration
:
let
cell
=
DisposableCell
()
let
cell
=
DisposableCell
()
cell
.
textLabel
?
.
text
=
L10n
.
AccountPage
.
autoRegistration
cell
.
textLabel
?
.
text
=
L10n
.
AccountPage
.
autoRegistration
cell
.
textLabel
?
.
numberOfLines
=
0
let
switchView
=
UISwitch
()
let
switchView
=
UISwitch
()
switchView
.
onTintColor
=
.
jamiButtonDark
switchView
.
onTintColor
=
.
jamiButtonDark
cell
.
selectionStyle
=
.
none
cell
.
selectionStyle
=
.
none
...
@@ -314,6 +315,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
...
@@ -314,6 +315,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
let
cell
=
tableView
.
dequeueReusableCell
(
for
:
indexPath
,
cellType
:
DeviceCell
.
self
)
let
cell
=
tableView
.
dequeueReusableCell
(
for
:
indexPath
,
cellType
:
DeviceCell
.
self
)
cell
.
deviceIdLabel
.
text
=
device
.
deviceId
cell
.
deviceIdLabel
.
text
=
device
.
deviceId
cell
.
deviceIdLabel
.
font
=
UIFont
.
preferredFont
(
forTextStyle
:
.
caption1
)
cell
.
deviceIdLabel
.
font
=
UIFont
.
preferredFont
(
forTextStyle
:
.
caption1
)
cell
.
textLabel
?
.
numberOfLines
=
0
cell
.
deviceIdLabel
.
sizeToFit
()
cell
.
deviceIdLabel
.
sizeToFit
()
if
let
deviceName
=
device
.
deviceName
{
if
let
deviceName
=
device
.
deviceName
{
cell
.
deviceNameLabel
.
text
=
deviceName
cell
.
deviceNameLabel
.
text
=
deviceName
...
@@ -334,6 +336,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
...
@@ -334,6 +336,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
cell
.
textLabel
?
.
text
=
L10n
.
AccountPage
.
linkDeviceTitle
cell
.
textLabel
?
.
text
=
L10n
.
AccountPage
.
linkDeviceTitle
cell
.
textLabel
?
.
textColor
=
UIColor
.
jamiButtonDark
cell
.
textLabel
?
.
textColor
=
UIColor
.
jamiButtonDark
cell
.
textLabel
?
.
textAlignment
=
.
center
cell
.
textLabel
?
.
textAlignment
=
.
center
cell
.
textLabel
?
.
numberOfLines
=
0
cell
.
selectionStyle
=
.
none
cell
.
selectionStyle
=
.
none
cell
.
sizeToFit
()
cell
.
sizeToFit
()
let
button
=
UIButton
.
init
(
frame
:
cell
.
frame
)
let
button
=
UIButton
.
init
(
frame
:
cell
.
frame
)
...
@@ -352,6 +355,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
...
@@ -352,6 +355,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
let
cell
=
DisposableCell
()
let
cell
=
DisposableCell
()
cell
.
textLabel
?
.
text
=
L10n
.
AccountPage
.
blockedContacts
cell
.
textLabel
?
.
text
=
L10n
.
AccountPage
.
blockedContacts
cell
.
textLabel
?
.
font
=
UIFont
.
preferredFont
(
forTextStyle
:
.
body
)
cell
.
textLabel
?
.
font
=
UIFont
.
preferredFont
(
forTextStyle
:
.
body
)
cell
.
textLabel
?
.
numberOfLines
=
0
cell
.
accessoryType
=
UITableViewCell
.
AccessoryType
.
disclosureIndicator
cell
.
accessoryType
=
UITableViewCell
.
AccessoryType
.
disclosureIndicator
cell
.
selectionStyle
=
.
none
cell
.
selectionStyle
=
.
none
cell
.
sizeToFit
()
cell
.
sizeToFit
()
...
@@ -370,6 +374,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
...
@@ -370,6 +374,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
cell
.
textLabel
?
.
text
=
L10n
.
Global
.
removeAccount
cell
.
textLabel
?
.
text
=
L10n
.
Global
.
removeAccount
cell
.
textLabel
?
.
textColor
=
UIColor
.
systemRed
cell
.
textLabel
?
.
textColor
=
UIColor
.
systemRed
cell
.
textLabel
?
.
textAlignment
=
.
center
cell
.
textLabel
?
.
textAlignment
=
.
center
cell
.
textLabel
?
.
numberOfLines
=
0
cell
.
selectionStyle
=
.
none
cell
.
selectionStyle
=
.
none
cell
.
sizeToFit
()
cell
.
sizeToFit
()
let
button
=
UIButton
.
init
(
frame
:
cell
.
frame
)
let
button
=
UIButton
.
init
(
frame
:
cell
.
frame
)
...
@@ -394,6 +399,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
...
@@ -394,6 +399,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
cell
.
textLabel
?
.
text
=
L10n
.
Global
.
registerAUsername
cell
.
textLabel
?
.
text
=
L10n
.
Global
.
registerAUsername
cell
.
textLabel
?
.
textColor
=
UIColor
.
jamiButtonDark
cell
.
textLabel
?
.
textColor
=
UIColor
.
jamiButtonDark
cell
.
textLabel
?
.
textAlignment
=
.
center
cell
.
textLabel
?
.
textAlignment
=
.
center
cell
.
textLabel
?
.
numberOfLines
=
0
cell
.
sizeToFit
()
cell
.
sizeToFit
()
cell
.
selectionStyle
=
.
none
cell
.
selectionStyle
=
.
none
let
button
=
UIButton
.
init
(
frame
:
cell
.
frame
)
let
button
=
UIButton
.
init
(
frame
:
cell
.
frame
)
...
@@ -413,6 +419,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
...
@@ -413,6 +419,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
case
.
ordinary
(
let
label
):
case
.
ordinary
(
let
label
):
let
cell
=
UITableViewCell
()
let
cell
=
UITableViewCell
()
cell
.
textLabel
?
.
text
=
label
cell
.
textLabel
?
.
text
=
label
cell
.
textLabel
?
.
numberOfLines
=
0
cell
.
selectionStyle
=
.
none
cell
.
selectionStyle
=
.
none
return
cell
return
cell
case
.
shareAccountDetails
:
case
.
shareAccountDetails
:
...
@@ -420,6 +427,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
...
@@ -420,6 +427,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
cell
.
textLabel
?
.
text
=
L10n
.
AccountPage
.
inviteFriends
cell
.
textLabel
?
.
text
=
L10n
.
AccountPage
.
inviteFriends
cell
.
textLabel
?
.
textColor
=
UIColor
.
jamiButtonDark
cell
.
textLabel
?
.
textColor
=
UIColor
.
jamiButtonDark
cell
.
textLabel
?
.
textAlignment
=
.
center
cell
.
textLabel
?
.
textAlignment
=
.
center
cell
.
textLabel
?
.
numberOfLines
=
0
cell
.
sizeToFit
()
cell
.
sizeToFit
()
cell
.
selectionStyle
=
.
none
cell
.
selectionStyle
=
.
none
let
button
=
UIButton
.
init
(
frame
:
cell
.
frame
)
let
button
=
UIButton
.
init
(
frame
:
cell
.
frame
)
...
@@ -439,6 +447,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
...
@@ -439,6 +447,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
cell
.
textLabel
?
.
text
=
title
cell
.
textLabel
?
.
text
=
title
cell
.
textLabel
?
.
textColor
=
UIColor
.
jamiButtonDark
cell
.
textLabel
?
.
textColor
=
UIColor
.
jamiButtonDark
cell
.
textLabel
?
.
textAlignment
=
.
center
cell
.
textLabel
?
.
textAlignment
=
.
center
cell
.
textLabel
?
.
numberOfLines
=
0
cell
.
sizeToFit
()
cell
.
sizeToFit
()
cell
.
selectionStyle
=
.
none
cell
.
selectionStyle
=
.
none
let
button
=
UIButton
.
init
(
frame
:
cell
.
frame
)
let
button
=
UIButton
.
init
(
frame
:
cell
.
frame
)
...
@@ -454,6 +463,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
...
@@ -454,6 +463,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
case
.
notifications
:
case
.
notifications
:
let
cell
=
DisposableCell
()
let
cell
=
DisposableCell
()
cell
.
textLabel
?
.
text
=
L10n
.
AccountPage
.
enableNotifications
cell
.
textLabel
?
.
text
=
L10n
.
AccountPage
.
enableNotifications
cell
.
textLabel
?
.
numberOfLines
=
0
let
switchView
=
UISwitch
()
let
switchView
=
UISwitch
()
switchView
.
onTintColor
=
.
jamiButtonDark
switchView
.
onTintColor
=
.
jamiButtonDark
cell
.
selectionStyle
=
.
none
cell
.
selectionStyle
=
.
none
...
@@ -477,6 +487,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
...
@@ -477,6 +487,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
case
.
peerDiscovery
:
case
.
peerDiscovery
:
let
cell
=
DisposableCell
()
let
cell
=
DisposableCell
()
cell
.
textLabel
?
.
text
=
L10n
.
AccountPage
.
peerDiscovery
cell
.
textLabel
?
.
text
=
L10n
.
AccountPage
.
peerDiscovery
cell
.
textLabel
?
.
numberOfLines
=
0
let
switchView
=
UISwitch
()
let
switchView
=
UISwitch
()
switchView
.
onTintColor
=
.
jamiButtonDark
switchView
.
onTintColor
=
.
jamiButtonDark
cell
.
selectionStyle
=
.
none
cell
.
selectionStyle
=
.
none
...
@@ -528,6 +539,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
...
@@ -528,6 +539,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
cell
.
backgroundColor
=
UIColor
.
jamiBackgroundColor
cell
.
backgroundColor
=
UIColor
.
jamiBackgroundColor
cell
.
textLabel
?
.
text
=
L10n
.
Account
.
accountStatus
cell
.
textLabel
?
.
text
=
L10n
.
Account
.
accountStatus
cell
.
textLabel
?
.
numberOfLines
=
0
cell
.
selectionStyle
=
.
none
cell
.
selectionStyle
=
.
none
cell
.
textLabel
?
.
sizeToFit
()
cell
.
textLabel
?
.
sizeToFit
()
cell
.
detailTextLabel
?
.
font
=
UIFont
.
preferredFont
(
forTextStyle
:
.
callout
)
cell
.
detailTextLabel
?
.
font
=
UIFont
.
preferredFont
(
forTextStyle
:
.
callout
)
...
@@ -542,6 +554,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
...
@@ -542,6 +554,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
case
.
boothMode
:
case
.
boothMode
:
let
cell
=
DisposableCell
(
style
:
.
subtitle
,
reuseIdentifier
:
self
.
jamiIDCell
)
let
cell
=
DisposableCell
(
style
:
.
subtitle
,
reuseIdentifier
:
self
.
jamiIDCell
)
cell
.
textLabel
?
.
text
=
L10n
.
AccountPage
.
enableBoothMode
cell
.
textLabel
?
.
text
=
L10n
.
AccountPage
.
enableBoothMode
cell
.
textLabel
?
.
numberOfLines
=
0
cell
.
textLabel
?
.
sizeToFit
()
cell
.
textLabel
?
.
sizeToFit
()
let
switchView
=
UISwitch
()
let
switchView
=
UISwitch
()
switchView
.
onTintColor
=
.
jamiButtonDark
switchView
.
onTintColor
=
.
jamiButtonDark
...
@@ -577,6 +590,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
...
@@ -577,6 +590,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
case
.
enableAccount
:
case
.
enableAccount
:
let
cell
=
DisposableCell
()
let
cell
=
DisposableCell
()
cell
.
textLabel
?
.
text
=
L10n
.
Account
.
enableAccount
cell
.
textLabel
?
.
text
=
L10n
.
Account
.
enableAccount
cell
.
textLabel
?
.
numberOfLines
=
0
let
switchView
=
UISwitch
()
let
switchView
=
UISwitch
()
switchView
.
onTintColor
=
.
jamiButtonDark
switchView
.
onTintColor
=
.
jamiButtonDark
cell
.
selectionStyle
=
.
none
cell
.
selectionStyle
=
.
none
...
@@ -602,6 +616,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
...
@@ -602,6 +616,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
case
.
turnEnabled
:
case
.
turnEnabled
:
let
cell
=
DisposableCell
()
let
cell
=
DisposableCell
()
cell
.
textLabel
?
.
text
=
L10n
.
AccountPage
.
turnEnabled
cell
.
textLabel
?
.
text
=
L10n
.
AccountPage
.
turnEnabled
cell
.
textLabel
?
.
numberOfLines
=
0
let
switchView
=
UISwitch
()
let
switchView
=
UISwitch
()
switchView
.
onTintColor
=
.
jamiButtonDark
switchView
.
onTintColor
=
.
jamiButtonDark
cell
.
selectionStyle
=
.
none
cell
.
selectionStyle
=
.
none
...
@@ -626,6 +641,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
...
@@ -626,6 +641,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
case
.
upnpEnabled
:
case
.
upnpEnabled
:
let
cell
=
DisposableCell
()
let
cell
=
DisposableCell
()
cell
.
textLabel
?
.
text
=
L10n
.
AccountPage
.
upnpEnabled
cell
.
textLabel
?
.
text
=
L10n
.
AccountPage
.
upnpEnabled
cell
.
textLabel
?
.
numberOfLines
=
0
let
switchView
=
UISwitch
()
let
switchView
=
UISwitch
()
switchView
.
onTintColor
=
.
jamiButtonDark
switchView
.
onTintColor
=
.
jamiButtonDark
cell
.
selectionStyle
=
.
none
cell
.
selectionStyle
=
.
none
...
@@ -769,6 +785,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
...
@@ -769,6 +785,7 @@ class MeViewController: EditProfileViewController, StoryboardBased, ViewModelBas
default
:
default
:
break
break
}
}
cell
.
textLabel
?
.
numberOfLines
=
0
cell
.
textLabel
?
.
sizeToFit
()
cell
.
textLabel
?
.
sizeToFit
()
cell
.
sizeToFit
()
cell
.
sizeToFit
()
cell
.
detailTextLabel
?
.
font
=
UIFont
.
preferredFont
(
forTextStyle
:
.
callout
)
cell
.
detailTextLabel
?
.
font
=
UIFont
.
preferredFont
(
forTextStyle
:
.
callout
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment