Commit Graph

218 Commits

Author SHA1 Message Date
Alfonso Grillo 1538a3b6ac Add intrinsic sized bottom sheet 2022-11-09 12:05:47 +01:00
Alfonso Grillo be61cf8b12 Merge branch 'develop' into alfogrillo/learn_more_sheet 2022-11-08 17:04:20 +01:00
Aleksandrs Proskurins 775784150e Merge pull request #7023 from vector-im/aleksandrs/7022_hide_push
Hide push toggles for http pushers when there is no server support
2022-11-07 15:24:25 +02:00
paleksandrs e6efe4eb39 Device Manager: Session list item is not tappable everywhere 2022-11-04 15:50:37 +02:00
Alfonso Grillo 092fe9ef59 Merge branch 'develop' into alfogrillo/learn_more_sheet
# Conflicts:
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsModels.swift
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsViewModel.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionOverview/UserSessionOverviewModels.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionOverview/UserSessionOverviewViewModel.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionOverview/View/UserSessionOverview.swift
2022-11-03 18:25:06 +01:00
Alfonso Grillo b4d5c3b904 Merge branch 'develop' into alfogrillo/learn_more_sheet 2022-11-03 17:29:01 +01:00
Alfonso Grillo d5d2508eb1 Fix failing test 2022-11-03 15:30:13 +01:00
Alfonso Grillo 0d2b7a85da Add animations 2022-11-03 14:55:33 +01:00
Alfonso Grillo 7c8038ef36 Cleanup merge leftovers 2022-11-03 14:50:46 +01:00
Alfonso Grillo b471d81147 Fix UTs 2022-11-03 14:47:09 +01:00
Alfonso Grillo 4f2cf3d6d7 Inject setting service in UserSessionOverviewViewModel 2022-11-03 14:47:09 +01:00
Alfonso Grillo 2af87e91e2 Add settings service in UserOtherSessionsViewModel 2022-11-03 14:47:09 +01:00
Alfonso Grillo 6eb67dbdd0 Mock settings in UserSessionsOverviewViewModel 2022-11-03 14:47:09 +01:00
Alfonso Grillo fcbd780370 Refine settings logic 2022-11-03 14:47:08 +01:00
Alfonso Grillo d688600156 Add location info in UserOtherSessions 2022-11-03 14:47:08 +01:00
Alfonso Grillo e6e7e7c5d4 Add show/hide ip persistency 2022-11-03 14:47:08 +01:00
Alfonso Grillo 2045dfdaa0 Cleanup 2022-11-03 14:47:08 +01:00
Alfonso Grillo d7f8aefdb0 Cleanup code 2022-11-03 14:47:08 +01:00
Alfonso Grillo 68e02935d7 Cleanup merge leftovers 2022-11-03 14:47:08 +01:00
Alfonso Grillo f787043129 Add “show location“ feature in session overview 2022-11-03 14:46:19 +01:00
Alfonso Grillo ea50296b10 Add “show location” feature in other sessions list 2022-11-03 14:46:19 +01:00
Alfonso Grillo 3488cc508d Add location feature in UserSessionsOverview 2022-11-03 14:46:19 +01:00
Alfonso Grillo 8a5c5a7e07 Map location info 2022-11-03 14:46:19 +01:00
paleksandrs 2ed307bf1f Code review fixes 2022-11-03 13:38:23 +02:00
paleksandrs 246e2b01c7 Code review fixes, created DestructiveButton 2022-11-03 10:49:02 +02:00
Alfonso Grillo 74fb22f1e8 Cleanup 2022-11-03 09:40:00 +01:00
Alfonso Grillo 1405ea0940 Merge branch 'develop' into alfogrillo/learn_more_sheet
# Conflicts:
#	RiotSwiftUI/Modules/UserSessions/Coordinator/UserSessionsFlowCoordinator.swift
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/Coordinator/UserOtherSessionsCoordinator.swift
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/Test/UI/UserOtherSessionsUITests.swift
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsModels.swift
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsViewModel.swift
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/View/UserOtherSessions.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionOverview/Test/UI/UserSessionOverviewUITests.swift
2022-11-03 09:22:47 +01:00
paleksandrs a5c4410d52 Merge branch 'develop' into aleksandrs/7014_sign_out_of_other_sessions 2022-11-02 15:07:17 +02:00
paleksandrs 7c89480d6b Code review fixes 2022-11-02 14:09:26 +02:00
paleksandrs e8e349aa67 Merge branch 'develop' into aleksandrs/6963_multi_session_logout 2022-11-02 14:02:52 +02:00
paleksandrs 338da551ef Hide push toggles for http pushers when there is no server support 2022-11-02 13:36:58 +02:00
Alfonso Grillo 1febddc6a4 Merge pull request #7001 from vector-im/alfogrillo/improve_kebab_menu
Improve kebab menu in session overview (PSG-832)
2022-11-02 11:35:36 +01:00
Aleksandrs Proskurins 1897d92a67 Update RiotSwiftUI/Modules/UserSessions/UserOtherSessions/Test/UI/UserOtherSessionsUITests.swift
Co-authored-by: aringenbach <80891108+aringenbach@users.noreply.github.com>
2022-11-02 11:43:03 +02:00
Aleksandrs Proskurins a95621bec3 Update RiotSwiftUI/Modules/UserSessions/UserOtherSessions/Test/UI/UserOtherSessionsUITests.swift
Co-authored-by: aringenbach <80891108+aringenbach@users.noreply.github.com>
2022-11-02 11:42:55 +02:00
Anderas 821323db4c Merge pull request #6985 from vector-im/andy/complete_crypto
Complete MXCryptoV2 implementation
2022-10-31 17:56:05 +00:00
paleksandrs 2025a46a3b Sign out of all other sessions 2022-10-31 17:21:53 +02:00
paleksandrs 1fa2ab1604 Renamed sign out to logout 2022-10-31 14:44:03 +02:00
paleksandrs 69ccba2bc0 Renamed sign out to logout 2022-10-31 14:36:14 +02:00
paleksandrs 6ba50d3225 Renamed sign out to logout 2022-10-31 14:26:22 +02:00
paleksandrs 0d94c5129c Merge branch 'develop' into aleksandrs/6963_multi_session_logout 2022-10-31 11:30:12 +02:00
Alfonso Grillo 010e006ec6 Cleanup UI tests 2022-10-28 17:00:30 +02:00
Alfonso Grillo 79e25d2351 Fix memory leak 2022-10-28 16:44:34 +02:00
Aleksandrs Proskurins cde6312964 Refresh fix 2022-10-28 17:26:22 +03:00
Aleksandrs Proskurins e825fadb84 UI and unit tests 2022-10-28 17:25:56 +03:00
Alfonso Grillo 7b434063e5 Show rename sheet 2022-10-28 16:17:19 +02:00
Alfonso Grillo 7fd958be86 Show bottom sheet in rename session screen 2022-10-28 15:55:46 +02:00
Alfonso Grillo b5b6154a39 Show bottom sheet in other sessions screen 2022-10-28 15:50:35 +02:00
Alfonso Grillo da07f67573 Add MVVM-C for InfoSheet 2022-10-28 15:14:42 +02:00
Alfonso Grillo f5162834ea Add .viewSessionInfo view action 2022-10-28 12:06:56 +02:00
Alfonso Grillo f018f05410 Hide keyboard in UserSessionName 2022-10-28 11:38:09 +02:00