Skip to content
Snippets Groups Projects
Commit 8f65cafb authored by Bruno Muniz's avatar Bruno Muniz :apple:
Browse files

Added haptic on EULA radio button and fixed some copy

parent c05d490e
No related branches found
No related tags found
3 merge requests!71Releasing v1.1.5 (214),!69Implemented filtering for banned/blocked users and reporting,!67v1.1.5 b(203)
...@@ -519,7 +519,8 @@ let package = Package( ...@@ -519,7 +519,8 @@ let package = Package(
dependencies: [ dependencies: [
.target(name: "Theme"), .target(name: "Theme"),
.target(name: "Shared"), .target(name: "Shared"),
.target(name: "Defaults") .target(name: "Defaults"),
.target(name: "Presentation"),
] ]
), ),
.target( .target(
......
...@@ -37,7 +37,8 @@ final class ChatListViewModel { ...@@ -37,7 +37,8 @@ final class ChatListViewModel {
} }
var recentsPublisher: AnyPublisher<RecentsSnapshot, Never> { var recentsPublisher: AnyPublisher<RecentsSnapshot, Never> {
session.dbManager.fetchContactsPublisher(.init(isRecent: true)) let query = Contact.Query(isRecent: true, isBlocked: false, isBanned: false)
return session.dbManager.fetchContactsPublisher(query)
.assertNoFailure() .assertNoFailure()
.map { .map {
let section = SectionId() let section = SectionId()
...@@ -49,8 +50,10 @@ final class ChatListViewModel { ...@@ -49,8 +50,10 @@ final class ChatListViewModel {
} }
var searchPublisher: AnyPublisher<SearchSnapshot, Never> { var searchPublisher: AnyPublisher<SearchSnapshot, Never> {
Publishers.CombineLatest3( let contactsQuery = Contact.Query(isBlocked: false, isBanned: false)
session.dbManager.fetchContactsPublisher(.init()).assertNoFailure(),
return Publishers.CombineLatest3(
session.dbManager.fetchContactsPublisher(contactsQuery).assertNoFailure(),
chatsPublisher, chatsPublisher,
searchSubject searchSubject
.removeDuplicates() .removeDuplicates()
......
...@@ -33,7 +33,10 @@ public final class ContactController: UIViewController { ...@@ -33,7 +33,10 @@ public final class ContactController: UIViewController {
navigationItem.backButtonTitle = "" navigationItem.backButtonTitle = ""
statusBarController.style.send(.lightContent) statusBarController.style.send(.lightContent)
navigationController?.navigationBar navigationController?.navigationBar
.customize(backgroundColor: Asset.neutralBody.color) .customize(
backgroundColor: Asset.neutralBody.color,
tint: Asset.neutralWhite.color
)
} }
public override func viewSafeAreaInsetsDidChange() { public override func viewSafeAreaInsetsDidChange() {
......
...@@ -358,7 +358,7 @@ public enum Localized { ...@@ -358,7 +358,7 @@ public enum Localized {
public static let action = Localized.tr("Localizable", "chat.report.action") public static let action = Localized.tr("Localizable", "chat.report.action")
/// Cancel /// Cancel
public static let cancel = Localized.tr("Localizable", "chat.report.cancel") public static let cancel = Localized.tr("Localizable", "chat.report.cancel")
/// Reporting this user will block them, delete them from your connections and you won’t see direct messages from them again. In case this user is marked as banned user by us you won’t also see any new group chat msgs from this user /// Reporting this user will block them, delete them from your connections and you won’t see direct messages from them again. In case this user is marked as banned user by us you also won’t see any new group chat messages from this user
public static let subtitle = Localized.tr("Localizable", "chat.report.subtitle") public static let subtitle = Localized.tr("Localizable", "chat.report.subtitle")
/// Report user /// Report user
public static let title = Localized.tr("Localizable", "chat.report.title") public static let title = Localized.tr("Localizable", "chat.report.title")
...@@ -497,11 +497,11 @@ public enum Localized { ...@@ -497,11 +497,11 @@ public enum Localized {
public static func description(_ p1: Any) -> String { public static func description(_ p1: Any) -> String {
return Localized.tr("Localizable", "contact.delete.drawer.description", String(describing: p1)) return Localized.tr("Localizable", "contact.delete.drawer.description", String(describing: p1))
} }
/// Delete Connection? /// Delete and block connection?
public static let title = Localized.tr("Localizable", "contact.delete.drawer.title") public static let title = Localized.tr("Localizable", "contact.delete.drawer.title")
} }
public enum Info { public enum Info {
/// Delete Connection /// Delete and block connection
public static let title = Localized.tr("Localizable", "contact.delete.info.title") public static let title = Localized.tr("Localizable", "contact.delete.info.title")
} }
} }
......
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
"chat.report.title" "chat.report.title"
= "Report user"; = "Report user";
"chat.report.subtitle" "chat.report.subtitle"
= "Reporting this user will block them, delete them from your connections and you won’t see direct messages from them again. In case this user is marked as banned user by us you won’t also see any new group chat msgs from this user"; = "Reporting this user will block them, delete them from your connections and you won’t see direct messages from them again. In case this user is marked as banned user by us you also won’t see any new group chat messages from this user";
"chat.report.action" "chat.report.action"
= "Confirm and Report"; = "Confirm and Report";
"chat.report.cancel" "chat.report.cancel"
...@@ -258,9 +258,9 @@ ...@@ -258,9 +258,9 @@
// ContactFeature - Delete // ContactFeature - Delete
"contact.delete.info.title" "contact.delete.info.title"
= "Delete Connection"; = "Delete and block connection";
"contact.delete.drawer.title" "contact.delete.drawer.title"
= "Delete Connection?"; = "Delete and block connection?";
"contact.delete.drawer.description" "contact.delete.drawer.description"
= "This is a silent deletion, %@ will not know you deleted them. This action will remove all information on your phone about this user, including your communications. You #cannot undo this step, and cannot re-add them unless they delete you as a connection as well.#"; = "This is a silent deletion, %@ will not know you deleted them. This action will remove all information on your phone about this user, including your communications. You #cannot undo this step, and cannot re-add them unless they delete you as a connection as well.#";
......
...@@ -44,6 +44,7 @@ public final class TermsConditionsController: UIViewController { ...@@ -44,6 +44,7 @@ public final class TermsConditionsController: UIViewController {
.sink { [unowned self] in .sink { [unowned self] in
screenView.radioComponent.isEnabled.toggle() screenView.radioComponent.isEnabled.toggle()
screenView.nextButton.isEnabled = screenView.radioComponent.isEnabled screenView.nextButton.isEnabled = screenView.radioComponent.isEnabled
UIImpactFeedbackGenerator(style: .heavy).impactOccurred()
}.store(in: &cancellables) }.store(in: &cancellables)
screenView.nextButton screenView.nextButton
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment