Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-16 02:05:06 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,976 Commits 530 Branches 157 Tags 485 MiB
943ec7ee75
Commit Graph

336 Commits

Author SHA1 Message Date
Onuray Sahin
32d7516dcb Merge branch 'develop' into feature/ons/device_manager_filter 2022-09-19 12:02:22 +03:00
Adam Brown
9a298a6e3e
Merge pull request #7157 from vector-im/feature/adm/cache-misses 
Fix build cache misses
 2022-09-16 17:19:49 +01:00
Adam Brown
bbdac9d1ba fix build cache misses 
- forcing the stem string template generator to be cachable, without this the templates are regenerated causing the vector module to recompile its sources (our slowest task!)
 2022-09-16 14:57:11 +01:00
Onuray Sahin
61f5f81305 Merge branch 'develop' into feature/ons/device_manager_filter 
# Conflicts:
#	library/ui-strings/src/main/res/values/strings.xml
#	vector/src/main/AndroidManifest.xml
#	vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt
#	vector/src/main/res/layout/fragment_settings_devices.xml
 2022-09-16 15:25:09 +03:00
Adam Brown
1d8b4ce63b excluding support annotations from jsonviewer module dependency 2022-09-16 11:37:39 +01:00
Onuray Sahin
e3ee59f6c1 Refactor naming of strings. 2022-09-15 15:34:59 +03:00
Onuray Sahin
81cc8ab98b Code review fixes. 2022-09-15 15:14:46 +03:00
Maxime NATUREL
fb3fdf097c Reusing some existing strings 2022-09-14 10:31:22 +02:00
Maxime NATUREL
bf88c16c9d Show basic details info 2022-09-14 10:31:21 +02:00
Maxime NATUREL
a661f9c3fb Navigation from session overview to session details 2022-09-14 10:31:21 +02:00
Maxime NATUREL
4a89fcea14 Adding basic structure for the new screen 2022-09-14 10:31:21 +02:00
Onuray Sahin
2763ebdd5a Merge branch 'develop' into feature/ons/device_manager_filter 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesAction.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewModel.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewState.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/GetCurrentSessionCrossSigningInfoUseCase.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
 2022-09-13 17:20:44 +03:00
Onuray Sahin
0ec67c1ab8 Implement clear filter. 2022-09-13 13:10:03 +03:00
Onuray Sahin
41ca662dcc Update device list according to the filter type. 2022-09-08 18:28:17 +03:00
Benoit Marty
de17c47a7d
Merge pull request #7038 from vector-im/feature/eric/new-layout-labs 
New Layout - Labs Flag (to replace feature flag)
 2022-09-08 14:35:38 +02:00
Maxime NATUREL
6c2bf35d60
Merge pull request #7005 from vector-im/feature/mna/session-overview-screen 
[Devices Management] Session overview screen (PSG-691, PSG-693)
 2022-09-08 09:18:31 +02:00
Benoit Marty
418a48de18 Deleting translations of 2 strings. They will have to be translated again due to the addition of %s in the original strings. 2022-09-07 18:24:13 +02:00
Onuray Sahin
8dcbd3710d Merge branch 'feature/mna/session-overview-screen' into feature/ons/device_manager_filter 
* feature/mna/session-overview-screen: (57 commits)
  Fix missing mapper in CryptoStoreHelper for tests
  Fix unused string warning
  Update unit tests
  Rendering inactive status in SessionInfoView
  Adding comment with examples of some parametrized strings
  Fix post rebase
  Fixing wrong copyright title
  Adding last seen details + fix observation of wrong deviceId in ViewModel
  Adding learn more link in verification status details
  Unit tests for computing trust level of device
  Unit tests for GetCurrentSessionCrossSigningInfoUseCase
  Updating existing unit tests
  Navigation from other session item
  Show info in overview screen
  Renaming CurrentSessionView into SessionInfoView to be more generic
  Introducing some reusable usecases
  Adding unit tests for viewModel
  Adding unit tests for mapper
  Adding unit tests for the new use case
  Adding use case to get full device info for a given device id
  ...

# Conflicts:
#	library/ui-strings/src/main/res/values/strings.xml
#	vector/src/main/AndroidManifest.xml
#	vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesViewNavigator.kt
 2022-09-07 16:33:35 +03:00
Weblate
d1776a04c0 Merge branch 'origin/develop' into Weblate. 2022-09-07 12:12:04 +00:00
Przemysław Romanik
36ba1c5491 Translated using Weblate (Polish) 
Currently translated at 99.8% (2358 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2022-09-07 12:11:54 +00:00
ericdecanini
64c8789ef2 Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-labs 2022-09-07 10:35:44 +02:00
Maxime NATUREL
682905df25 Fix unused string warning 2022-09-07 09:32:48 +02:00
Maxime NATUREL
6e9b2baf6f Rendering inactive status in SessionInfoView 2022-09-07 09:32:48 +02:00
Maxime NATUREL
0b105e2a7a Adding comment with examples of some parametrized strings 2022-09-07 09:32:48 +02:00
Maxime NATUREL
1ad585e154 Adding last seen details + fix observation of wrong deviceId in ViewModel 2022-09-07 09:32:47 +02:00
Maxime NATUREL
f4865df50c Show info in overview screen 2022-09-07 09:32:47 +02:00
Maxime NATUREL
ebf707dca9 Navigation from current session 2022-09-07 09:32:45 +02:00
Maxime NATUREL
969663786b Renaming header list view to be consistent 2022-09-07 09:32:09 +02:00
Onuray Sahin
604b7dafbd Create other sessions fragment. 2022-09-06 17:09:07 +03:00
ericdecanini
593a04ea25 Adds missing space list header 2022-09-06 15:41:30 +02:00
ericdecanini
31a3552e26 Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-labs 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
 2022-09-06 15:32:00 +02:00
Onuray Sahin
5485b9a530 Implement device manager filter bottom sheet. 2022-09-06 15:56:50 +03:00
Benoit Marty
1c35e5ae9c
Merge pull request #6986 from vector-im/feature/nfe/invites_empty_state 
empty state for new invites screen
 2022-09-06 14:56:06 +02:00
Onuray Sahin
83990b6a0b Add string resources. 2022-09-06 14:48:39 +03:00
phardyle
250633ec67 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 99.7% (2356 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2022-09-06 11:32:54 +00:00
Anonimas
fea0c27bdd Translated using Weblate (Lithuanian) 
Currently translated at 25.0% (592 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lt/
 2022-09-06 11:32:53 +00:00
waclaw66
59f8753c6a Translated using Weblate (Czech) 
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2022-09-06 11:32:43 +00:00
ericdecanini
24509543b9 Replaces feature flag with labs flag 2022-09-06 12:48:03 +02:00
Nikita Fedrunov
7cc7444bd5
applayout release experience (#7003) 2022-09-06 11:32:11 +02:00
ericdecanini
05f7850a01 Adds space name to expand / collapse chevron content description in space bottom sheet 2022-09-05 20:28:11 +02:00
Nikita Fedrunov
efe5eb0501
App layout Home screen empty states (#7007) 2022-09-05 18:11:25 +02:00
Nikita Fedrunov
b37996e4c3
space switcher empty spaces (#6988) 2022-09-05 16:11:50 +02:00
NIkita Fedrunov
8314eb71c0 Merge branch 'develop' into feature/nfe/invites_empty_state 2022-09-05 12:32:01 +02:00
Maxime NATUREL
eb59a534e0 Fix unused string warning 2022-09-05 10:54:38 +02:00
Maxime NATUREL
af484813b5 Rendering inactive status in SessionInfoView 2022-09-05 09:40:02 +02:00
Maxime NATUREL
1c501a0083 Adding comment with examples of some parametrized strings 2022-09-05 09:19:14 +02:00
Maxime NATUREL
bbe238e9c6 Adding last seen details + fix observation of wrong deviceId in ViewModel 2022-09-05 09:13:13 +02:00
Maxime NATUREL
b626a1e4f9 Show info in overview screen 2022-09-05 09:13:12 +02:00
Maxime NATUREL
ba1549048d Navigation from current session 2022-09-05 09:13:12 +02:00
Maxime NATUREL
ed3bd871ea Renaming header list view to be consistent 2022-09-05 09:13:12 +02:00