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

4263 Commits

Author SHA1 Message Date
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
Benoit Marty ae6de8fdf1 Small cleanup 2020-11-20 14:50:21 +01:00
Benoit Marty b888d13e62 Use orEmpty() 2020-11-20 14:50:21 +01:00
Benoit Marty 1070c23608 QR code invite flow support - invite friends 
Author: Valere
 2020-11-20 14:50:21 +01:00
TR-SLimey e8d084b855 Add ability to share profile by QR code 2020-11-20 14:49:39 +01:00
Benoit Marty 85bc5f54aa
Merge branch 'develop' into feature/bma_create_room_form 2020-11-20 13:57:35 +01:00
Benoit Marty 41f46d0810
Merge pull request #2367 from vector-im/feature/bma/sanity_test 
Feature/bma/sanity test
 2020-11-20 13:56:49 +01:00
SpiritCroc ac713124e7 Single-side bubbles don't need margin to other side 
The margin is there for dual-side bubbles, so the bubbles are more
connected to the same side of the sender avatar.
For single-side bubbles, this is a waste of space, so remove it for this
scenario.

Change-Id: Ib70cd0b1d30c2a8dbb356c80bd12a8310dceda8c
 2020-11-20 09:46:46 +01:00
Benoit Marty 675e4579ac
Merge branch 'develop' into feature/bma/fix_crash 2020-11-19 18:44:17 +01:00
Benoit Marty d2880432da
Merge pull request #2366 from vector-im/feature/bma/cleanup 
Feature/bma/cleanup
 2020-11-19 17:49:17 +01:00