Merge pull request #46 from GetStream/feature/fixes

Small fixes

Author: zsmb13

samplejava/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.chattutorialjava">
+    package="com.example.chattutorial">
 
     <application
         android:allowBackup="true"

…le/chattutorialjava/ChannelActivity.java …xample/chattutorial/ChannelActivity.javasamplejava/src/main/java/com/example/chattutorialjava/ChannelActivity.java renamed to samplejava/src/main/java/com/example/chattutorial/ChannelActivity.java samplejava/src/main/java/com/example/chattutorialjava/ChannelActivity.java renamed to samplejava/src/main/java/com/example/chattutorial/ChannelActivity.java

@@ -1,4 +1,4 @@
-package com.example.chattutorialjava;
+package com.example.chattutorial;
 
 import android.content.Context;
 import android.content.Intent;
@@ -9,7 +9,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.ViewModelProvider;
 
-import com.example.chattutorialjava.databinding.ActivityChannelBinding;
+import com.example.chattutorial.databinding.ActivityChannelBinding;
 import com.getstream.sdk.chat.viewmodel.MessageInputViewModel;
 import com.getstream.sdk.chat.viewmodel.messages.MessageListViewModel;
 import com.getstream.sdk.chat.viewmodel.messages.MessageListViewModel.Mode.Normal;
@@ -54,7 +54,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         MessageListViewModel messageListViewModel = provider.get(MessageListViewModel.class);
         MessageInputViewModel messageInputViewModel = provider.get(MessageInputViewModel.class);
 
-        // TODO set custom Imgur attachment View Holder Factory
+        // TODO set custom Imgur ViewHolderFactory
 
         // Step 2 - Bind the view and ViewModels, they are loosely coupled so it's easy to customize
         MessageListHeaderViewModelBinding.bind(channelHeaderViewModel, binding.messageListHeaderView, this);

…e/chattutorialjava/ChannelActivity2.java …ample/chattutorial/ChannelActivity2.javasamplejava/src/main/java/com/example/chattutorialjava/ChannelActivity2.java renamed to samplejava/src/main/java/com/example/chattutorial/ChannelActivity2.java samplejava/src/main/java/com/example/chattutorialjava/ChannelActivity2.java renamed to samplejava/src/main/java/com/example/chattutorial/ChannelActivity2.java

@@ -1,4 +1,4 @@
-package com.example.chattutorialjava;
+package com.example.chattutorial;
 
 import android.content.Context;
 import android.content.Intent;
@@ -9,7 +9,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.ViewModelProvider;
 
-import com.example.chattutorialjava.databinding.ActivityChannel2Binding;
+import com.example.chattutorial.databinding.ActivityChannel2Binding;
 import com.getstream.sdk.chat.viewmodel.MessageInputViewModel;
 import com.getstream.sdk.chat.viewmodel.messages.MessageListViewModel;
 import com.getstream.sdk.chat.viewmodel.messages.MessageListViewModel.Mode.Normal;

…e/chattutorialjava/ChannelActivity3.java …ample/chattutorial/ChannelActivity3.javasamplejava/src/main/java/com/example/chattutorialjava/ChannelActivity3.java renamed to samplejava/src/main/java/com/example/chattutorial/ChannelActivity3.java samplejava/src/main/java/com/example/chattutorialjava/ChannelActivity3.java renamed to samplejava/src/main/java/com/example/chattutorial/ChannelActivity3.java

@@ -1,4 +1,4 @@
-package com.example.chattutorialjava;
+package com.example.chattutorial;
 
 import android.content.Context;
 import android.content.Intent;
@@ -11,7 +11,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.ViewModelProvider;
 
-import com.example.chattutorialjava.databinding.ActivityChannel3Binding;
+import com.example.chattutorial.databinding.ActivityChannel3Binding;
 import com.getstream.sdk.chat.viewmodel.MessageInputViewModel;
 import com.getstream.sdk.chat.viewmodel.messages.MessageListViewModel;
 import com.getstream.sdk.chat.viewmodel.messages.MessageListViewModel.Mode.Normal;

…e/chattutorialjava/ChannelActivity4.java …ample/chattutorial/ChannelActivity4.javasamplejava/src/main/java/com/example/chattutorialjava/ChannelActivity4.java renamed to samplejava/src/main/java/com/example/chattutorial/ChannelActivity4.java samplejava/src/main/java/com/example/chattutorialjava/ChannelActivity4.java renamed to samplejava/src/main/java/com/example/chattutorial/ChannelActivity4.java

@@ -1,4 +1,4 @@
-package com.example.chattutorialjava;
+package com.example.chattutorial;
 
 import android.content.Context;
 import android.content.Intent;
@@ -11,7 +11,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.ViewModelProvider;
 
-import com.example.chattutorialjava.databinding.ActivityChannel4Binding;
+import com.example.chattutorial.databinding.ActivityChannel4Binding;
 import com.getstream.sdk.chat.viewmodel.MessageInputViewModel;
 import com.getstream.sdk.chat.viewmodel.messages.MessageListViewModel;
 import com.getstream.sdk.chat.viewmodel.messages.MessageListViewModel.Mode.Normal;

…orialjava/ImgurAttachmentViewHolder.java …ttutorial/ImgurAttachmentViewHolder.javasamplejava/src/main/java/com/example/chattutorialjava/ImgurAttachmentViewHolder.java renamed to samplejava/src/main/java/com/example/chattutorial/ImgurAttachmentViewHolder.java samplejava/src/main/java/com/example/chattutorialjava/ImgurAttachmentViewHolder.java renamed to samplejava/src/main/java/com/example/chattutorial/ImgurAttachmentViewHolder.java

@@ -1,4 +1,4 @@
-package com.example.chattutorialjava;
+package com.example.chattutorial;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -7,7 +7,7 @@
 
 import androidx.constraintlayout.widget.ConstraintLayout;
 
-import com.example.chattutorialjava.databinding.ListItemAttachmentImgurBinding;
+import com.example.chattutorial.databinding.ListItemAttachmentImgurBinding;
 import com.getstream.sdk.chat.adapter.MessageListItem;
 import com.google.android.material.shape.ShapeAppearanceModel;
 

…va/ImgurAttachmentViewHolderFactory.java …al/ImgurAttachmentViewHolderFactory.javasamplejava/src/main/java/com/example/chattutorialjava/ImgurAttachmentViewHolderFactory.java renamed to samplejava/src/main/java/com/example/chattutorial/ImgurAttachmentViewHolderFactory.java samplejava/src/main/java/com/example/chattutorialjava/ImgurAttachmentViewHolderFactory.java renamed to samplejava/src/main/java/com/example/chattutorial/ImgurAttachmentViewHolderFactory.java

@@ -1,4 +1,4 @@
-package com.example.chattutorialjava;
+package com.example.chattutorial;
 
 import android.view.ViewGroup;
 

…ample/chattutorialjava/MainActivity.java …m/example/chattutorial/MainActivity.javasamplejava/src/main/java/com/example/chattutorialjava/MainActivity.java renamed to samplejava/src/main/java/com/example/chattutorial/MainActivity.java samplejava/src/main/java/com/example/chattutorialjava/MainActivity.java renamed to samplejava/src/main/java/com/example/chattutorial/MainActivity.java

@@ -1,11 +1,11 @@
-package com.example.chattutorialjava;
+package com.example.chattutorial;
 
 import android.os.Bundle;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.ViewModelProvider;
 
-import com.example.chattutorialjava.databinding.ActivityMainBinding;
+import com.example.chattutorial.databinding.ActivityMainBinding;
 import com.getstream.sdk.chat.ChatUI;
 
 import org.jetbrains.annotations.Nullable;

samplekotlin/src/main/java/com/example/chattutorial/ChannelActivity.kt

@@ -40,7 +40,7 @@ class ChannelActivity : AppCompatActivity() {
         val messageListViewModel: MessageListViewModel by viewModels { factory }
         val messageInputViewModel: MessageInputViewModel by viewModels { factory }
 
-        // TODO set custom AttachmentViewHolderFactory
+        // TODO set custom Imgur ViewHolderFactory
 
         // Step 2 - Bind the view and ViewModels, they are loosely coupled so it's easy to customize
         messageListHeaderViewModel.bindView(binding.messageListHeaderView, this)

samplekotlin/src/main/java/com/example/chattutorial/MainActivity.kt

@@ -26,9 +26,7 @@ class MainActivity : AppCompatActivity() {
         setContentView(binding.root)
 
         // Step 1 - Set up the client for API calls, the domain for offline storage and the UI components
-        val client = ChatClient.Builder("b67pax5b2wdq", applicationContext)
-                .logLevel(ChatLogLevel.ALL)
-                .build()
+        val client = ChatClient.Builder("b67pax5b2wdq", applicationContext).build()
         ChatDomain.Builder(client, applicationContext).build()
         ChatUI.Builder(applicationContext).build()