Commit Graph

5433 Commits

Author SHA1 Message Date
SpiritCroc cd7fb3e164 Add pre_merge.sh merge helper
Change-Id: Ic1cbd5f124a6a56dd7cd384b5177f739f5085f73
2020-09-08 18:29:26 +02:00
SpiritCroc 65716c0ee8 Don't restart activity if inactive theme is changed
Change-Id: I1241b419cf588606af7e465bb1ac8285a026b944
2020-09-06 15:50:55 +02:00
SpiritCroc 9dca2d433e Hide dark theme on devices older than Q
Most likely, the don't support it (although theoratically, the -night
resource qualifier has been around for a while).

Change-Id: I54f736c2b06c71bb520727b0c834e687cad09237
2020-09-06 15:32:45 +02:00
SpiritCroc 35aedafc2f Work around wrap_content bug with italic text
Change-Id: I82e7750504b7ea78f0a01fb0e5ed44a06e1a8a8c
2020-09-06 15:07:07 +02:00
SpiritCroc b212344ad9 Hide trailing newlines in text messages
Change-Id: I4e11feeb28abd5f186691d6f61bdf65252b2db0d
2020-09-05 17:59:38 +02:00
SpiritCroc 3a47c1b438 Shorter code here because I'm looking at it
Change-Id: I444d0fa28fc92f996d58c16f65d9bebbd065ef69
2020-09-05 17:48:38 +02:00
SpiritCroc 2995375586 Hide redactions from the overview except for "show all events" setting
Change-Id: Ia2745f3d89277514b7137d1a1604b1cb031c321d
2020-09-05 17:22:09 +02:00
SpiritCroc 0003dc41ee Redaction item: fix bubble size
Change-Id: I213cbaf550d62e23566ee048d4f2db868217ad49
2020-09-05 17:07:45 +02:00
SpiritCroc f9cda6bbbf README: Add link to play version
Change-Id: Icb801769ccfd5ea3db2d966acaf5782b61f00681
2020-09-03 19:51:34 +02:00
SpiritCroc 853dd617e7
Merge pull request #10 from Poussinou/patch-1
Update README.md
2020-09-03 15:22:10 +02:00
Poussinou df1271d0b6
Update README.md 2020-09-03 15:19:45 +02:00
SpiritCroc 34afe55b5c alternative_package.sh: Don't run twice
Change-Id: I83295b2e68d3610667e257cbde91715937f626b7
2020-09-02 13:15:16 +02:00
SpiritCroc 372ae6e162 Increment version
Change-Id: I7de06d933fdddf3b4cd05538f0c5b3f29066b6c8
2020-09-02 11:58:48 +02:00
SpiritCroc 6477b4cc47 Remove from Play Store for now
Change-Id: I43973331b58c1fd2495e5b5b2e50145c755cc37c
2020-09-02 09:30:40 +02:00
SpiritCroc bc539a8cc7 alternative_package.sh: Fix fastlane title
Change-Id: Ie2e90c46622bee4a50a931e93717a64a775163fd
2020-09-02 09:27:07 +02:00
SpiritCroc e3b86d9d91 Remove RiotX from description
Change-Id: Ib514a4a1c271a49f734bb35a85bce1f3ff0c1496
2020-09-01 11:09:23 +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 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