Skip to content

Commit 101326b

Browse files
leandroBorgesFerreiraleandroBorgesFerreira
committed
Merge remote-tracking branch 'origin/main' into FixingDarkMode
2 parents 4f31d0b + fda6446 commit 101326b

Some content is hidden

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

44 files changed

+148
-114
lines changed

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# http://www.gradle.org/docs/current/userguide/build_environment.html
77
# Specifies the JVM arguments used for the daemon process.
88
# The setting is particularly useful for tweaking memory settings.
9-
org.gradle.jvmargs=-Xmx1536m
9+
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
1010
# When configured, Gradle will run in incubating parallel mode.
1111
# This option should only be used with decoupled projects. More details, visit
1212
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

‎samplejava/.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
/build
1+
/build

‎samplejava/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ android {
3535

3636
dependencies {
3737
// Add new dependencies
38-
implementation "io.getstream:stream-chat-android-ui-components:4.5.4"
38+
implementation "io.getstream:stream-chat-android-ui-components:4.5.5"
3939
implementation 'io.coil-kt:coil:1.1.1'
4040

4141
implementation 'androidx.appcompat:appcompat:1.2.0'

‎samplejava/proguard-rules.pro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818

1919
# If you keep the line number information, uncomment this to
2020
# hide the original source file name.
21-
#-renamesourcefileattribute SourceFile
21+
#-renamesourcefileattribute SourceFile

‎samplejava/src/main/AndroidManifest.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.example.chattutorialjava">
3+
package="com.example.chattutorial">
44

55
<application
66
android:allowBackup="true"
77
android:icon="@mipmap/ic_launcher"
88
android:label="@string/app_name"
99
android:roundIcon="@mipmap/ic_launcher_round"
1010
android:supportsRtl="true"
11-
android:theme="@style/AppTheme">
11+
android:theme="@style/Theme.ChatTutorial">
1212
<activity android:name=".MainActivity">
1313
<intent-filter>
1414
<action android:name="android.intent.action.MAIN" />
@@ -22,4 +22,4 @@
2222
<activity android:name=".ChannelActivity4" />
2323
</application>
2424

25-
</manifest>
25+
</manifest>

samplejava/src/main/java/com/example/chattutorialjava/ChannelActivity.java renamed to samplejava/src/main/java/com/example/chattutorial/ChannelActivity.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.chattutorialjava;
1+
package com.example.chattutorial;
22

33
import android.content.Context;
44
import android.content.Intent;
@@ -9,20 +9,20 @@
99
import androidx.appcompat.app.AppCompatActivity;
1010
import androidx.lifecycle.ViewModelProvider;
1111

12-
import com.example.chattutorialjava.databinding.ActivityChannelBinding;
12+
import com.example.chattutorial.databinding.ActivityChannelBinding;
1313
import com.getstream.sdk.chat.viewmodel.MessageInputViewModel;
1414
import com.getstream.sdk.chat.viewmodel.messages.MessageListViewModel;
1515
import com.getstream.sdk.chat.viewmodel.messages.MessageListViewModel.Mode.Normal;
1616
import com.getstream.sdk.chat.viewmodel.messages.MessageListViewModel.Mode.Thread;
1717
import com.getstream.sdk.chat.viewmodel.messages.MessageListViewModel.State.NavigateUp;
1818

1919
import io.getstream.chat.android.client.models.Channel;
20-
import io.getstream.chat.android.ui.message.input.MessageInputViewModelBinding;
20+
import io.getstream.chat.android.ui.message.input.viewmodel.MessageInputViewModelBinding;
2121
import io.getstream.chat.android.ui.message.list.header.MessageListHeaderView;
2222
import io.getstream.chat.android.ui.message.list.header.viewmodel.MessageListHeaderViewModel;
2323
import io.getstream.chat.android.ui.message.list.header.viewmodel.MessageListHeaderViewModelBinding;
24+
import io.getstream.chat.android.ui.message.list.viewmodel.MessageListViewModelBinding;
2425
import io.getstream.chat.android.ui.message.list.viewmodel.factory.MessageListViewModelFactory;
25-
import io.getstream.chat.android.ui.message.view.MessageListViewModelBinding;
2626

2727
public class ChannelActivity extends AppCompatActivity {
2828

@@ -54,7 +54,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
5454
MessageListViewModel messageListViewModel = provider.get(MessageListViewModel.class);
5555
MessageInputViewModel messageInputViewModel = provider.get(MessageInputViewModel.class);
5656

57-
// TODO set custom Imgur attachment View Holder Factory
57+
// TODO set custom Imgur ViewHolderFactory
5858

5959
// Step 2 - Bind the view and ViewModels, they are loosely coupled so it's easy to customize
6060
MessageListHeaderViewModelBinding.bind(channelHeaderViewModel, binding.messageListHeaderView, this);

samplejava/src/main/java/com/example/chattutorialjava/ChannelActivity2.java renamed to samplejava/src/main/java/com/example/chattutorial/ChannelActivity2.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.chattutorialjava;
1+
package com.example.chattutorial;
22

33
import android.content.Context;
44
import android.content.Intent;
@@ -9,20 +9,20 @@
99
import androidx.appcompat.app.AppCompatActivity;
1010
import androidx.lifecycle.ViewModelProvider;
1111

12-
import com.example.chattutorialjava.databinding.ActivityChannel2Binding;
12+
import com.example.chattutorial.databinding.ActivityChannel2Binding;
1313
import com.getstream.sdk.chat.viewmodel.MessageInputViewModel;
1414
import com.getstream.sdk.chat.viewmodel.messages.MessageListViewModel;
1515
import com.getstream.sdk.chat.viewmodel.messages.MessageListViewModel.Mode.Normal;
1616
import com.getstream.sdk.chat.viewmodel.messages.MessageListViewModel.Mode.Thread;
1717
import com.getstream.sdk.chat.viewmodel.messages.MessageListViewModel.State.NavigateUp;
1818

1919
import io.getstream.chat.android.client.models.Channel;
20-
import io.getstream.chat.android.ui.message.input.MessageInputViewModelBinding;
20+
import io.getstream.chat.android.ui.message.input.viewmodel.MessageInputViewModelBinding;
2121
import io.getstream.chat.android.ui.message.list.header.MessageListHeaderView;
2222
import io.getstream.chat.android.ui.message.list.header.viewmodel.MessageListHeaderViewModel;
2323
import io.getstream.chat.android.ui.message.list.header.viewmodel.MessageListHeaderViewModelBinding;
24+
import io.getstream.chat.android.ui.message.list.viewmodel.MessageListViewModelBinding;
2425
import io.getstream.chat.android.ui.message.list.viewmodel.factory.MessageListViewModelFactory;
25-
import io.getstream.chat.android.ui.message.view.MessageListViewModelBinding;
2626

2727
public class ChannelActivity2 extends AppCompatActivity {
2828

samplejava/src/main/java/com/example/chattutorialjava/ChannelActivity3.java renamed to samplejava/src/main/java/com/example/chattutorial/ChannelActivity3.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.chattutorialjava;
1+
package com.example.chattutorial;
22

33
import android.content.Context;
44
import android.content.Intent;
@@ -11,7 +11,7 @@
1111
import androidx.appcompat.app.AppCompatActivity;
1212
import androidx.lifecycle.ViewModelProvider;
1313

14-
import com.example.chattutorialjava.databinding.ActivityChannel3Binding;
14+
import com.example.chattutorial.databinding.ActivityChannel3Binding;
1515
import com.getstream.sdk.chat.viewmodel.MessageInputViewModel;
1616
import com.getstream.sdk.chat.viewmodel.messages.MessageListViewModel;
1717
import com.getstream.sdk.chat.viewmodel.messages.MessageListViewModel.Mode.Normal;
@@ -25,12 +25,12 @@
2525
import io.getstream.chat.android.client.models.User;
2626
import io.getstream.chat.android.livedata.ChatDomain;
2727
import io.getstream.chat.android.livedata.controller.ChannelController;
28-
import io.getstream.chat.android.ui.message.input.MessageInputViewModelBinding;
28+
import io.getstream.chat.android.ui.message.input.viewmodel.MessageInputViewModelBinding;
2929
import io.getstream.chat.android.ui.message.list.header.MessageListHeaderView;
3030
import io.getstream.chat.android.ui.message.list.header.viewmodel.MessageListHeaderViewModel;
3131
import io.getstream.chat.android.ui.message.list.header.viewmodel.MessageListHeaderViewModelBinding;
32+
import io.getstream.chat.android.ui.message.list.viewmodel.MessageListViewModelBinding;
3233
import io.getstream.chat.android.ui.message.list.viewmodel.factory.MessageListViewModelFactory;
33-
import io.getstream.chat.android.ui.message.view.MessageListViewModelBinding;
3434

3535
public class ChannelActivity3 extends AppCompatActivity {
3636

samplejava/src/main/java/com/example/chattutorialjava/ChannelActivity4.java renamed to samplejava/src/main/java/com/example/chattutorial/ChannelActivity4.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.chattutorialjava;
1+
package com.example.chattutorial;
22

33
import android.content.Context;
44
import android.content.Intent;
@@ -11,7 +11,7 @@
1111
import androidx.appcompat.app.AppCompatActivity;
1212
import androidx.lifecycle.ViewModelProvider;
1313

14-
import com.example.chattutorialjava.databinding.ActivityChannel4Binding;
14+
import com.example.chattutorial.databinding.ActivityChannel4Binding;
1515
import com.getstream.sdk.chat.viewmodel.MessageInputViewModel;
1616
import com.getstream.sdk.chat.viewmodel.messages.MessageListViewModel;
1717
import com.getstream.sdk.chat.viewmodel.messages.MessageListViewModel.Mode.Normal;
@@ -26,12 +26,12 @@
2626
import io.getstream.chat.android.client.events.TypingStopEvent;
2727
import io.getstream.chat.android.client.models.Channel;
2828
import io.getstream.chat.android.client.models.User;
29-
import io.getstream.chat.android.ui.message.input.MessageInputViewModelBinding;
29+
import io.getstream.chat.android.ui.message.input.viewmodel.MessageInputViewModelBinding;
3030
import io.getstream.chat.android.ui.message.list.header.MessageListHeaderView;
3131
import io.getstream.chat.android.ui.message.list.header.viewmodel.MessageListHeaderViewModel;
3232
import io.getstream.chat.android.ui.message.list.header.viewmodel.MessageListHeaderViewModelBinding;
33+
import io.getstream.chat.android.ui.message.list.viewmodel.MessageListViewModelBinding;
3334
import io.getstream.chat.android.ui.message.list.viewmodel.factory.MessageListViewModelFactory;
34-
import io.getstream.chat.android.ui.message.view.MessageListViewModelBinding;
3535

3636
public class ChannelActivity4 extends AppCompatActivity {
3737

samplejava/src/main/java/com/example/chattutorialjava/ImgurAttachmentViewHolder.java renamed to samplejava/src/main/java/com/example/chattutorial/ImgurAttachmentViewHolder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.chattutorialjava;
1+
package com.example.chattutorial;
22

33
import android.content.Context;
44
import android.view.LayoutInflater;
@@ -7,7 +7,7 @@
77

88
import androidx.constraintlayout.widget.ConstraintLayout;
99

10-
import com.example.chattutorialjava.databinding.ListItemAttachmentImgurBinding;
10+
import com.example.chattutorial.databinding.ListItemAttachmentImgurBinding;
1111
import com.getstream.sdk.chat.adapter.MessageListItem;
1212
import com.google.android.material.shape.ShapeAppearanceModel;
1313

0 commit comments

Comments
 (0)