From 8f8789fc288136e80f9f2adf5064e2b9c9ddfa86 Mon Sep 17 00:00:00 2001 From: Stevan Bogosavljevic Date: Thu, 9 Apr 2020 15:50:53 +0200 Subject: [PATCH 1/3] Dependencies updated and migrated to AndroidX --- Rooster/.idea/caches/build_file_checksums.ser | Bin 0 -> 541 bytes Rooster/.idea/codeStyles/Project.xml | 116 ++++++++++++++++++ Rooster/.idea/gradle.xml | 2 + Rooster/.idea/jarRepositories.xml | 45 +++++++ Rooster/.idea/misc.xml | 2 +- Rooster/.idea/modules.xml | 2 + Rooster/.idea/vcs.xml | 6 + Rooster/app/build.gradle | 19 ++- .../com/blikoon/rooster/ChatActivity.java | 14 +-- .../blikoon/rooster/ContactListActivity.java | 6 +- .../com/blikoon/rooster/ContactModel.java | 1 - .../com/blikoon/rooster/LoginActivity.java | 6 +- .../blikoon/rooster/RoosterConnection.java | 4 +- .../rooster/RoosterConnectionService.java | 2 +- .../main/res/layout/activity_contact_list.xml | 4 +- .../src/main/res/layout/activity_login.xml | 8 +- Rooster/build.gradle | 2 +- Rooster/gradle.properties | 4 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 19 files changed, 201 insertions(+), 44 deletions(-) create mode 100644 Rooster/.idea/caches/build_file_checksums.ser create mode 100644 Rooster/.idea/codeStyles/Project.xml create mode 100644 Rooster/.idea/jarRepositories.xml create mode 100644 Rooster/.idea/vcs.xml diff --git a/Rooster/.idea/caches/build_file_checksums.ser b/Rooster/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000000000000000000000000000000000000..03919ea6ee675ffcd4ac242081cde6cfdd566f51 GIT binary patch literal 541 zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2 zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}nf0c10S!18}mhbLxkeX0=^7o4WADqX_B zlLYcFOjjX89RnLk;qT8!C%(|=Y?n(sCQ}qHA6CL3kdvRBm;(x}g4Cjt%+%sixMKG0 zV!}~|rmg}(i$gLcj~yyu5JZG6hU%mcK9!vZx-RJbwAjLS^4QH11|9v-;?$yI{o<0; zvdWCa + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + \ No newline at end of file diff --git a/Rooster/.idea/gradle.xml b/Rooster/.idea/gradle.xml index 7ac24c7..5cd135a 100644 --- a/Rooster/.idea/gradle.xml +++ b/Rooster/.idea/gradle.xml @@ -1,8 +1,10 @@ + - + diff --git a/Rooster/.idea/modules.xml b/Rooster/.idea/modules.xml index 41b5b1e..731f8eb 100644 --- a/Rooster/.idea/modules.xml +++ b/Rooster/.idea/modules.xml @@ -3,6 +3,8 @@ + + diff --git a/Rooster/.idea/vcs.xml b/Rooster/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/Rooster/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Rooster/app/build.gradle b/Rooster/app/build.gradle index 08173da..f1b01fa 100644 --- a/Rooster/app/build.gradle +++ b/Rooster/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 - buildToolsVersion '27.0.3' + compileSdkVersion 29 + buildToolsVersion '29.0.3' defaultConfig { applicationId "com.blikoon.rooster" - minSdkVersion 16 - targetSdkVersion 23 + minSdkVersion 21 + targetSdkVersion 29 versionCode 1 versionName "1.0" } @@ -20,8 +20,7 @@ android { } ext { - smackVersion = '4.2.4' - supportLibVersion = '27.1.0' + smackVersion = '4.3.1' } //Ge rid of problem described here : https://stackoverflow.com/questions/31049735/can-not-run-application-below-lollipop @@ -31,10 +30,10 @@ configurations { dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') - testCompile 'junit:junit:4.12' - implementation "com.android.support:appcompat-v7:$supportLibVersion" - implementation "com.android.support:design:$supportLibVersion" - implementation "com.android.support:recyclerview-v7:$supportLibVersion" + testCompile 'junit:junit:4.13' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'com.google.android.material:material:1.1.0' + implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation 'com.github.timigod:android-chat-ui:v0.1.3' implementation "org.igniterealtime.smack:smack-tcp:$smackVersion" implementation "org.igniterealtime.smack:smack-experimental:$smackVersion" diff --git a/Rooster/app/src/main/java/com/blikoon/rooster/ChatActivity.java b/Rooster/app/src/main/java/com/blikoon/rooster/ChatActivity.java index 9c239a4..77a2d82 100644 --- a/Rooster/app/src/main/java/com/blikoon/rooster/ChatActivity.java +++ b/Rooster/app/src/main/java/com/blikoon/rooster/ChatActivity.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.util.Log; import android.widget.Toast; @@ -53,18 +53,6 @@ public boolean sendMessage(ChatMessage chatMessage){ }); - - - - - - - - - - - - Intent intent = getIntent(); contactJid = intent.getStringExtra("EXTRA_CONTACT_JID"); setTitle(contactJid); diff --git a/Rooster/app/src/main/java/com/blikoon/rooster/ContactListActivity.java b/Rooster/app/src/main/java/com/blikoon/rooster/ContactListActivity.java index a71101a..dd53f9f 100644 --- a/Rooster/app/src/main/java/com/blikoon/rooster/ContactListActivity.java +++ b/Rooster/app/src/main/java/com/blikoon/rooster/ContactListActivity.java @@ -1,10 +1,10 @@ package com.blikoon.rooster; import android.content.Intent; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; diff --git a/Rooster/app/src/main/java/com/blikoon/rooster/ContactModel.java b/Rooster/app/src/main/java/com/blikoon/rooster/ContactModel.java index 60b419f..9ab2e1f 100644 --- a/Rooster/app/src/main/java/com/blikoon/rooster/ContactModel.java +++ b/Rooster/app/src/main/java/com/blikoon/rooster/ContactModel.java @@ -33,7 +33,6 @@ private void populateWithInitialContacts(Context context) { //Create the Foods and add them to the list; - Contact contact1 = new Contact("gakwaya@salama.im"); mContacts.add(contact1); Contact contact2 = new Contact("User2@server.com"); diff --git a/Rooster/app/src/main/java/com/blikoon/rooster/LoginActivity.java b/Rooster/app/src/main/java/com/blikoon/rooster/LoginActivity.java index 38d9043..289bfd7 100644 --- a/Rooster/app/src/main/java/com/blikoon/rooster/LoginActivity.java +++ b/Rooster/app/src/main/java/com/blikoon/rooster/LoginActivity.java @@ -11,9 +11,9 @@ import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import com.google.android.material.snackbar.Snackbar; +import androidx.appcompat.app.AppCompatActivity; import android.os.Build; import android.os.Bundle; import android.text.TextUtils; diff --git a/Rooster/app/src/main/java/com/blikoon/rooster/RoosterConnection.java b/Rooster/app/src/main/java/com/blikoon/rooster/RoosterConnection.java index 450a3a6..94d240f 100644 --- a/Rooster/app/src/main/java/com/blikoon/rooster/RoosterConnection.java +++ b/Rooster/app/src/main/java/com/blikoon/rooster/RoosterConnection.java @@ -14,8 +14,6 @@ import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException; - -import org.jivesoftware.smack.chat.ChatMessageListener; import org.jivesoftware.smack.chat2.Chat; import org.jivesoftware.smack.chat2.ChatManager; import org.jivesoftware.smack.chat2.IncomingChatMessageListener; @@ -81,7 +79,7 @@ public void connect() throws IOException,XMPPException,SmackException XMPPTCPConnectionConfiguration conf = XMPPTCPConnectionConfiguration.builder() .setXmppDomain(mServiceName) - .setHost("salama.im") + .setHost("conversations.im") .setResource("Rooster") //Was facing this issue diff --git a/Rooster/app/src/main/java/com/blikoon/rooster/RoosterConnectionService.java b/Rooster/app/src/main/java/com/blikoon/rooster/RoosterConnectionService.java index fe85c04..87943fd 100644 --- a/Rooster/app/src/main/java/com/blikoon/rooster/RoosterConnectionService.java +++ b/Rooster/app/src/main/java/com/blikoon/rooster/RoosterConnectionService.java @@ -5,7 +5,7 @@ import android.os.Handler; import android.os.IBinder; import android.os.Looper; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import org.jivesoftware.smack.SmackException; diff --git a/Rooster/app/src/main/res/layout/activity_contact_list.xml b/Rooster/app/src/main/res/layout/activity_contact_list.xml index 49a47cc..72ddb38 100644 --- a/Rooster/app/src/main/res/layout/activity_contact_list.xml +++ b/Rooster/app/src/main/res/layout/activity_contact_list.xml @@ -10,11 +10,11 @@ android:paddingTop="@dimen/activity_vertical_margin" tools:context="com.blikoon.rooster.ContactListActivity"> - - + diff --git a/Rooster/app/src/main/res/layout/activity_login.xml b/Rooster/app/src/main/res/layout/activity_login.xml index 5300b98..e89ddde 100644 --- a/Rooster/app/src/main/res/layout/activity_login.xml +++ b/Rooster/app/src/main/res/layout/activity_login.xml @@ -30,7 +30,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - @@ -43,9 +43,9 @@ android:maxLines="1" android:singleLine="true"/> - + - @@ -61,7 +61,7 @@ android:maxLines="1" android:singleLine="true"/> - +