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

5415 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
e91be715a1 Add F-Droid badge 
Change-Id: Ie84dde3a8604bfd575dbefa54ed3d768bf71116d
 2020-08-31 15:56:49 +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
746f7a46ce correct_strings.sh: Add manual intervention required warning 
Change-Id: I72264e7f297e8a5c02300326c171e54d42de9710
 2020-08-24 15:45:01 +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
83edf15727 Android-studio keeps changing this 2020-08-22 15:02:25 +02:00
SpiritCroc
94eee632ba Update SC themes to v1.0.5 2020-08-22 14:55:18 +02:00
SpiritCroc
3ea56d5e53 Remove temporary downstream translation 2020-08-22 11:38:16 +02:00
SpiritCroc
d912c5a356 Automatic SchildiChat string correction 2020-08-22 11:33:19 +02:00
SpiritCroc
0802a86555 correct_strings.sh: Remove Triple-T files to avoid usage in F-Droid 2020-08-22 11:33:15 +02:00
SpiritCroc
984ba0724f Make correct_strings.sh automatically commit 2020-08-22 11:26:22 +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
9c3089c2b9 Revert back to updated correct_strings.sh 2020-08-22 10:51:45 +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
19f9c94d60 Merge branch 'release/1.0.5' 2020-08-21 17:02:49 +02:00
Benoit Marty
81dece5516 Prepare release 1.0.5 2020-08-21 17:02:32 +02:00
Benoit Marty
52e66b09dc
Merge pull request #1977 from vector-im/feature/networkonmainthread 
Avoid NetworkOnMainThreadException when setting a user avatar
 2020-08-21 16:48:19 +02:00
Benoit Marty
06f4b95dc0
Merge branch 'develop' into feature/networkonmainthread 2020-08-21 16:48:11 +02:00
Benoit Marty
de728f6c36
Merge pull request #1971 from tzeitlho/turn_fix 
Turn fix
 2020-08-21 16:28:52 +02:00
Benoit Marty
a8c6678efc Avoid NetworkOnMainThreadException when setting a user avatar 2020-08-21 16:11:22 +02:00
Benoit Marty
35dbab2ff5
Merge pull request #1976 from vector-im/feature/post_weblate_merge 
Feature/post weblate merge
 2020-08-21 14:47:25 +02:00
Thomas Zeitlhofer
a732d8856b change var -> val according to review comment 
Signed-off-by: Thomas Zeitlhofer <tz+github@ze-it.at>
 2020-08-21 14:28:18 +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