mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-27 19:38:53 +03:00
Code Issues Projects Releases Packages Wiki Activity
11433 commits 7 branches 124 tags 230 MiB
Commit graph

11433 commits

This branch
This branch
All branches
Author SHA1 Message Date
ganfra
b7e5a6cf28 Jitsi call: start using call tiles 2021-07-06 19:58:36 +02:00
Benoit Marty
07e8074c25
Merge pull request #3641 from vector-im/bmarty-patch-1 
Update issue templates
 2021-07-06 17:05:14 +02:00
Benoit Marty
1cb93b60c2 Update issue templates 2021-07-06 17:04:38 +02:00
random
60d9e4b344 Translated using Weblate (Italian) 
Currently translated at 100.0% (23 of 23 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
 2021-07-06 14:34:51 +00:00
random
87df147a28 Translated using Weblate (Italian) 
Currently translated at 99.8% (2491 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2021-07-06 14:34:50 +00:00
Thibault Martin
9efb213ff7 Translated using Weblate (French) 
Currently translated at 100.0% (2494 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2021-07-06 14:34:50 +00:00
Onuray Sahin
6cb53c991a Fix visibility of microphone icon. 2021-07-06 14:29:56 +03:00
Onuray Sahin
7a1b138894 Merge branch 'develop' into feature/ons/voice_message 
* develop: (286 commits)
  Fix crash after video call
  Fix issue on button styles
  Clean after benoits review
  Fix warning about implicit type, introduced in Kotlin 1.5.20. "Returning type parameter has been inferred to Nothing implicitly. Please specify type arguments explicitly to hide this warning. Nothing can produce an exception at runtime."
  Bump kotlin_version from 1.5.10 to 1.5.20
  Bump libphonenumber from 8.12.25 to 8.12.26
  Fix call invite processed after call is ended because of fastlane mode.
  Jump to unread: removes unnecessary check which can cause scroll issue
  Jump to unread: avoid blink when jumping
  Clean after Benoits review
  Delete unused drawable to avoid conflict on develop
  Jump to unread: add towncrier file.
  Read marker: fix some issues with jump to unread visibility.
  Stop using ProgressDialog, there is a theme issue with it. It's not maintain by Google since it's deprecated. Force usage of MaterialAlertDialogBuilder to have the same UI effect. We sometimes need to block the UI :/
  Reordering
  Add text style for dialogs
  Colored dialog button is now handled by the theme
  Update theme for material dialog and create a destructive variant
  Reorder buttons
  Update doc
  ...

# Conflicts:
#	library/ui-styles/src/main/res/values/theme_dark.xml
#	library/ui-styles/src/main/res/values/theme_light.xml
#	vector/build.gradle
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
#	vector/src/main/res/values/strings.xml
 2021-07-06 13:17:49 +03:00
Benoit Marty
e9da63e3ee
Merge pull request #3635 from vector-im/feature/bma/crash_room_aliases 
Fix crash in room aliases
 2021-07-06 12:15:37 +02:00
Benoit Marty
8f1b7649aa Make the code compile... 2021-07-06 12:10:06 +02:00
Benoit Marty
4963025150 Decorelate interfaces for code clarity 2021-07-06 11:36:50 +02:00
Benoit Marty
ca9f5161d1 Add retry support on Room Alias screen 2021-07-06 11:12:40 +02:00
Benoit Marty
5b149c8a34 Crash when opening room addresses screen with no internet connection 2021-07-06 10:57:59 +02:00
SpiritCroc
566feaecc1 Make jump to unread better visible for SC dark theme 
Change-Id: I9c95ab4348f4b4c2c77056b81a0e3de585d56cb0
 2021-07-06 10:14:47 +02:00
Benoit Marty
e22bd8f637
Merge pull request #3593 from vector-im/dependabot/gradle/androidx.test.ext-junit-1.1.3 
Bump junit from 1.1.2 to 1.1.3
 2021-07-05 21:36:38 +02:00
Benoit Marty
ca45cdd5c7
Merge pull request #3585 from vector-im/feature/bma/wellknown 
Improve wellknown usage
 2021-07-05 21:36:16 +02:00
Benoit Marty
692adffa69
Merge pull request #3626 from vector-im/dependabot/gradle/com.google.android.material-material-1.4.0 
Bump material from 1.3.0 to 1.4.0
 2021-07-05 21:29:49 +02:00
Benoit Marty
07d6eaacf9 Quick cleanup after #3624 2021-07-05 21:28:37 +02:00
Benoit Marty
a335c5eb4b
Merge pull request #3624 from vector-im/dbkr/scan_button_title 
Use different copy for self verification
 2021-07-05 21:25:57 +02:00
David Baker
04cad290f7 Also change the emoji button subtitle 
and tweak the other string more because it's not "each other" either
 2021-07-05 19:49:48 +01:00
ganfra
cdf97fc29f Merge branch 'develop' into feature/fga/new_voip_design 2021-07-05 18:02:19 +02:00
SpiritCroc
0b8b9d3cad Fix jump-to-unread style for non-Element themes 
Change-Id: If203eb8af60542eff57269dfe318b754b1e83b10
 2021-07-05 18:00:51 +02:00
SpiritCroc
37b729c1d1 Remove freshly added corner radius from Element 
Change-Id: I966aeb01b0fdfd30f03b601beefa049d92a6b3ac
 2021-07-05 16:59:52 +02:00
SpiritCroc
e0e17e8996 Automatic SchildiChat string correction 
Change-Id: I07253ef1a3be8dc753c734eb93fe50f6899d03e5
 2021-07-05 16:58:50 +02:00
SpiritCroc
0cb876485d Automatic upstream merge postprocessing 
Change-Id: Ie2b3c8142cf8fd3fe9a042b686c8f8ba57fac7dd
 2021-07-05 16:58:49 +02:00
SpiritCroc
e5c9c33a0f Merge tag 'v1.1.12' into sc 
Change-Id: I224f427a0d65bfea7ed0b1e19a95e1f03d0d5236

Conflicts:
	library/ui-styles/src/main/res/values/text_appearances.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/GroupRoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
	vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
	vector/src/main/res/layout/dialog_export_e2e_keys.xml
	vector/src/main/res/layout/dialog_import_e2e_keys.xml
 2021-07-05 16:58:45 +02:00
Benoit Marty
d29e04f16c Create fun String.getDomain(): String to avoid duplicated code 2021-07-05 16:49:09 +02:00
Benoit Marty
67f41028ff Remove Riot ref: Riot -> Web client 2021-07-05 16:41:26 +02:00
Benoit Marty
0e8018cbba ktlint and format 2021-07-05 16:24:19 +02:00
Benoit Marty
97cae9926b
Merge pull request #2848 from vector-im/neilalexander/vectorpreferences 
Add subscribeToChanges/unsubscribeToChanges to VectorPreferences
 2021-07-05 16:22:43 +02:00
dependabot[bot]
974d5c23d3
Bump junit from 1.1.2 to 1.1.3 
Bumps junit from 1.1.2 to 1.1.3.

---
updated-dependencies:
- dependency-name: androidx.test.ext:junit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-05 14:19:54 +00:00
Benoit Marty
d85099f23c
Merge pull request #3595 from vector-im/dependabot/gradle/espresso_version-3.4.0 
Bump espresso_version from 3.3.0 to 3.4.0
 2021-07-05 16:19:17 +02:00
Benoit Marty
edbf70c820
Merge pull request #3273 from vector-im/feature/bma/cleanup_redundant_fields 
Cleanup redundant fields - TO BE MERGED ON JULY 1st
 2021-07-05 16:16:33 +02:00
Benoit Marty
c2e649f64e Fix deprecated method 2021-07-05 16:07:44 +02:00
Benoit Marty
b285bd0359 Merge branch 'develop' into feature/bca/room_upgrade 2021-07-05 16:01:27 +02:00
ganfra
47d2d31a94 Jitsi call: add join status for Jitsi in RoomDetailViewState 2021-07-05 15:45:01 +02:00
ganfra
7f74278a73 Jitsi call: fix PiP 2021-07-05 15:44:36 +02:00
ganfra
6b6fb03dce Jitsi call : create JitsiBroadcastEventObserver 2021-07-05 15:43:54 +02:00
zeritti
084e497463 Translated using Weblate (Czech) 
Currently translated at 100.0% (23 of 23 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
 2021-07-05 13:34:54 +00:00
Jeff Huang
46320ef71b Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (23 of 23 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
 2021-07-05 13:34:54 +00:00
Priit Jõerüüt
f35050d4b4 Translated using Weblate (Estonian) 
Currently translated at 100.0% (23 of 23 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
 2021-07-05 13:34:53 +00:00
sr093906
10e38d3319 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (23 of 23 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hans/
 2021-07-05 13:34:52 +00:00
Szimszon
80d415b242 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (23 of 23 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/hu/
 2021-07-05 13:34:52 +00:00
Jeff Huang
e0f5099bd6 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2494 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2021-07-05 13:34:51 +00:00
sr093906
900769174c Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (2494 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2021-07-05 13:34:51 +00:00
lvre
7ccc218c6b Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2494 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2021-07-05 13:34:50 +00:00
Szimszon
a610ea06aa Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2494 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2021-07-05 13:34:50 +00:00
Priit Jõerüüt
8034ea16e5 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2494 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2021-07-05 13:34:50 +00:00
zeritti
5fc818fac2 Translated using Weblate (Czech) 
Currently translated at 100.0% (2494 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2021-07-05 13:34:49 +00:00
Benoit Marty
c40add88f9
Merge pull request #3617 from vector-im/dependabot/gradle/io.realm-realm-gradle-plugin-10.6.1 
Bump realm-gradle-plugin from 10.6.0 to 10.6.1
 2021-07-05 14:38:07 +02:00