mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-22 09:25:49 +03:00
Code Issues Projects Releases Packages Wiki Activity
6636 commits 6 branches 120 tags 229 MiB
Commit graph

6636 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
8c5a8b9a2f Customize github templates 
Change-Id: Ifcfcbdfefe24aa24c9e1c32ca7674feee1c4db80
 2020-11-25 09:29:16 +01: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
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
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
SpiritCroc
e1cb8c520a Fix SC theme reaction background colors after last uptsream merge 
Change-Id: Ib86accac0a189eabd79f1159452c28d3dfe42e87
 2020-11-08 17:36:51 +01:00
SpiritCroc
164848e0aa Increment version 
Change-Id: Id0642c0e557b85b4209713028ba7c1d1223a070d
 2020-11-07 11:37:55 +01:00
SpiritCroc
786660f3bd merge_helpers.sh: downstream_latest_tag: Refer to HEAD instead of sc 
Fix getting the best tag in detached head state, when sc is not
up-to-date.

Change-Id: I50294b9de3134815deef30a4b1c61da81721de89
 2020-11-06 14:24:10 +01:00
SpiritCroc
10e67bd5df Remember expand status for all categories except invite 
We did remember low priority before. We might want to remember other
categories as well, but let's better keep the invite category expanded
by default.

Change-Id: Ia351de35751ce5a13f3739ed5f7a3528e315261f
 2020-11-06 14:24:03 +01:00
SpiritCroc
096e046556 merge_helpers.sh: Introduce NO_REQUIRE_CLEAN_GIT env var 
Change-Id: I278b39959c93d95869414ab00577953422057e28
 2020-11-05 16:46:32 +01:00
SpiritCroc
54b9cbd653 alternative_package.sh: Auto-commit, check, if git is clean 
Change-Id: Ieae93761dc51c1c141d138a34c6ae01dfef557d2
 2020-11-05 16:11:32 +01:00
SpiritCroc
4a483986f0 increment_version.sh: Add preview mode 
Change-Id: Icc7169e4abdc289ed60884b3ed6aec74c37d19d1
 2020-11-05 15:48:16 +01:00
SpiritCroc
d245af4d9c increment_version.sh: Add possibility for test releases 
Change-Id: I1ae628b56d0d2f49373cf507815f5efa3a881208
 2020-11-05 15:10:10 +01:00
SpiritCroc
6844c71987 increment_version.sh: No sc version change required for upstream merges 
Change-Id: I55e414902a232426e0af48911183f7f267cc3419
 2020-11-05 15:03:13 +01:00
SpiritCroc
eecbdde2fb Fix some colors (and fix compile) 
Change-Id: I2cb3d144afbb9af306774bf3d763d1f299133517
 2020-11-05 13:58:41 +01:00
SpiritCroc
2590f8f690 Resolve required manual intervention in german strings 
This reverts commit 85b77f6555.

Change-Id: I4f0056cdfd099205899f46b19962799052a6b461
 2020-11-05 13:27:39 +01:00
SpiritCroc
5a4907362a Automatic SchildiChat string correction 
Change-Id: I2b19a9bd837a14a3aaf5830bcde6af5026ff9c05
 2020-11-05 13:16:03 +01:00
SpiritCroc
c3f62cf80d Automatic upstream merge postprocessing 
Change-Id: Ib14a077c026657aff23ffbc42ade1e4524b0b8c2
 2020-11-05 13:16:02 +01:00
SpiritCroc
58d99e10a0 Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: I004362e70c17eba5828e10ec9bf8b37568f64f01

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/res/menu/menu_timeline.xml
 2020-11-05 13:15:55 +01:00
SpiritCroc
fc33d50c61 [TMP] Automatic upstream merge preparation 
Change-Id: Idd7894614eec671dcce0eecda95e2b7cf31ee7a6
 2020-11-05 13:14:16 +01:00
SpiritCroc
3837ce4204 Revert "Automatic SchildiChat string correction" 
This reverts commit 835bde286c.
 2020-11-05 13:14:16 +01:00
SpiritCroc
85b77f6555 Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Resolve required manual intervention in german strings""""""""" 
This reverts commit bde0020305.
 2020-11-05 13:14:16 +01:00
Benoit Marty
bba167d4ea Merge branch 'release/1.0.10' 2020-11-04 15:58:45 +01:00
Benoit Marty
619ec4faa4 Prepare release v1.0.10 2020-11-04 15:57:56 +01:00
Benoit Marty
49beae431f
Merge pull request #2343 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2020-11-04 15:14:28 +01:00
Weblate
f3b8bb066c Merge branch 'origin/develop' into Weblate. 2020-11-04 13:43:47 +00:00
LinAGKar
b879be2b02 Translated using Weblate (Swedish) 
Currently translated at 100.0% (1929 of 1929 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2020-11-04 13:43:37 +00:00
Hivaa
52e699e125 Translated using Weblate (Persian) 
Currently translated at 98.4% (1899 of 1929 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2020-11-04 13:43:36 +00:00
Benoit Marty
8a86b2c940
Merge pull request #2341 from vector-im/feature/bma/multi_home 
Two elements in the task switcher (#2299)
 2020-11-04 14:34:33 +01:00
Benoit Marty
b15fa7c0d7 Two elements in the task switcher (#2299) 2020-11-04 14:32:54 +01:00
Benoit Marty
6cd50cfaf1
Merge pull request #2336 from vector-im/feature/ons/fix_markdown_formatter 
Markdown body should be pure text, see #739, #1506.
 2020-11-04 13:50:46 +01:00
Onuray Sahin
9ed529b944
Merge branch 'develop' into feature/ons/fix_markdown_formatter 2020-11-04 13:43:26 +03:00
Onuray Sahin
bbc3dc0504 Set br softbreak to html parser. 2020-11-04 13:42:52 +03:00
Benoit Marty
d1d2c5f117
Merge pull request #2327 from vector-im/feature/bma/keysbackupcrash 
Feature/bma/keysbackupcrash
 2020-11-04 00:02:48 +01:00
Onuray Sahin
f24b593349 Update MarkdownParserTest. 2020-11-03 15:56:51 +03:00
SpiritCroc
600674e871 Room topic: tweak collapse behaviour some more 
One could argue that collapsing is only useful if we have more than 2
lines to hide.
Also, @su-ex wants more lines, so let's go for 5+3.

Change-Id: I5f3580171d4b1544fd8f91f1de48cea85023b60a
 2020-11-03 10:46:25 +01:00
Benoit Marty
0db1095373
Merge pull request #2334 from vector-im/feature/bca/crypto_db_clean 
Feature/bca/crypto db clean
 2020-11-03 10:31:53 +01:00
Benoit Marty
997cd68344 Add some padding for easier readability 2020-11-03 09:57:34 +01:00
Onuray Sahin
b40334f7db Markdown body should be pure text, see #739, #1506. 2020-11-03 11:53:50 +03:00
SpiritCroc
56b84a5201 Move footer time slighlty down in the bubble 
Change-Id: I0d61691ca56a44a6c8efb01d2c447bac9d50c9cb
 2020-11-03 09:49:53 +01:00
Benoit Marty
a216f82b35 Avoid code duplication and log total count 2020-11-03 09:30:26 +01:00
Benoit Marty
5eb2f14375 Move RealmDebugTools and make it an internal class 2020-11-03 09:20:24 +01:00
Benoit Marty
d4963dfb31 Use the same name for the 2 db log methods 2020-11-03 09:17:07 +01:00
Valere
3c7f61e45c Clean oldest gossiping entries on open 
Add a dump of DB size on bug report
 2020-11-02 17:45:08 +01:00
Besnik Bleta
10eef60f45 Translated using Weblate (Albanian) 
Currently translated at 99.4% (189 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sq/
 2020-11-02 15:49:57 +00:00
zeritti
cb70757790 Translated using Weblate (Czech) 
Currently translated at 100.0% (190 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/cs/
 2020-11-02 15:49:57 +00:00