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

3331 Commits

Author SHA1 Message Date
SpiritCroc 372ae6e162 Increment version 
Change-Id: I7de06d933fdddf3b4cd05538f0c5b3f29066b6c8
 2020-09-02 11:58:48 +02:00
SpiritCroc f7767070bf Hide "unread notifications as tab"-preference when not using tabs 
Change-Id: Ia616786d88a78f8b70fd07b4187836a494d4be94
 2020-09-01 11:08:21 +02:00
SpiritCroc 0df61496f4 Make sure we're not landing on people's tab when using unified list 
Fix bug after toggling notification tab visibility while in unified list
(which shouldn't be possible either way).

Change-Id: I61d90c3f6973b2629608a00d55332c034465851e
 2020-09-01 11:04:51 +02:00
SpiritCroc ef5c7d5511 Disable swipe-to-reply by default 
Change-Id: Ifbbb264e83634857a69870be52c5973dfc909e10
 2020-08-28 10:25:18 +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
SpiritCroc c7ae49df1b Increment version 
Change-Id: I2e30e69f149fa363d8a0391fd4c4682575a234ae
 2020-08-24 17:54:08 +02:00
SpiritCroc 4d3229a321 Fix sorting rooms when filtering out events from overview 
Follow-up to b1d96ebba9

Change-Id: I8eeb052b9c883100470f8a124460f78dc643bbcc
 2020-08-24 17:52:53 +02:00
SpiritCroc 3b23ed9830 Increment version 
Change-Id: Ia0033b834c7b1a9145ead4247fe70d427ef53ae9
 2020-08-24 15:56:04 +02:00
SpiritCroc f00d68f0fe Fix another typo 
Change-Id: I3b675d3f1cc0aa5a8fc2509324a3d6005e2ab705
 2020-08-24 15:46:58 +02:00
SpiritCroc 19260fce65 Resolve required manual intervention in german strings 
Change-Id: I5755f1493a9cb28a951d8165c0e791e303c32150
 2020-08-24 15:45:32 +02:00
SpiritCroc 4a2e492f65 Fix sc string mismerge 
Change-Id: I2369f253058e85a73d3e45ed577dcc9134007a39
 2020-08-24 15:45:25 +02:00
SpiritCroc 4dfdfba42c Increment version 
Change-Id: I2b9b613775e1698a9b4339e153eb9b677f0898c7
 2020-08-24 11:35:41 +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 5b5cfa5bf1 Increment version 2020-08-23 15:27:39 +02:00
SpiritCroc d96417fda3 Fix login screen animation crash since v1.0.5 upstream merge 2020-08-23 15:22:59 +02:00
SpiritCroc 0474e4194d Fix draft icon visibility on dark themes 2020-08-22 15:26:15 +02:00
SpiritCroc 18cf1111ea SC light theme: accent color for unread badge 2020-08-22 15:11:44 +02:00
SpiritCroc 3380dd5169 Completely hide rageshake settings 2020-08-22 15:11:31 +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 27a6b3c79e Merge commit '11b5512cb86369a9c3b50e5b469a8182cce79f52' into sc 
Merge v1.0.5 pt. 6

Conflicts:
	matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStoreMigration.kt
	matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/summary/RoomSummaryUpdater.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
 2020-08-22 11:00:23 +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 8a2d1d5011 Merge commit '0127339eac46cd7032682eeae923eb5805099704' into sc 
Merge v1.0.5 pt. 4
 2020-08-22 10:30:50 +02:00
SpiritCroc 7ddae5726b Merge commit '05b849de13dcabb6a90b4ec9b28fe0c5a57ad3e4' into sc 
Merge v1.0.5 pt. 3
 2020-08-22 10:29:39 +02:00
SpiritCroc cbd22a1257 Merge commit 'a1f90abcd20d2100e02767a6fd2cfb9969f12a4d' into sc 
Merge v1.0.5 pt. 2

Conflicts:
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
	vector/src/main/java/im/vector/app/core/resources/ColorProvider.kt
	vector/src/main/java/im/vector/app/core/ui/views/WrapWidthTextView.kt
	vector/src/main/java/im/vector/app/core/utils/UserColor.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/RoomColor.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/RedactedMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListActivity.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
	vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginHeaderItem.kt
	vector/src/main/java/im/vector/app/features/themes/BubbleThemeUtils.kt
	vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryUserItem.kt
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_base_state.xml
	vector/src/main/res/xml/vector_settings_advanced_settings.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2020-08-22 10:29:31 +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 28ed6cb3b6 Fix typos reported by Lint 2020-08-21 12:47:39 +02:00
Benoit Marty 927c3e7e94 Update element web url (Fixes #1974) 2020-08-21 12:31:06 +02:00
Benoit Marty 5416f4194c Fix lint issue 2020-08-21 12:27:57 +02:00
Benoit Marty b09c1e3cbf Format strings 2020-08-21 12:23:25 +02:00
Weblate 43d0a11cba Merge branch 'origin/develop' into Weblate. 2020-08-21 09:30:51 +00:00
notramo a27b22a972 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3 of 3 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.riot.im/projects/element-android/element-store/hu/
 2020-08-21 09:30:37 +00:00
Priit Jõerüüt 338c569c0b Translated using Weblate (Estonian) 
Currently translated at 89.8% (1649 of 1836 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/et/
 2020-08-21 09:30:37 +00:00
Lua f7db14fb02 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (3 of 3 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.riot.im/projects/element-android/element-store/pt_BR/
 2020-08-21 00:42:34 +00:00
Lua cfd0e00c0c Translated using Weblate (Portuguese) 
Currently translated at 44.5% (817 of 1836 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/pt/
 2020-08-21 00:42:34 +00:00
Priit Jõerüüt 7c4afd922c Translated using Weblate (Estonian) 
Currently translated at 87.4% (1605 of 1836 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/et/
 2020-08-21 00:42:34 +00:00
Benoit Marty f07bf43ada
Merge branch 'develop' into feature/highlight 2020-08-20 19:04:03 +02:00
Benoit Marty 2acda2c5da
Merge pull request #1962 from vector-im/feature/membership_state_event 
A Kick appears has "someone has made no change" (Fixes #1959)
 2020-08-20 18:29:23 +02:00
Benoit Marty cbe093fe77 Highlighted Event when opening a permalink from another room (Fixes #1033) 2020-08-20 18:20:53 +02:00
Benoit Marty 2c90e33ceb Move package 2020-08-20 17:33:55 +02:00
Benoit Marty af10344b6b Share button in rooms gives room ID link without via parameters (#1927) 
Following the algorithm described in #1927
Create a PermalinkService
 2020-08-20 17:33:55 +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