mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-29 04:18:38 +03:00
Code Issues Projects Releases Packages Wiki Activity
10572 commits 7 branches 124 tags 230 MiB
Commit graph

6342 commits

Author SHA1 Message Date
SpiritCroc
6399e71e25 [merge-features] Fix and properly style voice message recording for SC 
Change-Id: Iba97f334b07e0fa1f4a4cc8fc92c97e53d919dd4
 2021-08-01 11:42:17 +02:00
SpiritCroc
3959a838d1 [merge-features] Fix voice messsage bubble layout + SC themes 
Change-Id: Idd2dddc8c8f6333ca90fa5411c69e084e3a4cdcf
 2021-08-01 10:31:17 +02:00
SpiritCroc
3cb509c58a Automatic SchildiChat string correction 
Change-Id: I9c40b43cf33abd696d421bdafd77db159eeb6545
 2021-08-01 09:37:47 +02:00
SpiritCroc
25ba52115b Merge tag 'v1.1.15' into sc 
Change-Id: I6bc7a7c052ccaae6adec247889b37baac2672ba4

Conflicts:
	vector/src/main/assets/open_source_licenses.html
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
	vector/src/main/res/drawable/ic_insert_emoji.xml
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/fragment_room_detail.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/xml/vector_settings_labs.xml
 2021-08-01 09:37:33 +02:00
SpiritCroc
26b1a478f0 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Ieaa970a813aa29bdc792add82c43f73062262056
 2021-07-30 18:33:30 +02:00
Onuray Sahin
c6bd6e4961
Merge pull request #3598 from vector-im/feature/ons/voice_message 
Voice Message
 2021-07-30 17:24:17 +03:00
Onuray Sahin
8e28872c9f Fix lint error. 2021-07-30 17:17:55 +03:00
Weblate
7e79473df5 Merge branch 'origin/develop' into Weblate. 2021-07-30 12:37:18 +00:00
Vojko Rajh
d4d43f228c Translated using Weblate (Slovenian) 
Currently translated at 1.0% (27 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sl/
 2021-07-30 12:36:56 +00:00
Onuray Sahin
1aa706dee5 Lint fixes. 2021-07-30 15:25:02 +03:00
Benoit Marty
7cd90b0b14
Merge pull request #3760 from vector-im/feature/bma/otk1 
2 small fixes
 2021-07-30 12:55:57 +02:00
Onuray Sahin
cfe64eed2a Update initial recording state to restore from background. 2021-07-30 11:27:14 +03:00
Onuray Sahin
e945b8911c Hide mic if there is a draft message. 2021-07-30 11:14:29 +03:00
Onuray Sahin
cdd2fca258 Design review fixes. 2021-07-29 18:41:29 +03:00
Szimszon
5afc689bcf Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2518 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2021-07-28 21:25:11 +00:00
Benoit Marty
a7e3c0d0d8 Fix wording when verification is cancelled. 2021-07-27 17:31:19 +02:00
waclaw66
e69011835e Translated using Weblate (Czech) 
Currently translated at 77.6% (66 of 85 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
 2021-07-27 14:52:38 +02:00
Onuray Sahin
4c8a8d8cfb Design review fixes. 2021-07-27 15:32:35 +03:00
David Langley
9c139b3bd0 Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/fix_account_notifications_discrepancies 2021-07-26 22:55:27 +01:00
Priit Jõerüüt
f123db398e Translated using Weblate (Estonian) 
Currently translated at 100.0% (2518 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2021-07-26 20:25:09 +00:00
SpiritCroc
abccf99f55 Theme color of quotation bar 
Change-Id: Ia9d9c34c1bb276fea42b00131ea1915f93f23263
 2021-07-25 10:34:27 +02:00
SpiritCroc
e785bcc1f1 Tweak accents 
Change-Id: I3ccb799dd430c56fd4d27ef307618e255773d5fa
 2021-07-25 10:02:53 +02:00
Jeff Huang
ebbd9af7a6 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2518 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2021-07-24 21:25:53 +00:00
sr093906
739bd7fd84 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (2518 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2021-07-24 21:25:51 +00:00
Ihor Hordiichuk
ad8f42a9c0 Translated using Weblate (Ukrainian) 
Currently translated at 70.3% (1772 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-07-24 21:25:49 +00:00
Besnik Bleta
1c75c8f6f2 Translated using Weblate (Albanian) 
Currently translated at 99.5% (2507 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/
 2021-07-24 21:25:49 +00:00
tanmatsu
df75c9375f Translated using Weblate (Romanian) 
Currently translated at 10.4% (264 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
 2021-07-24 21:25:47 +00:00
Michael Mihai
ba52336a60 Translated using Weblate (Romanian) 
Currently translated at 10.4% (264 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
 2021-07-24 21:25:46 +00:00
lvre
fe8a9c8753 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2518 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2021-07-24 21:25:46 +00:00
oksya8and8
936ca950d9 Translated using Weblate (Japanese) 
Currently translated at 65.6% (1653 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2021-07-24 21:25:44 +00:00
random
c5dfcc9c09 Translated using Weblate (Italian) 
Currently translated at 99.8% (2515 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2021-07-24 21:25:43 +00:00
Vancha
ff37ed0e1f Translated using Weblate (Frisian) 
Currently translated at 39.3% (990 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fy/
 2021-07-24 21:25:42 +00:00
1kiarash
d0bb1bcf59 Translated using Weblate (Persian) 
Currently translated at 100.0% (2518 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2021-07-24 21:25:16 +00:00
Danial Behzadi
56dd0541e5 Translated using Weblate (Persian) 
Currently translated at 100.0% (2518 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2021-07-24 21:25:15 +00:00
Priit Jõerüüt
ad270a4e2b Translated using Weblate (Estonian) 
Currently translated at 100.0% (2518 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2021-07-24 21:25:13 +00:00
libexus
f1da60e582 Translated using Weblate (German) 
Currently translated at 99.0% (2493 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-07-24 21:25:11 +00:00
zeritti
be660fbbf3 Translated using Weblate (Czech) 
Currently translated at 100.0% (2518 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2021-07-24 21:25:10 +00:00
SpiritCroc
a88f90e0e7 Merge remote-tracking branch 'weblate/sc' into sc 
Change-Id: I0f891680d74073a89018fbe13e2c477e31650bed
 2021-07-24 18:07:41 +02:00
SpiritCroc
ac4fe57995 Add some more accents 
Imported from AICP

Change-Id: Icce1c1d602bdf8a9d762448801df5cf57b221e60
 2021-07-24 17:57:41 +02:00
SpiritCroc
d54a9302fc Accent color theming 
Change-Id: I31b19858d0e01e1427df91750875bc470e741bcd
 2021-07-24 17:42:05 +02:00
SpiritCroc
8b7cae31a9 Import ColorMatrixListPreference from AICP 
Original commit history from frameworks/opt/aicpgear:

commit adf33979bdd1da0a3fd96e7276dd567e559db780
Author: SpiritCroc <dev@spiritcroc.de>
Date:   Thu Oct 31 11:59:04 2019 +0100

    Use proper androidx attrs again

    Have been removed in the blueprint bringup commit

    Change-Id: I25f7781db9b39916680feec6fe75e1e39240e78a

commit 9de1e6ae734b3acc686c57d2b7984ffd2f3346ba
Author: SpiritCroc <dev@spiritcroc.de>
Date:   Sun Oct 20 16:43:10 2019 +0200

    Migrate AicpGear to blueprint

    Change-Id: I6fecdb3c18a80b6fc9fda52bd730c20e4568f54b

commit 26931c7a31ee4aa1bb88b6de1f2f7c9fee7c68e5
Author: SpiritCroc <dev@spiritcroc.de>
Date:   Sat Sep 7 11:08:01 2019 +0200

    AICP Q Theming [1/2]

    Change-Id: Ic947806f618d9e9a81def568781f409d3a428dba

commit 31b5eb51bd4ff3378eb4b8b5cac010c1b9e47932
Author: SpiritCroc <dev@spiritcroc.de>
Date:   Fri Sep 6 17:29:44 2019 +0200

    androidx: PreferenceFragment is deprecated, use PreferenceFragmentCompat

    Change-Id: I000587f1e775900d92e9b3cf859f145995afa08b

commit 58e09c3dfaad470e9eaea5f11299c5504db9366d
Author: Michele Bono <bono.michele94@gmail.com>
Date:   Sat Aug 17 14:21:34 2019 +0200

    aicpgear: Migrate to androidx

    Change-Id: I3c63fe017128785bb541a7668bbb388a8cb2fed0

commit 4636b50f0c6788f9945f64427a8a541623f2b48d
Author: SpiritCroc <dev@spiritcroc.de>
Date:   Mon Sep 2 18:48:51 2019 +0200

    ColorMatrixListPreferenceDialogFragment: It's a feature

    When previewing two colors for light and dark theme at the same time,
    this is considered as "glitchy" by some users.
    Enlighten them (hopefully) by hiding the second color with a toggle
    button.

    Change-Id: I90a70af5188687edd184e5937e55686843fdaba0

commit e1e6b7b44c2a801f787ee8e42aed9af24464d4b2
Author: SpiritCroc <dev@spiritcroc.de>
Date:   Fri Aug 9 13:09:14 2019 +0200

    Add ColorMatrixListPreference

    Change-Id: I3c03d95fa56aed2ee5754e58f0394f3ff55fae39

Change-Id: I41098d5f5255dc8efa515e8b68191dd89d94233f
 2021-07-24 10:27:57 +02:00
Allan Nordhøy
98b1e013e7 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 100.0% (62 of 62 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/nb_NO/
 2021-07-24 10:17:22 +02:00
Allan Nordhøy
47d90d9d21 Translated using Weblate (English) 
Currently translated at 100.0% (62 of 62 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/en/
 2021-07-24 10:17:22 +02:00
Weblate
a917e2c455 Added translation using Weblate (Norwegian Bokmål) 2021-07-24 10:17:22 +02:00
SpiritCroc
4c9b304135 Automatic SchildiChat string correction 
Change-Id: Id7236cbbbc4a56dcef81d005e3e4e2523f11ea97
 2021-07-24 10:13:52 +02:00
SpiritCroc
acb12c2005 Merge tag 'v1.1.14' into sc 
Change-Id: I7668fc7603c8f6e7aafa89886bb0fdf586e4a871

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
 2021-07-24 10:12:48 +02:00
SpiritCroc
5b5ce76298 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I61e7986a0a3d243ff96e4eb65cf960566b28e790
 2021-07-23 17:37:47 +02:00
Onuray Sahin
bd2ed4c58a Stop playback when deleting record on locked mode. 2021-07-23 16:53:34 +03:00
Onuray Sahin
a11941714d Code review fixes. 2021-07-23 15:19:50 +03:00
ganfra
e3464f58fa Call notif: make end call notif better 2021-07-22 18:51:36 +02:00