Merge branch 'beta' into beta-call

# Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/com/example/chat/application/chatexample/ChatContract.java # app/src/main/java/com/example/chat/application/chatexample/ChatMainActivity.java # podchat/build.gradle # podchat/src/main/java/com/fanap/podchat/chat/Chat.java # podchat/src/main/java/com/fanap/podchat/chat/ChatListener.java
FanapSoft · Aug 16, 2021 · f9fe744 · f9fe744
2 parents b989cb7 + c69f156
commit f9fe744
Show file tree

Hide file tree

Showing 38 changed files with 2,392 additions and 5,436 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,15 @@
 All notable changes to this project will be documented here.
 
 
+## Version [0.9.10.0] -2021-7-17
+
+[Added] ```getMutualGroup``` method
+
+[Added] ```onGetMutualGroups``` callback
+
+[Added] ```getContacts``` => add username to RequestGetContact
+
+
 ## Version [0.9.9.0]
 [BugFixed] Failure to receive history in specific situations
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -67,6 +67,7 @@ dependencies {
 
 //    implementation 'com.google.android.gms:play-services:12.0.1'
     implementation 'com.orhanobut:logger:2.2.0'
+    implementation 'com.android.support:cardview-v7:28.0.0'
     androidTestImplementation 'com.orhanobut:logger:2.2.0'
     implementation 'com.google.code.gson:gson:2.8.2'
 
@@ -83,7 +84,11 @@ dependencies {
 //    implementation project(path: ':podotp')
 
     implementation 'com.github.bumptech.glide:glide:4.8.0'
-
+    //placeholderview
+//    implementation 'com.mindorks:placeholderview:0.7.1'
+    implementation ('com.mindorks:placeholderview:0.7.1') {
+        exclude group: 'com.android.support', module: 'recyclerview'
+    }
 
 }
 repositories {

diff --git a/app/src/androidTest/java/com/example/podchat/LocalChatTest.java b/app/src/androidTest/java/com/example/podchat/LocalChatTest.java
@@ -9,7 +9,6 @@
 
 import com.example.chat.application.chatexample.ChatContract;
 import com.example.chat.application.chatexample.ChatPresenter;
-import com.example.chat.application.chatexample.ChatSandBoxActivity;
 import com.fanap.podchat.mainmodel.History;
 
 import org.junit.Before;

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -27,20 +27,25 @@
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
         tools:ignore="GoogleAppIndexingWarning"
+        android:hardwareAccelerated="false"
         tools:targetApi="n">
+
         <activity android:name="com.example.chat.application.chatexample.CallActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.example.chat.application.chatexample.ChatSandBoxActivity" />
-        <activity
-            android:name="com.example.chat.application.chatexample.ChatMainActivity"
-            android:launchMode="singleInstance">
 
+        <activity android:name="com.example.chat.application.chatexample.ChatActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
         </activity>
+
     </application>
 
 </manifest>