filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,395 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

3311 Commits

Author SHA1 Message Date
Marcelo Filho ebe43497d5 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (1834 of 1834 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/pt_BR/
 2020-08-07 19:44:16 +00:00
aevw f181f4e449 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (1834 of 1834 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/pt_BR/
 2020-08-07 19:44:16 +00:00
rkfg 0e6d296c87 Translated using Weblate (Russian) 
Currently translated at 90.6% (1662 of 1834 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/ru/
 2020-08-07 14:42:26 +00:00
Artyom 6dbefb212e Translated using Weblate (Russian) 
Currently translated at 90.6% (1662 of 1834 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/ru/
 2020-08-07 14:42:26 +00:00
Alexey Murz Korepov e11bd9436b Translated using Weblate (Russian) 
Currently translated at 90.6% (1662 of 1834 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/ru/
 2020-08-07 14:42:24 +00:00
aevw 61373e6e8e Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.0% (1688 of 1834 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/pt_BR/
 2020-08-07 14:42:23 +00:00
Marcelo Filho aa7a0abad7 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.0% (1688 of 1834 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/pt_BR/
 2020-08-07 14:42:22 +00:00
Benoit Marty c9d7559f03 Translated using Weblate (French) 
Currently translated at 100.0% (1 of 1 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.riot.im/projects/element-android/element-store/fr/
 2020-08-07 14:42:21 +00:00
Priit Jõerüüt a6b7a65dfb Translated using Weblate (Estonian) 
Currently translated at 30.1% (552 of 1834 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/et/
 2020-08-07 14:42:21 +00:00
linsui 3eb12ab116 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 78.9% (1447 of 1834 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/zh_Hans/
 2020-08-07 14:42:11 +00:00
SpiritCroc 459e20aac9 Merge tag 'v1.0.4' into sc 2020-08-07 12:34:18 +02:00
Marcelo Filho 84a6d4a592 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.3% (1675 of 1834 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/pt_BR/
 2020-08-07 06:25:04 +00:00
aevw 66a7802e1b Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.3% (1675 of 1834 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/pt_BR/
 2020-08-07 06:25:04 +00:00
SpiritCroc b7424ef92a Fix accent color in bottom navigation icons 2020-08-06 17:30:48 +02:00
SpiritCroc f0f7ef4dd8 Make single overview page optional 
Allow tabbed layout like element
 2020-08-06 17:30:44 +02:00
Benoit Marty fc510e86f7 ktlint 2020-08-06 17:20:14 +02:00
Xidorn Quan 0901075c9f Translated using Weblate (Chinese (Simplified)) 
Currently translated at 72.3% (1326 of 1834 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/zh_Hans/
 2020-08-06 10:14:45 +00:00
linsui 6bb5835bea Translated using Weblate (Chinese (Simplified)) 
Currently translated at 72.3% (1326 of 1834 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/zh_Hans/
 2020-08-06 10:14:44 +00:00
Artyom 2b91482ec4 Translated using Weblate (Russian) 
Currently translated at 88.7% (1626 of 1834 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/ru/
 2020-08-06 03:43:04 +00:00
rkfg 4ca0a5acae Translated using Weblate (Russian) 
Currently translated at 88.7% (1626 of 1834 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/ru/
 2020-08-06 03:42:55 +00:00
aevw 2c16fc467b Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 62.5% (1146 of 1834 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/pt_BR/
 2020-08-06 03:42:51 +00:00
Marcelo Filho 87084e5065 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 62.5% (1146 of 1834 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/pt_BR/
 2020-08-06 03:42:38 +00:00
random f0f0fcf9ba Translated using Weblate (Italian) 
Currently translated at 94.8% (1739 of 1834 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/it/
 2020-08-06 03:42:36 +00:00
@a2sc:matrix.org d301a3e5d3 Translated using Weblate (German) 
Currently translated at 99.9% (1832 of 1834 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/de/
 2020-08-06 03:42:32 +00:00
Priit Jõerüüt 1c66705c5a Translated using Weblate (Estonian) 
Currently translated at 21.6% (397 of 1834 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/et/
 2020-08-06 03:42:30 +00:00
Jeff Huang 2e8f87b80d Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1834 of 1834 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/zh_Hant/
 2020-08-06 03:42:20 +00:00
linsui 2ef4e9c378 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 68.0% (1248 of 1834 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/zh_Hans/
 2020-08-06 03:42:13 +00:00
Benoit Marty 02baf824f9 Give user the possibility to prevent accidental call (#1869) 2020-08-05 19:59:25 +02:00
Benoit Marty b833198a3a Rework text selector 2020-08-05 19:34:19 +02:00
Benoit Marty 06d927a911 Rework tabbar style 2020-08-05 19:26:00 +02:00
Benoit Marty 7ab55d46c0 No need to overide with same value 2020-08-05 18:55:57 +02:00
Benoit Marty 8e81d6fe01 Rework attrs riotx_highlighted_message_background 2020-08-05 18:54:13 +02:00
Benoit Marty 85e6ef40a1 Rework attrs vctr_line_divider and vctr_pill_receipt 2020-08-05 18:49:22 +02:00
Benoit Marty e1db7630d9 Remove unused resources 2020-08-05 18:35:09 +02:00
Benoit Marty a343e25785 Remove useless method now that we are on API 21+ 2020-08-05 18:30:37 +02:00
Benoit Marty 0ad059359f R.drawable.vector_label_background for API 21 2020-08-05 18:27:59 +02:00
Benoit Marty 20336af84e R.drawable.bg_unread_notification for API 21 2020-08-05 18:21:13 +02:00
Benoit Marty 0a775444dd R.drawable.divider_horizontal for API 21 2020-08-05 18:19:20 +02:00
Benoit Marty 7fe30e464d Remove unused png 2020-08-05 18:12:10 +02:00
aWeinzierl 9c1e61992a Translated using Weblate (German) 
Currently translated at 99.7% (1828 of 1834 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/de/
 2020-08-05 12:33:25 +00:00
@a2sc:matrix.org d41036f861 Translated using Weblate (German) 
Currently translated at 99.7% (1828 of 1834 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/de/
 2020-08-05 12:33:15 +00:00
Clemens Zeidler 5e711f6c57 Fix relative date time formatting (#822) 
The transitionResolution parameter has to go back to the beginning of
the day. In general, going back 24h is not enough.
 2020-08-05 20:59:56 +12:00
Benoit Marty 16f80f35dd Remove unused resources 2020-08-04 17:31:14 +02:00
Benoit Marty 188aec9fc4 Remove unused attrs 2020-08-04 17:22:05 +02:00
Benoit Marty cf7770e47e Remove unused strings 2020-08-04 11:04:36 +02:00
Benoit Marty 6a8ac72b6a Remove riot ref 2020-08-04 09:13:29 +02:00
Benoit Marty 95bbdba141 Rework settings_notification_advanced_summary string 2020-08-04 09:13:29 +02:00
Benoit Marty 1ddeeba561 Little rework of default session public name 2020-08-04 09:13:29 +02:00
Benoit Marty e95735c491 Remove unused strings 2020-08-04 09:12:16 +02:00
Benoit Marty fa49e5cb4f Rename string id 2020-08-04 09:12:16 +02:00
Benoit Marty a48302f433 Remove PlayStore strings from Android resource 2020-08-04 09:12:16 +02:00
Benoit Marty ad1b2b4511 Add PlayStore description resources in the Triple-T format, to let Weblate handle them 2020-08-04 09:12:16 +02:00
Benoit Marty ab4a517ae0 Cleanup 2020-08-03 18:50:04 +02:00
Benoit Marty 8931fd314d Rename package `im.vector.riotx` to `im.vector.app` (other manual changes) 2020-08-03 18:48:20 +02:00
Benoit Marty 05b849de13 Rename package `im.vector.riotx` to `im.vector.app` (IDE, other variants) 2020-08-03 18:46:29 +02:00
Benoit Marty a1f90abcd2 Rename package `im.vector.riotx` to `im.vector.app` (IDE) 2020-08-03 18:46:29 +02:00
Benoit Marty 67fc2feacb Rename package `im.vector.riotx.multipicker` to `im.vector.lib.multipicker` 2020-08-03 18:35:02 +02:00
Benoit Marty d28c091f0a Rename package `im.vector.riotx.attachmentviewer` to `im.vector.lib.attachmentviewer` 2020-08-03 18:35:02 +02:00
Benoit Marty 025d5f7b4c Code readability 2020-08-03 17:33:24 +02:00
Benoit Marty d531e88666 Key is private 2020-08-03 17:33:24 +02:00
Benoit Marty ac845ad8c9 Hide Flair settings, this is not implemented yet. 2020-08-03 17:33:24 +02:00
Benoit Marty ace7ff464b Banned users: use the counter as the title 2020-08-03 17:33:24 +02:00
Benoit Marty 562c6fbcce Naming convention 2020-08-03 17:33:24 +02:00
Benoit Marty 707b69e3e2
Merge branch 'develop' into develop 2020-08-03 16:58:52 +02:00
Valere 33f6e7e337 Version ++ 2020-08-03 14:04:31 +02:00
Valere 69e499e497 Merge hotfix 2020-08-03 14:00:32 +02:00
Valere db6045778e Update change log 2020-08-03 12:11:50 +02:00
Valere 2810923519 FIx / Crash when opening Invite User screen 2020-08-03 12:00:08 +02:00
ganfra acf977577f Pin: clean code 2020-07-31 11:47:51 +02:00
SpiritCroc 41aece007d Ignore vector/fdroid/release 2020-07-31 11:43:39 +02:00
SpiritCroc e10a530d69 Fix splash theme 2020-07-31 11:42:13 +02:00
ganfra 995c552f2a
Merge branch 'develop' into feature/pin_code 2020-07-31 11:41:42 +02:00
SpiritCroc 65be2c982a Revert "Fix rebranding assets on login screens." 
This reverts commit 4cc3e87d64.

Conflicts:
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/item_login_header.xml
 2020-07-31 11:35:48 +02:00
ganfra 99ae1655f5 Pin: fix PopupAlertManager showing on top of PinCode 2020-07-31 11:34:24 +02:00
ganfra 7e45fe4509 Pin: add comment on UnlockActivity interface 2020-07-31 11:33:25 +02:00
SpiritCroc 9f7bf14a22 Merge tag 'v1.0.3' into sc 
1.0.3

Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/item_login_header.xml
	vector/src/main/res/values/strings.xml
	vector/src/main/res/values/styles_login.xml
 2020-07-31 11:22:57 +02:00
Valere 531623178a Version ++ 2020-07-31 00:52:22 +02:00
ganfra a883d3ecdd Merge branch 'develop' into feature/pin_code 2020-07-30 18:49:13 +02:00
Valere 2f6cdc6529
Merge pull request #1847 from vector-im/feature/crash_store_mvrx 
Fix IllegalArgumentException reported from store on HomeActivity aunch
 2020-07-30 18:07:11 +02:00
ganfra eb0d350097 Merge branch 'develop' into feature/pin_code 2020-07-30 17:24:48 +02:00
Valere c90f5ed370 Fix IllegalArgumentException reported from store on HomeActivity aunch 2020-07-30 17:03:11 +02:00
Valere 1204f6d9ce UX feedback, reduce severity of message 2020-07-30 15:25:10 +02:00
ganfra efa1263c35 Pin: set back the grace period to 2 minutes 2020-07-30 15:22:41 +02:00
ganfra 06bd353d44 Pin: polish a bit and clean code 2020-07-30 14:58:46 +02:00
Valere 562cfce9e2 Support HS admin option to disable E2EE for DMs 
Fixes #1794
 2020-07-30 12:08:30 +02:00
ganfra bb066b7c65 Add PinLocker to handle lock state 2020-07-29 20:19:01 +02:00
ganfra 37521d2d4f Pin: add settings to enable/disable 2020-07-29 16:11:57 +02:00
Valere b732ea6c69 Version ++ 2020-07-29 11:39:23 +02:00
ganfra 5426e43cbb Create PinCodeStore and migrate code to fragment 2020-07-29 11:38:04 +02:00
Valere c04f22d3bf quick fix plural 2020-07-29 09:51:20 +02:00
Valere 9197275343 version++ 2020-07-29 09:00:29 +02:00
ganfra ecdef52829 Continue PIN code library integration (fork required) 2020-07-28 20:22:59 +02:00
ganfra cd38aa42aa Merge branch 'develop' into feature/pin_code 2020-07-28 17:49:36 +02:00
Valere dde9cdd8ac
Merge pull request #1821 from vector-im/feature/notification_off_alert 
Check if migration disabled notif
 2020-07-28 17:04:15 +02:00
Valere a47ff99be7
Merge branch 'develop' into feature/fix_reply_tag 2020-07-28 16:58:00 +02:00
Valere e619217687 Code quality 2020-07-28 16:56:55 +02:00
Valere 6f5b3371fe Check if migration disabled notif 2020-07-28 16:56:55 +02:00
Valere f7b9fc3bb1
Merge pull request #1826 from vector-im/feature/banned_list 
Added banned user screen
 2020-07-28 16:53:58 +02:00
ganfra 5176a3e2aa
Merge branch 'develop' into feature/fix_timeline_loading 2020-07-28 16:30:34 +02:00
Valere 4631cd0e80
Merge pull request #1831 from vector-im/feature/quick_call_update 
Allow call in all 2 participants rooms
 2020-07-28 16:24:22 +02:00
Valere 60c6512418 Fix / item flickering 2020-07-28 16:23:21 +02:00
Valere 12bc821ef3 code review 2020-07-28 16:23:21 +02:00
Valere c82e910c38 Added banned user screen 2020-07-28 16:23:21 +02:00
Valere 12e2a8ffc8 Allow call in all 2 participants rooms 2020-07-28 14:43:50 +02:00
SpiritCroc adaed3fd64 Increment version 2020-07-28 13:55:09 +02:00
SpiritCroc 3ddda4e55e Fix login server selection spacing 2020-07-28 13:14:05 +02:00
ganfra 833f64fcec Fix timeline non loading when there are lots of filtered events 2020-07-28 11:49:45 +02:00
Valere 73c051d2b1 Improve UI of edit role button 2020-07-28 11:35:37 +02:00
SpiritCroc 47b4968dd0 SC dark: lighter riotx_base for home drawer header 2020-07-25 11:16:03 +02:00
SpiritCroc 7ae5ae2922 Add options menu entries for participant list and room details 2020-07-25 11:09:08 +02:00
SpiritCroc 7c959176fd Update strings 2020-07-25 10:27:16 +02:00
SpiritCroc 8d6c8b4a30 Re-prioritize login selection 
1. Matrix-ID
2. "Other" -> Custom server
3. Matrix

- Matrix-ID should be intuitive (compare: email address)
- Promoting Element Matrix Services for organisations makes not much
  sense here
    - if you have a server hosted this way, you can use the "other"
      selection or mxid as well (?)
    - if organisations feel like using SchildiChat instead of Element,
      they will probably find a way ;)
 2020-07-24 20:12:35 +02:00
ganfra da06695ab7 Relation content should be checked in encrypted content and not the decrypted one 2020-07-24 18:31:01 +02:00
SpiritCroc e89d2df45e Disable disclaimer 2020-07-24 17:45:55 +02:00
Onuray Sahin 984ffc4fb9
Merge pull request #1797 from vector-im/feature/fix_rebranding_assets 
Fix rebranding assets on login screens
 2020-07-24 15:16:02 +03:00
SpiritCroc 6170800f9c Increment version 2020-07-24 12:10:03 +02:00
ganfra a19a3f2a7f Merge branch 'develop' into feature/pin_code 2020-07-24 11:35:38 +02:00
ganfra d7b44ba0cf
Merge branch 'develop' into feature/fix_reply_tag 2020-07-24 11:32:59 +02:00
ganfra 20c7d80bb1 Clean code 2020-07-24 11:30:27 +02:00
SpiritCroc 8563346fe4 Better center icon 2020-07-24 11:24:03 +02:00
onurays 21b609420b ktlint fix. 2020-07-24 03:00:06 +03:00
ganfra 794b89c041 Reply: remove inner tags when replying 2020-07-23 18:23:49 +02:00
ganfra 407595e613 Change warning badge (white background) 2020-07-23 16:38:42 +02:00
onurays 4cc3e87d64 Fix rebranding assets on login screens. 2020-07-23 15:02:40 +03:00
SpiritCroc 2ff6273892 Hide "Add matrix app" when integrations are disabled 2020-07-23 10:12:05 +02:00
SpiritCroc 4c601f2119 SC light theme: light status bar, black navbar 2020-07-22 18:27:44 +02:00
SpiritCroc 8d883ce832 Change adaptive icon background 2020-07-22 18:02:54 +02:00
ganfra 3e429490e7 Update CHANGES 2020-07-22 17:04:48 +02:00
ganfra e23b02f2e2 Composer: set max lines to 6 so it can scroll 2020-07-22 16:02:38 +02:00
ganfra aa5ae45a0c Add hasFailedSending in RoomSummary and a small warning icon on room list 2020-07-22 15:21:48 +02:00
SpiritCroc f8c515092c Disable long-press room help 
Users reported this message to be more confusing than helpful
(might be related to german translation)
 2020-07-22 13:21:05 +02:00
SpiritCroc 83b033ddde Tweak SC dark theme 2020-07-22 13:21:00 +02:00
SpiritCroc 79a2848ad2 Improve unread badge visibility 2020-07-22 10:23:40 +02:00
SpiritCroc b43a2e7ac0 Set the message count for the notification badge 2020-07-22 09:46:21 +02:00
ganfra aa5de1896f
Merge pull request #1766 from vector-im/feature/fix_annoying_issues 
Fix post Element release issues
 2020-07-21 16:43:26 +02:00
SpiritCroc e1274ac4c2 Revert "Update attachment and send icons." 
This reverts commit 34d7a86175.
 2020-07-21 11:13:41 +02:00
ganfra d638306b04
Merge pull request #1703 from vector-im/feature/md_files 
Riot -> Element
 2020-07-21 10:08:07 +02:00
ganfra fb247f8bea Update CHANGES and clean code 2020-07-20 20:29:52 +02:00
ganfra 1436477a14 Rework a bit user account data (and avoid blocking syncs) 2020-07-20 19:52:24 +02:00
ganfra 35fe4f7268 Fix modular link to EMS 2020-07-20 18:47:41 +02:00
ganfra a488e88f93 Add reaction to RoomSummary latest previewable event 2020-07-20 16:49:05 +02:00
SpiritCroc af7cbeea11 Increment version 2020-07-20 16:46:11 +02:00
SpiritCroc 7f07833a9e Fix usage of old light theme 
It is no longer the default theme, so we can't count on that
 2020-07-20 16:39:02 +02:00
SpiritCroc fea41d3901 Increment version 2020-07-20 15:55:18 +02:00
SpiritCroc efd8a4d88b Make both dark and light themes work for login 
-> Allows us to use SC light theme for default theme again
- Also tweak default dark theme
 2020-07-20 15:43:28 +02:00
SpiritCroc 3e57e4bec0 Fix default device name 2020-07-20 15:24:29 +02:00
SpiritCroc f9b031dca5 Add SC light theme 2020-07-20 15:20:59 +02:00
vulet f5b584ddb8 fix: invisible toolbar(status.im theme) 2020-07-20 00:15:45 +08:00
SpiritCroc eb3f2ad28e Choose icon colors closer to other branding colors 2020-07-19 16:33:52 +02:00
SpiritCroc 126b344434 SchildiChat notification icon 2020-07-19 15:10:58 +02:00
SpiritCroc 387d7eefb4 Add advanced settings icon based on old icon design 2020-07-19 14:46:19 +02:00
SpiritCroc 000ed55452 Revert "Update settings icons from v1.0" 
Old ones were nicer.

This reverts commit 1d1267ea6a.
 2020-07-19 14:03:22 +02:00
SpiritCroc e1cbd8c764 Theme riotx_positive_accent 2020-07-19 11:55:01 +02:00
SpiritCroc 311244508d Hide "element" type logo in login splash screen 2020-07-19 11:24:07 +02:00
SpiritCroc b25b9fa08b Better icon 2020-07-19 11:10:53 +02:00
SpiritCroc e26010bf14 Fix own name color in dual-side bubbles 2020-07-18 15:28:24 +02:00
SpiritCroc 3ab88153c0 SchildiChat icon 2020-07-18 15:14:57 +02:00
Benoit Marty 5082defddf i18n deactivated account error 2020-07-17 17:23:48 +02:00
ganfra c5f06386bd Continue trying to configure Pin library, stil WIP 2020-07-17 17:13:50 +02:00
SpiritCroc 1d1267ea6a Update settings icons from v1.0 2020-07-17 15:34:42 +02:00
SpiritCroc 8c3963eb5d Fix some accent colors introduced in v1.0 2020-07-17 15:27:24 +02:00
SpiritCroc e857052e37 Redo hidden bottom bar and combined chats view for v1.0 merge 2020-07-17 15:20:31 +02:00
SpiritCroc 95850440bd Merge remote-tracking branch 'upstream/master' into sc 
Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/riotx/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt
	vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListDisplayModeFilter.kt
	vector/src/main/res/drawable/bg_login_server.xml
	vector/src/main/res/drawable/bg_login_server_checked.xml
	vector/src/main/res/layout/fragment_login_server_selection.xml
 2020-07-17 13:39:52 +02:00
ganfra 6e0095edb0
Feature/fix notification clearing (#1707) 
Updating notification when entering a room
 2020-07-17 13:31:36 +02:00
ganfra f5fbb2bc4f Setup screens for Pin 2020-07-17 13:29:18 +02:00
SpiritCroc af627f4d9b Restore some Riot icons to ease upstream merge 
and prepare the rebrand (both upstream and downstream)
 2020-07-17 12:09:24 +02:00
SpiritCroc e37769aae4 SchildiChat 2020-07-17 11:35:40 +02:00
Benoit Marty d78cd81c6f Cleanup strings.xml 2020-07-16 19:21:02 +02:00
Benoit Marty 1d2e374526 RiotX -> Element 2020-07-16 16:01:25 +02:00
Benoit Marty 6d0a1ee824 SSO Login: use "element://element" url instead of "riotx://riotx" 2020-07-15 20:21:35 +02:00
Benoit Marty 978ab76644
Merge pull request #1694 from vector-im/feature/improve_splash 
Improve splash screen
 2020-07-15 20:15:47 +02:00
Benoit Marty f6d2d05e70 Improve splash screen 2020-07-15 15:08:46 +02:00
Benoit Marty d747d96e77 Use correct title 2020-07-15 14:49:26 +02:00
Benoit Marty 484b69165b Add rounded light background to fix dark images on dark background issue (#1613) 2020-07-15 14:34:06 +02:00
Benoit Marty 0159e6dc00 Hide the menu item, it's not implemented yet 2020-07-15 14:33:01 +02:00
Benoit Marty 8f7aae4980 Tint the icon (#1613) 2020-07-15 14:33:01 +02:00
Benoit Marty 53f0b77fb0 Version++ 2020-07-15 14:32:15 +02:00
Benoit Marty 7651eb5c3c Revert "Temporary remove the _dev suffix added to version" 
This reverts commit 7237ec7310.
 2020-07-15 14:14:44 +02:00
Benoit Marty 9b49e6a817 Use local file in a dialog though (else -> crash) 2020-07-13 23:03:16 +02:00
Benoit Marty bef0c7725b Use openUrlInChromeCustomTab because it's better and it fixes crash on API 21 (at least) 2020-07-13 22:43:19 +02:00
Benoit Marty 7237ec7310 Temporary remove the _dev suffix added to version 2020-07-13 21:50:26 +02:00
Benoit Marty 3abe5b8467 ktlint 2020-07-13 21:38:49 +02:00
Valere 0406854fa5 lighter bottom sheet separator 2020-07-13 19:25:59 +02:00
Valere ca6a398a72 Update add room icon 2020-07-13 19:25:44 +02:00
Valere 5e81ce8e3e Update tmp lab icon for notif tab 2020-07-13 19:25:35 +02:00
Onuray Sahin 8658090736 Fix tint color of settings. 2020-07-13 20:16:01 +03:00
Onuray Sahin 614ac88567 Create group room icon changed. 2020-07-13 20:06:39 +03:00
Onuray Sahin 797dcdb48b Merge branch 'riotx_develop' into rebranding_rebase 
* riotx_develop: (111 commits)
  Video calls are shown as a voice ones in the timeline (Fixes #1676)
  Fix regression: not able to create a room without IS configured (Fixes #1679)
  Fix / view attachment crash + freeze when offline
  Version++
  Prepare release 0.91.5
  Fix test compilation issue
  Fix crash after rebase
  Add TODO
  Copy Javadoc to the API class
  Move internal methods to internal task
  Latest renaming
  Rename CreateRoomParamsInternalBuilder to CreateRoomBodyBuilder for clarity
  Rename CreateRoomParamsBuilder to CreateRoomParams for clarity
  Rename internal class
  Expose other objects in the builder to create a room
  ktlint
  Display threePid invite along with the other invite (code is a bit dirty)
  Hide right arrow if threepid invite can not be revoked
  Disable fetching Msisdn, it does not work
  Revoke ThreePid invitation (#548)
  ...

# Conflicts:
#	vector/build.gradle
#	vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysExporter.kt
#	vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
#	vector/src/main/res/values/strings.xml
 2020-07-13 19:59:20 +03:00
Onuray Sahin 3a696ea9a1 Revert shield icons. 2020-07-13 19:21:22 +03:00
Onuray Sahin 1b19cb7449 Roll back ic_shield_black 2020-07-13 19:18:56 +03:00
Onuray Sahin ea81a5298b ic_shield_black icon changed. 2020-07-13 18:55:30 +03:00
Onuray Sahin ae65eb6a3e Advanced Settings icon changed. 2020-07-13 18:39:09 +03:00
Onuray Sahin 67e07a7932 Room action settings and leave icons changed. 2020-07-13 18:33:29 +03:00
Onuray Sahin 6ef15f3c1c ic_star icon changed. 2020-07-13 18:28:05 +03:00
Benoit Marty 0e3be83da2 Merge branch 'rebranding' of https://gitlab.matrix.org/new-vector/element/element-android into rebranding 2020-07-13 17:21:40 +02:00
Benoit Marty 8b5b7db241 Fix icons alignment issue 2020-07-13 17:21:33 +02:00
Onuray Sahin 1fd8a5fa91 Merge branch 'rebranding' of https://gitlab.matrix.org/new-vector/element/element-android into rebranding 
* 'rebranding' of https://gitlab.matrix.org/new-vector/element/element-android:
  Icon: "Modular" -> "Element Matrix Services"
 2020-07-13 18:11:45 +03:00
Onuray Sahin 34d7a86175 Update attachment and send icons. 2020-07-13 18:10:49 +03:00
Benoit Marty 21f1f89a4b Merge branch 'rebranding' of https://gitlab.matrix.org/new-vector/element/element-android into rebranding 2020-07-13 16:53:48 +02:00
Benoit Marty 159f286b2c Icon: "Modular" -> "Element Matrix Services" 2020-07-13 16:53:26 +02:00