Commit graph

4272 commits

Author SHA1 Message Date
SpiritCroc
3cb5f6087c Remove empty task affinity
By default, all activities of the app share the same task affinity. By
setting it to "" for this activity, on launch the splash screen and the
home activity are launched as two separate tasks (tested on Android 11).

Change-Id: I60e3791017b6c33288d152cf97c5af04ae8979eb
2020-11-29 18:27:37 +01:00
SpiritCroc
6d1cb06373 Bubble style none = else
Change-Id: I910075b871f55968685f109ac3f729e42be1b384
2020-11-29 15:51:19 +01:00
SpiritCroc
de8bd1d605 View stub minimum width: read from informationData
Change-Id: If0ea41028044750ff540dc6a1bee2d1143715321
2020-11-29 15:45:24 +01:00
SpiritCroc
4b5aab3c8d Show "more" again in case topic is shown in easy mode
Change-Id: Ib5e93fd0b471746dc3fb58be581f35b0ff28c64b
2020-11-29 14:56:51 +01:00
SpiritCroc
6830ffd3f0 Easy mode: Hide encryption status and action in room profile
Change-Id: Ia12cd69a5c4cad5577049020478987fb588932a1
2020-11-29 13:31:41 +01:00
SpiritCroc
f23bea23e5 Fix compile after v1.0.11 merge
Change-Id: I122e4d98b464606c25c837d6d28e32a2c9f08c72
2020-11-29 13:15:47 +01:00
SpiritCroc
86e638428b Revert "Revert "Resolve required manual intervention in german strings""
This reverts commit 77df970e1b.

Change-Id: Idbb71587c4e54a53cf9890416376444e7c8b5907
2020-11-29 12:57:03 +01:00
SpiritCroc
4afb6aa469 Automatic SchildiChat string correction
Change-Id: I4a542ccc442ce0ec5a2bde5daf8c612342b8410d
2020-11-29 12:52:26 +01:00
SpiritCroc
e0ca1f2751 Automatic color correction
Change-Id: Ia5d7d0bcba99005bb81a16a02edcc18b2480db1c
2020-11-29 12:52:25 +01:00
SpiritCroc
0b4f56d7a0 Merge remote-tracking branch 'upstream/master' into sc
Change-Id: Icb4d672fc9d301803b300d6ac25b348780f11e6c

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
	vector/src/main/res/layout/fragment_known_users.xml
	vector/src/main/res/layout/fragment_user_list.xml
2020-11-29 12:51:43 +01:00
SpiritCroc
857ebde8ba Revert "Automatic SchildiChat string correction"
This reverts commit 5a4907362a.
2020-11-29 12:32:30 +01:00
SpiritCroc
77df970e1b Revert "Resolve required manual intervention in german strings"
This reverts commit 2590f8f690.
2020-11-29 12:32:30 +01:00
Benoit Marty
7b969ebd74 Ensure the Activity is destroyed, it seems that the intent flags are not enough now. - finish all 2020-11-27 16:00:30 +01:00
Benoit Marty
163f4cfaf2 Ensure the Activity is destroyed, it seems that the intent flags are not enough now. 2020-11-27 15:15:56 +01:00
Benoit Marty
e3ca89a81b Fix issue when there is no display name 2020-11-27 13:54:21 +01:00
Benoit Marty
8696650f20 Cleanup 2020-11-27 13:53:19 +01:00
Benoit Marty
32d42794dd
Merge branch 'develop' into feature/bca/home_empty_screens 2020-11-27 12:02:30 +01:00
Benoit Marty
14c71d6c07 Fix issue with too big icons 2020-11-27 12:01:19 +01:00
Benoit Marty
cce4d7d4d9 Use style instead of duplicating the whole layout file 2020-11-27 11:09:13 +01:00
Benoit Marty
bc889cbcf4
Merge pull request #2444 from vector-im/feature/bca/deeplink_mxto
Fix issues with matrix.to deep linking
2020-11-27 10:22:51 +01:00
Valere
7c9b943733 Try other asset strategy as lint not happy 2020-11-27 09:58:14 +01:00
Weblate
d80927a8f9 Merge branch 'origin/develop' into Weblate. 2020-11-27 07:37:32 +00:00
Valere
835a36986d Refactoring following review 2020-11-26 17:39:00 +01:00
Valere
67057bfac4
Merge pull request #2417 from vector-im/feature/bca/quick_invite_dm_tab
Feature/bca/quick invite dm tab
2020-11-26 14:58:14 +01:00
Valere
fa191136cc Home empty screen design update 2020-11-26 13:27:10 +01:00
Daniel Løvbrøtte Olsen
15d93c8aeb Translated using Weblate (Norwegian Bokmål)
Currently translated at 43.3% (837 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nb_NO/
2020-11-26 11:50:02 +00:00
Valere
4f5632b916 code review 2020-11-26 09:09:27 +01:00
Valere
8e6e6736a3 Code review 2020-11-26 09:09:27 +01:00
Valere
804afc9a1d Fix issues with matrix.to deep linking 2020-11-26 09:09:27 +01:00
Valere
bcd86977d2 Fix test + lint 2020-11-25 17:17:48 +01:00
Valere
a8b5a5227f Code review update 2020-11-25 15:47:27 +01:00
Daniel Løvbrøtte Olsen
0e908ad882 Translated using Weblate (Norwegian Bokmål)
Currently translated at 43.1% (834 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nb_NO/
2020-11-25 08:50:02 +00:00
SpiritCroc
ac89fb97f8 Increment version
Change-Id: Ic11038b22a85eb4ee863bb865439ae3c9751da1b
2020-11-24 16:13:49 +01:00
SpiritCroc
4fb7ff6cf5 Also hide encryption in room settings in simplified mode
Change-Id: I180d841cf3c62000d34b0642bfbf40eb1dd7037e
2020-11-23 13:35:11 +01:00
SpiritCroc
78766d7fc5 SC dark theme: fix touch guard transparency behind fab
Change-Id: Id8ab5e57236cd3383bebd3597b4ac2a3577a4f41
2020-11-23 13:35:08 +01:00
SpiritCroc
a7315ee56f FAB label background is finally dark in dark theme, so fix text color
Change-Id: Ifa43b19eca293fc15aab25f067d0516686e75a29
2020-11-23 13:35:05 +01:00
Ed Geraghty
bc6debea89
Disable native dialler integration on jitsi widget
Native dialler integration breaks the jitsi widget for those of us with non-vanilla telephony frameworks.

Disabling this integration (as is default on the Jitsi Meet Android app) allows us to also join conference calls, with no adverse effect on those for whom it already works.

Signed-off-by: Ed Geraghty <ed@geraghty.london>
2020-11-22 23:13:01 +00:00
SpiritCroc
d850c7ac42 Simplified mode setting
- Hide public room functionality (rationale: people chatting with strangers on the internet can be considered advanced users)
    - Clicking on + / Rooms goes directly to "Create new room" instead of the intermediate step which allows joining public rooms
    - The "New room" screen would hide the setting to make the room public and publish it in the room directory
    - Hide room address settings in the room settings
- Hide encryption settings (rationale: encryption is hard to explain to users without background knowledge)

Closes https://github.com/SpiritCroc/SchildiChat-android/issues/23

Change-Id: If1a7f16880ca2f4333270ec29cc1d27f70a9132d
2020-11-22 17:42:08 +01:00
SpiritCroc
c3a20b5192 Enable "Prevent accidental call" by default
Change-Id: Ic1eb704bfb3c17add56c21ff6ac76c1968753ff1
2020-11-22 09:48:19 +01:00
SpiritCroc
8a06ad5c89 Reduce reserved space for dual-side bubbles
The reason for this being two times the reserved avatar size was
aligning it to the right side, even when having avatars on both sides.
By now, we hide the user's avatar, so one times the reserved avatar size
is enough.

For landscape tablets, don't reduce it, as we have enough screen estate.

Change-Id: I526d11e891612627418fe31bb40c3c131ea18c4c
2020-11-22 09:48:03 +01:00
keraint
d5523b18b9 Translated using Weblate (French)
Currently translated at 100.0% (1933 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
2020-11-21 08:49:59 +00:00
Valere
d9757cc660 Fix lint 2020-11-20 16:23:04 +01:00
Valere
1cb3522e73 Fix string 2020-11-20 15:46:21 +01:00
Valere
7583b0a358 Fix rebase 2020-11-20 15:17:35 +01:00
Valere
77863e2e88 copy tweaks 2020-11-20 14:50:21 +01:00
Valere
564404d4ae Design review 2020-11-20 14:50:21 +01:00
Valere
e2320cd3b2 Upgrade to new design input 2020-11-20 14:50:21 +01:00
Valere
fd92d6559c Refact move utility method open settings 2020-11-20 14:50:21 +01:00
Valere
6146925757 Better error handling Rx call 2020-11-20 14:50:21 +01:00
Valere
baef9f5aa7 Fix permission handling + share my code by text 2020-11-20 14:50:21 +01:00