diff options
176 files changed, 459 insertions, 492 deletions
diff --git a/.gitignore b/.gitignore index 81a24e7f4..c689a5f59 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,6 @@ src/quicksyPlaystore/res/values/push.xml # https://github.com/github/gitignore/blob/master/Gradle.gitignore .gradle/ build/ -gradle.properties captures/ signing.properties # Ignore Gradle GUI config diff --git a/build.gradle b/build.gradle index b3b95a841..d29c97eb7 100644 --- a/build.gradle +++ b/build.gradle @@ -30,11 +30,9 @@ configurations { quicksyImplementation } -ext { - supportLibVersion = '28.0.0' -} - dependencies { + implementation 'androidx.viewpager:viewpager:1.0.0' + //should remain that low because later versions introduce dependency to androidx (not sure exactly from what version) playstoreImplementation('com.google.firebase:firebase-messaging:17.3.4') { exclude group: 'com.google.firebase', module: 'firebase-core' @@ -48,15 +46,15 @@ dependencies { exclude group: 'com.android.support', module: 'appcompat-v7' exclude group: 'com.android.support', module: 'exifinterface' } - implementation "com.android.support:support-v13:$supportLibVersion" - implementation "com.android.support:appcompat-v7:$supportLibVersion" - implementation "com.android.support:exifinterface:$supportLibVersion" - implementation "com.android.support:cardview-v7:$supportLibVersion" - implementation "com.android.support:support-emoji:$supportLibVersion" - implementation "com.android.support:design:$supportLibVersion" - compatImplementation "com.android.support:support-emoji-appcompat:$supportLibVersion" - conversationsFreeCompatImplementation "com.android.support:support-emoji-bundled:$supportLibVersion" - quicksyFreeCompatImplementation "com.android.support:support-emoji-bundled:$supportLibVersion" + //implementation 'androidx.legacy:legacy-support-v13:1.0.0' + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'androidx.exifinterface:exifinterface:1.0.0' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'androidx.emoji:emoji:1.0.0' + implementation 'com.google.android.material:material:1.0.0' + compatImplementation 'androidx.emoji:emoji-appcompat:1.0.0' + conversationsFreeCompatImplementation 'androidx.emoji:emoji-bundled:1.0.0' + quicksyFreeCompatImplementation 'androidx.emoji:emoji-bundled:1.0.0' implementation 'org.bouncycastle:bcmail-jdk15on:1.64' //zxing stopped supporting Java 7 so we have to stick with 3.3.3 //https://github.com/zxing/zxing/issues/1170 diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 000000000..646c51b97 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +android.useAndroidX=true +android.enableJetifier=true diff --git a/src/compat/java/eu/siacs/conversations/ui/widget/EmojiWrapperEditText.java b/src/compat/java/eu/siacs/conversations/ui/widget/EmojiWrapperEditText.java index af6587ef5..15b24d572 100644 --- a/src/compat/java/eu/siacs/conversations/ui/widget/EmojiWrapperEditText.java +++ b/src/compat/java/eu/siacs/conversations/ui/widget/EmojiWrapperEditText.java @@ -1,7 +1,7 @@ package eu.siacs.conversations.ui.widget; import android.content.Context; -import android.support.text.emoji.widget.EmojiAppCompatEditText; +import androidx.emoji.widget.EmojiAppCompatEditText; import android.util.AttributeSet; public class EmojiWrapperEditText extends EmojiAppCompatEditText { diff --git a/src/compat/java/eu/siacs/conversations/utils/EmojiWrapper.java b/src/compat/java/eu/siacs/conversations/utils/EmojiWrapper.java index 9466531a3..3b6cf71e1 100644 --- a/src/compat/java/eu/siacs/conversations/utils/EmojiWrapper.java +++ b/src/compat/java/eu/siacs/conversations/utils/EmojiWrapper.java @@ -29,7 +29,7 @@ package eu.siacs.conversations.utils; -import android.support.text.emoji.EmojiCompat; +import androidx.emoji.text.EmojiCompat; public class EmojiWrapper { diff --git a/src/conversations/java/eu/siacs/conversations/services/ImportBackupService.java b/src/conversations/java/eu/siacs/conversations/services/ImportBackupService.java index 3fee92855..3aa1ab56b 100644 --- a/src/conversations/java/eu/siacs/conversations/services/ImportBackupService.java +++ b/src/conversations/java/eu/siacs/conversations/services/ImportBackupService.java @@ -12,8 +12,8 @@ import android.net.Uri; import android.os.Binder; import android.os.IBinder; import android.provider.OpenableColumns; -import android.support.v4.app.NotificationCompat; -import android.support.v4.app.NotificationManagerCompat; +import androidx.core.app.NotificationCompat; +import androidx.core.app.NotificationManagerCompat; import android.util.Log; import com.google.common.base.Charsets; diff --git a/src/conversations/java/eu/siacs/conversations/ui/EasyOnboardingInviteActivity.java b/src/conversations/java/eu/siacs/conversations/ui/EasyOnboardingInviteActivity.java index 4db0f5bfe..072c7f87b 100644 --- a/src/conversations/java/eu/siacs/conversations/ui/EasyOnboardingInviteActivity.java +++ b/src/conversations/java/eu/siacs/conversations/ui/EasyOnboardingInviteActivity.java @@ -2,11 +2,11 @@ package eu.siacs.conversations.ui; import android.app.Activity; import android.content.Intent; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.graphics.Bitmap; import android.graphics.Point; import android.os.Bundle; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.Menu; import android.view.MenuItem; diff --git a/src/conversations/java/eu/siacs/conversations/ui/ImportBackupActivity.java b/src/conversations/java/eu/siacs/conversations/ui/ImportBackupActivity.java index da4512465..b37918591 100644 --- a/src/conversations/java/eu/siacs/conversations/ui/ImportBackupActivity.java +++ b/src/conversations/java/eu/siacs/conversations/ui/ImportBackupActivity.java @@ -5,15 +5,15 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.ServiceConnection; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.os.IBinder; -import android.support.design.widget.Snackbar; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.Toolbar; +import com.google.android.material.snackbar.Snackbar; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; diff --git a/src/conversations/java/eu/siacs/conversations/ui/MagicCreateActivity.java b/src/conversations/java/eu/siacs/conversations/ui/MagicCreateActivity.java index a20d416bc..8d2c904d9 100644 --- a/src/conversations/java/eu/siacs/conversations/ui/MagicCreateActivity.java +++ b/src/conversations/java/eu/siacs/conversations/ui/MagicCreateActivity.java @@ -2,9 +2,9 @@ package eu.siacs.conversations.ui; import android.content.Intent; import android.content.pm.ActivityInfo; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.widget.Toolbar; import android.text.Editable; import android.text.TextWatcher; import android.view.View; diff --git a/src/conversations/java/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/conversations/java/eu/siacs/conversations/ui/ManageAccountActivity.java index 1c127a877..93cc7ec79 100644 --- a/src/conversations/java/eu/siacs/conversations/ui/ManageAccountActivity.java +++ b/src/conversations/java/eu/siacs/conversations/ui/ManageAccountActivity.java @@ -5,9 +5,9 @@ import android.content.Intent; import android.os.Bundle; import android.security.KeyChain; import android.security.KeyChainAliasCallback; -import android.support.annotation.NonNull; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AlertDialog; import android.util.Pair; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; diff --git a/src/conversations/java/eu/siacs/conversations/ui/PickServerActivity.java b/src/conversations/java/eu/siacs/conversations/ui/PickServerActivity.java index f84f47d69..7c991c57b 100644 --- a/src/conversations/java/eu/siacs/conversations/ui/PickServerActivity.java +++ b/src/conversations/java/eu/siacs/conversations/ui/PickServerActivity.java @@ -2,10 +2,10 @@ package eu.siacs.conversations.ui; import android.content.Intent; import android.content.pm.ActivityInfo; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.MenuItem; import java.util.List; diff --git a/src/conversations/java/eu/siacs/conversations/ui/WelcomeActivity.java b/src/conversations/java/eu/siacs/conversations/ui/WelcomeActivity.java index 03e41a1bf..266b7c9d4 100644 --- a/src/conversations/java/eu/siacs/conversations/ui/WelcomeActivity.java +++ b/src/conversations/java/eu/siacs/conversations/ui/WelcomeActivity.java @@ -4,15 +4,15 @@ import android.Manifest; import android.content.ActivityNotFoundException; import android.content.Intent; import android.content.pm.ActivityInfo; -import android.content.pm.PackageManager; -import android.databinding.DataBindingUtil; + +import androidx.databinding.DataBindingUtil; import android.net.Uri; import android.os.Bundle; import android.security.KeyChain; import android.security.KeyChainAliasCallback; -import android.support.annotation.NonNull; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.Menu; import android.view.MenuItem; diff --git a/src/conversations/java/eu/siacs/conversations/ui/adapter/BackupFileAdapter.java b/src/conversations/java/eu/siacs/conversations/ui/adapter/BackupFileAdapter.java index e71505e96..375e1d73a 100644 --- a/src/conversations/java/eu/siacs/conversations/ui/adapter/BackupFileAdapter.java +++ b/src/conversations/java/eu/siacs/conversations/ui/adapter/BackupFileAdapter.java @@ -1,13 +1,13 @@ package eu.siacs.conversations.ui.adapter; import android.content.res.Resources; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.AsyncTask; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.text.format.DateUtils; import android.util.DisplayMetrics; import android.view.LayoutInflater; diff --git a/src/conversations/res/layout/activity_import_backup.xml b/src/conversations/res/layout/activity_import_backup.xml index b1d0bd9b0..5435c0f72 100644 --- a/src/conversations/res/layout/activity_import_backup.xml +++ b/src/conversations/res/layout/activity_import_backup.xml @@ -26,20 +26,20 @@ - <android.support.design.widget.CoordinatorLayout + <androidx.coordinatorlayout.widget.CoordinatorLayout android:id="@+id/coordinator" android:layout_width="match_parent" android:layout_height="match_parent" android:background="?attr/color_background_primary"> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/list" android:layout_width="match_parent" android:layout_height="match_parent" android:background="?attr/color_background_primary" android:orientation="vertical" - app:layoutManager="android.support.v7.widget.LinearLayoutManager" /> - </android.support.design.widget.CoordinatorLayout> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + </androidx.coordinatorlayout.widget.CoordinatorLayout> </LinearLayout> </layout>
\ No newline at end of file diff --git a/src/conversations/res/layout/dialog_enter_password.xml b/src/conversations/res/layout/dialog_enter_password.xml index e2fc38ff4..40f3ba34d 100644 --- a/src/conversations/res/layout/dialog_enter_password.xml +++ b/src/conversations/res/layout/dialog_enter_password.xml @@ -22,7 +22,7 @@ android:text="@string/restore_warning" android:textAppearance="@style/TextAppearance.Conversations.Body1"/> - <android.support.design.widget.TextInputLayout + <com.google.android.material.textfield.TextInputLayout android:id="@+id/account_password_layout" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -42,6 +42,6 @@ android:textColor="?attr/edit_text_color" style="@style/Widget.Conversations.EditText"/> - </android.support.design.widget.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> </LinearLayout> </layout>
\ No newline at end of file diff --git a/src/freeCompat/java/eu/siacs/conversations/ui/service/EmojiService.java b/src/freeCompat/java/eu/siacs/conversations/ui/service/EmojiService.java index 53cea0dfd..1f60368bb 100644 --- a/src/freeCompat/java/eu/siacs/conversations/ui/service/EmojiService.java +++ b/src/freeCompat/java/eu/siacs/conversations/ui/service/EmojiService.java @@ -2,14 +2,9 @@ package eu.siacs.conversations.ui.service; import android.content.Context; import android.os.Build; -import android.support.text.emoji.EmojiCompat; -import android.support.text.emoji.FontRequestEmojiCompatConfig; -import android.support.text.emoji.bundled.BundledEmojiCompatConfig; -import android.support.v4.provider.FontRequest; -import android.util.Log; - -import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; +import androidx.emoji.text.EmojiCompat; +import androidx.emoji.text.FontRequestEmojiCompatConfig; +import androidx.emoji.bundled.BundledEmojiCompatConfig; public class EmojiService { diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 16731574e..c98aae041 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -266,7 +266,7 @@ </service> <provider - android:name="android.support.v4.content.FileProvider" + android:name="androidx.core.content.FileProvider" android:authorities="${applicationId}.files" android:exported="false" android:grantUriPermissions="true"> diff --git a/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java b/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java index 69f78c913..2ffbbafbd 100644 --- a/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java +++ b/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java @@ -2,7 +2,7 @@ package eu.siacs.conversations.crypto; import android.app.PendingIntent; import android.content.Intent; -import android.support.annotation.StringRes; +import androidx.annotation.StringRes; import android.util.Log; import org.openintents.openpgp.OpenPgpError; diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java index cc22bc818..7c363258c 100644 --- a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java +++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java @@ -2,8 +2,8 @@ package eu.siacs.conversations.crypto.axolotl; import android.os.Bundle; import android.security.KeyChain; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.Log; import android.util.Pair; diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java index c48459190..bf3b097dd 100644 --- a/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java +++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java @@ -1,7 +1,7 @@ package eu.siacs.conversations.crypto.axolotl; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.Log; import org.whispersystems.libsignal.SignalProtocolAddress; diff --git a/src/main/java/eu/siacs/conversations/entities/Bookmark.java b/src/main/java/eu/siacs/conversations/entities/Bookmark.java index e04328b1a..08e54565f 100644 --- a/src/main/java/eu/siacs/conversations/entities/Bookmark.java +++ b/src/main/java/eu/siacs/conversations/entities/Bookmark.java @@ -1,8 +1,8 @@ package eu.siacs.conversations.entities; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.lang.ref.WeakReference; import java.util.ArrayList; diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java index a3cbfc896..ad0bfcf83 100644 --- a/src/main/java/eu/siacs/conversations/entities/Contact.java +++ b/src/main/java/eu/siacs/conversations/entities/Contact.java @@ -4,7 +4,7 @@ import android.content.ContentValues; import android.content.Context; import android.database.Cursor; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import org.json.JSONArray; diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java index 702873fe2..4e38caa78 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -2,8 +2,8 @@ package eu.siacs.conversations.entities; import android.content.ContentValues; import android.database.Cursor; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.google.common.collect.ComparisonChain; diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java index 83b0c76fb..b2b4d14f6 100644 --- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java +++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java @@ -1,7 +1,7 @@ package eu.siacs.conversations.entities; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import java.util.ArrayList; diff --git a/src/main/java/eu/siacs/conversations/entities/Presence.java b/src/main/java/eu/siacs/conversations/entities/Presence.java index 5b89e5279..741ec03e0 100644 --- a/src/main/java/eu/siacs/conversations/entities/Presence.java +++ b/src/main/java/eu/siacs/conversations/entities/Presence.java @@ -1,6 +1,6 @@ package eu.siacs.conversations.entities; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.lang.Comparable; import java.util.Locale; diff --git a/src/main/java/eu/siacs/conversations/entities/RtpSessionStatus.java b/src/main/java/eu/siacs/conversations/entities/RtpSessionStatus.java index 8e360cb27..87a2e0601 100644 --- a/src/main/java/eu/siacs/conversations/entities/RtpSessionStatus.java +++ b/src/main/java/eu/siacs/conversations/entities/RtpSessionStatus.java @@ -1,6 +1,6 @@ package eu.siacs.conversations.entities; -import android.support.annotation.DrawableRes; +import androidx.annotation.DrawableRes; import com.google.common.base.Strings; diff --git a/src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java b/src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java index d0bdb5632..8b8e58458 100644 --- a/src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java +++ b/src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java @@ -2,7 +2,7 @@ package eu.siacs.conversations.entities; import android.content.ContentValues; import android.database.Cursor; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Base64; import android.util.Log; diff --git a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java index 476ea2d20..df397ac7f 100644 --- a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java +++ b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java @@ -1,7 +1,7 @@ package eu.siacs.conversations.http; import android.os.PowerManager; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import com.google.common.base.Strings; diff --git a/src/main/java/eu/siacs/conversations/parser/IqParser.java b/src/main/java/eu/siacs/conversations/parser/IqParser.java index 537f36058..076487a32 100644 --- a/src/main/java/eu/siacs/conversations/parser/IqParser.java +++ b/src/main/java/eu/siacs/conversations/parser/IqParser.java @@ -1,6 +1,6 @@ package eu.siacs.conversations.parser; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import android.util.Log; import android.util.Pair; diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java index a072e9d9a..448613bf9 100644 --- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java +++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java @@ -20,8 +20,8 @@ import android.os.Environment; import android.os.ParcelFileDescriptor; import android.provider.MediaStore; import android.provider.OpenableColumns; -import android.support.annotation.RequiresApi; -import android.support.v4.content.FileProvider; +import androidx.annotation.RequiresApi; +import androidx.core.content.FileProvider; import android.system.Os; import android.system.StructStat; import android.util.Base64; diff --git a/src/main/java/eu/siacs/conversations/services/AppRTCAudioManager.java b/src/main/java/eu/siacs/conversations/services/AppRTCAudioManager.java index 144341b8e..9f010087a 100644 --- a/src/main/java/eu/siacs/conversations/services/AppRTCAudioManager.java +++ b/src/main/java/eu/siacs/conversations/services/AppRTCAudioManager.java @@ -20,7 +20,7 @@ import android.media.AudioManager; import android.media.AudioRecord; import android.media.MediaRecorder; import android.os.Build; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import org.webrtc.ThreadUtils; diff --git a/src/main/java/eu/siacs/conversations/services/AppRTCBluetoothManager.java b/src/main/java/eu/siacs/conversations/services/AppRTCBluetoothManager.java index e5ea9be02..b0a3b81f5 100644 --- a/src/main/java/eu/siacs/conversations/services/AppRTCBluetoothManager.java +++ b/src/main/java/eu/siacs/conversations/services/AppRTCBluetoothManager.java @@ -23,7 +23,7 @@ import android.media.AudioManager; import android.os.Handler; import android.os.Looper; import android.os.Process; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import java.util.List; diff --git a/src/main/java/eu/siacs/conversations/services/AppRTCProximitySensor.java b/src/main/java/eu/siacs/conversations/services/AppRTCProximitySensor.java index 8bdc65f2e..daacefa3a 100644 --- a/src/main/java/eu/siacs/conversations/services/AppRTCProximitySensor.java +++ b/src/main/java/eu/siacs/conversations/services/AppRTCProximitySensor.java @@ -15,7 +15,7 @@ import android.hardware.SensorEvent; import android.hardware.SensorEventListener; import android.hardware.SensorManager; import android.os.Build; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import org.webrtc.ThreadUtils; diff --git a/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java b/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java index eb3380396..c9acc6e58 100644 --- a/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java +++ b/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java @@ -6,7 +6,7 @@ import android.net.Uri; import android.os.Build; import android.os.ParcelFileDescriptor; import android.preference.PreferenceManager; -import android.support.annotation.RequiresApi; +import androidx.annotation.RequiresApi; import android.util.Log; import net.ypresto.androidtranscoder.MediaTranscoder; diff --git a/src/main/java/eu/siacs/conversations/services/AvatarService.java b/src/main/java/eu/siacs/conversations/services/AvatarService.java index 6a00e7440..54def2386 100644 --- a/src/main/java/eu/siacs/conversations/services/AvatarService.java +++ b/src/main/java/eu/siacs/conversations/services/AvatarService.java @@ -12,9 +12,9 @@ import android.graphics.Typeface; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.support.annotation.ColorInt; -import android.support.annotation.Nullable; -import android.support.v4.content.res.ResourcesCompat; +import androidx.annotation.ColorInt; +import androidx.annotation.Nullable; +import androidx.core.content.res.ResourcesCompat; import android.text.TextUtils; import android.util.DisplayMetrics; import android.util.Log; diff --git a/src/main/java/eu/siacs/conversations/services/BarcodeProvider.java b/src/main/java/eu/siacs/conversations/services/BarcodeProvider.java index bc9608ea3..baa679599 100644 --- a/src/main/java/eu/siacs/conversations/services/BarcodeProvider.java +++ b/src/main/java/eu/siacs/conversations/services/BarcodeProvider.java @@ -13,7 +13,7 @@ import android.net.Uri; import android.os.CancellationSignal; import android.os.IBinder; import android.os.ParcelFileDescriptor; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import com.google.zxing.BarcodeFormat; diff --git a/src/main/java/eu/siacs/conversations/services/ChannelDiscoveryService.java b/src/main/java/eu/siacs/conversations/services/ChannelDiscoveryService.java index 19c0085a0..a3b0b667d 100644 --- a/src/main/java/eu/siacs/conversations/services/ChannelDiscoveryService.java +++ b/src/main/java/eu/siacs/conversations/services/ChannelDiscoveryService.java @@ -1,6 +1,6 @@ package eu.siacs.conversations.services; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import com.google.common.cache.Cache; diff --git a/src/main/java/eu/siacs/conversations/services/EventReceiver.java b/src/main/java/eu/siacs/conversations/services/EventReceiver.java index 500eb25e5..66372028b 100644 --- a/src/main/java/eu/siacs/conversations/services/EventReceiver.java +++ b/src/main/java/eu/siacs/conversations/services/EventReceiver.java @@ -5,7 +5,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.util.Log; import com.google.common.base.Strings; diff --git a/src/main/java/eu/siacs/conversations/services/ExportBackupService.java b/src/main/java/eu/siacs/conversations/services/ExportBackupService.java index 1c6a53878..ae95573d6 100644 --- a/src/main/java/eu/siacs/conversations/services/ExportBackupService.java +++ b/src/main/java/eu/siacs/conversations/services/ExportBackupService.java @@ -11,7 +11,7 @@ import android.database.DatabaseUtils; import android.database.sqlite.SQLiteDatabase; import android.net.Uri; import android.os.IBinder; -import android.support.v4.app.NotificationCompat; +import androidx.core.app.NotificationCompat; import android.util.Log; import com.google.common.base.Strings; diff --git a/src/main/java/eu/siacs/conversations/services/MemorizingTrustManager.java b/src/main/java/eu/siacs/conversations/services/MemorizingTrustManager.java index 7caf80da0..4899f06e9 100644 --- a/src/main/java/eu/siacs/conversations/services/MemorizingTrustManager.java +++ b/src/main/java/eu/siacs/conversations/services/MemorizingTrustManager.java @@ -34,7 +34,7 @@ import android.content.Intent; import android.net.Uri; import android.os.Handler; import android.preference.PreferenceManager; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.util.Base64; import android.util.Log; import android.util.SparseArray; diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java index 500f95a54..7925c2010 100644 --- a/src/main/java/eu/siacs/conversations/services/NotificationService.java +++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java @@ -17,15 +17,15 @@ import android.net.Uri; import android.os.Build; import android.os.SystemClock; import android.preference.PreferenceManager; -import android.support.annotation.RequiresApi; -import android.support.v4.app.NotificationCompat; -import android.support.v4.app.NotificationCompat.BigPictureStyle; -import android.support.v4.app.NotificationCompat.Builder; -import android.support.v4.app.NotificationManagerCompat; -import android.support.v4.app.Person; -import android.support.v4.app.RemoteInput; -import android.support.v4.content.ContextCompat; -import android.support.v4.graphics.drawable.IconCompat; +import androidx.annotation.RequiresApi; +import androidx.core.app.NotificationCompat; +import androidx.core.app.NotificationCompat.BigPictureStyle; +import androidx.core.app.NotificationCompat.Builder; +import androidx.core.app.NotificationManagerCompat; +import androidx.core.app.Person; +import androidx.core.app.RemoteInput; +import androidx.core.content.ContextCompat; +import androidx.core.graphics.drawable.IconCompat; import android.text.SpannableString; import android.text.style.StyleSpan; import android.util.DisplayMetrics; diff --git a/src/main/java/eu/siacs/conversations/services/ShortcutService.java b/src/main/java/eu/siacs/conversations/services/ShortcutService.java index 9908879e7..7d9a74061 100644 --- a/src/main/java/eu/siacs/conversations/services/ShortcutService.java +++ b/src/main/java/eu/siacs/conversations/services/ShortcutService.java @@ -8,7 +8,7 @@ import android.graphics.Bitmap; import android.graphics.drawable.Icon; import android.net.Uri; import android.os.Build; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import java.util.ArrayList; diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index e3bf3f37a..9ec1c8b13 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -32,10 +32,10 @@ import android.os.SystemClock; import android.preference.PreferenceManager; import android.provider.ContactsContract; import android.security.KeyChain; -import android.support.annotation.BoolRes; -import android.support.annotation.IntegerRes; -import android.support.v4.app.RemoteInput; -import android.support.v4.content.ContextCompat; +import androidx.annotation.BoolRes; +import androidx.annotation.IntegerRes; +import androidx.core.app.RemoteInput; +import androidx.core.content.ContextCompat; import android.telephony.PhoneStateListener; import android.telephony.TelephonyManager; import android.text.TextUtils; diff --git a/src/main/java/eu/siacs/conversations/ui/AboutActivity.java b/src/main/java/eu/siacs/conversations/ui/AboutActivity.java index 2d281a9e2..916cbfbfc 100644 --- a/src/main/java/eu/siacs/conversations/ui/AboutActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/AboutActivity.java @@ -2,7 +2,7 @@ package eu.siacs.conversations.ui; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import eu.siacs.conversations.R; import eu.siacs.conversations.utils.ThemeHelper; diff --git a/src/main/java/eu/siacs/conversations/ui/AbstractSearchableListItemActivity.java b/src/main/java/eu/siacs/conversations/ui/AbstractSearchableListItemActivity.java index 78d1fb694..8cb5f0617 100644 --- a/src/main/java/eu/siacs/conversations/ui/AbstractSearchableListItemActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/AbstractSearchableListItemActivity.java @@ -1,9 +1,9 @@ package eu.siacs.conversations.ui; import android.content.Context; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.widget.Toolbar; import android.text.Editable; import android.text.TextWatcher; import android.view.KeyEvent; diff --git a/src/main/java/eu/siacs/conversations/ui/ActionBarActivity.java b/src/main/java/eu/siacs/conversations/ui/ActionBarActivity.java index 198599fd1..38835161b 100644 --- a/src/main/java/eu/siacs/conversations/ui/ActionBarActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ActionBarActivity.java @@ -1,7 +1,7 @@ package eu.siacs.conversations.ui; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import android.view.MenuItem; diff --git a/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java b/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java index 2e3db1730..922b272f0 100644 --- a/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java +++ b/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java @@ -1,8 +1,8 @@ package eu.siacs.conversations.ui; -import android.databinding.DataBindingUtil; -import android.support.annotation.StringRes; -import android.support.v7.app.AlertDialog; +import androidx.databinding.DataBindingUtil; +import androidx.annotation.StringRes; +import androidx.appcompat.app.AlertDialog; import android.view.View; import android.widget.Toast; @@ -11,7 +11,6 @@ import eu.siacs.conversations.databinding.DialogBlockContactBinding; import eu.siacs.conversations.entities.Blockable; import eu.siacs.conversations.entities.Conversation; import eu.siacs.conversations.ui.util.JidDialog; -import eu.siacs.conversations.xmpp.Jid; public final class BlockContactDialog { public static void show(final XmppActivity xmppActivity, final Blockable blockable) { diff --git a/src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java b/src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java index 201c5e7b7..01f16a510 100644 --- a/src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java @@ -1,8 +1,8 @@ package eu.siacs.conversations.ui; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentTransaction; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentTransaction; import android.text.Editable; import android.widget.Toast; diff --git a/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java b/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java index 4f6245c12..2fd853564 100644 --- a/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java @@ -2,7 +2,7 @@ package eu.siacs.conversations.ui; import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.TextInputLayout; +import com.google.android.material.textfield.TextInputLayout; import android.view.View; import android.widget.Button; import android.widget.EditText; diff --git a/src/main/java/eu/siacs/conversations/ui/ChannelDiscoveryActivity.java b/src/main/java/eu/siacs/conversations/ui/ChannelDiscoveryActivity.java index 398be7f68..1f6b1d847 100644 --- a/src/main/java/eu/siacs/conversations/ui/ChannelDiscoveryActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ChannelDiscoveryActivity.java @@ -4,11 +4,11 @@ import android.app.AlertDialog; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.net.Uri; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.widget.Toolbar; import android.text.Html; import android.text.method.LinkMovementMethod; import android.view.KeyEvent; diff --git a/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java b/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java index 3a507c519..ecb21ed73 100644 --- a/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java @@ -5,11 +5,11 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentTransaction; -import android.support.v7.app.ActionBar; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentTransaction; +import androidx.appcompat.app.ActionBar; import android.view.ActionMode; import android.view.KeyEvent; import android.view.Menu; diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java index 946a066fb..7bda9b21c 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java @@ -3,10 +3,10 @@ package eu.siacs.conversations.ui; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.widget.Toolbar; import android.text.Editable; import android.text.SpannableStringBuilder; import android.text.TextWatcher; diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java index 6c5496650..181ad281f 100644 --- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java @@ -6,7 +6,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.PackageManager; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -14,9 +14,9 @@ import android.preference.PreferenceManager; import android.provider.ContactsContract.CommonDataKinds; import android.provider.ContactsContract.Contacts; import android.provider.ContactsContract.Intents; -import android.support.annotation.NonNull; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.widget.Toolbar; import android.text.Spannable; import android.text.SpannableString; import android.text.style.RelativeSizeSpan; diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index 0f8b47939..8ffe98c78 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -2,8 +2,8 @@ package eu.siacs.conversations.ui; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; public class ConversationActivity extends AppCompatActivity { diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index 3e9b2600e..09cbeb0f2 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -6,15 +6,15 @@ import android.app.Activity; import android.app.FragmentManager; import android.content.SharedPreferences; import android.content.pm.PackageManager; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.net.Uri; import android.os.Build; import android.preference.PreferenceManager; import android.provider.MediaStore; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; -import android.support.v7.app.AlertDialog; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; +import androidx.appcompat.app.AlertDialog; import android.app.Fragment; import android.app.PendingIntent; import android.content.Context; @@ -24,15 +24,14 @@ import android.content.IntentSender.SendIntentException; import android.os.Bundle; import android.os.Handler; import android.os.SystemClock; -import android.support.v13.view.inputmethod.InputConnectionCompat; -import android.support.v13.view.inputmethod.InputContentInfoCompat; +import androidx.core.view.inputmethod.InputConnectionCompat; +import androidx.core.view.inputmethod.InputContentInfoCompat; import android.text.Editable; import android.text.TextUtils; import android.util.Log; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; import android.view.Gravity; -import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java index 026a0cafa..caac16ec7 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java @@ -39,15 +39,15 @@ import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.net.Uri; import android.os.Bundle; import android.provider.Settings; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.Toolbar; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.KeyEvent; import android.view.Menu; @@ -76,7 +76,6 @@ import eu.siacs.conversations.ui.util.ActivityResult; import eu.siacs.conversations.ui.util.ConversationMenuConfigurator; import eu.siacs.conversations.ui.util.MenuDoubleTabUtil; import eu.siacs.conversations.ui.util.PendingItem; -import eu.siacs.conversations.utils.AccountUtils; import eu.siacs.conversations.utils.EmojiWrapper; import eu.siacs.conversations.utils.ExceptionHelper; import eu.siacs.conversations.utils.SignupUtils; diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java index 3c3c53f63..17bbdd141 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java @@ -33,14 +33,14 @@ import android.app.Activity; import android.app.AlertDialog; import android.app.Fragment; import android.content.Intent; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.graphics.Canvas; import android.graphics.Paint; import android.os.Bundle; -import android.support.design.widget.Snackbar; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; +import com.google.android.material.snackbar.Snackbar; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.ItemTouchHelper; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; @@ -74,8 +74,8 @@ import eu.siacs.conversations.utils.AccountUtils; import eu.siacs.conversations.utils.EasyOnboardingInvite; import eu.siacs.conversations.utils.ThemeHelper; -import static android.support.v7.widget.helper.ItemTouchHelper.LEFT; -import static android.support.v7.widget.helper.ItemTouchHelper.RIGHT; +import static androidx.recyclerview.widget.ItemTouchHelper.LEFT; +import static androidx.recyclerview.widget.ItemTouchHelper.RIGHT; public class ConversationsOverviewFragment extends XmppFragment { diff --git a/src/main/java/eu/siacs/conversations/ui/CreatePrivateGroupChatDialog.java b/src/main/java/eu/siacs/conversations/ui/CreatePrivateGroupChatDialog.java index ef2984a23..5ce510a22 100644 --- a/src/main/java/eu/siacs/conversations/ui/CreatePrivateGroupChatDialog.java +++ b/src/main/java/eu/siacs/conversations/ui/CreatePrivateGroupChatDialog.java @@ -2,11 +2,11 @@ package eu.siacs.conversations.ui; import android.app.Dialog; import android.content.Context; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.DialogFragment; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.fragment.app.DialogFragment; +import androidx.appcompat.app.AlertDialog; import android.widget.Spinner; import java.util.ArrayList; diff --git a/src/main/java/eu/siacs/conversations/ui/CreatePublicChannelDialog.java b/src/main/java/eu/siacs/conversations/ui/CreatePublicChannelDialog.java index 90ecb6df0..4ddbcb551 100644 --- a/src/main/java/eu/siacs/conversations/ui/CreatePublicChannelDialog.java +++ b/src/main/java/eu/siacs/conversations/ui/CreatePublicChannelDialog.java @@ -4,11 +4,11 @@ import android.app.Activity; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.DialogFragment; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.fragment.app.DialogFragment; +import androidx.appcompat.app.AlertDialog; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java index d7eff28ec..8765e8529 100644 --- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java @@ -6,7 +6,7 @@ import android.content.ActivityNotFoundException; import android.content.Intent; import android.content.IntentSender; import android.content.SharedPreferences; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.graphics.Bitmap; import android.net.Uri; import android.os.Build; @@ -16,11 +16,11 @@ import android.preference.PreferenceManager; import android.provider.Settings; import android.security.KeyChain; import android.security.KeyChainAliasCallback; -import android.support.design.widget.TextInputLayout; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AlertDialog.Builder; -import android.support.v7.widget.Toolbar; +import com.google.android.material.textfield.TextInputLayout; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AlertDialog.Builder; +import androidx.appcompat.widget.Toolbar; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; @@ -42,7 +42,6 @@ import java.net.URL; import java.util.Arrays; import java.util.List; import java.util.Set; -import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import eu.siacs.conversations.Config; @@ -65,7 +64,6 @@ import eu.siacs.conversations.ui.util.AvatarWorkerTask; import eu.siacs.conversations.ui.util.MenuDoubleTabUtil; import eu.siacs.conversations.ui.util.PendingItem; import eu.siacs.conversations.ui.util.SoftKeyboardUtils; -import eu.siacs.conversations.utils.CharSequenceUtils; import eu.siacs.conversations.utils.CryptoHelper; import eu.siacs.conversations.utils.Resolver; import eu.siacs.conversations.utils.SignupUtils; diff --git a/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java b/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java index 83d6d4a0c..a6481f2f3 100644 --- a/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java +++ b/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java @@ -2,11 +2,11 @@ package eu.siacs.conversations.ui; import android.app.Activity; import android.app.Dialog; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.DialogFragment; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.fragment.app.DialogFragment; +import androidx.appcompat.app.AlertDialog; import android.text.Editable; import android.text.TextWatcher; import android.view.View; diff --git a/src/main/java/eu/siacs/conversations/ui/JoinConferenceDialog.java b/src/main/java/eu/siacs/conversations/ui/JoinConferenceDialog.java index 05dca588d..9a55467f9 100644 --- a/src/main/java/eu/siacs/conversations/ui/JoinConferenceDialog.java +++ b/src/main/java/eu/siacs/conversations/ui/JoinConferenceDialog.java @@ -2,14 +2,14 @@ package eu.siacs.conversations.ui; import android.app.Activity; import android.app.Dialog; -import android.databinding.DataBindingUtil; -import android.support.annotation.NonNull; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.DialogFragment; +import androidx.databinding.DataBindingUtil; +import androidx.annotation.NonNull; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.DialogFragment; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; -import android.support.v7.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.view.KeyEvent; import android.widget.AutoCompleteTextView; import android.widget.Spinner; diff --git a/src/main/java/eu/siacs/conversations/ui/LocationActivity.java b/src/main/java/eu/siacs/conversations/ui/LocationActivity.java index eb11e5a74..487218c52 100644 --- a/src/main/java/eu/siacs/conversations/ui/LocationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/LocationActivity.java @@ -14,8 +14,8 @@ import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.Settings; -import android.support.annotation.BoolRes; -import android.support.annotation.NonNull; +import androidx.annotation.BoolRes; +import androidx.annotation.NonNull; import android.util.Log; import android.view.MenuItem; diff --git a/src/main/java/eu/siacs/conversations/ui/MediaBrowserActivity.java b/src/main/java/eu/siacs/conversations/ui/MediaBrowserActivity.java index ba5102886..7dbf9ac16 100644 --- a/src/main/java/eu/siacs/conversations/ui/MediaBrowserActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/MediaBrowserActivity.java @@ -2,9 +2,9 @@ package eu.siacs.conversations.ui; import android.content.Context; import android.content.Intent; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.widget.Toolbar; import java.util.List; diff --git a/src/main/java/eu/siacs/conversations/ui/MemorizingActivity.java b/src/main/java/eu/siacs/conversations/ui/MemorizingActivity.java index 556ed760c..490ed8041 100644 --- a/src/main/java/eu/siacs/conversations/ui/MemorizingActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/MemorizingActivity.java @@ -31,8 +31,8 @@ import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/src/main/java/eu/siacs/conversations/ui/MucUsersActivity.java b/src/main/java/eu/siacs/conversations/ui/MucUsersActivity.java index 298741651..3c5ab5dfd 100644 --- a/src/main/java/eu/siacs/conversations/ui/MucUsersActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/MucUsersActivity.java @@ -2,9 +2,9 @@ package eu.siacs.conversations.ui; import android.content.Context; import android.content.Intent; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.widget.Toolbar; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; diff --git a/src/main/java/eu/siacs/conversations/ui/OmemoActivity.java b/src/main/java/eu/siacs/conversations/ui/OmemoActivity.java index 9d41be658..c83c073a3 100644 --- a/src/main/java/eu/siacs/conversations/ui/OmemoActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/OmemoActivity.java @@ -1,23 +1,17 @@ package eu.siacs.conversations.ui; -import android.databinding.DataBindingUtil; -import android.net.Uri; -import android.support.v7.app.AlertDialog; +import androidx.databinding.DataBindingUtil; + +import androidx.appcompat.app.AlertDialog; import android.content.Intent; -import android.os.Bundle; -import android.support.v4.content.ContextCompat; import android.view.ContextMenu; import android.view.MenuItem; import android.view.View; import android.widget.CompoundButton; import android.widget.LinearLayout; -import android.widget.TextView; import android.widget.Toast; -import java.security.cert.X509Certificate; -import java.util.Arrays; - import eu.siacs.conversations.Config; import eu.siacs.conversations.R; import eu.siacs.conversations.crypto.axolotl.FingerprintStatus; diff --git a/src/main/java/eu/siacs/conversations/ui/PublishGroupChatProfilePictureActivity.java b/src/main/java/eu/siacs/conversations/ui/PublishGroupChatProfilePictureActivity.java index 898f607c4..fba484a67 100644 --- a/src/main/java/eu/siacs/conversations/ui/PublishGroupChatProfilePictureActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/PublishGroupChatProfilePictureActivity.java @@ -30,12 +30,12 @@ package eu.siacs.conversations.ui; import android.content.Intent; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.graphics.Bitmap; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.StringRes; -import android.support.v7.widget.Toolbar; +import androidx.annotation.StringRes; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.View; import android.widget.Toast; diff --git a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java index db05cc8bf..d1901fac2 100644 --- a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java @@ -6,7 +6,7 @@ import android.graphics.Bitmap; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.support.annotation.StringRes; +import androidx.annotation.StringRes; import android.util.Log; import android.view.View; import android.view.View.OnLongClickListener; diff --git a/src/main/java/eu/siacs/conversations/ui/RecordingActivity.java b/src/main/java/eu/siacs/conversations/ui/RecordingActivity.java index bcd564788..def935efd 100644 --- a/src/main/java/eu/siacs/conversations/ui/RecordingActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/RecordingActivity.java @@ -1,10 +1,9 @@ package eu.siacs.conversations.ui; -import android.annotation.SuppressLint; import android.app.Activity; import android.content.Context; import android.content.Intent; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.media.MediaRecorder; import android.net.Uri; import android.os.Bundle; diff --git a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java index 0cf2d6f33..fca5516e0 100644 --- a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java @@ -7,15 +7,15 @@ import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.PowerManager; import android.os.SystemClock; -import android.support.annotation.NonNull; -import android.support.annotation.RequiresApi; -import android.support.annotation.StringRes; +import androidx.annotation.NonNull; +import androidx.annotation.RequiresApi; +import androidx.annotation.StringRes; import android.util.Log; import android.util.Rational; import android.view.Menu; diff --git a/src/main/java/eu/siacs/conversations/ui/ScanActivity.java b/src/main/java/eu/siacs/conversations/ui/ScanActivity.java index 24f3e82af..ad5aa3266 100644 --- a/src/main/java/eu/siacs/conversations/ui/ScanActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ScanActivity.java @@ -45,8 +45,8 @@ import android.os.Handler; import android.os.HandlerThread; import android.os.Process; import android.os.Vibrator; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; import android.util.Log; import android.view.KeyEvent; import android.view.Surface; diff --git a/src/main/java/eu/siacs/conversations/ui/SearchActivity.java b/src/main/java/eu/siacs/conversations/ui/SearchActivity.java index 1b2430f6d..6ff7d0764 100644 --- a/src/main/java/eu/siacs/conversations/ui/SearchActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/SearchActivity.java @@ -30,9 +30,9 @@ package eu.siacs.conversations.ui; import android.content.Intent; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.widget.Toolbar; import android.text.Editable; import android.text.InputType; import android.text.TextWatcher; diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java index 1a84dcb72..7683bb732 100644 --- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java @@ -1,9 +1,9 @@ package eu.siacs.conversations.ui; import android.preference.CheckBoxPreference; -import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.AlertDialog; import android.app.FragmentManager; import android.content.DialogInterface; import android.content.Intent; diff --git a/src/main/java/eu/siacs/conversations/ui/ShareLocationActivity.java b/src/main/java/eu/siacs/conversations/ui/ShareLocationActivity.java index 136e9d2b2..dc36da9bf 100644 --- a/src/main/java/eu/siacs/conversations/ui/ShareLocationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ShareLocationActivity.java @@ -3,14 +3,14 @@ package eu.siacs.conversations.ui; import android.Manifest; import android.content.Intent; import android.content.pm.PackageManager; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.location.Location; import android.location.LocationListener; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import com.google.android.material.snackbar.Snackbar; +import androidx.appcompat.widget.Toolbar; import android.view.View; import org.osmdroid.api.IGeoPoint; diff --git a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java index 3589bb41e..df8b2a263 100644 --- a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java @@ -4,8 +4,8 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.net.Uri; 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.Menu; import android.view.MenuItem; diff --git a/src/main/java/eu/siacs/conversations/ui/ShortcutActivity.java b/src/main/java/eu/siacs/conversations/ui/ShortcutActivity.java index db25ee3e8..f2e73307e 100644 --- a/src/main/java/eu/siacs/conversations/ui/ShortcutActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ShortcutActivity.java @@ -4,7 +4,7 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.ActionBar; +import androidx.appcompat.app.ActionBar; import android.util.Log; import android.view.View; import android.view.inputmethod.InputMethodManager; diff --git a/src/main/java/eu/siacs/conversations/ui/ShowLocationActivity.java b/src/main/java/eu/siacs/conversations/ui/ShowLocationActivity.java index b591659c6..ffd9e1f79 100644 --- a/src/main/java/eu/siacs/conversations/ui/ShowLocationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ShowLocationActivity.java @@ -5,13 +5,13 @@ import android.content.ClipData; import android.content.ClipboardManager; import android.content.ComponentName; import android.content.Intent; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.location.Location; import android.location.LocationListener; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; import android.view.View; diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java index fa0d5ada9..e77efc127 100644 --- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java @@ -9,22 +9,22 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.PackageManager; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.widget.Toolbar; import android.text.Editable; import android.text.Html; import android.text.TextWatcher; diff --git a/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java b/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java index 0ac96fea4..5aa3479dd 100644 --- a/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java @@ -2,10 +2,10 @@ package eu.siacs.conversations.ui; import android.app.AlertDialog; import android.content.Intent; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.app.ActionBar; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.Gravity; import android.view.Menu; diff --git a/src/main/java/eu/siacs/conversations/ui/UriHandlerActivity.java b/src/main/java/eu/siacs/conversations/ui/UriHandlerActivity.java index 30c330c4d..e4acde536 100644 --- a/src/main/java/eu/siacs/conversations/ui/UriHandlerActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/UriHandlerActivity.java @@ -7,8 +7,8 @@ import android.content.pm.PackageManager; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.AppCompatActivity; import android.widget.Toast; import com.google.common.base.Strings; diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java index e143cee3d..15887880e 100644 --- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java @@ -19,7 +19,7 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.content.res.Resources; import android.content.res.TypedArray; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.graphics.Bitmap; import android.graphics.Color; import android.graphics.Point; @@ -35,12 +35,12 @@ import android.os.IBinder; import android.os.PowerManager; import android.os.SystemClock; import android.preference.PreferenceManager; -import android.support.annotation.BoolRes; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AlertDialog.Builder; -import android.support.v7.app.AppCompatDelegate; +import androidx.annotation.BoolRes; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AlertDialog.Builder; +import androidx.appcompat.app.AppCompatDelegate; import android.text.InputType; import android.util.DisplayMetrics; import android.util.Log; diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java index 73e3b4194..6bbe3d979 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java @@ -1,21 +1,14 @@ package eu.siacs.conversations.ui.adapter; -import android.content.res.Resources; -import android.databinding.DataBindingUtil; -import android.graphics.Bitmap; -import android.graphics.drawable.BitmapDrawable; -import android.graphics.drawable.Drawable; -import android.os.AsyncTask; -import android.support.annotation.NonNull; +import androidx.databinding.DataBindingUtil; + +import androidx.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; -import android.widget.ImageView; -import java.lang.ref.WeakReference; import java.util.List; -import java.util.concurrent.RejectedExecutionException; import eu.siacs.conversations.Config; import eu.siacs.conversations.R; @@ -24,7 +17,6 @@ import eu.siacs.conversations.entities.Account; import eu.siacs.conversations.ui.XmppActivity; import eu.siacs.conversations.ui.util.AvatarWorkerTask; import eu.siacs.conversations.ui.util.StyledAttributes; -import eu.siacs.conversations.utils.UIHelper; public class AccountAdapter extends ArrayAdapter<Account> { diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ChannelSearchResultAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ChannelSearchResultAdapter.java index 3c533a7a2..6966da365 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/ChannelSearchResultAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/ChannelSearchResultAdapter.java @@ -1,11 +1,11 @@ package eu.siacs.conversations.ui.adapter; import android.app.Activity; -import android.databinding.DataBindingUtil; -import android.support.annotation.NonNull; -import android.support.v7.recyclerview.extensions.ListAdapter; -import android.support.v7.util.DiffUtil; -import android.support.v7.widget.RecyclerView; +import androidx.databinding.DataBindingUtil; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.ListAdapter; +import androidx.recyclerview.widget.DiffUtil; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.ContextMenu; import android.view.LayoutInflater; diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java index 8aaeceafd..b97a39c5b 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java @@ -1,9 +1,9 @@ package eu.siacs.conversations.ui.adapter; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.graphics.Typeface; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.util.Pair; import android.view.LayoutInflater; import android.view.View; diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java index f6017cf4d..ba59f52b9 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java @@ -1,7 +1,7 @@ package eu.siacs.conversations.ui.adapter; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.widget.ArrayAdapter; import android.widget.Filter; diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java index a0e6ded14..cea63f2ee 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java @@ -1,7 +1,7 @@ package eu.siacs.conversations.ui.adapter; import android.content.SharedPreferences; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.preference.PreferenceManager; import android.view.LayoutInflater; import android.view.View; diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java index 03920f2dc..a1212a68c 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java @@ -2,15 +2,15 @@ package eu.siacs.conversations.ui.adapter; import android.content.Context; import android.content.res.Resources; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.AsyncTask; -import android.support.annotation.AttrRes; -import android.support.annotation.DimenRes; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.AttrRes; +import androidx.annotation.DimenRes; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.LayoutInflater; import android.view.ViewGroup; diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MediaPreviewAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MediaPreviewAdapter.java index a2f423a04..49981c623 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MediaPreviewAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MediaPreviewAdapter.java @@ -4,14 +4,14 @@ import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; import android.content.res.Resources; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.AsyncTask; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.ViewGroup; import android.widget.ImageView; diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 25f0dfe1e..9d092af6c 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -7,20 +7,16 @@ import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.graphics.Typeface; import android.preference.PreferenceManager; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; import android.text.Spannable; import android.text.SpannableString; import android.text.SpannableStringBuilder; -import android.text.Spanned; import android.text.format.DateUtils; import android.text.style.ForegroundColorSpan; import android.text.style.RelativeSizeSpan; import android.text.style.StyleSpan; import android.util.DisplayMetrics; -import android.view.ActionMode; -import android.view.Menu; -import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/PresenceTemplateAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/PresenceTemplateAdapter.java index c77784c6e..5fe4a727d 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/PresenceTemplateAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/PresenceTemplateAdapter.java @@ -30,7 +30,7 @@ package eu.siacs.conversations.ui.adapter; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.widget.ArrayAdapter; import android.widget.Filter; diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/UserAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/UserAdapter.java index 7b61ec822..f96d2dac5 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/UserAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/UserAdapter.java @@ -2,11 +2,11 @@ package eu.siacs.conversations.ui.adapter; import android.app.PendingIntent; import android.content.IntentSender; -import android.databinding.DataBindingUtil; -import android.support.annotation.NonNull; -import android.support.v7.recyclerview.extensions.ListAdapter; -import android.support.v7.util.DiffUtil; -import android.support.v7.widget.RecyclerView; +import androidx.databinding.DataBindingUtil; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.ListAdapter; +import androidx.recyclerview.widget.DiffUtil; +import androidx.recyclerview.widget.RecyclerView; import android.view.ContextMenu; import android.view.LayoutInflater; import android.view.View; diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/UserPreviewAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/UserPreviewAdapter.java index 12cfd35f1..77c4734a8 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/UserPreviewAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/UserPreviewAdapter.java @@ -1,9 +1,9 @@ package eu.siacs.conversations.ui.adapter; -import android.databinding.DataBindingUtil; -import android.support.annotation.NonNull; -import android.support.v7.recyclerview.extensions.ListAdapter; -import android.support.v7.widget.RecyclerView; +import androidx.databinding.DataBindingUtil; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.ListAdapter; +import androidx.recyclerview.widget.RecyclerView; import android.view.ContextMenu; import android.view.LayoutInflater; import android.view.View; diff --git a/src/main/java/eu/siacs/conversations/ui/interfaces/OnAvatarPublication.java b/src/main/java/eu/siacs/conversations/ui/interfaces/OnAvatarPublication.java index 5d84c5853..4d120ebaf 100644 --- a/src/main/java/eu/siacs/conversations/ui/interfaces/OnAvatarPublication.java +++ b/src/main/java/eu/siacs/conversations/ui/interfaces/OnAvatarPublication.java @@ -29,7 +29,7 @@ package eu.siacs.conversations.ui.interfaces; -import android.support.annotation.StringRes; +import androidx.annotation.StringRes; public interface OnAvatarPublication { diff --git a/src/main/java/eu/siacs/conversations/ui/service/AudioPlayer.java b/src/main/java/eu/siacs/conversations/ui/service/AudioPlayer.java index e1dc10e82..1a48f1387 100644 --- a/src/main/java/eu/siacs/conversations/ui/service/AudioPlayer.java +++ b/src/main/java/eu/siacs/conversations/ui/service/AudioPlayer.java @@ -12,8 +12,8 @@ import android.media.AudioManager; import android.os.Build; import android.os.Handler; import android.os.PowerManager; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; import android.util.Log; import android.view.View; import android.widget.ImageButton; diff --git a/src/main/java/eu/siacs/conversations/ui/text/QuoteSpan.java b/src/main/java/eu/siacs/conversations/ui/text/QuoteSpan.java index 0757ad5de..48b20a47f 100644 --- a/src/main/java/eu/siacs/conversations/ui/text/QuoteSpan.java +++ b/src/main/java/eu/siacs/conversations/ui/text/QuoteSpan.java @@ -2,7 +2,7 @@ package eu.siacs.conversations.ui.text; import android.graphics.Canvas; import android.graphics.Paint; -import android.support.annotation.ColorInt; +import androidx.annotation.ColorInt; import android.text.Layout; import android.text.TextPaint; import android.text.style.CharacterStyle; diff --git a/src/main/java/eu/siacs/conversations/ui/util/AvatarWorkerTask.java b/src/main/java/eu/siacs/conversations/ui/util/AvatarWorkerTask.java index ad7da7189..388a38003 100644 --- a/src/main/java/eu/siacs/conversations/ui/util/AvatarWorkerTask.java +++ b/src/main/java/eu/siacs/conversations/ui/util/AvatarWorkerTask.java @@ -6,7 +6,7 @@ import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.AsyncTask; -import android.support.annotation.DimenRes; +import androidx.annotation.DimenRes; import android.widget.ImageView; import java.lang.ref.WeakReference; diff --git a/src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java b/src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java index 24bbdd7c7..c301a03ce 100644 --- a/src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java +++ b/src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java @@ -33,7 +33,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.provider.MediaStore; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.Menu; import android.view.MenuItem; diff --git a/src/main/java/eu/siacs/conversations/ui/util/DelayedHintHelper.java b/src/main/java/eu/siacs/conversations/ui/util/DelayedHintHelper.java index 805b8f217..4680b2afd 100644 --- a/src/main/java/eu/siacs/conversations/ui/util/DelayedHintHelper.java +++ b/src/main/java/eu/siacs/conversations/ui/util/DelayedHintHelper.java @@ -30,7 +30,7 @@ package eu.siacs.conversations.ui.util; import android.os.Handler; -import android.support.annotation.StringRes; +import androidx.annotation.StringRes; import android.widget.EditText; public class DelayedHintHelper { diff --git a/src/main/java/eu/siacs/conversations/ui/util/GridManager.java b/src/main/java/eu/siacs/conversations/ui/util/GridManager.java index c84dbd63b..5e523aa31 100644 --- a/src/main/java/eu/siacs/conversations/ui/util/GridManager.java +++ b/src/main/java/eu/siacs/conversations/ui/util/GridManager.java @@ -1,9 +1,9 @@ package eu.siacs.conversations.ui.util; import android.content.Context; -import android.support.annotation.DimenRes; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.DimenRes; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.ViewTreeObserver; diff --git a/src/main/java/eu/siacs/conversations/ui/util/JidDialog.java b/src/main/java/eu/siacs/conversations/ui/util/JidDialog.java index ae5401717..dbc196f4b 100644 --- a/src/main/java/eu/siacs/conversations/ui/util/JidDialog.java +++ b/src/main/java/eu/siacs/conversations/ui/util/JidDialog.java @@ -1,7 +1,7 @@ package eu.siacs.conversations.ui.util; import android.content.Context; -import android.support.annotation.StringRes; +import androidx.annotation.StringRes; import android.text.SpannableString; import android.text.Spanned; import android.text.style.TypefaceSpan; diff --git a/src/main/java/eu/siacs/conversations/ui/util/MucConfiguration.java b/src/main/java/eu/siacs/conversations/ui/util/MucConfiguration.java index 3f40f714f..952084816 100644 --- a/src/main/java/eu/siacs/conversations/ui/util/MucConfiguration.java +++ b/src/main/java/eu/siacs/conversations/ui/util/MucConfiguration.java @@ -2,7 +2,7 @@ package eu.siacs.conversations.ui.util; import android.content.Context; import android.os.Bundle; -import android.support.annotation.StringRes; +import androidx.annotation.StringRes; import eu.siacs.conversations.R; import eu.siacs.conversations.entities.MucOptions; diff --git a/src/main/java/eu/siacs/conversations/ui/util/MucDetailsContextMenuHelper.java b/src/main/java/eu/siacs/conversations/ui/util/MucDetailsContextMenuHelper.java index 0e848e392..31da26f22 100644 --- a/src/main/java/eu/siacs/conversations/ui/util/MucDetailsContextMenuHelper.java +++ b/src/main/java/eu/siacs/conversations/ui/util/MucDetailsContextMenuHelper.java @@ -2,7 +2,7 @@ package eu.siacs.conversations.ui.util; import android.app.Activity; import android.preference.PreferenceManager; -import android.support.v7.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.text.SpannableString; import android.text.Spanned; import android.text.style.TypefaceSpan; diff --git a/src/main/java/eu/siacs/conversations/ui/util/PresenceSelector.java b/src/main/java/eu/siacs/conversations/ui/util/PresenceSelector.java index 2f29e5b76..05a364b79 100644 --- a/src/main/java/eu/siacs/conversations/ui/util/PresenceSelector.java +++ b/src/main/java/eu/siacs/conversations/ui/util/PresenceSelector.java @@ -31,7 +31,7 @@ package eu.siacs.conversations.ui.util; import android.app.Activity; import android.content.Context; -import android.support.v7.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.util.Pair; import java.util.Collections; diff --git a/src/main/java/eu/siacs/conversations/ui/util/SoftKeyboardUtils.java b/src/main/java/eu/siacs/conversations/ui/util/SoftKeyboardUtils.java index bcc25b01e..09a8544df 100644 --- a/src/main/java/eu/siacs/conversations/ui/util/SoftKeyboardUtils.java +++ b/src/main/java/eu/siacs/conversations/ui/util/SoftKeyboardUtils.java @@ -31,7 +31,7 @@ package eu.siacs.conversations.ui.util; import android.app.Activity; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import android.view.inputmethod.InputMethodManager; import android.widget.EditText; diff --git a/src/main/java/eu/siacs/conversations/ui/util/StyledAttributes.java b/src/main/java/eu/siacs/conversations/ui/util/StyledAttributes.java index 2b0b3f6e3..cfd177031 100644 --- a/src/main/java/eu/siacs/conversations/ui/util/StyledAttributes.java +++ b/src/main/java/eu/siacs/conversations/ui/util/StyledAttributes.java @@ -31,8 +31,8 @@ package eu.siacs.conversations.ui.util; import android.content.Context; import android.content.res.TypedArray; -import android.support.annotation.AttrRes; -import android.support.annotation.ColorInt; +import androidx.annotation.AttrRes; +import androidx.annotation.ColorInt; public class StyledAttributes { public static android.graphics.drawable.Drawable getDrawable(Context context, @AttrRes int id) { diff --git a/src/main/java/eu/siacs/conversations/ui/widget/EditMessage.java b/src/main/java/eu/siacs/conversations/ui/widget/EditMessage.java index 1a1327ec4..3461ebc9e 100644 --- a/src/main/java/eu/siacs/conversations/ui/widget/EditMessage.java +++ b/src/main/java/eu/siacs/conversations/ui/widget/EditMessage.java @@ -2,9 +2,9 @@ package eu.siacs.conversations.ui.widget; import android.content.SharedPreferences; import android.preference.PreferenceManager; -import android.support.v13.view.inputmethod.EditorInfoCompat; -import android.support.v13.view.inputmethod.InputConnectionCompat; -import android.support.v13.view.inputmethod.InputContentInfoCompat; +import androidx.core.view.inputmethod.EditorInfoCompat; +import androidx.core.view.inputmethod.InputConnectionCompat; +import androidx.core.view.inputmethod.InputContentInfoCompat; import android.content.Context; import android.os.Build; diff --git a/src/main/java/eu/siacs/conversations/ui/widget/ImmediateAutoCompleteTextView.java b/src/main/java/eu/siacs/conversations/ui/widget/ImmediateAutoCompleteTextView.java index 4e40ff404..71e56d7fa 100644 --- a/src/main/java/eu/siacs/conversations/ui/widget/ImmediateAutoCompleteTextView.java +++ b/src/main/java/eu/siacs/conversations/ui/widget/ImmediateAutoCompleteTextView.java @@ -32,7 +32,7 @@ package eu.siacs.conversations.ui.widget; import android.content.Context; import android.util.AttributeSet; -public class ImmediateAutoCompleteTextView extends android.support.v7.widget.AppCompatAutoCompleteTextView { +public class ImmediateAutoCompleteTextView extends androidx.appcompat.widget.AppCompatAutoCompleteTextView { public ImmediateAutoCompleteTextView(Context context, AttributeSet attrs) { super(context, attrs); diff --git a/src/main/java/eu/siacs/conversations/ui/widget/MyLocation.java b/src/main/java/eu/siacs/conversations/ui/widget/MyLocation.java index a48e78f92..f49f3dd79 100644 --- a/src/main/java/eu/siacs/conversations/ui/widget/MyLocation.java +++ b/src/main/java/eu/siacs/conversations/ui/widget/MyLocation.java @@ -1,14 +1,13 @@ package eu.siacs.conversations.ui.widget; -import android.annotation.TargetApi; import android.content.Context; import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Point; import android.location.Location; -import android.os.Build; -import android.support.v4.content.ContextCompat; + +import androidx.core.content.ContextCompat; import org.osmdroid.util.GeoPoint; import org.osmdroid.util.TileSystem; diff --git a/src/main/java/eu/siacs/conversations/ui/widget/SwipeRefreshListFragment.java b/src/main/java/eu/siacs/conversations/ui/widget/SwipeRefreshListFragment.java index 5f04647c9..8057a423f 100644 --- a/src/main/java/eu/siacs/conversations/ui/widget/SwipeRefreshListFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/widget/SwipeRefreshListFragment.java @@ -18,9 +18,8 @@ package eu.siacs.conversations.ui.widget; import android.content.Context; import android.os.Bundle; -import android.support.v4.app.ListFragment; -import android.support.v4.view.ViewCompat; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.fragment.app.ListFragment; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -30,9 +29,9 @@ import eu.siacs.conversations.R; import eu.siacs.conversations.ui.util.StyledAttributes; /** - * Subclass of {@link android.support.v4.app.ListFragment} which provides automatic support for + * Subclass of {@link androidx.fragment.app.ListFragment} which provides automatic support for * providing the 'swipe-to-refresh' UX gesture by wrapping the the content view in a - * {@link android.support.v4.widget.SwipeRefreshLayout}. + * {@link androidx.swiperefreshlayout.widget.SwipeRefreshLayout}. */ public class SwipeRefreshListFragment extends ListFragment { @@ -80,10 +79,10 @@ public class SwipeRefreshListFragment extends ListFragment { } /** - * Set the {@link android.support.v4.widget.SwipeRefreshLayout.OnRefreshListener} to listen for + * Set the {@link androidx.core.widget.SwipeRefreshLayout.OnRefreshListener} to listen for * initiated refreshes. * - * @see android.support.v4.widget.SwipeRefreshLayout#setOnRefreshListener(android.support.v4.widget.SwipeRefreshLayout.OnRefreshListener) + * @see androidx.core.widget.SwipeRefreshLayout#setOnRefreshListener(androidx.core.widget.SwipeRefreshLayout.OnRefreshListener) */ public void setOnRefreshListener(SwipeRefreshLayout.OnRefreshListener listener) { onRefreshListener = listener; @@ -95,10 +94,10 @@ public class SwipeRefreshListFragment extends ListFragment { } /** - * Set whether the {@link android.support.v4.widget.SwipeRefreshLayout} should be displaying + * Set whether the {@link androidx.core.widget.SwipeRefreshLayout} should be displaying * that it is refreshing or not. * - * @see android.support.v4.widget.SwipeRefreshLayout#setRefreshing(boolean) + * @see androidx.core.widget.SwipeRefreshLayout#setRefreshing(boolean) */ public void setRefreshing(boolean refreshing) { this.refreshing = refreshing; @@ -109,12 +108,12 @@ public class SwipeRefreshListFragment extends ListFragment { /** - * Sub-class of {@link android.support.v4.widget.SwipeRefreshLayout} for use in this - * {@link android.support.v4.app.ListFragment}. The reason that this is needed is because - * {@link android.support.v4.widget.SwipeRefreshLayout} only supports a single child, which it + * Sub-class of {@link androidx.core.widget.SwipeRefreshLayout} for use in this + * {@link androidx.core.app.ListFragment}. The reason that this is needed is because + * {@link androidx.core.widget.SwipeRefreshLayout} only supports a single child, which it * expects to be the one which triggers refreshes. In our case the layout's child is the content * view returned from - * {@link android.support.v4.app.ListFragment#onCreateView(android.view.LayoutInflater, android.view.ViewGroup, android.os.Bundle)} + * {@link androidx.core.app.ListFragment#onCreateView(android.view.LayoutInflater, android.view.ViewGroup, android.os.Bundle)} * which is a {@link android.view.ViewGroup}. * * <p>To enable 'swipe-to-refresh' support via the {@link android.widget.ListView} we need to diff --git a/src/main/java/eu/siacs/conversations/ui/widget/TextInputEditText.java b/src/main/java/eu/siacs/conversations/ui/widget/TextInputEditText.java index 747e59916..c6b9968b3 100644 --- a/src/main/java/eu/siacs/conversations/ui/widget/TextInputEditText.java +++ b/src/main/java/eu/siacs/conversations/ui/widget/TextInputEditText.java @@ -12,7 +12,7 @@ import java.lang.reflect.Field; * A wrapper class to fix some weird fuck ups on Meizu devices * credit goes to the people in this thread https://github.com/android-in-china/Compatibility/issues/11 */ -public class TextInputEditText extends android.support.design.widget.TextInputEditText { +public class TextInputEditText extends com.google.android.material.textfield.TextInputEditText { public TextInputEditText(Context context) { super(context); diff --git a/src/main/java/eu/siacs/conversations/ui/widget/UnreadCountCustomView.java b/src/main/java/eu/siacs/conversations/ui/widget/UnreadCountCustomView.java index f981fcf7a..cfe291f73 100644 --- a/src/main/java/eu/siacs/conversations/ui/widget/UnreadCountCustomView.java +++ b/src/main/java/eu/siacs/conversations/ui/widget/UnreadCountCustomView.java @@ -6,7 +6,7 @@ import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; import android.graphics.Typeface; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.util.AttributeSet; import android.view.View; diff --git a/src/main/java/eu/siacs/conversations/utils/Android360pFormatStrategy.java b/src/main/java/eu/siacs/conversations/utils/Android360pFormatStrategy.java index 761eff2a3..b2da09f97 100644 --- a/src/main/java/eu/siacs/conversations/utils/Android360pFormatStrategy.java +++ b/src/main/java/eu/siacs/conversations/utils/Android360pFormatStrategy.java @@ -3,7 +3,7 @@ package eu.siacs.conversations.utils; import android.media.MediaCodecInfo; import android.media.MediaFormat; import android.os.Build; -import android.support.annotation.RequiresApi; +import androidx.annotation.RequiresApi; import android.util.Log; import net.ypresto.androidtranscoder.format.MediaFormatExtraConstants; diff --git a/src/main/java/eu/siacs/conversations/utils/Android720pFormatStrategy.java b/src/main/java/eu/siacs/conversations/utils/Android720pFormatStrategy.java index 981866951..47ad515eb 100644 --- a/src/main/java/eu/siacs/conversations/utils/Android720pFormatStrategy.java +++ b/src/main/java/eu/siacs/conversations/utils/Android720pFormatStrategy.java @@ -3,7 +3,7 @@ package eu.siacs.conversations.utils; import android.media.MediaCodecInfo; import android.media.MediaFormat; import android.os.Build; -import android.support.annotation.RequiresApi; +import androidx.annotation.RequiresApi; import android.util.Log; import net.ypresto.androidtranscoder.format.MediaFormatExtraConstants; diff --git a/src/main/java/eu/siacs/conversations/utils/Compatibility.java b/src/main/java/eu/siacs/conversations/utils/Compatibility.java index b03ad5454..e11ea42d7 100644 --- a/src/main/java/eu/siacs/conversations/utils/Compatibility.java +++ b/src/main/java/eu/siacs/conversations/utils/Compatibility.java @@ -10,12 +10,11 @@ import android.os.Build; import android.preference.Preference; import android.preference.PreferenceCategory; import android.preference.PreferenceManager; -import android.support.annotation.BoolRes; -import android.support.v4.content.ContextCompat; +import androidx.annotation.BoolRes; +import androidx.core.content.ContextCompat; import android.util.Log; import java.util.Arrays; -import java.util.Collections; import java.util.List; import eu.siacs.conversations.Config; diff --git a/src/main/java/eu/siacs/conversations/utils/Emoticons.java b/src/main/java/eu/siacs/conversations/utils/Emoticons.java index 26dc205b4..39106caa8 100644 --- a/src/main/java/eu/siacs/conversations/utils/Emoticons.java +++ b/src/main/java/eu/siacs/conversations/utils/Emoticons.java @@ -29,7 +29,7 @@ package eu.siacs.conversations.utils; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.LruCache; import java.util.ArrayList; diff --git a/src/main/java/eu/siacs/conversations/utils/ExceptionHandler.java b/src/main/java/eu/siacs/conversations/utils/ExceptionHandler.java index 68672156b..808abbdb4 100644 --- a/src/main/java/eu/siacs/conversations/utils/ExceptionHandler.java +++ b/src/main/java/eu/siacs/conversations/utils/ExceptionHandler.java @@ -1,7 +1,7 @@ package eu.siacs.conversations.utils; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java b/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java index ca515e8fa..9ad6b5d3d 100644 --- a/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java @@ -6,7 +6,7 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.Signature; import android.preference.PreferenceManager; -import android.support.v7.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.util.Log; import java.io.BufferedReader; diff --git a/src/main/java/eu/siacs/conversations/utils/IrregularUnicodeDetector.java b/src/main/java/eu/siacs/conversations/utils/IrregularUnicodeDetector.java index 832e0dc56..52936fcfa 100644 --- a/src/main/java/eu/siacs/conversations/utils/IrregularUnicodeDetector.java +++ b/src/main/java/eu/siacs/conversations/utils/IrregularUnicodeDetector.java @@ -32,7 +32,7 @@ package eu.siacs.conversations.utils; import android.annotation.TargetApi; import android.content.Context; import android.os.Build; -import android.support.annotation.ColorInt; +import androidx.annotation.ColorInt; import android.text.Spannable; import android.text.SpannableString; import android.text.SpannableStringBuilder; diff --git a/src/main/java/eu/siacs/conversations/utils/PermissionUtils.java b/src/main/java/eu/siacs/conversations/utils/PermissionUtils.java index 852dedc00..f025c256f 100644 --- a/src/main/java/eu/siacs/conversations/utils/PermissionUtils.java +++ b/src/main/java/eu/siacs/conversations/utils/PermissionUtils.java @@ -4,7 +4,7 @@ import android.Manifest; import android.app.Activity; import android.content.pm.PackageManager; import android.os.Build; -import android.support.v4.app.ActivityCompat; +import androidx.core.app.ActivityCompat; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/eu/siacs/conversations/utils/Resolver.java b/src/main/java/eu/siacs/conversations/utils/Resolver.java index 2afec6225..27685a65d 100644 --- a/src/main/java/eu/siacs/conversations/utils/Resolver.java +++ b/src/main/java/eu/siacs/conversations/utils/Resolver.java @@ -2,7 +2,7 @@ package eu.siacs.conversations.utils; import android.content.ContentValues; import android.database.Cursor; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import java.io.IOException; diff --git a/src/main/java/eu/siacs/conversations/utils/SSLSocketHelper.java b/src/main/java/eu/siacs/conversations/utils/SSLSocketHelper.java index 13b33570b..6835f5d3f 100644 --- a/src/main/java/eu/siacs/conversations/utils/SSLSocketHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/SSLSocketHelper.java @@ -1,7 +1,7 @@ package eu.siacs.conversations.utils; import android.os.Build; -import android.support.annotation.RequiresApi; +import androidx.annotation.RequiresApi; import android.util.Log; import org.conscrypt.Conscrypt; diff --git a/src/main/java/eu/siacs/conversations/utils/StylingHelper.java b/src/main/java/eu/siacs/conversations/utils/StylingHelper.java index 4d4339a42..d434be126 100644 --- a/src/main/java/eu/siacs/conversations/utils/StylingHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/StylingHelper.java @@ -32,8 +32,8 @@ package eu.siacs.conversations.utils; import android.content.Context; import android.graphics.Color; import android.graphics.Typeface; -import android.support.annotation.ColorInt; -import android.support.v4.content.ContextCompat; +import androidx.annotation.ColorInt; +import androidx.core.content.ContextCompat; import android.text.Editable; import android.text.ParcelableSpan; import android.text.Spannable; diff --git a/src/main/java/eu/siacs/conversations/utils/ThemeHelper.java b/src/main/java/eu/siacs/conversations/utils/ThemeHelper.java index bd50ab0ae..36e8d8179 100644 --- a/src/main/java/eu/siacs/conversations/utils/ThemeHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/ThemeHelper.java @@ -36,9 +36,9 @@ import android.content.res.Resources; import android.content.res.TypedArray; import android.os.Build; import android.preference.PreferenceManager; -import android.support.annotation.StyleRes; -import android.support.design.widget.Snackbar; -import android.support.v4.content.ContextCompat; +import androidx.annotation.StyleRes; +import com.google.android.material.snackbar.Snackbar; +import androidx.core.content.ContextCompat; import android.util.TypedValue; import android.widget.TextView; @@ -103,8 +103,8 @@ public class ThemeHelper { final float size = typedArray.getDimension(0,0f); typedArray.recycle(); if (size != 0f) { - final TextView text = snackbar.getView().findViewById(android.support.design.R.id.snackbar_text); - final TextView action = snackbar.getView().findViewById(android.support.design.R.id.snackbar_action); + final TextView text = snackbar.getView().findViewById(com.google.android.material.R.id.snackbar_text); + final TextView action = snackbar.getView().findViewById(com.google.android.material.R.id.snackbar_action); if (text != null && action != null) { text.setTextSize(TypedValue.COMPLEX_UNIT_PX, size); action.setTextSize(TypedValue.COMPLEX_UNIT_PX, size); diff --git a/src/main/java/eu/siacs/conversations/utils/TimeFrameUtils.java b/src/main/java/eu/siacs/conversations/utils/TimeFrameUtils.java index 6ad1325be..b96370dc3 100644 --- a/src/main/java/eu/siacs/conversations/utils/TimeFrameUtils.java +++ b/src/main/java/eu/siacs/conversations/utils/TimeFrameUtils.java @@ -31,7 +31,7 @@ package eu.siacs.conversations.utils; import android.content.Context; import android.os.SystemClock; -import android.support.annotation.PluralsRes; +import androidx.annotation.PluralsRes; import java.util.Locale; diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java index bf87dd0bd..fbbbe8752 100644 --- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java @@ -1,7 +1,7 @@ package eu.siacs.conversations.utils; import android.content.Context; -import android.support.annotation.ColorInt; +import androidx.annotation.ColorInt; import android.text.SpannableStringBuilder; import android.text.format.DateFormat; import android.text.format.DateUtils; diff --git a/src/main/java/eu/siacs/conversations/utils/XmppUri.java b/src/main/java/eu/siacs/conversations/utils/XmppUri.java index 52f84f24b..7be4766f3 100644 --- a/src/main/java/eu/siacs/conversations/utils/XmppUri.java +++ b/src/main/java/eu/siacs/conversations/utils/XmppUri.java @@ -1,7 +1,7 @@ package eu.siacs.conversations.utils; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/src/main/java/eu/siacs/conversations/xmpp/InvalidJid.java b/src/main/java/eu/siacs/conversations/xmpp/InvalidJid.java index a990dc5c1..f3a21c36f 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/InvalidJid.java +++ b/src/main/java/eu/siacs/conversations/xmpp/InvalidJid.java @@ -29,7 +29,7 @@ package eu.siacs.conversations.xmpp; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import eu.siacs.conversations.xmpp.stanzas.AbstractStanza; diff --git a/src/main/java/eu/siacs/conversations/xmpp/WrappedJid.java b/src/main/java/eu/siacs/conversations/xmpp/WrappedJid.java index aeee5c6e4..42fa7f3ae 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/WrappedJid.java +++ b/src/main/java/eu/siacs/conversations/xmpp/WrappedJid.java @@ -1,7 +1,7 @@ package eu.siacs.conversations.xmpp; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.jxmpp.jid.Jid; import org.jxmpp.jid.impl.JidCreate; diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java index 2054dfa53..59fc3977a 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java @@ -5,7 +5,7 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.os.SystemClock; import android.security.KeyChain; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Base64; import android.util.Log; import android.util.Pair; diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java index f27efb1e2..e945e4b4b 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java @@ -1,6 +1,6 @@ package eu.siacs.conversations.xmpp.jingle.stanzas; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.google.common.base.Preconditions; diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/JinglePacket.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/JinglePacket.java index 21b1d5089..d4c5fd745 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/JinglePacket.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/JinglePacket.java @@ -1,6 +1,6 @@ package eu.siacs.conversations.xmpp.jingle.stanzas; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.google.common.base.CaseFormat; import com.google.common.base.Preconditions; diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java index 9e4c8d95d..c419045b0 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java @@ -1,6 +1,6 @@ package eu.siacs.conversations.xmpp.jingle.stanzas; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.google.common.base.CaseFormat; diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml index 75e3c2e54..914ee1950 100644 --- a/src/main/res/layout/account_row.xml +++ b/src/main/res/layout/account_row.xml @@ -44,7 +44,7 @@ android:textAppearance="@style/TextAppearance.Conversations.Body2" /> </LinearLayout> - <android.support.v7.widget.SwitchCompat + <androidx.appcompat.widget.SwitchCompat android:id="@+id/tgl_account_status" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml index 9caaa13f0..159472af1 100644 --- a/src/main/res/layout/activity_about.xml +++ b/src/main/res/layout/activity_about.xml @@ -16,7 +16,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/activity_vertical_margin" @@ -34,7 +34,7 @@ android:text="@string/pref_about_message" android:textAppearance="@style/TextAppearance.Conversations.Body1" android:typeface="monospace"/> - </android.support.v7.widget.CardView> + </androidx.cardview.widget.CardView> </LinearLayout> </ScrollView> </LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml index 03d575f98..51f26920a 100644 --- a/src/main/res/layout/activity_change_password.xml +++ b/src/main/res/layout/activity_change_password.xml @@ -13,7 +13,7 @@ android:layout_above="@+id/button_bar" android:layout_below="@id/toolbar"> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/activity_vertical_margin" @@ -28,7 +28,7 @@ android:padding="@dimen/card_padding_regular"> - <android.support.design.widget.TextInputLayout + <com.google.android.material.textfield.TextInputLayout android:id="@+id/current_password_layout" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -46,9 +46,9 @@ android:layout_alignParentTop="true" android:hint="@string/current_password" android:inputType="textPassword"/> - </android.support.design.widget.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> - <android.support.design.widget.TextInputLayout + <com.google.android.material.textfield.TextInputLayout android:id="@+id/new_password_layout" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -66,9 +66,9 @@ android:layout_alignParentTop="true" android:hint="@string/new_password" android:inputType="textPassword"/> - </android.support.design.widget.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> </LinearLayout> - </android.support.v7.widget.CardView> + </androidx.cardview.widget.CardView> </ScrollView> <LinearLayout diff --git a/src/main/res/layout/activity_channel_discovery.xml b/src/main/res/layout/activity_channel_discovery.xml index 34b680622..42761cdeb 100644 --- a/src/main/res/layout/activity_channel_discovery.xml +++ b/src/main/res/layout/activity_channel_discovery.xml @@ -21,21 +21,21 @@ android:layout_gravity="center_horizontal" app:layout_anchor="@+id/list" /> - <android.support.design.widget.CoordinatorLayout + <androidx.coordinatorlayout.widget.CoordinatorLayout android:id="@+id/coordinator" android:layout_width="match_parent" android:layout_height="match_parent" android:background="?attr/color_background_primary"> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/list" android:layout_width="match_parent" android:layout_height="match_parent" android:background="?attr/color_background_primary" android:orientation="vertical" android:scrollbars="vertical" - app:layoutManager="android.support.v7.widget.LinearLayoutManager" /> - </android.support.design.widget.CoordinatorLayout> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + </androidx.coordinatorlayout.widget.CoordinatorLayout> </LinearLayout> </layout>
\ No newline at end of file diff --git a/src/main/res/layout/activity_choose_contact.xml b/src/main/res/layout/activity_choose_contact.xml index f44ef3509..b937f6d19 100644 --- a/src/main/res/layout/activity_choose_contact.xml +++ b/src/main/res/layout/activity_choose_contact.xml @@ -22,7 +22,7 @@ android:divider="@android:color/transparent" android:dividerHeight="0dp"/> - <android.support.design.widget.FloatingActionButton + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/fab" android:visibility="gone" app:backgroundTint="?colorPrimary" diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml index 9f927ec1f..1c2ce4359 100644 --- a/src/main/res/layout/activity_contact_details.xml +++ b/src/main/res/layout/activity_contact_details.xml @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/activity_vertical_margin" @@ -116,9 +116,9 @@ android:text="@string/using_account" android:textAppearance="@style/TextAppearance.Conversations.Caption" /> </RelativeLayout> - </android.support.v7.widget.CardView> + </androidx.cardview.widget.CardView> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:id="@+id/media_wrapper" android:layout_width="fill_parent" android:layout_height="wrap_content" @@ -132,7 +132,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/media" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -162,9 +162,9 @@ android:textColor="?attr/colorAccent" /> </LinearLayout> </LinearLayout> - </android.support.v7.widget.CardView> + </androidx.cardview.widget.CardView> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:id="@+id/keys_wrapper" android:layout_width="fill_parent" android:layout_height="wrap_content" @@ -215,7 +215,7 @@ android:textColor="?attr/colorAccent" /> </LinearLayout> </LinearLayout> - </android.support.v7.widget.CardView> + </androidx.cardview.widget.CardView> </LinearLayout> </ScrollView> </LinearLayout> diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index 8741740ad..4fd8dc3c3 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -24,7 +24,7 @@ android:orientation="vertical"> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:id="@+id/editor" android:layout_width="fill_parent" android:layout_height="wrap_content" @@ -53,7 +53,7 @@ android:layout_toRightOf="@+id/avater" android:orientation="vertical"> - <android.support.design.widget.TextInputLayout + <com.google.android.material.textfield.TextInputLayout android:id="@+id/account_jid_layout" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -69,10 +69,10 @@ android:inputType="textEmailAddress" android:textColor="?attr/edit_text_color" style="@style/Widget.Conversations.EditText"/> - </android.support.design.widget.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> - <android.support.design.widget.TextInputLayout + <com.google.android.material.textfield.TextInputLayout android:id="@+id/account_password_layout" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -91,7 +91,7 @@ android:inputType="textPassword" android:textColor="?attr/edit_text_color" style="@style/Widget.Conversations.EditText"/> - </android.support.design.widget.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> <LinearLayout android:id="@+id/name_port" @@ -107,7 +107,7 @@ android:layout_weight="0.8" android:orientation="vertical"> - <android.support.design.widget.TextInputLayout + <com.google.android.material.textfield.TextInputLayout android:id="@+id/hostname_layout" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -121,7 +121,7 @@ android:layout_height="wrap_content" android:inputType="textWebEmailAddress" style="@style/Widget.Conversations.EditText"/> - </android.support.design.widget.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> </LinearLayout> <LinearLayout @@ -130,7 +130,7 @@ android:layout_weight="0.2" android:orientation="vertical"> - <android.support.design.widget.TextInputLayout + <com.google.android.material.textfield.TextInputLayout android:id="@+id/port_layout" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -145,7 +145,7 @@ android:inputType="number" android:maxLength="5" style="@style/Widget.Conversations.EditText"/> - </android.support.design.widget.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> </LinearLayout> </LinearLayout> @@ -158,9 +158,9 @@ android:text="@string/register_account"/> </LinearLayout> </RelativeLayout> - </android.support.v7.widget.CardView> + </androidx.cardview.widget.CardView> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:id="@+id/os_optimization" android:layout_width="fill_parent" android:layout_height="wrap_content" @@ -215,10 +215,10 @@ android:textColor="?colorAccent"/> </LinearLayout> </LinearLayout> - </android.support.v7.widget.CardView> + </androidx.cardview.widget.CardView> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:id="@+id/stats" android:layout_width="fill_parent" android:layout_height="fill_parent" @@ -636,9 +636,9 @@ </LinearLayout> </RelativeLayout> </LinearLayout> - </android.support.v7.widget.CardView> + </androidx.cardview.widget.CardView> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:id="@+id/other_device_keys_card" android:layout_width="fill_parent" android:layout_height="wrap_content" @@ -677,7 +677,7 @@ android:text="@string/clear_other_devices" android:textColor="?colorAccent"/> </LinearLayout> - </android.support.v7.widget.CardView> + </androidx.cardview.widget.CardView> </LinearLayout> </ScrollView> diff --git a/src/main/res/layout/activity_media_browser.xml b/src/main/res/layout/activity_media_browser.xml index 4a54e5fd4..57e12be9b 100644 --- a/src/main/res/layout/activity_media_browser.xml +++ b/src/main/res/layout/activity_media_browser.xml @@ -11,7 +11,7 @@ android:id="@+id/toolbar" layout="@layout/toolbar"/> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/media" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index 0d67187e4..d19bf93e9 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/activity_vertical_margin" @@ -100,7 +100,7 @@ android:layout_alignParentLeft="true" android:layout_toLeftOf="@+id/edit_muc_name_button"> - <android.support.design.widget.TextInputLayout + <com.google.android.material.textfield.TextInputLayout android:layout_width="match_parent" android:layout_height="wrap_content" app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error" @@ -112,9 +112,9 @@ android:layout_height="wrap_content" android:hint="@string/group_chat_name" android:textAppearance="@style/Widget.Conversations.EditText"/> - </android.support.design.widget.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> - <android.support.design.widget.TextInputLayout + <com.google.android.material.textfield.TextInputLayout android:layout_width="match_parent" android:layout_height="wrap_content" app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error" @@ -126,7 +126,7 @@ android:layout_height="wrap_content" android:hint="@string/topic" android:textAppearance="@style/Widget.Conversations.EditText"/> - </android.support.design.widget.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> </LinearLayout> @@ -216,9 +216,9 @@ android:layout_marginTop="32dp" android:textAppearance="@style/TextAppearance.Conversations.Caption"/> </LinearLayout> - </android.support.v7.widget.CardView> + </androidx.cardview.widget.CardView> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:id="@+id/users_wrapper" android:layout_width="fill_parent" android:layout_height="wrap_content" @@ -242,7 +242,7 @@ android:text="@string/no_users_hint_channel" android:textAppearance="@style/TextAppearance.Conversations.Body2"/> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/users" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -283,9 +283,9 @@ android:textColor="?attr/colorAccent" /> </LinearLayout> </LinearLayout> - </android.support.v7.widget.CardView> + </androidx.cardview.widget.CardView> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/activity_vertical_margin" @@ -377,8 +377,8 @@ android:text="@string/using_account" android:textAppearance="@style/TextAppearance.Conversations.Caption"/> </LinearLayout> - </android.support.v7.widget.CardView> - <android.support.v7.widget.CardView + </androidx.cardview.widget.CardView> + <androidx.cardview.widget.CardView android:id="@+id/media_wrapper" android:layout_width="fill_parent" android:layout_height="wrap_content" @@ -392,7 +392,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/media" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -422,7 +422,7 @@ android:textColor="?attr/colorAccent" /> </LinearLayout> </LinearLayout> - </android.support.v7.widget.CardView> + </androidx.cardview.widget.CardView> </LinearLayout> </ScrollView> diff --git a/src/main/res/layout/activity_muc_users.xml b/src/main/res/layout/activity_muc_users.xml index c195a0a1a..3fc73d02c 100644 --- a/src/main/res/layout/activity_muc_users.xml +++ b/src/main/res/layout/activity_muc_users.xml @@ -14,21 +14,21 @@ layout="@layout/toolbar" /> - <android.support.design.widget.CoordinatorLayout + <androidx.coordinatorlayout.widget.CoordinatorLayout android:id="@+id/coordinator" android:layout_width="match_parent" android:layout_height="match_parent" android:background="?attr/color_background_primary"> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/list" android:layout_width="match_parent" android:layout_height="match_parent" android:background="?attr/color_background_primary" android:orientation="vertical" android:scrollbars="vertical" - app:layoutManager="android.support.v7.widget.LinearLayoutManager" /> - </android.support.design.widget.CoordinatorLayout> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + </androidx.coordinatorlayout.widget.CoordinatorLayout> </LinearLayout> </layout>
\ No newline at end of file diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml index 635f49b45..aa9e9dc8f 100644 --- a/src/main/res/layout/activity_publish_profile_picture.xml +++ b/src/main/res/layout/activity_publish_profile_picture.xml @@ -8,7 +8,7 @@ <include android:id="@+id/toolbar" layout="@layout/toolbar"/> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_below="@id/toolbar" @@ -60,7 +60,7 @@ android:textAppearance="@style/TextAppearance.Conversations.Body1"/> </LinearLayout> - </android.support.v7.widget.CardView> + </androidx.cardview.widget.CardView> <LinearLayout android:id="@+id/button_bar" diff --git a/src/main/res/layout/activity_rtp_session.xml b/src/main/res/layout/activity_rtp_session.xml index 121f712ce..ccc02259a 100644 --- a/src/main/res/layout/activity_rtp_session.xml +++ b/src/main/res/layout/activity_rtp_session.xml @@ -34,13 +34,13 @@ android:visibility="gone" /> </LinearLayout> - <android.support.design.widget.AppBarLayout + <com.google.android.material.appbar.AppBarLayout android:id="@+id/app_bar_layout" android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="visible"> - <android.support.v7.widget.Toolbar + <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" @@ -60,7 +60,7 @@ android:textColor="@color/white" tools:text="Juliet Capulet" /> - </android.support.design.widget.AppBarLayout> + </com.google.android.material.appbar.AppBarLayout> <RelativeLayout android:layout_width="match_parent" @@ -136,7 +136,7 @@ android:layout_height="wrap_content" android:layout_centerInParent="true"> - <android.support.design.widget.FloatingActionButton + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/reject_call" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -151,7 +151,7 @@ app:maxImageSize="36dp" tools:visibility="visible" /> - <android.support.design.widget.FloatingActionButton + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/accept_call" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -169,7 +169,7 @@ </RelativeLayout> - <android.support.design.widget.FloatingActionButton + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/in_call_action_left" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -183,7 +183,7 @@ app:fabSize="mini" app:tint="?attr/icon_tint" /> - <android.support.design.widget.FloatingActionButton + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/end_call" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -196,7 +196,7 @@ app:fabCustomSize="72dp" app:maxImageSize="36dp" /> - <android.support.design.widget.FloatingActionButton + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/in_call_action_right" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -210,7 +210,7 @@ app:fabSize="mini" app:tint="?attr/icon_tint" /> - <android.support.design.widget.FloatingActionButton + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/in_call_action_far_right" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/src/main/res/layout/activity_share_location.xml b/src/main/res/layout/activity_share_location.xml index 01249da55..754503f2a 100644 --- a/src/main/res/layout/activity_share_location.xml +++ b/src/main/res/layout/activity_share_location.xml @@ -12,7 +12,7 @@ android:id="@+id/toolbar" layout="@layout/toolbar" /> - <android.support.design.widget.CoordinatorLayout + <androidx.coordinatorlayout.widget.CoordinatorLayout android:id="@+id/snackbar_coordinator" android:layout_width="match_parent" @@ -26,7 +26,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - <android.support.design.widget.FloatingActionButton + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/fab" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -40,7 +40,7 @@ android:src="?attr/icon_gps_fixed" app:backgroundTint="?colorPrimary" /> - </android.support.design.widget.CoordinatorLayout> + </androidx.coordinatorlayout.widget.CoordinatorLayout> <LinearLayout android:id="@+id/button_bar" diff --git a/src/main/res/layout/activity_share_with.xml b/src/main/res/layout/activity_share_with.xml index 472a27dc6..7f9460cdf 100644 --- a/src/main/res/layout/activity_share_with.xml +++ b/src/main/res/layout/activity_share_with.xml @@ -8,7 +8,7 @@ <include layout="@layout/toolbar" /> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/choose_conversation_list" android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/src/main/res/layout/activity_show_location.xml b/src/main/res/layout/activity_show_location.xml index c3bd6ea46..ab9bafa1a 100644 --- a/src/main/res/layout/activity_show_location.xml +++ b/src/main/res/layout/activity_show_location.xml @@ -18,7 +18,7 @@ android:layout_height="fill_parent" android:layout_below="@id/toolbar" /> - <android.support.design.widget.FloatingActionButton + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/fab" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/src/main/res/layout/activity_start_conversation.xml b/src/main/res/layout/activity_start_conversation.xml index 1fd915bd6..6709b3b2a 100644 --- a/src/main/res/layout/activity_start_conversation.xml +++ b/src/main/res/layout/activity_start_conversation.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent"> <include android:id="@+id/toolbar" layout="@layout/toolbar" /> - <android.support.design.widget.TabLayout + <com.google.android.material.tabs.TabLayout android:id="@+id/tab_layout" android:layout_below="@id/toolbar" android:layout_width="match_parent" @@ -20,7 +20,7 @@ app:tabSelectedTextColor="@color/white" app:tabIndicatorColor="@color/white87" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" /> - <android.support.v4.view.ViewPager + <androidx.viewpager.widget.ViewPager android:id="@+id/start_conversation_view_pager" android:layout_width="match_parent" android:layout_height="match_parent" @@ -28,7 +28,7 @@ android:background="?attr/color_background_primary"> - </android.support.v4.view.ViewPager> + </androidx.viewpager.widget.ViewPager> <com.leinardi.android.speeddial.SpeedDialOverlayLayout android:id="@+id/overlay" diff --git a/src/main/res/layout/activity_trust_keys.xml b/src/main/res/layout/activity_trust_keys.xml index 96617702e..03f002149 100644 --- a/src/main/res/layout/activity_trust_keys.xml +++ b/src/main/res/layout/activity_trust_keys.xml @@ -21,7 +21,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:id="@+id/key_error_message_card" android:layout_width="fill_parent" android:layout_height="wrap_content" @@ -86,9 +86,9 @@ </LinearLayout> </LinearLayout> - </android.support.v7.widget.CardView> + </androidx.cardview.widget.CardView> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:id="@+id/own_keys_card" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -118,7 +118,7 @@ android:orientation="vertical"/> </LinearLayout> - </android.support.v7.widget.CardView> + </androidx.cardview.widget.CardView> <LinearLayout android:id="@+id/foreign_keys" diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml index a0971c9fa..80c3dd8cd 100644 --- a/src/main/res/layout/contact_key.xml +++ b/src/main/res/layout/contact_key.xml @@ -69,7 +69,7 @@ android:src="@drawable/ic_verified_fingerprint" android:visibility="gone"/> - <android.support.v7.widget.SwitchCompat + <androidx.appcompat.widget.SwitchCompat android:id="@+id/tgl_trust" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/src/main/res/layout/create_conference_dialog.xml b/src/main/res/layout/create_conference_dialog.xml index f0e2f19f7..2296699a5 100644 --- a/src/main/res/layout/create_conference_dialog.xml +++ b/src/main/res/layout/create_conference_dialog.xml @@ -22,7 +22,7 @@ android:layout_width="fill_parent" android:layout_height="wrap_content"/> - <android.support.design.widget.TextInputLayout + <com.google.android.material.textfield.TextInputLayout android:layout_width="match_parent" android:layout_height="wrap_content" app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error" @@ -35,6 +35,6 @@ android:layout_height="wrap_content" android:hint="@string/create_dialog_group_chat_name" android:imeOptions="actionNext|flagNoExtractUi"/> - </android.support.design.widget.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> </LinearLayout> </layout> diff --git a/src/main/res/layout/create_public_channel_dialog.xml b/src/main/res/layout/create_public_channel_dialog.xml index 4e458fc3c..048244d0c 100644 --- a/src/main/res/layout/create_public_channel_dialog.xml +++ b/src/main/res/layout/create_public_channel_dialog.xml @@ -19,7 +19,7 @@ android:layout_width="fill_parent" android:layout_height="wrap_content"/> - <android.support.design.widget.TextInputLayout + <com.google.android.material.textfield.TextInputLayout android:id="@+id/name_layout" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -33,8 +33,8 @@ android:layout_height="wrap_content" android:hint="@string/create_dialog_channel_name" android:imeOptions="actionNext|flagNoExtractUi"/> - </android.support.design.widget.TextInputLayout> - <android.support.design.widget.TextInputLayout + </com.google.android.material.textfield.TextInputLayout> + <com.google.android.material.textfield.TextInputLayout android:id="@+id/xmpp_address_layout" android:visibility="gone" android:layout_width="match_parent" @@ -50,6 +50,6 @@ android:layout_height="wrap_content" android:inputType="textEmailAddress" android:imeOptions="actionDone|flagNoExtractUi"/> - </android.support.design.widget.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> </LinearLayout> </layout> diff --git a/src/main/res/layout/dialog_join_conference.xml b/src/main/res/layout/dialog_join_conference.xml index cb8fd313d..e4d4b8000 100644 --- a/src/main/res/layout/dialog_join_conference.xml +++ b/src/main/res/layout/dialog_join_conference.xml @@ -22,7 +22,7 @@ android:layout_width="fill_parent" android:layout_height="wrap_content"/> - <android.support.design.widget.TextInputLayout + <com.google.android.material.textfield.TextInputLayout android:id="@+id/account_jid_layout" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -37,7 +37,7 @@ android:layout_height="wrap_content" android:inputType="textEmailAddress" android:imeOptions="actionDone|flagNoExtractUi"/> - </android.support.design.widget.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> <CheckBox android:id="@+id/bookmark" diff --git a/src/main/res/layout/dialog_presence.xml b/src/main/res/layout/dialog_presence.xml index 11ecf3b46..35a7df7ac 100644 --- a/src/main/res/layout/dialog_presence.xml +++ b/src/main/res/layout/dialog_presence.xml @@ -46,7 +46,7 @@ android:text="@string/presence_dnd"/> </RadioGroup> - <android.support.design.widget.TextInputLayout + <com.google.android.material.textfield.TextInputLayout android:layout_width="match_parent" android:layout_height="wrap_content" app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error" @@ -60,7 +60,7 @@ android:ems="10" android:hint="@string/status_message" android:inputType="textShortMessage"/> - </android.support.design.widget.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> </LinearLayout> </layout>
\ No newline at end of file diff --git a/src/main/res/layout/dialog_quickedit.xml b/src/main/res/layout/dialog_quickedit.xml index f0b71fc1b..0b3219fec 100644 --- a/src/main/res/layout/dialog_quickedit.xml +++ b/src/main/res/layout/dialog_quickedit.xml @@ -8,7 +8,7 @@ android:orientation="vertical" android:padding="?dialogPreferredPadding"> - <android.support.design.widget.TextInputLayout + <com.google.android.material.textfield.TextInputLayout android:id="@+id/input_layout" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -27,6 +27,6 @@ <requestFocus/> </eu.siacs.conversations.ui.widget.EmojiWrapperEditText> - </android.support.design.widget.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> </LinearLayout> </layout>
\ No newline at end of file diff --git a/src/main/res/layout/enter_jid_dialog.xml b/src/main/res/layout/enter_jid_dialog.xml index b7b7a310f..cacb98a6f 100644 --- a/src/main/res/layout/enter_jid_dialog.xml +++ b/src/main/res/layout/enter_jid_dialog.xml @@ -22,7 +22,7 @@ android:layout_width="fill_parent" android:layout_height="wrap_content"/> - <android.support.design.widget.TextInputLayout + <com.google.android.material.textfield.TextInputLayout android:id="@+id/jid_layout" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -37,6 +37,6 @@ android:layout_height="wrap_content" android:imeOptions="actionDone|flagNoExtractUi" android:inputType="textEmailAddress" /> - </android.support.design.widget.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> </LinearLayout> </layout> diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml index db67a7889..4b862b752 100644 --- a/src/main/res/layout/fragment_conversation.xml +++ b/src/main/res/layout/fragment_conversation.xml @@ -23,7 +23,7 @@ android:transcriptMode="normal" tools:listitem="@layout/message_sent"></ListView> - <android.support.design.widget.FloatingActionButton + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/scroll_to_bottom_button" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -81,7 +81,7 @@ android:textAppearance="@style/TextAppearance.Conversations.Caption.Highlight" android:visibility="gone" /> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/media_preview" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -89,10 +89,10 @@ android:paddingTop="8dp" android:requiresFadingEdge="horizontal" android:visibility="gone" - app:layoutManager="android.support.v7.widget.LinearLayoutManager" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" tools:listitem="@layout/media_preview"> - </android.support.v7.widget.RecyclerView> + </androidx.recyclerview.widget.RecyclerView> <eu.siacs.conversations.ui.widget.EditMessage android:id="@+id/textinput" diff --git a/src/main/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml index a6ee56e6d..e51238e93 100644 --- a/src/main/res/layout/fragment_conversations_overview.xml +++ b/src/main/res/layout/fragment_conversations_overview.xml @@ -1,13 +1,13 @@ <layout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> - <android.support.design.widget.CoordinatorLayout + <androidx.coordinatorlayout.widget.CoordinatorLayout android:background="?attr/color_background_primary" android:layout_width="match_parent" android:layout_height="match_parent"> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/list" android:scrollbars="vertical" android:layout_width="match_parent" @@ -15,7 +15,7 @@ android:background="?attr/color_background_primary" /> - <android.support.design.widget.FloatingActionButton + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/fab" app:backgroundTint="?colorPrimary" android:layout_width="wrap_content" @@ -23,5 +23,5 @@ android:layout_gravity="end|bottom" android:layout_margin="16dp" android:src="@drawable/ic_chat_white_24dp"/> - </android.support.design.widget.CoordinatorLayout> + </androidx.coordinatorlayout.widget.CoordinatorLayout> </layout>
\ No newline at end of file diff --git a/src/main/res/layout/keys_card.xml b/src/main/res/layout/keys_card.xml index e0c385ad5..54eaaabc0 100644 --- a/src/main/res/layout/keys_card.xml +++ b/src/main/res/layout/keys_card.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <layout xmlns:android="http://schemas.android.com/apk/res/android"> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:id="@+id/foreign_keys_card" android:layout_width="fill_parent" @@ -39,5 +39,5 @@ android:textAppearance="@style/TextAppearance.Conversations.Body1" android:layout_margin="@dimen/list_padding"/> </LinearLayout> - </android.support.v7.widget.CardView> + </androidx.cardview.widget.CardView> </layout>
\ No newline at end of file diff --git a/src/main/res/layout/toolbar.xml b/src/main/res/layout/toolbar.xml index 89b029df5..ebee72b0a 100644 --- a/src/main/res/layout/toolbar.xml +++ b/src/main/res/layout/toolbar.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.v7.widget.Toolbar android:id="@+id/toolbar" +<androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/colorPrimary" diff --git a/src/playstore/java/eu/siacs/conversations/services/MaintenanceReceiver.java b/src/playstore/java/eu/siacs/conversations/services/MaintenanceReceiver.java index 6eb5172c2..cdbdd5954 100644 --- a/src/playstore/java/eu/siacs/conversations/services/MaintenanceReceiver.java +++ b/src/playstore/java/eu/siacs/conversations/services/MaintenanceReceiver.java @@ -3,7 +3,7 @@ package eu.siacs.conversations.services; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.util.Log; import com.google.firebase.iid.FirebaseInstanceId; diff --git a/src/playstore/java/eu/siacs/conversations/services/PushMessageReceiver.java b/src/playstore/java/eu/siacs/conversations/services/PushMessageReceiver.java index eb6bdf905..871fdb03a 100644 --- a/src/playstore/java/eu/siacs/conversations/services/PushMessageReceiver.java +++ b/src/playstore/java/eu/siacs/conversations/services/PushMessageReceiver.java @@ -1,7 +1,7 @@ package eu.siacs.conversations.services; import android.content.Intent; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.util.Log; import com.google.firebase.messaging.FirebaseMessagingService; diff --git a/src/playstoreCompat/java/eu/siacs/conversations/ui/service/EmojiService.java b/src/playstoreCompat/java/eu/siacs/conversations/ui/service/EmojiService.java index 106d08204..242539543 100644 --- a/src/playstoreCompat/java/eu/siacs/conversations/ui/service/EmojiService.java +++ b/src/playstoreCompat/java/eu/siacs/conversations/ui/service/EmojiService.java @@ -2,9 +2,9 @@ package eu.siacs.conversations.ui.service; import android.content.Context; import android.os.Build; -import android.support.text.emoji.EmojiCompat; -import android.support.text.emoji.FontRequestEmojiCompatConfig; -import android.support.v4.provider.FontRequest; +import androidx.emoji.text.EmojiCompat; +import androidx.emoji.text.FontRequestEmojiCompatConfig; +import androidx.core.provider.FontRequest; import android.util.Log; import eu.siacs.conversations.Config; diff --git a/src/quicksy/java/eu/siacs/conversations/ui/ChooseCountryActivity.java b/src/quicksy/java/eu/siacs/conversations/ui/ChooseCountryActivity.java index c17776554..3e1d39db0 100644 --- a/src/quicksy/java/eu/siacs/conversations/ui/ChooseCountryActivity.java +++ b/src/quicksy/java/eu/siacs/conversations/ui/ChooseCountryActivity.java @@ -2,10 +2,10 @@ package eu.siacs.conversations.ui; import android.content.Context; import android.content.Intent; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.Toolbar; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.appcompat.widget.Toolbar; import android.text.Editable; import android.text.TextWatcher; import android.view.Menu; diff --git a/src/quicksy/java/eu/siacs/conversations/ui/EnterNameActivity.java b/src/quicksy/java/eu/siacs/conversations/ui/EnterNameActivity.java index 136cb8e31..a15419eba 100644 --- a/src/quicksy/java/eu/siacs/conversations/ui/EnterNameActivity.java +++ b/src/quicksy/java/eu/siacs/conversations/ui/EnterNameActivity.java @@ -1,9 +1,9 @@ package eu.siacs.conversations.ui; import android.content.Intent; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.widget.Toolbar; import android.view.View; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/src/quicksy/java/eu/siacs/conversations/ui/EnterPhoneNumberActivity.java b/src/quicksy/java/eu/siacs/conversations/ui/EnterPhoneNumberActivity.java index 270be018c..e146ab3be 100644 --- a/src/quicksy/java/eu/siacs/conversations/ui/EnterPhoneNumberActivity.java +++ b/src/quicksy/java/eu/siacs/conversations/ui/EnterPhoneNumberActivity.java @@ -2,9 +2,9 @@ package eu.siacs.conversations.ui; import android.app.AlertDialog; import android.content.Intent; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.widget.Toolbar; import android.text.Editable; import android.text.Html; import android.text.TextUtils; diff --git a/src/quicksy/java/eu/siacs/conversations/ui/TosActivity.java b/src/quicksy/java/eu/siacs/conversations/ui/TosActivity.java index d38bab7ce..21f06e794 100644 --- a/src/quicksy/java/eu/siacs/conversations/ui/TosActivity.java +++ b/src/quicksy/java/eu/siacs/conversations/ui/TosActivity.java @@ -5,8 +5,8 @@ import android.content.SharedPreferences; import android.content.pm.ActivityInfo; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import android.text.Html; import android.text.method.LinkMovementMethod; import android.widget.Button; diff --git a/src/quicksy/java/eu/siacs/conversations/ui/VerifyActivity.java b/src/quicksy/java/eu/siacs/conversations/ui/VerifyActivity.java index 7dc59845e..7e8bab44e 100644 --- a/src/quicksy/java/eu/siacs/conversations/ui/VerifyActivity.java +++ b/src/quicksy/java/eu/siacs/conversations/ui/VerifyActivity.java @@ -6,12 +6,12 @@ import android.content.ClipDescription; import android.content.ClipboardManager; import android.content.Context; import android.content.Intent; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; import android.os.Handler; import android.os.SystemClock; -import android.support.design.widget.Snackbar; -import android.support.v7.widget.Toolbar; +import com.google.android.material.snackbar.Snackbar; +import androidx.appcompat.widget.Toolbar; import android.text.Html; import android.view.View; diff --git a/src/quicksy/java/eu/siacs/conversations/ui/adapter/CountryAdapter.java b/src/quicksy/java/eu/siacs/conversations/ui/adapter/CountryAdapter.java index 266f9e631..adbd07f82 100644 --- a/src/quicksy/java/eu/siacs/conversations/ui/adapter/CountryAdapter.java +++ b/src/quicksy/java/eu/siacs/conversations/ui/adapter/CountryAdapter.java @@ -1,8 +1,8 @@ package eu.siacs.conversations.ui.adapter; -import android.databinding.DataBindingUtil; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.databinding.DataBindingUtil; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.ViewGroup; diff --git a/src/quicksy/java/eu/siacs/conversations/ui/util/ApiDialogHelper.java b/src/quicksy/java/eu/siacs/conversations/ui/util/ApiDialogHelper.java index 9bd7b2514..6deca9c5b 100644 --- a/src/quicksy/java/eu/siacs/conversations/ui/util/ApiDialogHelper.java +++ b/src/quicksy/java/eu/siacs/conversations/ui/util/ApiDialogHelper.java @@ -7,7 +7,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.net.Uri; import android.os.SystemClock; -import android.support.annotation.StringRes; +import androidx.annotation.StringRes; import eu.siacs.conversations.R; import eu.siacs.conversations.services.QuickConversationsService; diff --git a/src/quicksy/res/layout/activity_choose_country.xml b/src/quicksy/res/layout/activity_choose_country.xml index 640923c4f..47ba167b1 100644 --- a/src/quicksy/res/layout/activity_choose_country.xml +++ b/src/quicksy/res/layout/activity_choose_country.xml @@ -11,7 +11,7 @@ android:id="@+id/toolbar" layout="@layout/toolbar"/> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/countries" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -21,4 +21,4 @@ android:scrollbars="vertical"/> </LinearLayout> -</layout>
\ No newline at end of file +</layout> diff --git a/src/quicksy/res/layout/activity_enter_number.xml b/src/quicksy/res/layout/activity_enter_number.xml index b76faba19..d54ead3bf 100644 --- a/src/quicksy/res/layout/activity_enter_number.xml +++ b/src/quicksy/res/layout/activity_enter_number.xml @@ -10,7 +10,7 @@ android:id="@+id/toolbar" layout="@layout/toolbar" /> - <android.support.design.widget.CoordinatorLayout + <androidx.coordinatorlayout.widget.CoordinatorLayout android:id="@+id/coordinator" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -108,6 +108,6 @@ android:textColor="?colorAccent" /> </RelativeLayout> </ScrollView> - </android.support.design.widget.CoordinatorLayout> + </androidx.coordinatorlayout.widget.CoordinatorLayout> </LinearLayout> </layout> diff --git a/src/quicksy/res/layout/activity_verify.xml b/src/quicksy/res/layout/activity_verify.xml index b46aa0910..4ecc349c1 100644 --- a/src/quicksy/res/layout/activity_verify.xml +++ b/src/quicksy/res/layout/activity_verify.xml @@ -11,7 +11,7 @@ android:id="@+id/toolbar" layout="@layout/toolbar" /> - <android.support.design.widget.CoordinatorLayout + <androidx.coordinatorlayout.widget.CoordinatorLayout android:id="@+id/coordinator" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -188,6 +188,6 @@ android:layout_centerHorizontal="true" /> </RelativeLayout> </ScrollView> - </android.support.design.widget.CoordinatorLayout> + </androidx.coordinatorlayout.widget.CoordinatorLayout> </LinearLayout> -</layout>
\ No newline at end of file +</layout> diff --git a/src/system/java/eu/siacs/conversations/ui/widget/EmojiWrapperEditText.java b/src/system/java/eu/siacs/conversations/ui/widget/EmojiWrapperEditText.java index be21c56f6..58e1ab318 100644 --- a/src/system/java/eu/siacs/conversations/ui/widget/EmojiWrapperEditText.java +++ b/src/system/java/eu/siacs/conversations/ui/widget/EmojiWrapperEditText.java @@ -1,7 +1,7 @@ package eu.siacs.conversations.ui.widget; import android.content.Context; -import android.support.v7.widget.AppCompatEditText; +import androidx.appcompat.widget.AppCompatEditText; import android.util.AttributeSet; public class EmojiWrapperEditText extends AppCompatEditText { diff --git a/src/system/java/eu/siacs/conversations/utils/EmojiWrapper.java b/src/system/java/eu/siacs/conversations/utils/EmojiWrapper.java index 9466531a3..3b6cf71e1 100644 --- a/src/system/java/eu/siacs/conversations/utils/EmojiWrapper.java +++ b/src/system/java/eu/siacs/conversations/utils/EmojiWrapper.java @@ -29,7 +29,7 @@ package eu.siacs.conversations.utils; -import android.support.text.emoji.EmojiCompat; +import androidx.emoji.text.EmojiCompat; public class EmojiWrapper { |