From b26b5d01feef6feb06f2414e7034e6cb5e648406 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Fri, 20 Sep 2019 17:54:28 +0200 Subject: migrate to AndroidX --- .../java/de/pixart/messenger/ui/adapter/AccountAdapter.java | 4 ++-- .../java/de/pixart/messenger/ui/adapter/BackupFileAdapter.java | 6 +++--- .../messenger/ui/adapter/ChannelSearchResultAdapter.java | 10 +++++----- .../de/pixart/messenger/ui/adapter/ConversationAdapter.java | 8 ++++---- .../java/de/pixart/messenger/ui/adapter/KnownHostsAdapter.java | 2 +- .../java/de/pixart/messenger/ui/adapter/ListItemAdapter.java | 2 +- src/main/java/de/pixart/messenger/ui/adapter/MediaAdapter.java | 10 +++++----- .../de/pixart/messenger/ui/adapter/MediaPreviewAdapter.java | 6 +++--- .../java/de/pixart/messenger/ui/adapter/MessageAdapter.java | 7 +++---- .../pixart/messenger/ui/adapter/PresenceTemplateAdapter.java | 2 +- src/main/java/de/pixart/messenger/ui/adapter/UserAdapter.java | 10 +++++----- .../de/pixart/messenger/ui/adapter/UserPreviewAdapter.java | 8 ++++---- 12 files changed, 37 insertions(+), 38 deletions(-) (limited to 'src/main/java/de/pixart/messenger/ui/adapter') diff --git a/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java index e37c0ea16..f43868f1f 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java @@ -1,7 +1,7 @@ package de.pixart.messenger.ui.adapter; -import android.databinding.DataBindingUtil; -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; diff --git a/src/main/java/de/pixart/messenger/ui/adapter/BackupFileAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/BackupFileAdapter.java index 9a7f70d12..10592eee1 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/BackupFileAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/BackupFileAdapter.java @@ -1,13 +1,13 @@ package de.pixart.messenger.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/main/java/de/pixart/messenger/ui/adapter/ChannelSearchResultAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ChannelSearchResultAdapter.java index dee701c9d..cf5986738 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/ChannelSearchResultAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/ChannelSearchResultAdapter.java @@ -1,10 +1,10 @@ package de.pixart.messenger.ui.adapter; -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.LayoutInflater; import android.view.View; diff --git a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java index fe4218dd4..62bc711b2 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java @@ -1,12 +1,12 @@ package de.pixart.messenger.ui.adapter; import android.content.SharedPreferences; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.graphics.Typeface; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; import android.util.Pair; import android.view.LayoutInflater; import android.view.View; diff --git a/src/main/java/de/pixart/messenger/ui/adapter/KnownHostsAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/KnownHostsAdapter.java index 2e0bfccc6..69067da79 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/KnownHostsAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/KnownHostsAdapter.java @@ -1,7 +1,7 @@ package de.pixart.messenger.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/de/pixart/messenger/ui/adapter/ListItemAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java index 250dcc1cd..a6387d182 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java @@ -1,7 +1,7 @@ package de.pixart.messenger.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/de/pixart/messenger/ui/adapter/MediaAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MediaAdapter.java index 847ab35cf..1551f6021 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/MediaAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/MediaAdapter.java @@ -2,15 +2,15 @@ package de.pixart.messenger.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.view.LayoutInflater; import android.view.ViewGroup; import android.widget.ImageView; diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MediaPreviewAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MediaPreviewAdapter.java index f27158927..4a636dde2 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/MediaPreviewAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/MediaPreviewAdapter.java @@ -2,13 +2,13 @@ package de.pixart.messenger.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.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/de/pixart/messenger/ui/adapter/MessageAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java index e3719d205..5e7c5962f 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java @@ -9,8 +9,8 @@ import android.graphics.Rect; import android.graphics.Typeface; import android.net.Uri; 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.Editable; import android.text.Spannable; import android.text.SpannableString; @@ -1035,8 +1035,7 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie viewHolder.contact_picture.setOnClickListener(v -> { if (MessageAdapter.this.mOnContactPictureClickedListener != null) { - MessageAdapter.this.mOnContactPictureClickedListener - .onContactPictureClicked(message); + MessageAdapter.this.mOnContactPictureClickedListener.onContactPictureClicked(message); } }); diff --git a/src/main/java/de/pixart/messenger/ui/adapter/PresenceTemplateAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/PresenceTemplateAdapter.java index 8fe84af5b..8b0253d05 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/PresenceTemplateAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/PresenceTemplateAdapter.java @@ -30,7 +30,7 @@ package de.pixart.messenger.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/de/pixart/messenger/ui/adapter/UserAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/UserAdapter.java index 9677aa61d..22f292024 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/UserAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/UserAdapter.java @@ -2,11 +2,11 @@ package de.pixart.messenger.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/de/pixart/messenger/ui/adapter/UserPreviewAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/UserPreviewAdapter.java index 0a0e9f587..ff06832ce 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/UserPreviewAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/UserPreviewAdapter.java @@ -1,9 +1,9 @@ package de.pixart.messenger.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; -- cgit v1.2.3