From 6d9339b4639a95c3268f28f6ba52e0d7b9f0e939 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 23 Nov 2018 16:30:14 +0100 Subject: [PATCH] Migrated to androidX --- app/build.gradle | 8 ++++---- app/src/main/AndroidManifest.xml | 2 +- .../main/java/org/linphone/LinphoneActivity.java | 10 +++++----- .../linphone/assistant/AssistantActivity.java | 4 ++-- .../java/org/linphone/call/CallActivity.java | 6 +++--- .../org/linphone/call/CallIncomingActivity.java | 3 +-- .../org/linphone/call/CallOutgoingActivity.java | 3 +-- .../org/linphone/chat/ChatMessageViewHolder.java | 16 +--------------- .../org/linphone/chat/ChatMessagesAdapter.java | 2 +- .../org/linphone/chat/ChatMessagesFragment.java | 4 ++-- .../linphone/chat/ChatRoomCreationFragment.java | 6 +++--- .../org/linphone/chat/ChatRoomViewHolder.java | 2 +- .../org/linphone/chat/ChatRoomsFragment.java | 7 +++---- .../org/linphone/chat/ChatScrollListener.java | 4 ++-- .../java/org/linphone/chat/DevicesFragment.java | 2 +- .../java/org/linphone/chat/GroupInfoAdapter.java | 5 ++--- .../org/linphone/chat/GroupInfoFragment.java | 6 +++--- .../java/org/linphone/chat/ImdnFragment.java | 2 +- .../linphone/compatibility/ApiTwentyOnePlus.java | 4 +--- .../linphone/contacts/ContactsListAdapter.java | 5 ++--- .../linphone/contacts/ContactsListFragment.java | 6 +++--- .../contacts/SearchContactsListAdapter.java | 4 ++-- .../org/linphone/fragments/AboutFragment.java | 2 +- .../org/linphone/fragments/StatusFragment.java | 2 +- .../org/linphone/history/HistoryAdapter.java | 2 +- .../linphone/history/HistoryListFragment.java | 6 +++--- .../org/linphone/history/HistoryViewHolder.java | 2 +- .../org/linphone/utils/SelectableAdapter.java | 2 +- .../org/linphone/utils/SelectableHelper.java | 2 +- .../linphone/views/CallIncomingAnswerButton.java | 2 +- .../views/CallIncomingDeclineButton.java | 2 +- app/src/main/res/layout-land/call.xml | 4 ++-- app/src/main/res/layout-land/main.xml | 4 ++-- app/src/main/res/layout-sw533dp-land/main.xml | 4 ++-- app/src/main/res/layout-sw533dp/main.xml | 4 ++-- app/src/main/res/layout/call.xml | 4 ++-- app/src/main/res/layout/chat.xml | 2 +- app/src/main/res/layout/chat_bubble.xml | 15 +-------------- app/src/main/res/layout/chat_create.xml | 2 +- app/src/main/res/layout/chat_infos.xml | 4 ++-- app/src/main/res/layout/chatlist.xml | 2 +- app/src/main/res/layout/contacts_list.xml | 2 +- app/src/main/res/layout/context_bar.xml | 4 ++-- app/src/main/res/layout/history.xml | 2 +- app/src/main/res/layout/main.xml | 4 ++-- 45 files changed, 78 insertions(+), 112 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 117a15693..e587c47d2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -109,10 +109,10 @@ dependencies { implementation 'com.google.firebase:firebase-messaging:15.0.2' implementation 'com.android.billingclient:billing:1.2' implementation 'org.apache.commons:commons-compress:1.16.1' - implementation 'com.android.support:support-v4:28.0.0' - implementation 'com.android.support:recyclerview-v7:28.0.0' - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support:design:28.0.0' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.0.0' + implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'com.google.android.material:material:1.1.0-alpha01' if (isLocalAarAvailable()) { implementation project(":linphone-sdk-android") } else { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 82f4caa06..82d28839b 100755 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -282,7 +282,7 @@ diff --git a/app/src/main/java/org/linphone/LinphoneActivity.java b/app/src/main/java/org/linphone/LinphoneActivity.java index e3b166639..4b3a971f0 100644 --- a/app/src/main/java/org/linphone/LinphoneActivity.java +++ b/app/src/main/java/org/linphone/LinphoneActivity.java @@ -36,11 +36,11 @@ import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Bundle; import android.provider.Settings; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; -import android.support.v4.widget.DrawerLayout; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.drawerlayout.widget.DrawerLayout; import android.view.Gravity; import android.view.KeyEvent; import android.view.LayoutInflater; diff --git a/app/src/main/java/org/linphone/assistant/AssistantActivity.java b/app/src/main/java/org/linphone/assistant/AssistantActivity.java index 65ecb39c1..026fb1bbb 100644 --- a/app/src/main/java/org/linphone/assistant/AssistantActivity.java +++ b/app/src/main/java/org/linphone/assistant/AssistantActivity.java @@ -36,8 +36,8 @@ import android.content.pm.PackageManager; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.Bundle; -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.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/org/linphone/call/CallActivity.java b/app/src/main/java/org/linphone/call/CallActivity.java index dd24a68dd..1704586f6 100644 --- a/app/src/main/java/org/linphone/call/CallActivity.java +++ b/app/src/main/java/org/linphone/call/CallActivity.java @@ -36,9 +36,9 @@ import android.os.Bundle; import android.os.CountDownTimer; import android.os.Handler; import android.os.SystemClock; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; -import android.support.v4.widget.DrawerLayout; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.drawerlayout.widget.DrawerLayout; import android.text.Html; import android.view.Gravity; import android.view.KeyEvent; diff --git a/app/src/main/java/org/linphone/call/CallIncomingActivity.java b/app/src/main/java/org/linphone/call/CallIncomingActivity.java index 1d7b5aec6..a8db7baf8 100644 --- a/app/src/main/java/org/linphone/call/CallIncomingActivity.java +++ b/app/src/main/java/org/linphone/call/CallIncomingActivity.java @@ -26,7 +26,7 @@ import android.content.Intent; import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; import android.os.Bundle; -import android.support.v4.app.ActivityCompat; +import androidx.core.app.ActivityCompat; import android.view.KeyEvent; import android.view.WindowManager; import android.widget.ImageView; @@ -56,7 +56,6 @@ import org.linphone.views.CallIncomingButtonListener; import org.linphone.views.CallIncomingDeclineButton; import java.util.ArrayList; -import java.util.List; public class CallIncomingActivity extends LinphoneGenericActivity { private static CallIncomingActivity instance; diff --git a/app/src/main/java/org/linphone/call/CallOutgoingActivity.java b/app/src/main/java/org/linphone/call/CallOutgoingActivity.java index 191722e33..81e3e39d4 100644 --- a/app/src/main/java/org/linphone/call/CallOutgoingActivity.java +++ b/app/src/main/java/org/linphone/call/CallOutgoingActivity.java @@ -23,7 +23,7 @@ import android.Manifest; import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; import android.os.Bundle; -import android.support.v4.app.ActivityCompat; +import androidx.core.app.ActivityCompat; import android.view.Gravity; import android.view.KeyEvent; import android.view.LayoutInflater; @@ -53,7 +53,6 @@ import org.linphone.core.Reason; import org.linphone.mediastream.Log; import java.util.ArrayList; -import java.util.List; public class CallOutgoingActivity extends LinphoneGenericActivity implements OnClickListener { private static CallOutgoingActivity instance; diff --git a/app/src/main/java/org/linphone/chat/ChatMessageViewHolder.java b/app/src/main/java/org/linphone/chat/ChatMessageViewHolder.java index cf142850d..5fac08640 100644 --- a/app/src/main/java/org/linphone/chat/ChatMessageViewHolder.java +++ b/app/src/main/java/org/linphone/chat/ChatMessageViewHolder.java @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. package org.linphone.chat; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.text.Spanned; import android.text.method.LinkMovementMethod; import android.view.View; @@ -63,8 +63,6 @@ public class ChatMessageViewHolder extends RecyclerView.ViewHolder implements Vi public ImageView outgoingImdn; public TextView messageText; - public RecyclerView pictures; - public CheckBox delete; private ClickListener mListener; @@ -93,8 +91,6 @@ public class ChatMessageViewHolder extends RecyclerView.ViewHolder implements Vi outgoingImdn = view.findViewById(R.id.imdn); messageText = view.findViewById(R.id.message); - pictures = view.findViewById(R.id.pictures); - delete = view.findViewById(R.id.delete_message); } @@ -118,7 +114,6 @@ public class ChatMessageViewHolder extends RecyclerView.ViewHolder implements Vi timeText.setVisibility(View.VISIBLE); outgoingImdn.setVisibility(View.GONE); avatarLayout.setVisibility(View.GONE); - pictures.setVisibility(View.GONE); sendInProgress.setVisibility(View.GONE); ChatMessage.State status = message.getState(); @@ -188,14 +183,5 @@ public class ChatMessageViewHolder extends RecyclerView.ViewHolder implements Vi fileContents.add(c); } } - - /*if (fileContents.size() > 0) { - pictures.setVisibility(View.VISIBLE); - mAdapter = new ChatBubbleFilesAdapter(mContext, message, fileContents); - pictures.setAdapter(mAdapter); - pictures.setHasFixedSize(true); - mLayoutManager = new StaggeredGridLayoutManager(1, StaggeredGridLayoutManager.HORIZONTAL); - pictures.setLayoutManager(mLayoutManager); - }*/ } } \ No newline at end of file diff --git a/app/src/main/java/org/linphone/chat/ChatMessagesAdapter.java b/app/src/main/java/org/linphone/chat/ChatMessagesAdapter.java index 7a82d17f4..971616b38 100644 --- a/app/src/main/java/org/linphone/chat/ChatMessagesAdapter.java +++ b/app/src/main/java/org/linphone/chat/ChatMessagesAdapter.java @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. package org.linphone.chat; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java index 097c8f8c5..1ccc22884 100644 --- a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java +++ b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java @@ -35,8 +35,8 @@ import android.os.Handler; import android.os.Looper; import android.os.Parcelable; import android.provider.MediaStore; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.Editable; import android.text.TextWatcher; import android.view.ContextMenu; diff --git a/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java b/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java index ea482a7f4..7cb1e07b1 100644 --- a/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java +++ b/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java @@ -21,9 +21,9 @@ package org.linphone.chat; import android.app.Fragment; import android.os.Bundle; -import android.support.v7.widget.DividerItemDecoration; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/org/linphone/chat/ChatRoomViewHolder.java b/app/src/main/java/org/linphone/chat/ChatRoomViewHolder.java index 5b65d19ae..70faec426 100644 --- a/app/src/main/java/org/linphone/chat/ChatRoomViewHolder.java +++ b/app/src/main/java/org/linphone/chat/ChatRoomViewHolder.java @@ -22,7 +22,7 @@ package org.linphone.chat; import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.CheckBox; import android.widget.ImageView; diff --git a/app/src/main/java/org/linphone/chat/ChatRoomsFragment.java b/app/src/main/java/org/linphone/chat/ChatRoomsFragment.java index 512d006a1..aa37d873a 100644 --- a/app/src/main/java/org/linphone/chat/ChatRoomsFragment.java +++ b/app/src/main/java/org/linphone/chat/ChatRoomsFragment.java @@ -22,9 +22,9 @@ package org.linphone.chat; import android.app.Fragment; import android.content.Context; import android.os.Bundle; -import android.support.v7.widget.DividerItemDecoration; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -44,7 +44,6 @@ import org.linphone.core.CoreListenerStub; import org.linphone.core.EventLog; import org.linphone.core.ProxyConfig; import org.linphone.fragments.FragmentsAvailable; -import org.linphone.mediastream.Log; import org.linphone.utils.SelectableHelper; import java.io.File; diff --git a/app/src/main/java/org/linphone/chat/ChatScrollListener.java b/app/src/main/java/org/linphone/chat/ChatScrollListener.java index 96b85a20e..d65c7d949 100644 --- a/app/src/main/java/org/linphone/chat/ChatScrollListener.java +++ b/app/src/main/java/org/linphone/chat/ChatScrollListener.java @@ -19,8 +19,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; public abstract class ChatScrollListener extends RecyclerView.OnScrollListener { // The minimum amount of items to have below your current scroll position diff --git a/app/src/main/java/org/linphone/chat/DevicesFragment.java b/app/src/main/java/org/linphone/chat/DevicesFragment.java index 4569d8f2b..21ef9eb5b 100644 --- a/app/src/main/java/org/linphone/chat/DevicesFragment.java +++ b/app/src/main/java/org/linphone/chat/DevicesFragment.java @@ -21,7 +21,7 @@ package org.linphone.chat; import android.app.Fragment; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/org/linphone/chat/GroupInfoAdapter.java b/app/src/main/java/org/linphone/chat/GroupInfoAdapter.java index a7f4a1785..2050c9f36 100644 --- a/app/src/main/java/org/linphone/chat/GroupInfoAdapter.java +++ b/app/src/main/java/org/linphone/chat/GroupInfoAdapter.java @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. package org.linphone.chat; -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.View; import android.view.ViewGroup; @@ -33,7 +33,6 @@ import org.linphone.R; import org.linphone.contacts.ContactAddress; import org.linphone.contacts.LinphoneContact; import org.linphone.core.ChatRoom; -import org.linphone.core.ChatRoomCapabilities; import org.linphone.core.Participant; import org.linphone.views.ContactAvatar; diff --git a/app/src/main/java/org/linphone/chat/GroupInfoFragment.java b/app/src/main/java/org/linphone/chat/GroupInfoFragment.java index 5c1a8244d..cd2710a3a 100644 --- a/app/src/main/java/org/linphone/chat/GroupInfoFragment.java +++ b/app/src/main/java/org/linphone/chat/GroupInfoFragment.java @@ -23,9 +23,9 @@ import android.app.Dialog; import android.app.Fragment; import android.content.Context; import android.os.Bundle; -import android.support.v7.widget.DividerItemDecoration; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.Editable; import android.text.TextWatcher; import android.view.LayoutInflater; diff --git a/app/src/main/java/org/linphone/chat/ImdnFragment.java b/app/src/main/java/org/linphone/chat/ImdnFragment.java index bc4c66e68..bf78813b2 100644 --- a/app/src/main/java/org/linphone/chat/ImdnFragment.java +++ b/app/src/main/java/org/linphone/chat/ImdnFragment.java @@ -21,7 +21,7 @@ package org.linphone.chat; import android.app.Fragment; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/org/linphone/compatibility/ApiTwentyOnePlus.java b/app/src/main/java/org/linphone/compatibility/ApiTwentyOnePlus.java index 42bd1d015..2d3f7d638 100644 --- a/app/src/main/java/org/linphone/compatibility/ApiTwentyOnePlus.java +++ b/app/src/main/java/org/linphone/compatibility/ApiTwentyOnePlus.java @@ -24,9 +24,7 @@ import android.app.Notification; import android.app.PendingIntent; import android.content.Context; import android.graphics.Bitmap; -import android.support.v4.content.ContextCompat; -import android.view.ViewTreeObserver; -import android.view.ViewTreeObserver.OnGlobalLayoutListener; +import androidx.core.content.ContextCompat; import org.linphone.R; diff --git a/app/src/main/java/org/linphone/contacts/ContactsListAdapter.java b/app/src/main/java/org/linphone/contacts/ContactsListAdapter.java index c68d56e26..4fc75ab3e 100644 --- a/app/src/main/java/org/linphone/contacts/ContactsListAdapter.java +++ b/app/src/main/java/org/linphone/contacts/ContactsListAdapter.java @@ -20,8 +20,8 @@ package org.linphone.contacts; */ import android.content.Context; -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.View; import android.view.ViewGroup; @@ -33,7 +33,6 @@ import android.widget.SectionIndexer; import android.widget.TextView; import org.linphone.R; -import org.linphone.mediastream.Log; import org.linphone.views.ContactAvatar; import org.linphone.utils.SelectableAdapter; import org.linphone.utils.SelectableHelper; diff --git a/app/src/main/java/org/linphone/contacts/ContactsListFragment.java b/app/src/main/java/org/linphone/contacts/ContactsListFragment.java index e7df2aa02..e284940f4 100644 --- a/app/src/main/java/org/linphone/contacts/ContactsListFragment.java +++ b/app/src/main/java/org/linphone/contacts/ContactsListFragment.java @@ -23,9 +23,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. import android.app.Fragment; import android.content.Context; import android.os.Bundle; -import android.support.v7.widget.DividerItemDecoration; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/org/linphone/contacts/SearchContactsListAdapter.java b/app/src/main/java/org/linphone/contacts/SearchContactsListAdapter.java index a01db0245..12b812ebc 100644 --- a/app/src/main/java/org/linphone/contacts/SearchContactsListAdapter.java +++ b/app/src/main/java/org/linphone/contacts/SearchContactsListAdapter.java @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. package org.linphone.contacts; -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.View; import android.view.ViewGroup; diff --git a/app/src/main/java/org/linphone/fragments/AboutFragment.java b/app/src/main/java/org/linphone/fragments/AboutFragment.java index b4bf6064e..db7c14918 100644 --- a/app/src/main/java/org/linphone/fragments/AboutFragment.java +++ b/app/src/main/java/org/linphone/fragments/AboutFragment.java @@ -25,7 +25,7 @@ import android.content.Intent; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; diff --git a/app/src/main/java/org/linphone/fragments/StatusFragment.java b/app/src/main/java/org/linphone/fragments/StatusFragment.java index 0dbb86209..fcc7e2671 100644 --- a/app/src/main/java/org/linphone/fragments/StatusFragment.java +++ b/app/src/main/java/org/linphone/fragments/StatusFragment.java @@ -26,7 +26,7 @@ import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.Handler; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; diff --git a/app/src/main/java/org/linphone/history/HistoryAdapter.java b/app/src/main/java/org/linphone/history/HistoryAdapter.java index aa92547c3..520ac4622 100644 --- a/app/src/main/java/org/linphone/history/HistoryAdapter.java +++ b/app/src/main/java/org/linphone/history/HistoryAdapter.java @@ -21,7 +21,7 @@ package org.linphone.history; import android.annotation.SuppressLint; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/org/linphone/history/HistoryListFragment.java b/app/src/main/java/org/linphone/history/HistoryListFragment.java index cb88b8674..4e36c5a39 100644 --- a/app/src/main/java/org/linphone/history/HistoryListFragment.java +++ b/app/src/main/java/org/linphone/history/HistoryListFragment.java @@ -22,9 +22,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. import android.app.Fragment; import android.content.Context; import android.os.Bundle; -import android.support.v7.widget.DividerItemDecoration; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; diff --git a/app/src/main/java/org/linphone/history/HistoryViewHolder.java b/app/src/main/java/org/linphone/history/HistoryViewHolder.java index f8cf24485..5a21dfcea 100644 --- a/app/src/main/java/org/linphone/history/HistoryViewHolder.java +++ b/app/src/main/java/org/linphone/history/HistoryViewHolder.java @@ -19,7 +19,7 @@ package org.linphone.history; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.CheckBox; import android.widget.ImageView; diff --git a/app/src/main/java/org/linphone/utils/SelectableAdapter.java b/app/src/main/java/org/linphone/utils/SelectableAdapter.java index 3267a1098..505c7547f 100644 --- a/app/src/main/java/org/linphone/utils/SelectableAdapter.java +++ b/app/src/main/java/org/linphone/utils/SelectableAdapter.java @@ -19,7 +19,7 @@ package org.linphone.utils; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.util.SparseBooleanArray; import java.util.ArrayList; diff --git a/app/src/main/java/org/linphone/utils/SelectableHelper.java b/app/src/main/java/org/linphone/utils/SelectableHelper.java index 23f406389..1544d91c9 100644 --- a/app/src/main/java/org/linphone/utils/SelectableHelper.java +++ b/app/src/main/java/org/linphone/utils/SelectableHelper.java @@ -21,7 +21,7 @@ package org.linphone.utils; import android.app.Dialog; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.Button; import android.widget.ImageView; diff --git a/app/src/main/java/org/linphone/views/CallIncomingAnswerButton.java b/app/src/main/java/org/linphone/views/CallIncomingAnswerButton.java index 2fbb2b207..f4fff9721 100644 --- a/app/src/main/java/org/linphone/views/CallIncomingAnswerButton.java +++ b/app/src/main/java/org/linphone/views/CallIncomingAnswerButton.java @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; diff --git a/app/src/main/java/org/linphone/views/CallIncomingDeclineButton.java b/app/src/main/java/org/linphone/views/CallIncomingDeclineButton.java index 022cfc446..fcce753eb 100644 --- a/app/src/main/java/org/linphone/views/CallIncomingDeclineButton.java +++ b/app/src/main/java/org/linphone/views/CallIncomingDeclineButton.java @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; diff --git a/app/src/main/res/layout-land/call.xml b/app/src/main/res/layout-land/call.xml index 9208c06a0..552b953ea 100644 --- a/app/src/main/res/layout-land/call.xml +++ b/app/src/main/res/layout-land/call.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - @@ -441,7 +441,7 @@ - + - - + \ No newline at end of file diff --git a/app/src/main/res/layout-sw533dp-land/main.xml b/app/src/main/res/layout-sw533dp-land/main.xml index 302ca4dc2..5a1fc434e 100644 --- a/app/src/main/res/layout-sw533dp-land/main.xml +++ b/app/src/main/res/layout-sw533dp-land/main.xml @@ -12,7 +12,7 @@ android:layout_height="35dp" tools:layout="@layout/status" /> - - + \ No newline at end of file diff --git a/app/src/main/res/layout-sw533dp/main.xml b/app/src/main/res/layout-sw533dp/main.xml index 83e455609..513028336 100644 --- a/app/src/main/res/layout-sw533dp/main.xml +++ b/app/src/main/res/layout-sw533dp/main.xml @@ -12,7 +12,7 @@ android:layout_height="40dp" tools:layout="@layout/status" /> - - + \ No newline at end of file diff --git a/app/src/main/res/layout/call.xml b/app/src/main/res/layout/call.xml index be1a94223..2620641be 100644 --- a/app/src/main/res/layout/call.xml +++ b/app/src/main/res/layout/call.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - @@ -441,7 +441,7 @@ - + - - - + android:layout_marginRight="10dp"/> diff --git a/app/src/main/res/layout/chat_create.xml b/app/src/main/res/layout/chat_create.xml index eeb0069af..bf6ba6597 100644 --- a/app/src/main/res/layout/chat_create.xml +++ b/app/src/main/res/layout/chat_create.xml @@ -173,7 +173,7 @@ android:layout_height="match_parent" android:id="@+id/relativeLayout"> - - - + - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/history.xml b/app/src/main/res/layout/history.xml index 748b5d2c1..1eb244ae6 100644 --- a/app/src/main/res/layout/history.xml +++ b/app/src/main/res/layout/history.xml @@ -76,7 +76,7 @@ - - - + \ No newline at end of file