Skip to content

Commit ca347bb

Browse files
gpuntogpunto
committed
Apply renaming to the ui-components module too
1 parent 8ae763a commit ca347bb

File tree

60 files changed

+617
-622
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+617
-622
lines changed

‎stream-chat-android-docs/src/main/java/io/getstream/chat/docs/java/ui/Overview.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import androidx.lifecycle.ViewModelProvider;
55

66
import io.getstream.chat.android.ui.feature.messages.list.MessageListView;
7+
import io.getstream.chat.android.ui.viewmodel.messages.ChannelViewModelFactory;
78
import io.getstream.chat.android.ui.viewmodel.messages.MessageListViewModel;
89
import io.getstream.chat.android.ui.viewmodel.messages.MessageListViewModelBinding;
9-
import io.getstream.chat.android.ui.viewmodel.messages.MessageListViewModelFactory;
1010

1111
/**
1212
* [Overview](https://getstream.io/chat/docs/sdk/android/ui/overview/)
@@ -20,7 +20,7 @@ public class Overview extends Fragment {
2020
*/
2121
public void viewModels() {
2222
// 1
23-
ViewModelProvider.Factory factory = new MessageListViewModelFactory
23+
ViewModelProvider.Factory factory = new ChannelViewModelFactory
2424
.Builder(requireContext())
2525
.cid("messaging:123")
2626
.build();

‎stream-chat-android-docs/src/main/java/io/getstream/chat/docs/java/ui/guides/BuildingAMessageListScreen.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,48 +9,48 @@
99
import io.getstream.chat.android.ui.common.state.messages.MessageMode;
1010
import io.getstream.chat.android.ui.common.state.messages.Reply;
1111
import io.getstream.chat.android.ui.feature.messages.composer.MessageComposerView;
12-
import io.getstream.chat.android.ui.feature.messages.header.MessageListHeaderView;
12+
import io.getstream.chat.android.ui.feature.messages.header.ChannelHeaderView;
1313
import io.getstream.chat.android.ui.feature.messages.list.MessageListView;
14+
import io.getstream.chat.android.ui.viewmodel.messages.ChannelHeaderViewModel;
15+
import io.getstream.chat.android.ui.viewmodel.messages.ChannelHeaderViewModelBinding;
16+
import io.getstream.chat.android.ui.viewmodel.messages.ChannelViewModelFactory;
1417
import io.getstream.chat.android.ui.viewmodel.messages.MessageComposerViewModel;
1518
import io.getstream.chat.android.ui.viewmodel.messages.MessageComposerViewModelBinding;
16-
import io.getstream.chat.android.ui.viewmodel.messages.MessageListHeaderViewModel;
17-
import io.getstream.chat.android.ui.viewmodel.messages.MessageListHeaderViewModelBinding;
1819
import io.getstream.chat.android.ui.viewmodel.messages.MessageListViewModel;
1920
import io.getstream.chat.android.ui.viewmodel.messages.MessageListViewModelBinding;
20-
import io.getstream.chat.android.ui.viewmodel.messages.MessageListViewModelFactory;
2121

2222
/**
2323
* [Building A Message List Screen](https://getstream.io/chat/docs/sdk/android/ui/guides/building-message-list-screen/)
2424
*/
2525
public class BuildingAMessageListScreen extends Fragment {
2626

2727
private MessageListView messageListView;
28-
private MessageListHeaderView messageListHeaderView;
28+
private ChannelHeaderView channelHeaderView;
2929
private MessageComposerView messageComposerView;
3030

3131
public void usage() {
3232
// Create ViewModels for the Views
33-
ViewModelProvider.Factory factory = new MessageListViewModelFactory.Builder(requireContext())
33+
ViewModelProvider.Factory factory = new ChannelViewModelFactory.Builder(requireContext())
3434
.cid("messaging:123")
3535
.build();
3636
ViewModelProvider provider = new ViewModelProvider(this, factory);
37-
MessageListHeaderViewModel messageListHeaderViewModel = provider.get(MessageListHeaderViewModel.class);
37+
ChannelHeaderViewModel channelHeaderViewModel = provider.get(ChannelHeaderViewModel.class);
3838
MessageListViewModel messageListViewModel = provider.get(MessageListViewModel.class);
3939
MessageComposerViewModel messageComposerViewModel = provider.get(MessageComposerViewModel.class);
4040

4141
// Bind the ViewModels with the Views
42-
MessageListHeaderViewModelBinding.bind(messageListHeaderViewModel, messageListHeaderView, getViewLifecycleOwner());
42+
ChannelHeaderViewModelBinding.bind(channelHeaderViewModel, channelHeaderView, getViewLifecycleOwner());
4343
MessageListViewModelBinding.bind(messageListViewModel, messageListView, getViewLifecycleOwner());
4444
MessageComposerViewModelBinding.bind(messageComposerViewModel, messageComposerView, getViewLifecycleOwner());
4545

4646
// Let both message list header and message input know when we open a thread
4747
messageListViewModel.getMode().observe(getViewLifecycleOwner(), mode -> {
4848
if (mode instanceof MessageMode.MessageThread) {
4949
Message parentMessage = ((MessageMode.MessageThread) mode).getParentMessage();
50-
messageListHeaderViewModel.setActiveThread(parentMessage);
50+
channelHeaderViewModel.setActiveThread(parentMessage);
5151
messageComposerViewModel.setMessageMode(new MessageMode.MessageThread(parentMessage, null));
5252
} else if (mode instanceof MessageMode.Normal) {
53-
messageListHeaderViewModel.resetThread();
53+
channelHeaderViewModel.resetThread();
5454
messageComposerViewModel.leaveThread();
5555
}
5656
});
@@ -73,10 +73,10 @@ public void usage() {
7373
});
7474

7575
// Handle back button behaviour correctly when you're in a thread
76-
MessageListHeaderView.OnClickListener backHandler = () -> {
76+
ChannelHeaderView.OnClickListener backHandler = () -> {
7777
messageListViewModel.onEvent(MessageListViewModel.Event.BackButtonPressed.INSTANCE);
7878
};
79-
messageListHeaderView.setBackButtonClickListener(backHandler);
79+
channelHeaderView.setBackButtonClickListener(backHandler);
8080

8181
// Override the default Activity's back button behaviour
8282
requireActivity().getOnBackPressedDispatcher().addCallback(getViewLifecycleOwner(), new OnBackPressedCallback(true) {

‎stream-chat-android-docs/src/main/java/io/getstream/chat/docs/java/ui/messages/MessageComposer.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@
5050
import io.getstream.chat.android.ui.feature.messages.composer.content.MessageComposerContent;
5151
import io.getstream.chat.android.ui.feature.messages.list.MessageListView;
5252
import io.getstream.chat.android.ui.helper.TransformStyle;
53+
import io.getstream.chat.android.ui.viewmodel.messages.ChannelViewModelFactory;
5354
import io.getstream.chat.android.ui.viewmodel.messages.MessageComposerViewModel;
5455
import io.getstream.chat.android.ui.viewmodel.messages.MessageComposerViewModelBinder;
5556
import io.getstream.chat.android.ui.viewmodel.messages.MessageComposerViewModelBinding;
5657
import io.getstream.chat.android.ui.viewmodel.messages.MessageListViewModel;
5758
import io.getstream.chat.android.ui.viewmodel.messages.MessageListViewModelBinding;
58-
import io.getstream.chat.android.ui.viewmodel.messages.MessageListViewModelFactory;
5959
import io.getstream.chat.docs.databinding.MessageComposerLeadingContentBinding;
6060
import io.getstream.result.call.Call;
6161
import io.getstream.result.call.CallKt;
@@ -77,7 +77,7 @@ class Usage extends Fragment {
7777

7878
public void usage1() {
7979
// Create MessageComposerViewModel for a given channel
80-
ViewModelProvider.Factory factory = new MessageListViewModelFactory.Builder(requireContext())
80+
ViewModelProvider.Factory factory = new ChannelViewModelFactory.Builder(requireContext())
8181
.cid("messaging:123")
8282
.build();
8383
ViewModelProvider provider = new ViewModelProvider(this, factory);
@@ -89,7 +89,7 @@ public void usage1() {
8989

9090
public void usage2() {
9191
// Create MessageComposerViewModel for a given channel
92-
ViewModelProvider.Factory factory = new MessageListViewModelFactory.Builder(requireContext())
92+
ViewModelProvider.Factory factory = new ChannelViewModelFactory.Builder(requireContext())
9393
.cid("messaging:123")
9494
.build();
9595
ViewModelProvider provider = new ViewModelProvider(this, factory);
@@ -185,7 +185,7 @@ public void usage2() {
185185

186186
public void usage3() {
187187
// Create ViewModels for MessageComposerView and MessageListView
188-
ViewModelProvider.Factory factory = new MessageListViewModelFactory.Builder(requireContext())
188+
ViewModelProvider.Factory factory = new ChannelViewModelFactory.Builder(requireContext())
189189
.cid("messaging:123")
190190
.build();
191191
ViewModelProvider provider = new ViewModelProvider(this, factory);
@@ -566,7 +566,7 @@ public void usage1() {
566566
String cid = "messaging:123";
567567
ChatClient chatClient = ChatClient.instance();
568568
UserLookupHandler defaultUserLookupHandler = new DefaultUserLookupHandler(chatClient, cid);
569-
ViewModelProvider.Factory factory = new MessageListViewModelFactory.Builder(requireContext())
569+
ViewModelProvider.Factory factory = new ChannelViewModelFactory.Builder(requireContext())
570570
.cid(cid)
571571
.userLookupHandler(defaultUserLookupHandler)
572572
.build();
@@ -594,7 +594,7 @@ public void usage2() {
594594
};
595595

596596
// Create MessageComposerViewModel for a given channel
597-
ViewModelProvider.Factory factory = new MessageListViewModelFactory.Builder(requireContext())
597+
ViewModelProvider.Factory factory = new ChannelViewModelFactory.Builder(requireContext())
598598
.cid(cid)
599599
.userLookupHandlerCompat(customUserLookupHandler)
600600
.build();

‎stream-chat-android-docs/src/main/java/io/getstream/chat/docs/java/ui/messages/MessageList.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
import io.getstream.chat.android.ui.feature.messages.list.adapter.MessageListItemPayloadDiff;
2626
import io.getstream.chat.android.ui.feature.messages.list.adapter.MessageListItemViewHolderFactory;
2727
import io.getstream.chat.android.ui.helper.TransformStyle;
28+
import io.getstream.chat.android.ui.viewmodel.messages.ChannelViewModelFactory;
2829
import io.getstream.chat.android.ui.viewmodel.messages.MessageListViewModel;
2930
import io.getstream.chat.android.ui.viewmodel.messages.MessageListViewModelBinding;
30-
import io.getstream.chat.android.ui.viewmodel.messages.MessageListViewModelFactory;
3131
import io.getstream.chat.docs.databinding.TodayMessageListItemBinding;
3232

3333
/**
@@ -39,7 +39,7 @@ public class MessageList extends Fragment {
3939

4040
public void usage() {
4141
// Init ViewModel
42-
ViewModelProvider.Factory factory = new MessageListViewModelFactory.Builder(requireContext())
42+
ViewModelProvider.Factory factory = new ChannelViewModelFactory.Builder(requireContext())
4343
.cid("messaging:123")
4444
.build();
4545
ViewModelProvider provider = new ViewModelProvider(this, factory);

‎stream-chat-android-docs/src/main/java/io/getstream/chat/docs/java/ui/messages/MessageListHeader.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,47 +3,47 @@
33
import androidx.fragment.app.Fragment;
44
import androidx.lifecycle.ViewModelProvider;
55

6-
import io.getstream.chat.android.ui.feature.messages.header.MessageListHeaderView;
7-
import io.getstream.chat.android.ui.viewmodel.messages.MessageListHeaderViewModel;
8-
import io.getstream.chat.android.ui.viewmodel.messages.MessageListHeaderViewModelBinding;
9-
import io.getstream.chat.android.ui.viewmodel.messages.MessageListViewModelFactory;
6+
import io.getstream.chat.android.ui.feature.messages.header.ChannelHeaderView;
7+
import io.getstream.chat.android.ui.viewmodel.messages.ChannelHeaderViewModel;
8+
import io.getstream.chat.android.ui.viewmodel.messages.ChannelHeaderViewModelBinding;
9+
import io.getstream.chat.android.ui.viewmodel.messages.ChannelViewModelFactory;
1010

1111
/**
1212
* [Message List Header](https://getstream.io/chat/docs/sdk/android/ui/message-components/message-list-header/)
1313
*/
1414
public class MessageListHeader extends Fragment {
1515

16-
private MessageListHeaderView messageListHeaderView;
16+
private ChannelHeaderView channelHeaderView;
1717

1818
/**
1919
* [Usage](https://getstream.io/chat/docs/sdk/android/ui/message-components/message-list-header/#usage)
2020
*/
2121
public void usage() {
2222
// Initialize ViewModel
23-
ViewModelProvider.Factory factory = new MessageListViewModelFactory.Builder(requireContext())
23+
ViewModelProvider.Factory factory = new ChannelViewModelFactory.Builder(requireContext())
2424
.cid("messaging:123")
2525
.build();
2626
ViewModelProvider provider = new ViewModelProvider(this, factory);
27-
MessageListHeaderViewModel viewModel = provider.get(MessageListHeaderViewModel.class);
27+
ChannelHeaderViewModel viewModel = provider.get(ChannelHeaderViewModel.class);
2828

2929
// Bind the View and ViewModel
30-
MessageListHeaderViewModelBinding.bind(viewModel, messageListHeaderView, getViewLifecycleOwner());
30+
ChannelHeaderViewModelBinding.bind(viewModel, channelHeaderView, getViewLifecycleOwner());
3131
}
3232

3333
/**
3434
* [Handling Actions](https://getstream.io/chat/docs/sdk/android/ui/message-components/message-list-header/#handling-actions)
3535
*/
3636
public void handlingActions() {
37-
messageListHeaderView.setBackButtonClickListener(() -> {
37+
channelHeaderView.setBackButtonClickListener(() -> {
3838
// Handle back button click
3939
});
40-
messageListHeaderView.setAvatarClickListener(() -> {
40+
channelHeaderView.setAvatarClickListener(() -> {
4141
// Handle avatar click
4242
});
43-
messageListHeaderView.setTitleClickListener(() -> {
43+
channelHeaderView.setTitleClickListener(() -> {
4444
// Handle title click
4545
});
46-
messageListHeaderView.setSubtitleClickListener(() -> {
46+
channelHeaderView.setSubtitleClickListener(() -> {
4747
// Handle subtitle click
4848
});
4949
}

‎stream-chat-android-docs/src/main/java/io/getstream/chat/docs/java/ui/messages/MessageListScreen.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
import androidx.annotation.Nullable;
88
import androidx.appcompat.app.AppCompatActivity;
99

10-
import io.getstream.chat.android.ui.feature.messages.MessageListActivity;
11-
import io.getstream.chat.android.ui.feature.messages.MessageListFragment;
10+
import io.getstream.chat.android.ui.feature.messages.ChannelActivity;
11+
import io.getstream.chat.android.ui.feature.messages.ChannelFragment;
1212
import io.getstream.chat.android.ui.feature.messages.composer.MessageComposerView;
13-
import io.getstream.chat.android.ui.feature.messages.header.MessageListHeaderView;
13+
import io.getstream.chat.android.ui.feature.messages.header.ChannelHeaderView;
1414
import io.getstream.chat.android.ui.feature.messages.list.MessageListView;
1515
import io.getstream.chat.docs.R;
1616
import kotlin.Unit;
@@ -26,20 +26,20 @@ public class MessageListScreen {
2626
class Usage {
2727

2828
public void startActivity(Context context) {
29-
context.startActivity(MessageListActivity.createIntent(context, "messaging:123"));
29+
context.startActivity(ChannelActivity.createIntent(context, "messaging:123"));
3030
}
3131

32-
public final class MyMessageListActivity extends AppCompatActivity {
32+
public final class MyChannelActivity extends AppCompatActivity {
3333

34-
public MyMessageListActivity() {
34+
public MyChannelActivity() {
3535
super(R.layout.stream_ui_fragment_container);
3636
}
3737

3838
@Override
3939
protected void onCreate(@Nullable Bundle savedInstanceState) {
4040
super.onCreate(savedInstanceState);
4141
if (savedInstanceState == null) {
42-
MessageListFragment fragment = MessageListFragment.newInstance("messaging:123", builder -> {
42+
ChannelFragment fragment = ChannelFragment.newInstance("messaging:123", builder -> {
4343
builder.showHeader(true);
4444
return Unit.INSTANCE;
4545
});
@@ -56,16 +56,16 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
5656
*/
5757
class HandlingActions {
5858

59-
public final class MyMessageListActivity extends AppCompatActivity implements MessageListFragment.BackPressListener {
59+
public final class MyChannelActivity extends AppCompatActivity implements ChannelFragment.BackPressListener {
6060

61-
public MyMessageListActivity() {
61+
public MyChannelActivity() {
6262
super(R.layout.stream_ui_fragment_container);
6363
}
6464

6565
@Override
6666
protected void onCreate(@Nullable Bundle savedInstanceState) {
6767
super.onCreate(savedInstanceState);
68-
// Add MessageListFragment to the layout
68+
// Add ChannelFragment to the layout
6969
}
7070

7171
@Override
@@ -80,15 +80,15 @@ public void onBackPress() {
8080
*/
8181
class Customization {
8282

83-
public final class CustomMessageListFragment extends MessageListFragment {
83+
public final class CustomChannelFragment extends ChannelFragment {
8484

8585
@Override
86-
protected void setupMessageListHeader(@NonNull MessageListHeaderView messageListHeaderView) {
87-
super.setupMessageListHeader(messageListHeaderView);
86+
protected void setupChannelHeader(@NonNull ChannelHeaderView channelHeaderView) {
87+
super.setupChannelHeader(channelHeaderView);
8888
// Customize message list header view
8989

9090
// For example, set a custom listener for the back button
91-
messageListHeaderView.setBackButtonClickListener(() -> {
91+
channelHeaderView.setBackButtonClickListener(() -> {
9292
// Handle back press
9393
});
9494
}
@@ -106,13 +106,13 @@ protected void setupMessageComposer(@NonNull MessageComposerView messageComposer
106106
}
107107
}
108108

109-
public final class CustomMessageListActivity extends MessageListActivity {
109+
public final class CustomChannelActivity extends ChannelActivity {
110110

111111
@NonNull
112112
@Override
113-
protected MessageListFragment createMessageListFragment(@NonNull String cid, @Nullable String messageId) {
114-
return MessageListFragment.newInstance(cid, builder -> {
115-
builder.setFragment(new CustomMessageListFragment());
113+
protected ChannelFragment createChannelFragment(@NonNull String cid, @Nullable String messageId) {
114+
return ChannelFragment.newInstance(cid, builder -> {
115+
builder.setFragment(new CustomChannelFragment());
116116
builder.customTheme(R.style.StreamUiTheme);
117117
builder.showHeader(true);
118118
builder.messageId(messageId);
@@ -122,7 +122,7 @@ protected MessageListFragment createMessageListFragment(@NonNull String cid, @Nu
122122
}
123123

124124
public void startActivity(Context context) {
125-
context.startActivity(MessageListActivity.createIntent(context, "messaging:123", null, CustomMessageListActivity.class));
125+
context.startActivity(ChannelActivity.createIntent(context, "messaging:123", null, CustomChannelActivity.class));
126126
}
127127
}
128128
}

0 commit comments

Comments
 (0)