mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-25 09:14:01 +03:00
Code Issues Projects Releases Packages Wiki Activity
5744 commits 7 branches 125 tags 235 MiB
Commit graph

648 commits

Author SHA1 Message Date
SpiritCroc
bdd71769a0 Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: Ibdd2790a7f2a8a1f126ef7af2032fe72f7dd777e
 2020-09-08 18:52:59 +02:00
SpiritCroc
1c8b720ff2 Revert "Automatic SchildiChat string correction" 
This reverts commit d912c5a356.
 2020-09-08 18:29:29 +02:00
Benoit Marty
22cd6ae239
Merge pull request #2047 from vector-im/feature/universal_link_navigation 
Handle room, user, group, email verification links by converting them to permalinks.
 2020-09-08 12:21:54 +02:00
Valere
a544ae264b Avoid showing debug notice format for event preview 2020-09-08 09:51:35 +02:00
Onuray Sahin
e65558958d Code review refactoring. 2020-09-08 10:45:00 +03:00
Benoit Marty
bc389d371d Move string def to app module instead of SDK (#1994) 2020-09-07 13:38:12 +02:00
SpiritCroc
9dca2d433e Hide dark theme on devices older than Q 
Most likely, the don't support it (although theoratically, the -night
resource qualifier has been around for a while).

Change-Id: I54f736c2b06c71bb520727b0c834e687cad09237
 2020-09-06 15:32:45 +02:00
Benoit Marty
05ec5bde93
Merge pull request #2020 from vector-im/feature/add_email 
Add email and phone numbers
 2020-09-03 14:33:09 +02:00
Benoit Marty
633b12f66d Propose to verify the current session if the 4S contains secret, even if there is no other sessions 2020-09-03 10:00:01 +02:00
Benoit Marty
1a452a6cd7 Improve error for non supported SSO flow to delete device or add MSISDN 2020-09-01 12:58:53 +02:00
Benoit Marty
bf5c1e9d8f Add phone numbers to account 2020-08-31 20:53:37 +02:00
Benoit Marty
931eeac548 Add MSISDN (WIP) 2020-08-31 18:07:25 +02:00
Benoit Marty
ee3e10a4b0 Add threePid: improve UI for phone numbers 2020-08-31 14:46:05 +02:00
Benoit Marty
e92cf38cde Add threePid: improve UX (remove dialog) 2020-08-31 14:30:47 +02:00
Benoit Marty
58938a239e Format phone number 2020-08-28 19:07:41 +02:00
Benoit Marty
36a9b80040 i18n for M_THREEPID_AUTH_FAILED 2020-08-28 17:05:40 +02:00
Benoit Marty
175a5ab824 List phone numbers and emails added to the Matrix account, and add Email to account (#44) 2020-08-28 16:45:09 +02:00
SpiritCroc
8d6b141d8b Category unread counter: count chats with non-notification events 
When collapsing categories and disabling notifications for chats, it
might still be interesting how many unread chats there are.

Change-Id: If62cda94844cc7741d5052e9954d8fe1447de93a
 2020-08-28 10:17:32 +02:00
ganfra
9970398cf2 Join room: add "UnknownItem" to public room list 2020-08-25 20:20:14 +02:00
SpiritCroc
4a2e492f65 Fix sc string mismerge 
Change-Id: I2369f253058e85a73d3e45ed577dcc9134007a39
 2020-08-24 15:45:25 +02:00
SpiritCroc
b1d96ebba9 Setting for unread badge / room summary event visibility 
- All previewable like in Element
- Exclude member state changes
- Exclude member state changes and reactions

Replaces commit 72d2b1c9f1.

Also fix marking rooms as unread when no previewable event is available
compared to above commit.

Related issue:
https://github.com/vector-im/element-android/issues/588

Change-Id: Id76b73829a719de88f9c07c492e78736e1f3d7db
 2020-08-24 11:29:38 +02:00
SpiritCroc
18cf1111ea SC light theme: accent color for unread badge 2020-08-22 15:11:44 +02:00
SpiritCroc
765db4c3d2 SC light theme: improve contrast of "(edited)" 2020-08-22 15:03:20 +02:00
SpiritCroc
94eee632ba Update SC themes to v1.0.5 2020-08-22 14:55:18 +02:00
SpiritCroc
d912c5a356 Automatic SchildiChat string correction 2020-08-22 11:33:19 +02:00
SpiritCroc
ce90a36891 Theme update as in upstream merge 2020-08-22 11:23:59 +02:00
SpiritCroc
7b4b5be759 Merge tag 'v1.0.5' into sc 
Conflicts:
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/layout/item_timeline_event_file_stub.xml
	vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
	vector/src/main/res/values-v21/styles_login.xml
	vector/src/main/res/values/theme_dark.xml
	vector/src/main/res/values/theme_light.xml
	vector/src/main/res/values/theme_status.xml
 2020-08-22 11:23:45 +02:00
SpiritCroc
7240e4562a Remove unused drawables since merge 2020-08-22 11:05:06 +02:00
SpiritCroc
28f65ec0e8 Merge commit 'e3bf4c1e7bce8c752b4fef54be9a76893561a24a' into sc 
Merge v1.0.5 pt. 5

Conflicts:
	README.md
	vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
 2020-08-22 10:54:14 +02:00
SpiritCroc
589068cbf8 Revert "Update strings" 
This reverts commit 7c959176fd.
 2020-08-22 10:51:24 +02:00
SpiritCroc
c2e1a33864 Merge commit '67fc2feacb8e2563cc25f61ed6da48cb4de57ed7' into sc 
Merge v1.0.5 pt. 1

Conflicts:
	vector/src/main/java/im/vector/riotx/features/settings/VectorPreferences.kt
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/values/theme_dark.xml
	vector/src/main/res/values/theme_light.xml
 2020-08-22 09:52:54 +02:00
Benoit Marty
80f7ffd7a6 Fix Potential Plurals - 3 2020-08-21 14:19:06 +02:00
Benoit Marty
d86536c949 Fix Potential Plurals (removing unused resource) - 2 2020-08-21 13:07:37 +02:00
Benoit Marty
f84ea0ad5b Fix Potential Plurals - 1 2020-08-21 12:55:15 +02:00
Benoit Marty
187edbd32a
Merge pull request #1968 from vector-im/feature/biometrics 
Improve PIN code feature
 2020-08-20 17:16:27 +02:00
Benoit Marty
828bf44b2b Better handling DM creation when invitees cannot be inviting due to denied federation 
As we do not know the created roomId, we cannot add it to the DM list though. But at least the user is informed that a room has been created and won't retry because the screen will be closed.
 2020-08-20 15:44:28 +02:00
Benoit Marty
b090468109 Logout after 3 wrong PIN codes 2020-08-20 14:21:24 +02:00
Benoit Marty
08292c874b
Merge pull request #1943 from vector-im/feature/design_quick_win 
Feature/design quick win
 2020-08-18 18:30:25 +02:00
Tilo Spannagel
8c7956d935 Remove old code that was used on devices with api level <21 
Signed-off-by: Tilo Spannagel <development@tilosp.de>
 2020-08-17 21:20:39 +02:00
Benoit Marty
497b07b156 Fix color issue in dark and black themes (#961) 2020-08-17 18:02:23 +02:00
Benoit Marty
ac32d6bb29 Remove /verify command, it was added temporarily 2020-08-17 14:44:56 +02:00
SpiritCroc
9f24356d92 Fix bottom sheet accent colors in SC themes 2020-08-14 16:38:50 +02:00
Benoit Marty
4f8fd7b994 Benoit's review 
- Cleanup
- Force refresh of HomeServerCapabilities
- add some doc
- remove dead code
- remove commented code
- remove duplicated comment
- use getBestName()
- improve code formatting
- Fix isAudioOnly parameter in jitsi url
- Fix layout issue between "Active conference" banner and "Jump to first unread message banner"
- Improve "Active conference" banner
- Remove Calendar permission from Manifest
 2020-08-14 15:40:02 +02:00
SpiritCroc
eeb65e60d5 Point non-existent links to localhost 
Closes SpiritCroc/SchildiChat-android#5.
 2020-08-14 10:43:21 +02:00
Valere
050ef659b3 Code quality 
Fix neg margin + typo in jitsi
 2020-08-14 10:10:08 +02:00
Valere
3ce1e3e5d9 Add/Remove jitsi widget via option menu 2020-08-14 09:45:33 +02:00
Valere
42a24300a1 Initial commit jitsi 2020-08-14 09:31:24 +02:00
Benoit Marty
15c9d68175
Merge branch 'develop' into feature/display_device_key 2020-08-13 20:31:07 +02:00
Benoit Marty
3103fe970a Ensure users do not accidentally ignore other users (#1890) 
- Wording: use "Ignore" instead of "Block" for consistency across the app and with other Element app
 2020-08-13 16:44:32 +02:00
Benoit Marty
e6f89b0b22 Display device information (name, id and key) in Cryptography setting screen (#1784) 2020-08-13 16:37:19 +02:00