From 8124c98e76fbd7cff00be16b0b009cd5d972c39b Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Thu, 9 Apr 2020 16:25:57 +0300 Subject: [PATCH] - Migraded project to AndroidX. --- app/build.gradle | 9 ++++---- .../com/tutpro/baresip/AboutActivity.kt | 4 ++-- .../com/tutpro/baresip/AccountActivity.kt | 2 +- .../com/tutpro/baresip/AccountListAdapter.kt | 2 +- .../com/tutpro/baresip/AccountsActivity.kt | 4 ++-- .../com/tutpro/baresip/BaresipService.kt | 23 ++++++++++--------- .../com/tutpro/baresip/CallListAdapter.kt | 4 ++-- .../com/tutpro/baresip/CallsActivity.kt | 4 ++-- .../kotlin/com/tutpro/baresip/ChatActivity.kt | 6 ++--- .../com/tutpro/baresip/ChatListAdapter.kt | 4 ++-- .../com/tutpro/baresip/ChatsActivity.kt | 4 ++-- .../com/tutpro/baresip/ConfigActivity.kt | 2 +- .../com/tutpro/baresip/ContactActivity.kt | 4 ++-- .../com/tutpro/baresip/ContactListAdapter.kt | 4 ++-- .../com/tutpro/baresip/ContactsActivity.kt | 2 +- .../kotlin/com/tutpro/baresip/MainActivity.kt | 6 ++--- .../com/tutpro/baresip/MessageListAdapter.kt | 2 +- .../main/kotlin/com/tutpro/baresip/Utils.kt | 6 ++--- app/src/main/res/layout/activity_contact.xml | 4 ++-- app/src/main/res/layout/call_row.xml | 4 ++-- app/src/main/res/layout/chat_row.xml | 4 ++-- app/src/main/res/layout/contact_row.xml | 4 ++-- app/src/main/res/layout/password_dialog.xml | 4 ++-- gradle.properties | 4 +++- 24 files changed, 60 insertions(+), 56 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 44b2d01f..f70d50c7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -44,11 +44,12 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'com.android.support:design:28.0.0' - implementation 'com.android.support:cardview-v7:28.0.0' + implementation 'com.google.android.material:material:1.1.0' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' } repositories { diff --git a/app/src/main/kotlin/com/tutpro/baresip/AboutActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AboutActivity.kt index fd5c84af..ce694466 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/AboutActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/AboutActivity.kt @@ -3,8 +3,8 @@ package com.tutpro.baresip import android.app.Activity import android.content.Intent import android.os.Bundle -import android.support.v4.text.HtmlCompat -import android.support.v7.app.AppCompatActivity +import androidx.core.text.HtmlCompat +import androidx.appcompat.app.AppCompatActivity import android.text.method.LinkMovementMethod import android.view.MenuItem import android.widget.TextView diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt index 99ef1de1..d8106efe 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt @@ -3,7 +3,7 @@ package com.tutpro.baresip import android.app.Activity import android.content.Intent import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.view.Menu import android.view.MenuItem import android.view.View diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt index 2243fb35..6cf86b44 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt @@ -4,7 +4,7 @@ import android.app.Activity import android.content.Context import android.content.Intent import android.os.Bundle -import android.support.v7.app.AlertDialog +import androidx.appcompat.app.AlertDialog import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt index 2c83e2ca..5b14c1f4 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt @@ -3,8 +3,8 @@ package com.tutpro.baresip import android.app.Activity import android.content.Intent import android.os.Bundle -import android.support.v7.app.AlertDialog -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity import android.text.method.HideReturnsTransformationMethod import android.text.method.PasswordTransformationMethod import android.view.LayoutInflater diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt index 8477a1ea..a587c0e7 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt @@ -1,5 +1,6 @@ package com.tutpro.baresip +import android.Manifest import android.annotation.TargetApi import android.app.* import android.app.Notification.VISIBILITY_PUBLIC @@ -11,13 +12,13 @@ import android.media.* import android.net.* import android.net.wifi.WifiManager import android.os.* -import android.support.annotation.Keep -import android.support.v4.app.NotificationCompat +import androidx.annotation.Keep +import androidx.core.app.NotificationCompat import android.view.View import android.widget.RemoteViews -import android.support.v4.content.LocalBroadcastManager -import android.support.v4.app.NotificationCompat.VISIBILITY_PRIVATE -import android.support.v4.content.ContextCompat +import androidx.localbroadcastmanager.content.LocalBroadcastManager +import androidx.core.app.NotificationCompat.VISIBILITY_PRIVATE +import androidx.core.content.ContextCompat import android.provider.Settings import android.telephony.TelephonyManager @@ -359,7 +360,7 @@ class BaresipService: Service() { newIntent.putExtra("callp", intent.getStringExtra("callp")) newIntent.putExtra("uri", intent.getStringExtra("uri")) startActivity(newIntent) - nm.cancel(BaresipService.TRANSFER_NOTIFICATION_ID) + nm.cancel(TRANSFER_NOTIFICATION_ID) } } @@ -370,7 +371,7 @@ class BaresipService: Service() { Log.w(LOG_TAG, "onStartCommand did not find call $callp") else Api.call_notify_sipfrag(callp, 603, "Decline") - nm.cancel(BaresipService.TRANSFER_NOTIFICATION_ID) + nm.cancel(TRANSFER_NOTIFICATION_ID) } "Message Show", "Message Reply" -> { @@ -381,7 +382,7 @@ class BaresipService: Service() { newIntent.putExtra("uap", intent!!.getStringExtra("uap")) newIntent.putExtra("peer", intent.getStringExtra("peer")) startActivity(newIntent) - nm.cancel(BaresipService.MESSAGE_NOTIFICATION_ID) + nm.cancel(MESSAGE_NOTIFICATION_ID) } "Message Save" -> { @@ -392,7 +393,7 @@ class BaresipService: Service() { else ChatsActivity.saveUaMessage(ua.account.aor, intent.getStringExtra("time").toLong()) - nm.cancel(BaresipService.MESSAGE_NOTIFICATION_ID) + nm.cancel(MESSAGE_NOTIFICATION_ID) } "Message Delete" -> { @@ -403,7 +404,7 @@ class BaresipService: Service() { else ChatsActivity.deleteUaMessage(ua.account.aor, intent.getStringExtra("time").toLong()) - nm.cancel(BaresipService.MESSAGE_NOTIFICATION_ID) + nm.cancel(MESSAGE_NOTIFICATION_ID) } "UpdateNotification" -> { @@ -552,7 +553,7 @@ class BaresipService: Service() { if ((Call.calls().size > 0) || (tm.callState != TelephonyManager.CALL_STATE_IDLE) || !Utils.checkPermission(applicationContext, - android.Manifest.permission.RECORD_AUDIO)) { + Manifest.permission.RECORD_AUDIO)) { Log.d(LOG_TAG, "Auto-rejecting incoming call $uap/$callp/$peerUri") Api.ua_hangup(uap, callp, 486, "Busy Here") if (ua.account.callHistory) { diff --git a/app/src/main/kotlin/com/tutpro/baresip/CallListAdapter.kt b/app/src/main/kotlin/com/tutpro/baresip/CallListAdapter.kt index 01fdca6b..5f2e08e8 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/CallListAdapter.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/CallListAdapter.kt @@ -2,8 +2,8 @@ package com.tutpro.baresip import android.content.Context import android.graphics.drawable.GradientDrawable -import android.support.v4.content.ContextCompat -import android.support.v7.widget.CardView +import androidx.core.content.ContextCompat +import androidx.cardview.widget.CardView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/app/src/main/kotlin/com/tutpro/baresip/CallsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/CallsActivity.kt index a08f8882..38116d82 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/CallsActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/CallsActivity.kt @@ -5,8 +5,8 @@ import android.content.DialogInterface import android.content.Intent import android.os.Bundle import android.os.SystemClock -import android.support.v7.app.AlertDialog -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity import android.text.format.DateUtils.isToday import android.view.Menu import android.view.MenuItem diff --git a/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt index 04a231b4..13e4c920 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt @@ -4,9 +4,9 @@ import android.app.Activity import android.content.* import android.os.Bundle import android.os.SystemClock -import android.support.v4.content.LocalBroadcastManager -import android.support.v7.app.AlertDialog -import android.support.v7.app.AppCompatActivity +import androidx.localbroadcastmanager.content.LocalBroadcastManager +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity import android.view.Menu import android.view.MenuItem import android.view.View diff --git a/app/src/main/kotlin/com/tutpro/baresip/ChatListAdapter.kt b/app/src/main/kotlin/com/tutpro/baresip/ChatListAdapter.kt index de13fd3d..c15bf934 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/ChatListAdapter.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/ChatListAdapter.kt @@ -3,8 +3,8 @@ package com.tutpro.baresip import android.content.Context import android.graphics.Typeface import android.graphics.drawable.GradientDrawable -import android.support.v4.content.ContextCompat -import android.support.v7.widget.CardView +import androidx.core.content.ContextCompat +import androidx.cardview.widget.CardView import android.text.format.DateUtils.isToday import android.view.LayoutInflater import android.view.View diff --git a/app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt index 79876fda..407ed1ee 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt @@ -3,8 +3,8 @@ package com.tutpro.baresip import android.app.Activity import android.content.* import android.os.Bundle -import android.support.v7.app.AlertDialog -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity import android.view.Menu import android.view.MenuItem import android.widget.* diff --git a/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt index a26a133f..c683eefe 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt @@ -5,7 +5,7 @@ import android.content.Intent import android.content.pm.PackageManager import android.graphics.Color import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.util.TypedValue import android.view.Gravity import android.view.Menu diff --git a/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt index 795fe365..f761ae5a 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt @@ -5,13 +5,13 @@ import android.content.Intent import android.graphics.Bitmap import android.graphics.drawable.GradientDrawable import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.view.Menu import android.view.MenuItem import android.widget.* import android.graphics.BitmapFactory import android.graphics.drawable.BitmapDrawable -import android.support.v7.widget.CardView +import androidx.cardview.widget.CardView import android.view.View import java.io.File diff --git a/app/src/main/kotlin/com/tutpro/baresip/ContactListAdapter.kt b/app/src/main/kotlin/com/tutpro/baresip/ContactListAdapter.kt index 7ad7914d..a3c10a65 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/ContactListAdapter.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/ContactListAdapter.kt @@ -7,8 +7,8 @@ import android.content.Intent import android.graphics.drawable.GradientDrawable import android.os.Bundle import android.os.SystemClock -import android.support.v7.app.AlertDialog -import android.support.v7.widget.CardView +import androidx.appcompat.app.AlertDialog +import androidx.cardview.widget.CardView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/app/src/main/kotlin/com/tutpro/baresip/ContactsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ContactsActivity.kt index 890b3d99..c3409aa0 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/ContactsActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/ContactsActivity.kt @@ -4,7 +4,7 @@ import android.app.Activity import android.content.* import android.os.Bundle import android.os.SystemClock -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.view.MenuItem import android.widget.ImageButton import android.widget.ListView diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt index 4460b7e2..bb167360 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt @@ -3,12 +3,12 @@ package com.tutpro.baresip import android.Manifest import android.app.* import android.content.* -import android.support.v7.app.AlertDialog -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity import android.content.pm.PackageManager import android.media.AudioManager import android.os.* -import android.support.v4.content.LocalBroadcastManager +import androidx.localbroadcastmanager.content.LocalBroadcastManager import android.view.inputmethod.InputMethodManager import android.text.InputType import android.text.TextWatcher diff --git a/app/src/main/kotlin/com/tutpro/baresip/MessageListAdapter.kt b/app/src/main/kotlin/com/tutpro/baresip/MessageListAdapter.kt index a8cf1f68..f65a7706 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/MessageListAdapter.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/MessageListAdapter.kt @@ -2,7 +2,7 @@ package com.tutpro.baresip import android.content.Context import android.graphics.Typeface -import android.support.v4.content.ContextCompat +import androidx.core.content.ContextCompat import android.text.format.DateUtils.isToday import android.view.LayoutInflater import android.view.View diff --git a/app/src/main/kotlin/com/tutpro/baresip/Utils.kt b/app/src/main/kotlin/com/tutpro/baresip/Utils.kt index 4c27fcd4..e5aa68ce 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/Utils.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/Utils.kt @@ -3,7 +3,7 @@ package com.tutpro.baresip import android.app.Activity import android.app.ActivityManager import android.content.Context -import android.support.v7.app.AlertDialog +import androidx.appcompat.app.AlertDialog import android.content.Intent import android.content.pm.PackageManager import android.graphics.Bitmap @@ -12,8 +12,8 @@ import android.graphics.Color import android.net.LinkAddress import android.net.LinkProperties 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.Editable import android.text.TextWatcher diff --git a/app/src/main/res/layout/activity_contact.xml b/app/src/main/res/layout/activity_contact.xml index 184a9fad..85cb0fb8 100644 --- a/app/src/main/res/layout/activity_contact.xml +++ b/app/src/main/res/layout/activity_contact.xml @@ -23,7 +23,7 @@ android:gravity="center" > - - + - - + - - + - - + - @@ -24,6 +24,6 @@ android:text="@string/show_password" android:checked="false"/> - + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 1d3591c8..915f0e66 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,6 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true +android.enableJetifier=true +android.useAndroidX=true \ No newline at end of file