Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • dev
  • hotfixes-oct-2022
  • main
  • refactor/avatar-cell
  • 1.0.6
  • 1.0.7
  • 1.0.8
  • 1.1
  • 1.1.3
  • 1.1.4
  • 1.1.5
11 results

Target

Select target project
  • mobile/ios/client-ios
1 result
Select Git revision
  • dev
  • hotfixes-oct-2022
  • main
  • refactor/avatar-cell
  • 1.0.6
  • 1.0.7
  • 1.0.8
  • 1.1
  • 1.1.3
  • 1.1.4
  • 1.1.5
11 results
Show changes
Commits on Source (5)
Showing
with 40 additions and 34 deletions
......@@ -8,7 +8,7 @@ import DrawerFeature
import ComposableArchitecture
final class BackupConfigController: UIViewController {
@Dependency(\.navigator) var navigator: Navigator
@Dependency(\.navigator) var navigator
private lazy var screenView = BackupConfigView()
......
......@@ -32,9 +32,9 @@ struct BackupConfigViewModel {
extension BackupConfigViewModel {
static func live() -> Self {
class Context {
@Dependency(\.navigator) var navigator: Navigator
@Dependency(\.backupService) var service: BackupService
@Dependency(\.app.hudManager) var hudManager: HUDManager
@Dependency(\.navigator) var navigator
@Dependency(\.backupService) var service
@Dependency(\.app.hudManager) var hudManager
}
let context = Context()
......
......@@ -18,7 +18,7 @@ struct SFTPViewState {
}
final class BackupSFTPViewModel {
@Dependency(\.app.hudManager) var hudManager: HUDManager
@Dependency(\.app.hudManager) var hudManager
var statePublisher: AnyPublisher<SFTPViewState, Never> {
stateSubject.eraseToAnyPublisher()
......
......@@ -11,7 +11,7 @@ struct BackupSetupViewModel {
extension BackupSetupViewModel {
static func live() -> Self {
class Context {
@Dependency(\.backupService) var service: BackupService
@Dependency(\.backupService) var service
}
let context = Context()
......
......@@ -16,7 +16,7 @@ struct BackupViewModel {
extension BackupViewModel {
static func live() -> Self {
class Context {
@Dependency(\.backupService) var service: BackupService
@Dependency(\.backupService) var service
}
let context = Context()
......
......@@ -28,9 +28,9 @@ public final class SingleChatController: UIViewController {
// @Dependency var makeReportDrawer: MakeReportDrawer
// @Dependency var makeAppScreenshot: MakeAppScreenshot
@Dependency(\.navigator) var navigator: Navigator
@Dependency(\.app.statusBar) var statusBar: StatusBarStylist
@Dependency(\.reportingStatus) var reportingStatus: ReportingStatus
@Dependency(\.navigator) var navigator
@Dependency(\.app.statusBar) var statusBar
@Dependency(\.reportingStatus) var reportingStatus
let voxophone = Voxophone()
......
......@@ -8,8 +8,8 @@ import Dependencies
import AppNavigation
public final class ChatListController: UIViewController {
@Dependency(\.navigator) var navigator: Navigator
@Dependency(\.app.statusBar) var statusBar: StatusBarStylist
@Dependency(\.navigator) var navigator
@Dependency(\.app.statusBar) var statusBar
private lazy var screenView = ChatListView()
private lazy var topLeftView = ChatListTopLeftNavView()
......
......@@ -17,7 +17,7 @@ class ChatSearchListTableViewDiffableDataSource: UITableViewDiffableDataSource<S
}
final class ChatSearchTableController: UITableViewController {
@Dependency(\.navigator) var navigator: Navigator
@Dependency(\.navigator) var navigator
private let viewModel: ChatListViewModel
private let cellHeight: CGFloat = 83.0
......
......@@ -13,7 +13,7 @@ extension ChatInfo: Differentiable {
}
final class ChatListTableController: UITableViewController {
@Dependency(\.navigator) var navigator: Navigator
@Dependency(\.navigator) var navigator
private var rows = [ChatInfo]()
private let viewModel: ChatListViewModel
......
......@@ -10,8 +10,8 @@ import DrawerFeature
import ScrollViewController
public final class ContactController: UIViewController {
@Dependency(\.navigator) var navigator: Navigator
@Dependency(\.app.statusBar) var statusBar: StatusBarStylist
@Dependency(\.navigator) var navigator
@Dependency(\.app.statusBar) var statusBar
private lazy var screenView = ContactView()
private lazy var scrollViewController = ScrollViewController()
......
......@@ -19,9 +19,9 @@ struct ContactViewState: Equatable {
}
final class ContactViewModel {
@Dependency(\.app.dbManager) var dbManager: DBManager
@Dependency(\.app.messenger) var messenger: Messenger
@Dependency(\.app.hudManager) var hudManager: HUDManager
@Dependency(\.app.dbManager) var dbManager
@Dependency(\.app.messenger) var messenger
@Dependency(\.app.hudManager) var hudManager
@KeyObject(.username, defaultValue: nil) var username: String?
@KeyObject(.sharingEmail, defaultValue: false) var sharingEmail: Bool
......
......@@ -7,8 +7,8 @@ import AppResources
import AppNavigation
public final class ContactListController: UIViewController {
@Dependency(\.navigator) var navigator: Navigator
@Dependency(\.app.statusBar) var statusBar: StatusBarStylist
@Dependency(\.navigator) var navigator
@Dependency(\.app.statusBar) var statusBar
private lazy var screenView = ContactListView()
private lazy var tableController = ContactListTableController(viewModel)
......
......@@ -11,9 +11,9 @@ import AppCore
import Dependencies
final class ContactListViewModel {
@Dependency(\.app.dbManager) var dbManager: DBManager
@Dependency(\.app.messenger) var messenger: Messenger
@Dependency(\.reportingStatus) var reportingStatus: ReportingStatus
@Dependency(\.app.dbManager) var dbManager
@Dependency(\.app.messenger) var messenger
@Dependency(\.reportingStatus) var reportingStatus
var myId: Data {
try! messenger.e2e.get()!.getContact().getId()
......
......@@ -6,7 +6,7 @@ import AppResources
import Dependencies
public final class CountryListController: UIViewController, UITableViewDelegate {
@Dependency(\.app.statusBar) var statusBar: StatusBarStylist
@Dependency(\.app.statusBar) var statusBar
private lazy var screenView = CountryListView()
......
......@@ -7,7 +7,7 @@ import Dependencies
import AppNavigation
public final class GroupDraftController: UIViewController {
@Dependency(\.navigator) var navigator: Navigator
@Dependency(\.navigator) var navigator
private lazy var titleLabel = UILabel()
private lazy var createButton = UIButton()
......
......@@ -153,7 +153,13 @@ public final class InputField: UIView {
}
public func update(placeholder: String) {
field.placeholder = placeholder
field.attributedPlaceholder = NSAttributedString(
string: placeholder,
attributes: [
.font: Fonts.Mulish.semiBold.font(size: 14.0),
.foregroundColor: Asset.neutralDisabled.color
]
)
}
public func update(status: ValidationStatus) {
......
......@@ -7,7 +7,7 @@ import DrawerFeature
import AppNavigation
public final class LaunchController: UIViewController {
@Dependency(\.navigator) var navigator: Navigator
@Dependency(\.navigator) var navigator
private lazy var screenView = LaunchView()
private let viewModel = LaunchViewModel()
......
......@@ -8,8 +8,8 @@ import AppNavigation
import DrawerFeature
public final class MenuController: UIViewController {
@Dependency(\.navigator) var navigator: Navigator
@Dependency(\.app.statusBar) var statusBar: StatusBarStylist
@Dependency(\.navigator) var navigator
@Dependency(\.app.statusBar) var statusBar
private lazy var screenView = MenuView()
......
......@@ -8,8 +8,8 @@ import ReportingFeature
import ComposableArchitecture
final class MenuViewModel {
@Dependency(\.app.dbManager) var dbManager: DBManager
@Dependency(\.reportingStatus) var reportingStatus: ReportingStatus
@Dependency(\.app.dbManager) var dbManager
@Dependency(\.reportingStatus) var reportingStatus
@KeyObject(.avatar, defaultValue: nil) var avatar: Data?
@KeyObject(.username, defaultValue: "") var username: String
......
......@@ -9,8 +9,8 @@ import DrawerFeature
import ScrollViewController
public final class OnboardingCodeController: UIViewController {
@Dependency(\.navigator) var navigator: Navigator
@Dependency(\.app.statusBar) var statusBar: StatusBarStylist
@Dependency(\.navigator) var navigator
@Dependency(\.app.statusBar) var statusBar
private lazy var screenView = OnboardingCodeView()
private lazy var scrollViewController = ScrollViewController()
......