mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-23 09:30:50 +03:00
Code Issues Projects Releases Packages Wiki Activity
6894 commits 7 branches 124 tags 230 MiB
Commit graph

6894 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
310b7a262c Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I77578d6304946bb60a67134b1b2e034c919d0e73
 2020-12-15 15:00:31 +01:00
SpiritCroc
ac57b10968 pre_merge.sh: Better upstream string change revert 
Change-Id: Iff217eea5b115f244bfa6e34faf35f430f638a7d
 2020-12-12 14:30:20 +01:00
SpiritCroc
da6547cedd merge_helpers.sh: upstream_previous_tag: for previous downstream tag 
Change-Id: I2204c727d825aa1f14e5051f607bb7ea8dc4b6e3
 2020-12-12 14:30:20 +01:00
SpiritCroc
1f35c3619c Fix a wrong upstream German translation 
Change-Id: I4752afdbee74a57c1cc0d8c883504d9e64d22add
 2020-12-12 14:29:29 +01:00
SpiritCroc
5f42fc7a5d Update README 
Change-Id: Iacbbfff57650cde5ef2038e2042a24dbea4bf565
 2020-12-09 15:14:06 +01:00
SpiritCroc
8d55c5ef9a Fix too wide message bubbles when hiding information 
Change-Id: I8507bf146a415237bef95683eb7a2f031bee9b7e
 2020-12-09 15:03:20 +01:00
SpiritCroc
455d48ea6a Hide "mark unread" functionality in labs 
Not many other clients support this yet

Change-Id: I37c618a592fec834f6376802434a5c8a20d1bbb1
 2020-12-09 15:03:14 +01:00
SpiritCroc
3e4f6a4689 Possibility to mark rooms as unread 
Using com.famedly.marked_unnread, as per MSC2867
(https://github.com/matrix-org/matrix-doc/pull/2867)

TODO:
- Currently, when upgrading from an older version, already existing
  unread flags are ignored until cache is cleared manually

Change-Id: I3b66fadb134c96f0eb428afd673035d790c16340
 2020-12-09 15:03:10 +01:00
SpiritCroc
3defe44eff Increment version 
Change-Id: Ic7a599e412c312fb5489500d2eb7ee1808a0b6bb
 2020-12-05 11:02:41 +01:00
SpiritCroc
852b715c61 Easy mode: Hide room directory button in room search 
Change-Id: I58f4fca9b2e03f7e4a8d7ddbe7fef66ac0f8cd0c
 2020-12-04 09:19:18 +01:00
SpiritCroc
fb42a6a89d Pad content also to the right, not only to the left 
Fixes:
- messages going directly to the right of the screen in no-bubble layout
- different padding of incoming and outgoing bubbles in dual-bubble
  layout

Change-Id: I7ac3ec72fed6dd925392eda0a96a2beadc8ff496
 2020-12-02 10:30:51 +01:00
SpiritCroc
d6ea5648b6 Re-arrange room profile 
- Show encryption status also in easy mode again
- Move encryption action down - it's a one-time action and not important
  enough to show prevalent on top
- Hide encryption action if permission missing
- TODO: hide encryption action when it's a public room (it's already
  hidden on room creation in that case)

Change-Id: I544704191fd7e3573ef35fa9de2f7023a01c4a04
 2020-12-01 11:23:22 +01:00
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
50b357642f Add back gradle checksum 
Change-Id: I88c997635b13164f44d473ae026a2bd1e6fe35fa
 2020-11-29 16:02:42 +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
0469beab1c Automatic upstream merge postprocessing 
Change-Id: Ib47b978128f8c6c0b243410591a1f9566ba08c6b
 2020-11-29 12:52:25 +01:00
SpiritCroc
e0ca1f2751 Automatic color correction 
Change-Id: Ia5d7d0bcba99005bb81a16a02edcc18b2480db1c
 2020-11-29 12:52:25 +01:00
SpiritCroc
6f0a1acaf7 post_merge.sh: Add some automatic accent color correction 
Change-Id: Ie0cf3b2d89fa8b24ac7544cba2f1540be041674b
 2020-11-29 12:52:07 +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
b283ba3b0a [TMP] Automatic upstream merge preparation 
Change-Id: I4824f735104a794acc944d39d52b61463a6fe17f
 2020-11-29 12:32:30 +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
SpiritCroc
7ca37b8b46 Bug report template: add note to link upstream issues 
Change-Id: Icf58edbe6e26726febf9b5c47e42901e332102ad
 2020-11-28 12:20:43 +01:00
Benoit Marty
dffdcfe1e4 Merge branch 'release/1.0.11' 2020-11-27 20:40:03 +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
9a8f45fc6f Prepare version 1.0.11 2020-11-27 13:59:23 +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
942f050579
Merge pull request #2450 from vector-im/feature/bca/home_empty_screens 
Home empty screen design update
 2020-11-27 13:51:04 +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
708cdad38b Update changelog 2020-11-27 10:24:07 +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
Benoit Marty
e3b88d1162
Merge pull request #2461 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2020-11-27 09:45:22 +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
4c599d3d40
Merge pull request #2451 from vector-im/feature/bca/fix_update_profile_no_rooms 
Fix / update profile when no rooms
 2020-11-26 15:09:40 +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
fbc3f47eeb Fix / update profile when no rooms 2020-11-26 14:34:45 +01:00
Valere
79caa4e510 update change log 2020-11-26 13:31:00 +01:00
Valere
fa191136cc Home empty screen design update 2020-11-26 13:27:10 +01:00