filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,679 Commits 7 Branches 127 Tags
Commit Graph

6097 Commits

Author SHA1 Message Date
zeritti
82bb0f19dd Translated using Weblate (Czech) 
Currently translated at 100.0% (2454 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2021-05-13 13:34:31 +00:00
SpiritCroc
af0108ffc6 Drawer button: reduce size 
This looked out of place, as it was considerably larger then the icon
found in other apps.
22dp would be even closer to other apps, but 24dp will make the unread
counter badge look less detached.

Change-Id: Icecbc1f99da90c2f237dda8a165c3cd8d2644aef
 2021-05-13 15:05:12 +02:00
Philipp Neumann
74b8660a44
Merge branch 'develop' into feature/conversations 2021-05-13 14:19:59 +02:00
dependabot[bot]
90f6f9f7c1
Bump libphonenumber from 8.12.22 to 8.12.23 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.22 to 8.12.23.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.22...v8.12.23)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-13 06:30:31 +00:00
Benoit Marty
1b84039407
Merge pull request #3288 from vector-im/dependabot/gradle/androidx.media-media-1.3.1 
Bump media from 1.3.0 to 1.3.1
 2021-05-12 20:58:23 +02:00
Benoit Marty
796bb80868
Merge pull request #3252 from vector-im/dependabot/gradle/com.github.chrisbanes-PhotoView-2.3.0 
Bump PhotoView from 2.1.4 to 2.3.0
 2021-05-12 16:51:12 +02:00
dependabot[bot]
cbd9ec33fe
Bump android-snowfall from 1.2.0 to 1.2.1 
Bumps [android-snowfall](https://github.com/JetradarMobile/android-snowfall) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/JetradarMobile/android-snowfall/releases)
- [Changelog](https://github.com/JetradarMobile/android-snowfall/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetradarMobile/android-snowfall/compare/1.2.0...1.2.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-12 14:50:50 +00:00
Benoit Marty
dcc37ec292
Merge pull request #3276 from vector-im/dependabot/gradle/daggerVersion-2.35.1 
Bump daggerVersion from 2.35 to 2.35.1
 2021-05-12 16:50:39 +02:00
dependabot[bot]
58dfe0f924
Bump daggerVersion from 2.35 to 2.35.1 
Bumps `daggerVersion` from 2.35 to 2.35.1.

Updates `dagger` from 2.35 to 2.35.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.35...dagger-2.35.1)

Updates `dagger-compiler` from 2.35 to 2.35.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.35...dagger-2.35.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-12 14:50:20 +00:00
Benoit Marty
4b87413b5f
Merge pull request #3278 from vector-im/dependabot/gradle/nl.dionsegijn-konfetti-1.3.2 
Bump konfetti from 1.2.6 to 1.3.2
 2021-05-12 16:50:10 +02:00
Benoit Marty
2709c1e99b
Merge pull request #3321 from vector-im/dependabot/gradle/com.google.firebase-firebase-messaging-22.0.0 
Bump firebase-messaging from 21.1.0 to 22.0.0
 2021-05-12 16:49:27 +02:00
Benoit Marty
dfc8860ade Fix avatar sample after PR merge 2021-05-12 16:43:46 +02:00
Benoit Marty
87953e7150
Merge pull request #3310 from vector-im/feature/bma/samples 
Improve layout preview regarding avatars
 2021-05-12 16:36:33 +02:00
SpiritCroc
808e381e09 No need to give spaces feedback to us 
Change-Id: Ie169ddff49368e0871036403ff0fab1ccea74f9a
 2021-05-12 16:29:36 +02:00
SpiritCroc
077e1b6896 Fix compile after merge 
Change-Id: I499115f40f75f07cdd0e42dafa2b17695d27e9b5
 2021-05-12 16:16:20 +02:00
SpiritCroc
5c68ccf67d Automatic SchildiChat string correction 
Change-Id: I5dff99fe89769fe352b2ff8d9f7c6b2814d48862
 2021-05-12 16:01:51 +02:00
SpiritCroc
db6cfd3054 Merge tag 'v1.1.7' into sc 
Change-Id: Icefe721894c7cd3d0702d07efbd0452f95775d32

Conflicts:
	.idea/codeStyles/Project.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/values-ca/strings.xml
	vector/src/main/res/values-cs/strings.xml
	vector/src/main/res/values-de/strings.xml
	vector/src/main/res/values-et/strings.xml
	vector/src/main/res/values-fa/strings.xml
	vector/src/main/res/values-fr/strings.xml
	vector/src/main/res/values-it/strings.xml
	vector/src/main/res/values-sq/strings.xml
	vector/src/main/res/values-sv/strings.xml
	vector/src/main/res/values-vi/strings.xml
	vector/src/main/res/values-zh-rTW/strings.xml
	vector/src/main/res/values/strings.xml
	vector/src/main/res/xml/vector_settings_labs.xml
 2021-05-12 16:01:36 +02:00
SpiritCroc
51b4ebdda7 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I8f600d6c60e381d3948645ebe77b35bbc6dc5ae8
 2021-05-12 15:45:49 +02:00
SpiritCroc
2269e0f1ed Merge branch 'spaces' into sc 
Change-Id: Ia2a25202fab4e5be3c4800bb5cb6ab47fc828bac
 2021-05-12 15:44:01 +02:00
Benoit Marty
a42a9b5e32 Version++ 2021-05-12 15:15:24 +02:00
Benoit Marty
72e343ad5a Better wording 2021-05-12 14:26:20 +02:00
Benoit Marty
6af9fda7df Fix lint issue 2021-05-12 14:06:59 +02:00
Benoit Marty
5d052cda79 Increase clickable area (no layout rendering change) 2021-05-12 13:55:47 +02:00
Benoit Marty
0d5b66f92b Flatten View hierarchy 2021-05-12 13:53:03 +02:00
Valere
391e952fbd Review + design update 2021-05-12 12:23:14 +02:00
Valere
df3d3b63c8 Code review 2021-05-12 11:04:54 +02:00
Valere
aefcb4841b Cleaning 2021-05-12 10:47:52 +02:00
Valere
eb18b23528 Add option to send beta feedback 2021-05-12 10:47:52 +02:00
Benoit Marty
03f2b516a0 Please the code quality checker 2021-05-12 10:17:33 +02:00
Benoit Marty
56d0699bc7
Merge pull request #3312 from vector-im/feature/bca/spaces_polish 
Spaces various fixes and polish
 2021-05-12 10:09:36 +02:00
Valere
1799dcbd0c Fix lint 2021-05-12 09:20:55 +02:00
Jeanne Lavoie
8e28b31170 Translated using Weblate (French) 
Currently translated at 99.5% (2442 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2021-05-12 06:07:14 +00:00
dependabot[bot]
3ddf181224
Bump firebase-messaging from 21.1.0 to 22.0.0 
Bumps firebase-messaging from 21.1.0 to 22.0.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-12 05:58:36 +00:00
Valere
0de56e2993 Code Review 2021-05-11 19:11:15 +02:00
Valere
eb9fadaebf user error when no space support on HS 
remove buggy separators on add room; design update
 2021-05-11 17:34:55 +02:00
Valere
91d8ee2a81 Space panel room ordering 2021-05-11 14:45:30 +02:00
SpiritCroc
e9e522603d Message footer: handle small width/height pictures 
Change-Id: Ib8554c5057f09277cb9ef2a29a57d3a85cf35417
 2021-05-11 12:21:41 +02:00
Valere
f9820cde58 Fixes on unread badges 2021-05-11 11:36:17 +02:00
Valere
14144dc99d Default all in home + lab flag 2021-05-11 10:45:07 +02:00
Valere
24a32f2b7e Subspace more hierarchy depth + fix bad notification count 2021-05-11 10:07:34 +02:00
Weblate
d9ffff70a6 Merge branch 'origin/develop' into Weblate. 2021-05-11 07:55:27 +00:00
Hivaa
631d8510ed Translated using Weblate (Persian) 
Currently translated at 100.0% (2438 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2021-05-11 07:53:01 +00:00
Michael Sasser
4e28de2107 Translated using Weblate (German) 
Currently translated at 99.5% (2428 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-05-11 07:52:56 +00:00
Philipp Neumann
f7d7362a85
Merge branch 'develop' into feature/conversations 2021-05-11 09:41:04 +02:00
Valere
1ec08bec07 Fix spaces add room via server 2021-05-11 08:18:37 +02:00
Benoit Marty
3a746cf23a Split sample step 3: rooms and spaces 2021-05-10 23:07:08 +02:00
Benoit Marty
2b632a2d52 Split sample step 2: messages 2021-05-10 22:53:51 +02:00
Benoit Marty
e34574f658 Split sample step 1 2021-05-10 22:51:07 +02:00
Benoit Marty
1b0b5e4ff0 Make the avatar matches the user 2021-05-10 22:45:08 +02:00
Benoit Marty
cf00cc2fda Fix issue with margin change 2021-05-10 22:34:42 +02:00