mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-30 21:08:40 +03:00
Code Issues Projects Releases Packages Wiki Activity
15594 commits 7 branches 124 tags 230 MiB
Commit graph

1525 commits

Author SHA1 Message Date
Maxime Naturel
70481e3ba3 Changing style of header 2022-03-14 11:15:16 +01:00
NIkita Fedrunov
84bd205014 "Add space" copy is replaced with "create space" in left sliding panel 2022-03-14 09:34:54 +01:00
Claire G
8f0d6a1adc use colorPrimary for tint 2022-03-10 14:30:15 +01:00
Benoit Marty
551b827753
Merge pull request #5384 from p1gp1g/bubble-space 
Add padding before first own message
 2022-03-10 14:09:23 +01:00
Benoit Marty
c339e10c07
Merge pull request #5436 from vector-im/feature/nfe/space_highlight 
change selected space highlight
 2022-03-10 13:28:08 +01:00
Benoit Marty
d83d5f9828
Merge pull request #5467 from vector-im/feature/bma/unused_resources_all 
Remove unused resources
 2022-03-10 13:03:27 +01:00
Adam Brown
ecb49b3b27 Merge branch 'main' into develop 2022-03-09 16:13:15 +00:00
Maxime NATUREL
f12afe0ef0
Merge pull request #5411 from vector-im/feature/mna/PSF-735-sharing-options-view 
#5395: Location sharing options view
 2022-03-09 16:10:46 +01:00
Benoit Marty
3f17cf595f Remove unused resources 2022-03-09 14:55:40 +01:00
Benoit Marty
e0914781fc
Merge pull request #5435 from vector-im/feature/nfe/space_menu_amend_copy 
Amend spaces menu to have consistent copy
 2022-03-09 11:13:46 +01:00
Adam Brown
662e9592a0
fixing overlapping room image and title (#5469) 
- the room title was missing constraints for the different types of leading icons
 2022-03-09 10:11:53 +00:00
Maxime Naturel
89db867ab3 Fix attributes style id conflicts 2022-03-09 09:46:52 +01:00
Maxime Naturel
82515cf095 Remove usage of strings to be deleted 2022-03-09 09:46:52 +01:00
Maxime Naturel
edc77b0c17 Fixing code syntax 2022-03-09 09:46:51 +01:00
Maxime Naturel
d36409d475 Renaming package to option 2022-03-09 09:46:51 +01:00
Maxime Naturel
b11f7f20e1 Adding user avatar and color for current location option 2022-03-09 09:46:51 +01:00
Maxime Naturel
42fca9bd6f Fixing ripple effect 2022-03-09 09:46:51 +01:00
Maxime Naturel
8bcc594320 Changing color of the live location icon 2022-03-09 09:46:47 +01:00
Maxime Naturel
fb764028c9 Adding dividers 2022-03-09 09:45:15 +01:00
Maxime Naturel
0707877b3c Using correct string resources for options 2022-03-09 09:45:15 +01:00
Maxime Naturel
3bbb7167f1 Adding icon for live location 2022-03-09 09:45:00 +01:00
Maxime Naturel
4586426958 Adding other options 2022-03-09 09:44:06 +01:00
Maxime Naturel
a98f502c01 Adding custom view for options picker 2022-03-09 09:44:06 +01:00
sim
17d58f24d2 Add padding before our first message 
Signed-off-by: sim <git@sgougeon.fr>
 2022-03-08 17:26:23 +01:00
Benoit Marty
b867e5f072 Iterate on badge / unread indicator color (#5332) 2022-03-08 14:52:10 +01:00
Adam Brown
9a02543afd
FTUE - Choose a display picture (#5323) 
* adding tests around the onboarding view model
- cases for the personalisation and display name actions

* adding base choose name fragment with UI

* add click handling for the display name actions

* adding tests around the onboarding view model
- cases for the personalisation and display name actions

* adding barebones profile picture fragment with ability to select a user avatar

* extracting uri filename resolving to a class which can be injected
- includes tests

* updating upstream avatar on profile picture save and continue step
- moves the personalisation state to a dedicated model to allow for back and forth state restoration

* adding test case for skipping profile picture setting

* taking the profile loading into account when rendering the onboarding loading

* extracting method for the handling of the profile picture selection

* adding dedicated camera icon for choosing profile picture

* adding toolbar to back to profile picture page
- this toolbar will fade in with the fragment as it sits at the fragment level, probably worth revisiting once more pages have a toolbar

* changing edit/add picture icon based on if we're already selected an image

* making use of debounced clicks to avoid potential extra clicks

* making the avatar height and camera icon relative percentage based
- also makes the avatar itself clicking, including a foreground ripple

* fixing formatting

* making use of fake session id for user id assertion

* using a real  matrix id syntax for the fake session user id

* removing duplicated dimens

* using self closing imageview tag
 2022-03-07 14:07:22 +00:00
NIkita Fedrunov
33246be2a5 change selected space highlight 2022-03-07 09:58:40 +01:00
NIkita Fedrunov
8732c6fe42 Amend spaces menu to have consistent copy 2022-03-07 08:32:31 +01:00
Ahmed Radhouane Belkilani
bcdf004082
Update the top bar in a room (#5213) 
Remove typing message notification from room toolbar.

Signed-off-by: Ahmed Radhouane Belkilani <arbelkilani@gmail.com>
 2022-03-04 16:38:53 +01:00
Onuray Sahin
2c611790db
Merge branch 'develop' into feature/ons/voice_message_scrubbing 2022-03-04 18:03:44 +03:00
Adam Brown
99e5a8f2fa
FTUE - Choose a display name (#5211) 
* adding base choose name fragment with UI

* add click handling for the display name actions

* updating real account display name

* setting the initial disabled state when the view is created

* adding header padding which would have been a toolbar

* exiting the flow on display name updated or skipped, the next PR will introduce the profile picture screen

* updating view model state testing to take all emissions into account

* adding tests around the onboarding view model
- cases for the personalisation and display name actions

* using colorSecondary instead of accent as per quality script rule

* making use of viewevent delegating action for the back handling

* using debounced clicks

* consuming the back action when existing the display name fragment via viewmodel

* making the keyboard imeDone update the display name
 2022-03-02 17:59:40 +00:00
Onuray Sahin
ab2001cd7f Create a custom audio waveform view. 2022-03-02 17:45:27 +03:00
Benoit Marty
80bc3af5fa
Merge pull request #5349 from vector-im/feature/mna/5005-save-image 
#5005: Add save media icon in gallery
 2022-02-28 14:23:17 +01:00
Benoit Marty
fd17517675 Remove unused strings 2022-02-25 13:45:24 +01:00
Maxime Naturel
0169396d7d Adding save icon into viewer 2022-02-24 17:39:40 +01:00
Benoit Marty
93de61e61f
Merge pull request #5206 from vector-im/arb/issues/3296 
#3296 Typing Notification update
 2022-02-23 18:57:14 +01:00
Benoit Marty
a2f3b43683
Merge pull request #5316 from vector-im/feature/fga/update_reaction_button_layout 
#5313: Update reaction button layout.
 2022-02-23 12:36:54 +01:00
Benoit Marty
276c526cef
Merge pull request #5158 from vector-im/feature/adm/ftue-post-account-creation 
FTUE - Account created screen
 2022-02-23 11:54:02 +01:00
Ahmed Radhouane Belkilani
91ab4726ad #3296 
- Fixes after review.

Signed-off-by: Ahmed Radhouane Belkilani <arbelkilani@gmail.com>
 2022-02-23 11:34:43 +01:00
Ahmed Radhouane Belkilani
5deabfae9d #4642 [Review] 
- revert vector_settings_round_avatar.xml file to develop state.

Signed-off-by: Ahmed Radhouane Belkilani <arbelkilani@gmail.com>
 2022-02-23 11:34:41 +01:00
Ahmed Radhouane Belkilani
a9b8871177 #3296 
- prevent timeline jump up while TypingMessageView populated.

Signed-off-by: Ahmed Radhouane Belkilani <arbelkilani@gmail.com>
 2022-02-23 11:34:40 +01:00
Ahmed Radhouane Belkilani
da9fdf1b18 #3296 
- Adding a typing message notification view at the bottom of the timeline in rooms.

Signed-off-by: Ahmed Radhouane Belkilani <arbelkilani@gmail.com>
 2022-02-23 11:34:39 +01:00
ganfra
e3b67fe30b #5313: Update reaction button layout. 2022-02-23 11:26:21 +01:00
Benoit Marty
6e7aa01437
Merge pull request #5303 from vector-im/feature/fga/improve_bubble_layout 
Feature/fga/improve bubble layout
 2022-02-22 22:56:09 +01:00
Benoit Marty
17fa463bc8 Delete unused resource 2022-02-22 16:05:40 +01:00
Sonia
f187bffc11 changes roomUnreadIndicator colour in item_room.xml 2022-02-22 11:11:31 +01:00
Benoit Marty
a89e8d0434
Merge pull request #5104 from noantiq/develop 
Make Space creation screens more consistent
 2022-02-21 16:53:56 +01:00
ganfra
10bf3e56fc Bubble: better handling of timestamp position for text messages 2022-02-17 19:09:51 +01:00
Maxime Naturel
2beff8d4cd adding headers to separate sections 2022-02-17 11:23:00 +01:00
Adam Brown
ea13f1c879
Merge pull request #5189 from vector-im/arb/issues/4640 
#4640 : The notification badge jumps around
 2022-02-11 14:18:41 +00:00
ganfra
0a52651e40 Reactions: update after remarks 2022-02-11 13:01:34 +01:00
Ahmed Radhouane Belkilani
a9a1532e01 #4640 
- change unread counter badge view in item_room to be in consistent place on the screen, to left of date/time.
 - change unread badge color state for dark and light theme to align with iOS.
 - add changelog file related to the issue.

Signed-off-by: Ahmed Radhouane Belkilani <arbelkilani@gmail.com>
 2022-02-11 11:45:39 +01:00
ganfra
31fa43b5bd Reactions: fix direction for outgoing bubble 2022-02-10 17:52:10 +01:00
ganfra
0244fea222 Reactions: more refinements 2022-02-10 17:51:49 +01:00
Adam Brown
023b32367b adding post account created screen, going to the personalise next steps are still TODO 2022-02-07 09:22:36 +00:00
Onuray Sahin
fbc8866394 Merge branch 'develop' into feature/ons/fix_failed_maps_rendering 
* develop: (54 commits)
  Bubbles: add CHANGELOG file
  Bubble: get LayoutDirection (RTL) from current Locale
  Version++
  fastlane
  towncrier
  Version 1.3.18
  changelog
  Improve missing state event detection to missing state events only one joined rooms (ignore LEFT room) Should reduce the number of initial sync Co-authors: ganfra and billcarsonfr
  Changelog added.
  taking the use case screen into account when accessing the sign up flows in the sanity tests
  updating copy split to match designs
  applying design feedback
  promoting use case strings for translation
  enabling the use case feature by default
  Code review fixes.
  ktlint
  Bubbles: clean up after review
  Sync: avoid deleting root event of CurrentState on gappy sync
  Code review fixes.
  Support generic location pin.
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLocationItem.kt
#	vector/src/main/res/layout/item_timeline_event_location_stub.xml
 2022-02-04 14:54:39 +03:00
ganfra
2e2da16a6b Bubbles: merge develop 2022-02-03 17:10:13 +01:00
Onuray Sahin
a7678241f2 Fix location rendering in timeline if map cannot be loaded. 2022-02-03 16:17:33 +03:00
Adam Brown
bac60677d5 applying design feedback 2022-02-03 11:28:33 +00:00
Benoit Marty
6ebba4e3dd
Merge pull request #5131 from vector-im/feature/nfe/spaces_promo_removal 
spaces restricted promo removed
 2022-02-03 00:44:07 +01:00
ganfra
9e0086742c Bubbles: clean up after review 2022-02-02 19:56:21 +01:00
Benoit Marty
2ffc89d863
Merge pull request #5125 from vector-im/feature/nfe/space_card_layout 
space and room card layout changed in explore rooms, space invite dia…
 2022-02-02 16:08:24 +01:00
NIkita Fedrunov
440c5f7516 spaces restricted promo removed 2022-02-02 15:42:28 +01:00
NIkita Fedrunov
c64c204878 code quality changes 2022-02-02 15:19:48 +01:00
ganfra
1bf2523437 Merge branch 'develop' into feature/fga/message_bubbles 2022-02-02 13:01:43 +01:00
Benoit Marty
407e065b90
Merge pull request #5041 from vector-im/feature/nfe/qr_scanner_fragments_merge 
qr scanner fragments merged into one
 2022-02-02 12:24:28 +01:00
NIkita Fedrunov
9dccc398b4 space and room card layout changed in explore rooms, space invite dialog, room invite dialog 2022-02-02 10:45:43 +01:00
ganfra
50810065a2 Bubbles: update media sizing (including LocationItem) 2022-02-01 20:19:35 +01:00
ganfra
825c2ca989 Merge branch 'develop' into feature/fga/message_bubbles 2022-02-01 10:05:51 +01:00
ganfra
38f1bbdab2 RTL: better support for some TextViews 2022-01-31 19:20:00 +01:00
ariskotsomitopoulos
d509b3324c Merge branch 'develop' into feature/aris/threads 2022-01-31 15:58:12 +02:00
Timuçin Boldt
90c502b16a Make Space creation screens more consistent 
Signed-off-by: Timuçin Boldt <timucin.boldt@udo.edu>
 2022-01-31 09:24:24 +01:00
Benoit Marty
eff6942f82 Use a MaterialCarView 2022-01-28 18:56:09 +01:00
Benoit Marty
e0ac8ee8b8 No need for an extra FrameLayout 2022-01-28 18:53:30 +01:00
Onuray Sahin
2dc52da30c Use static map image in bottom sheet. 2022-01-28 20:48:53 +03:00
ganfra
c425701c20 Bubbles: handle ripple effect 2022-01-28 17:55:32 +01:00
Onuray Sahin
50279e3183 Use static map image in timeline. 2022-01-28 18:51:28 +03:00
ganfra
35674ad401 Bubbles: handle location sharing (need updates) 2022-01-28 15:10:13 +01:00
ganfra
b79a5fd4f4 Bubble: move overlay view to MessageBubbleView (and fix corner radius) 2022-01-28 15:09:43 +01:00
NIkita Fedrunov
f56991f077 code review and lint fixes 2022-01-28 11:02:10 +01:00
Benoit Marty
26c0fee56d Add a loader waiting for the user location to be known 2022-01-27 22:27:43 +01:00
ganfra
c14eb050b1 Merge branch 'develop' into feature/fga/message_bubbles 2022-01-27 18:59:10 +01:00
ganfra
ed9adf8367 Bubbles: fix paddings 2022-01-27 18:18:39 +01:00
ariskotsomitopoulos
bac6d271ca Merge develop into this branch 2022-01-27 18:13:05 +02:00
ariskotsomitopoulos
b2a2fe2710 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
#	tools/check/forbidden_strings_in_code.txt
#	vector/build.gradle
#	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
#	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
#	vector/src/main/java/im/vector/app/features/command/Command.kt
#	vector/src/main/java/im/vector/app/features/command/CommandParser.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
#	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
#	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
#	vector/src/main/res/layout/fragment_timeline.xml
#	vector/src/main/res/xml/vector_settings_labs.xml
 2022-01-27 17:11:26 +02:00
ariskotsomitopoulos
554ece724e - Remove counter from thread notifications 
- Fix red dot on user mentioning
 2022-01-27 14:55:34 +02:00
Benoit Marty
6107fb644d Flatten View hierarchy 2022-01-26 17:00:36 +01:00
Benoit Marty
793cdf8f87 Ensure mapbox legal mention are displayed on the map 2022-01-26 00:22:07 +01:00
Adam Brown
523f4eeabf using material card view instead of androidx cardview 2022-01-25 18:15:32 +00:00
Benoit Marty
f14bf0dd50
Merge pull request #4817 from vector-im/feature/ons/static_location 
Static Location Sharing
 2022-01-25 18:03:17 +01:00
Benoit Marty
bca65281b6
Merge pull request #5025 from vector-im/feature/adm/use-case-dark-mode 
Updating use case icons to match designs
 2022-01-25 16:06:40 +01:00
Benoit Marty
b728e062e3 Cleanup layout 2022-01-25 15:15:47 +01:00
Benoit Marty
b619f70904 Merge branch 'develop' into feature/ons/static_location 2022-01-25 14:29:13 +01:00
Benoit Marty
5bb06158c7
Merge pull request #5020 from vector-im/feature/ons/edit_polls 
Edit Polls and Allow Undisclosed Polls
 2022-01-25 13:47:49 +01:00
Benoit Marty
3bc7b0acee Small issue 2022-01-24 18:57:53 +01:00
Adam Brown
203c7e0cd7 adding tools preview for the use case option icons 
- this is only the background layer though as the real image is programatically constructed
 2022-01-24 17:55:46 +00:00
Benoit Marty
3a8c788657 Add a Flow to ba able to hide one of the button 2022-01-24 18:47:26 +01:00
Onuray Sahin
12bfece89e Prevent anr in timeline. 2022-01-24 17:36:26 +03:00
fedrunov
b6eb27f8a1 qr scanner fragments merged into one 2022-01-24 15:27:22 +01:00
Onuray Sahin
b0b92c062e Undisclosed poll implementation. 2022-01-24 14:31:50 +03:00
Adam Brown
023409d8cf updating use case icons to match designs 
- programmatically creates a layer drawable to avoid introducing new colours into the palette
 2022-01-21 17:16:49 +00:00
ganfra
8c4dff4db9 Bubbles: change again url preview 2022-01-21 16:00:58 +01:00
fedrunov
f7aedff418
toolbar management (#4887) 
Toolbar management rework and toolbar style alignment
 2022-01-21 13:38:27 +01:00
Adam Brown
3c7f2c5bdf adding tools:text for dynamically set text 2022-01-19 11:18:54 +00:00
Adam Brown
211f184066 updating splash submit copy to use Create account when the I already have an account feature is enabled 2022-01-19 10:38:28 +00:00
ganfra
5ee4984ec8 Bubbles: handle images and make small refactoring 2022-01-18 19:27:12 +01:00
ganfra
a9e7c45074 Fix url preview sizing 2022-01-18 19:26:23 +01:00
ariskotsomitopoulos
636474b748 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
#	vector/src/main/java/im/vector/app/features/command/Command.kt
#	vector/src/main/java/im/vector/app/features/command/CommandParser.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
 2022-01-18 12:41:40 +02:00
ganfra
7ff8483592 Merge branch 'develop' into feature/fga/message_bubbles 2022-01-17 19:19:29 +01:00
ariskotsomitopoulos
5e23947419 Enhance filtering to support threads 2022-01-17 19:22:22 +02:00
Onuray Sahin
5581e0b5ba Code review fixes. 2022-01-17 18:30:04 +03:00
ariskotsomitopoulos
81a1dfd66d PR Remarks 2022-01-17 17:28:40 +02:00
Adam Brown
f4cacb2d16 applying percentage based heights to the carousel hero image and paddings 2022-01-17 09:24:53 +00:00
Adam Brown
b137009e6e replacing onboarding vectors with png to avoid performance overheads 
- also fixes the carousel text reposition based on line count
 2022-01-17 09:24:53 +00:00
Adam Brown
689c817606 updating splash carousel images with latest designs 2022-01-17 09:24:53 +00:00
ganfra
1108ef9fbe Bubbles: make it works for file, voice and polls. Also add parity for "modern" layout. 2022-01-14 19:19:23 +01:00
ariskotsomitopoulos
3a3cce85f8 Add encryption shield 
Change thread list filtering UI tick to radio buttons
 2022-01-14 18:42:57 +02:00
ariskotsomitopoulos
ff87f07f65 Add empty screen UI on empty thread list 2022-01-14 15:11:20 +02:00
ariskotsomitopoulos
53b82dfa3f Fix permalink handling for threads regarding timeline changes 2022-01-14 13:02:08 +02:00
Adam Brown
a208b48c15
Merge pull request #4927 from vector-im/feature/adm/ftue-usecase 
FTUE Use case UI/UX
 2022-01-13 14:48:49 +00:00
ganfra
d06df45e85 Merge branch 'develop' into feature/fga/message_bubbles 2022-01-13 13:17:23 +01:00
Adam Brown
b371e24d9f wrapping the use case into a scrollview to avoid overlapping on smaller devices 2022-01-13 12:00:59 +00:00
ganfra
b9cc795996 Bubbles : fix background colors 2022-01-13 12:33:36 +01:00
Adam Brown
1f876b9088 adding text to design preview for programatically set text 2022-01-13 10:39:34 +00:00
Adam Brown
47c9e75a77 making the text only buttons a button widget to give them touch feedback 2022-01-13 10:36:42 +00:00
Onuray Sahin
ae8ca5356f Fix recyclerview issues on async map functions. 2022-01-12 15:14:13 +03:00
Adam Brown
0ba6f55ad4 aligning the use case image padding to the other onboarding pages 2022-01-12 12:06:10 +00:00
Adam Brown
3d4caeaa75 extracting use case copy to the resources 2022-01-12 12:06:10 +00:00
Adam Brown
b6ff6aa4cc adding barebones ftue use case fragment 2022-01-12 12:06:10 +00:00
ariskotsomitopoulos
753e3e7519 - fix ktlint format 
- Update Threads toolbar UI
 2022-01-11 15:31:21 +02:00
Onuray Sahin
9ea30445ef Merge branch 'develop' into feature/ons/static_location 
* develop: (281 commits)
  Add a comment about the workaround
  Remove deprecated restricted lab option (#4889)
  Bump actions/github-script from 3 to 5.1.0
  Add some missing language in the change language screen
  Workaround to not to reuse poll option cells.
  Olm lib is now hosted in MavenCentral. Upgrade to 3.2.10
  Changelog
  Test: Fix test after change on OnBoarding screens
  Test: Analytics opt-in
  Cleanup
  Revert "Disable automatic opt-in screen display."
  - Do not add GitHub comments on successful ktlint runs  - Remove already existing comments when ktlint succeed
  restore deprecated lab preference
  Update nb of enum classes
  Change autoUisi label + rename matching_issue
  code review
  Fix enabling was broken
  Simple rate limiting of RS sending
  use flow instead of reactivex
  Fix UISIS preference listener
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
#	vector/src/main/res/layout/view_attachment_type_selector.xml
#	vector/src/main/res/values/strings.xml
 2022-01-11 14:42:11 +03:00
ganfra
f7c9b36cef Bubbles: continue exploration 2022-01-11 11:57:35 +01:00
Valere
5cbb1d99c7 Code review 2022-01-10 17:38:35 +01:00
Valere
ff4bbf0a8a Add "Create room" shortcut in Explore Space screen 2022-01-10 17:00:32 +01:00
ariskotsomitopoulos
50e51cbe29 Merge branch 'develop' into feature/aris/threads 2022-01-07 16:36:48 +02:00
Adam Brown
28f6d10af9
Merge pull request #4727 from vector-im/feature/adm/splash-carousel 
FTUE Splash carousel MVP
 2022-01-07 13:36:39 +00:00
ariskotsomitopoulos
ac5caccdf9 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
#	tools/check/forbidden_strings_in_code.txt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/res/menu/menu_timeline.xml
 2022-01-07 13:29:43 +02:00
Benoit Marty
b852b9de9c
Merge pull request #4871 from vector-im/feature/nfe/qr_scanner_toolbar 
Toolbar is added to a views with QR code scan
 2022-01-06 20:55:06 +01:00
Adam Brown
6929c947b0 adding gradient backgrounds to the carousel pages 
- also coverts the carousel pages to constraint layout and makes use of gutters to provide percentage based sizing
 2022-01-06 19:54:48 +00:00
Adam Brown
a2f780bef4 adding carousel content, images are temporary 2022-01-06 19:54:48 +00:00
Adam Brown
955fb03532 adding barebones splash carousel fragment, based on feature flag 2022-01-06 19:54:48 +00:00
ganfra
ad63d3de1c Bubbles: still R&D. Not sure how to handle every event types. 2022-01-06 19:07:28 +01:00
Adam Brown
16ed3f799f adding I already have an account functionality to the ftue auth splash 2022-01-06 17:50:13 +00:00
Adam Brown
fa939a2181 cloning the splash fragment into the onboarding 2022-01-06 17:50:13 +00:00
fedrunov
f35ffb0a60 referencing layout with @+id changed to @id according to code quality rules 2022-01-06 17:57:16 +01:00
fedrunov
6bfd9d07a9 Toolbar is added to a views with QR code scan 2022-01-06 17:11:23 +01:00
Adam Brown
ccd2d95f0f removing duplicated layout file 2022-01-06 10:03:13 +00:00
Adam Brown
d5373545f0 styling the debug trigger in the ftue splash 2022-01-06 10:03:13 +00:00
Adam Brown
811613fa4d adding I already have an account functionality to the ftue auth splash 2022-01-06 10:03:13 +00:00
Adam Brown
538f51e2d2 adds a debug menu entry point in the splash debug info 2022-01-06 10:03:13 +00:00