Migrate to AndroidX.

app/build.gradle

@@ -90,7 +90,7 @@ android {
     }
 
     defaultConfig {
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     /*
@@ -132,14 +132,14 @@ dependencies {
     def acraVersion = '5.2.1'
     implementation "ch.acra:acra-mail:$acraVersion"
     implementation "ch.acra:acra-toast:$acraVersion"
-    def supportVersion = '27.1.1'
+    def supportVersion = '1.0.0'
-    implementation "com.android.support:support-core-ui:$supportVersion"
+    implementation "androidx.legacy:legacy-support-core-ui:$supportVersion"
-    implementation "com.android.support:support-compat:$supportVersion"
+    implementation "androidx.core:core:$supportVersion"
-    implementation "com.android.support:support-fragment:$supportVersion"
+    implementation "androidx.fragment:fragment:$supportVersion"
-    implementation "com.android.support:appcompat-v7:$supportVersion"
+    implementation "androidx.appcompat:appcompat:$supportVersion"
-    implementation "com.android.support:cardview-v7:$supportVersion"
+    implementation "androidx.cardview:cardview:$supportVersion"
-    implementation "com.android.support:design:$supportVersion"
+    implementation "com.google.android.material:material:$supportVersion"
-    implementation "com.android.support:preference-v14:$supportVersion"
+    implementation "androidx.legacy:legacy-preference-v14:$supportVersion"
     implementation 'com.github.yukuku:ambilwarna:2.0.1'
     implementation ('com.github.worker8:tourguide:1.0.17-SNAPSHOT@aar') {
         transitive = true
@@ -167,10 +167,10 @@ dependencies {
     implementation project(':ical4android')
     implementation project(':vcard4android')
     // for tests
-    androidTestImplementation('com.android.support.test:runner:0.5') {
+    androidTestImplementation('androidx.test:runner:1.1.0-alpha4') {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
-    androidTestImplementation('com.android.support.test:rules:0.5') {
+    androidTestImplementation('androidx.test:rules:1.1.0-alpha4') {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
     androidTestImplementation 'junit:junit:4.12'

app/proguard-rules.txt

@@ -48,7 +48,7 @@
 -keep,includedescriptorclasses class com.etesync.syncadapter.** { *; }    # all DAVdroid code and deps are required
 
 # Android support
--keep,includedescriptorclasses class android.support.v4.content.FileProvider { *; }    # all DAVdroid code and deps are required
+-keep,includedescriptorclasses class androidx.core.content.FileProvider { *; }    # all DAVdroid code and deps are required
 
 # gson
 -dontnote sun.misc.Unsafe  # not available on Android

app/src/androidTest/java/com/etesync/syncadapter/SSLSocketFactoryCompatTest.java

@@ -22,7 +22,7 @@ import javax.net.ssl.SSLSocket;
 import at.bitfire.cert4android.CustomCertManager;
 import okhttp3.mockwebserver.MockWebServer;
 
-import static android.support.test.InstrumentationRegistry.getTargetContext;
+import static androidx.test.InstrumentationRegistry.getTargetContext;
 import static junit.framework.TestCase.assertFalse;
 import static org.junit.Assert.assertTrue;
 

app/src/androidTest/java/com/etesync/syncadapter/ui/setup/DavResourceFinderTest.java

@@ -22,7 +22,7 @@ import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
 
-import static android.support.test.InstrumentationRegistry.getTargetContext;
+import static androidx.test.InstrumentationRegistry.getTargetContext;
 
 public class DavResourceFinderTest {
 

app/src/main/AndroidManifest.xml

@@ -249,7 +249,7 @@
         <activity android:name=".ui.WebViewActivity" />
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="@string/authority_log_provider"
             android:grantUriPermissions="true"
             android:exported="false">

app/src/main/java/com/etesync/syncadapter/App.kt

@@ -25,9 +25,9 @@ import android.os.Process
 import android.os.StrictMode
 import android.provider.CalendarContract
 import android.provider.ContactsContract
-import android.support.v4.app.NotificationCompat
+import androidx.core.app.NotificationCompat
-import android.support.v4.app.NotificationManagerCompat
+import androidx.core.app.NotificationManagerCompat
-import android.support.v4.content.ContextCompat
+import androidx.core.content.ContextCompat
 import android.util.Log
 import at.bitfire.cert4android.CustomCertManager
 import at.bitfire.ical4android.AndroidCalendar

app/src/main/java/com/etesync/syncadapter/NotificationHelper.kt

@@ -10,8 +10,8 @@ import android.database.sqlite.SQLiteException
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
-import android.support.v4.app.NotificationCompat
+import androidx.core.app.NotificationCompat
-import android.support.v4.app.NotificationManagerCompat
+import androidx.core.app.NotificationManagerCompat
 import at.bitfire.ical4android.CalendarStorageException
 import at.bitfire.vcard4android.ContactsStorageException
 import com.etesync.syncadapter.journalmanager.Exceptions

app/src/main/java/com/etesync/syncadapter/model/ServiceDB.java

@@ -14,7 +14,7 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 
 import com.etesync.syncadapter.App;
 

app/src/main/java/com/etesync/syncadapter/model/Settings.java

@@ -11,7 +11,7 @@ package com.etesync.syncadapter.model;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 public class Settings {
     final SQLiteDatabase db;

app/src/main/java/com/etesync/syncadapter/syncadapter/SyncAdapterService.kt

@@ -16,9 +16,9 @@ import android.net.ConnectivityManager
 import android.net.wifi.WifiManager
 import android.os.Bundle
 import android.os.IBinder
-import android.support.v4.app.NotificationCompat
+import androidx.core.app.NotificationCompat
-import android.support.v4.app.NotificationManagerCompat
+import androidx.core.app.NotificationManagerCompat
-import android.support.v4.util.Pair
+import androidx.core.util.Pair
 import com.etesync.syncadapter.*
 import com.etesync.syncadapter.journalmanager.Crypto
 import com.etesync.syncadapter.journalmanager.Exceptions

app/src/main/java/com/etesync/syncadapter/ui/AboutActivity.kt

@@ -11,15 +11,15 @@ package com.etesync.syncadapter.ui
 import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Bundle
-import android.support.design.widget.TabLayout
+import com.google.android.material.tabs.TabLayout
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
-import android.support.v4.app.FragmentManager
+import androidx.fragment.app.FragmentManager
-import android.support.v4.app.FragmentPagerAdapter
+import androidx.fragment.app.FragmentPagerAdapter
-import android.support.v4.app.LoaderManager
+import androidx.loader.app.LoaderManager
-import android.support.v4.content.AsyncTaskLoader
+import androidx.loader.content.AsyncTaskLoader
-import android.support.v4.content.Loader
+import androidx.loader.content.Loader
-import android.support.v4.view.ViewPager
+import androidx.viewpager.widget.ViewPager
-import android.support.v7.widget.Toolbar
+import androidx.appcompat.widget.Toolbar
 import android.text.Html
 import android.text.Spanned
 import android.text.util.Linkify

app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt

@@ -19,10 +19,10 @@ import android.os.Bundle
 import android.os.IBinder
 import android.provider.CalendarContract
 import android.provider.ContactsContract
-import android.support.design.widget.Snackbar
+import com.google.android.material.snackbar.Snackbar
-import android.support.v4.content.ContextCompat
+import androidx.core.content.ContextCompat
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
-import android.support.v7.widget.Toolbar
+import androidx.appcompat.widget.Toolbar
 import android.text.TextUtils
 import android.view.*
 import android.widget.*

app/src/main/java/com/etesync/syncadapter/ui/AccountListFragment.kt

@@ -15,10 +15,10 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.support.v4.app.ListFragment
+import androidx.fragment.app.ListFragment
-import android.support.v4.app.LoaderManager
+import androidx.loader.app.LoaderManager
-import android.support.v4.content.AsyncTaskLoader
+import androidx.loader.content.AsyncTaskLoader
-import android.support.v4.content.Loader
+import androidx.loader.content.Loader
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup

app/src/main/java/com/etesync/syncadapter/ui/AccountSettingsActivity.kt

@@ -15,11 +15,11 @@ import android.content.Intent
 import android.content.SyncStatusObserver
 import android.os.Bundle
 import android.provider.CalendarContract
-import android.support.v4.app.LoaderManager
+import androidx.loader.app.LoaderManager
-import android.support.v4.app.NavUtils
+import androidx.core.app.NavUtils
-import android.support.v4.content.AsyncTaskLoader
+import androidx.loader.content.AsyncTaskLoader
-import android.support.v4.content.Loader
+import androidx.loader.content.Loader
-import android.support.v7.preference.*
+import androidx.preference.*
 import android.text.TextUtils
 import android.view.MenuItem
 import com.etesync.syncadapter.*

app/src/main/java/com/etesync/syncadapter/ui/AccountsActivity.kt

@@ -13,13 +13,13 @@ import android.content.ContentResolver.SYNC_OBSERVER_TYPE_SETTINGS
 import android.content.Intent
 import android.content.SyncStatusObserver
 import android.os.Bundle
-import android.support.design.widget.FloatingActionButton
+import com.google.android.material.floatingactionbutton.FloatingActionButton
-import android.support.design.widget.NavigationView
+import com.google.android.material.navigation.NavigationView
-import android.support.design.widget.Snackbar
+import com.google.android.material.snackbar.Snackbar
-import android.support.v4.view.GravityCompat
+import androidx.core.view.GravityCompat
-import android.support.v4.widget.DrawerLayout
+import androidx.drawerlayout.widget.DrawerLayout
-import android.support.v7.app.ActionBarDrawerToggle
+import androidx.appcompat.app.ActionBarDrawerToggle
-import android.support.v7.widget.Toolbar
+import androidx.appcompat.widget.Toolbar
 import android.view.Gravity
 import android.view.MenuItem
 import android.view.View

app/src/main/java/com/etesync/syncadapter/ui/AddMemberFragment.kt

@@ -6,8 +6,8 @@ import android.app.ProgressDialog
 import android.content.Context
 import android.os.AsyncTask
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
+import androidx.fragment.app.DialogFragment
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.TextView

app/src/main/java/com/etesync/syncadapter/ui/AppSettingsActivity.kt

@@ -11,8 +11,8 @@ package com.etesync.syncadapter.ui
 import android.content.Intent
 import android.os.AsyncTask
 import android.os.Bundle
-import android.support.design.widget.Snackbar
+import com.google.android.material.snackbar.Snackbar
-import android.support.v7.preference.*
+import androidx.preference.*
 import com.etesync.syncadapter.App
 import com.etesync.syncadapter.R
 import com.etesync.syncadapter.model.ServiceDB

app/src/main/java/com/etesync/syncadapter/ui/BaseActivity.kt

@@ -1,6 +1,6 @@
 package com.etesync.syncadapter.ui
 
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.view.MenuItem
 
 import com.etesync.syncadapter.App

app/src/main/java/com/etesync/syncadapter/ui/ChangeEncryptionPasswordActivity.kt

@@ -13,8 +13,8 @@ import android.app.ProgressDialog
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.support.design.widget.TextInputLayout
+import com.google.android.material.textfield.TextInputLayout
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import android.view.View
 import com.etesync.syncadapter.AccountSettings
 import com.etesync.syncadapter.App

app/src/main/java/com/etesync/syncadapter/ui/CollectionMembersActivity.kt

@@ -4,7 +4,7 @@ import android.accounts.Account
 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.text.InputType
 import android.view.View
 import android.widget.CheckBox
@@ -78,7 +78,7 @@ class CollectionMembersActivity : BaseActivity(), Refreshable {
         if (savedInstanceState == null) {
             listFragment = CollectionMembersListFragment.newInstance(account, info)
             supportFragmentManager.beginTransaction()
-                    .add(R.id.list_entries_container, listFragment)
+                    .add(R.id.list_entries_container, listFragment!!)
                     .commit()
         }
     }

app/src/main/java/com/etesync/syncadapter/ui/CollectionMembersListFragment.kt

@@ -3,8 +3,8 @@ package com.etesync.syncadapter.ui
 import android.accounts.Account
 import android.content.Context
 import android.os.Bundle
-import android.support.v4.app.ListFragment
+import androidx.fragment.app.ListFragment
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup

app/src/main/java/com/etesync/syncadapter/ui/CreateCollectionActivity.kt

@@ -13,7 +13,7 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
-import android.support.v4.app.NavUtils
+import androidx.core.app.NavUtils
 import android.text.TextUtils
 import android.view.Menu
 import android.view.MenuItem

app/src/main/java/com/etesync/syncadapter/ui/CreateCollectionFragment.kt

@@ -15,10 +15,10 @@ import android.content.ContentResolver
 import android.content.Context
 import android.os.Bundle
 import android.provider.CalendarContract
-import android.support.v4.app.DialogFragment
+import androidx.fragment.app.DialogFragment
-import android.support.v4.app.LoaderManager
+import androidx.loader.app.LoaderManager
-import android.support.v4.content.AsyncTaskLoader
+import androidx.loader.content.AsyncTaskLoader
-import android.support.v4.content.Loader
+import androidx.loader.content.Loader
 import at.bitfire.ical4android.TaskProvider
 import com.etesync.syncadapter.*
 import com.etesync.syncadapter.journalmanager.Crypto

app/src/main/java/com/etesync/syncadapter/ui/DebugInfoActivity.kt

@@ -23,7 +23,7 @@ import android.os.Bundle
 import android.os.PowerManager
 import android.provider.CalendarContract
 import android.provider.ContactsContract
-import android.support.v4.content.ContextCompat
+import androidx.core.content.ContextCompat
 import android.text.TextUtils
 import android.view.Menu
 import android.view.MenuItem

app/src/main/java/com/etesync/syncadapter/ui/DeleteCollectionFragment.kt

@@ -13,11 +13,11 @@ import android.app.Dialog
 import android.app.ProgressDialog
 import android.content.Context
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
+import androidx.fragment.app.DialogFragment
-import android.support.v4.app.LoaderManager
+import androidx.loader.app.LoaderManager
-import android.support.v4.content.AsyncTaskLoader
+import androidx.loader.content.AsyncTaskLoader
-import android.support.v4.content.Loader
+import androidx.loader.content.Loader
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import android.text.TextUtils
 import com.etesync.syncadapter.*
 import com.etesync.syncadapter.journalmanager.Crypto

app/src/main/java/com/etesync/syncadapter/ui/EditCollectionActivity.kt

@@ -12,7 +12,7 @@ import android.accounts.Account
 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.Menu
 import android.view.MenuItem
 import android.view.View

app/src/main/java/com/etesync/syncadapter/ui/ExceptionInfoFragment.kt

@@ -12,8 +12,8 @@ import android.accounts.Account
 import android.app.Dialog
 import android.content.Intent
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
+import androidx.fragment.app.DialogFragment
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import com.etesync.syncadapter.Constants
 import com.etesync.syncadapter.R
 import com.etesync.syncadapter.journalmanager.Exceptions.HttpException

app/src/main/java/com/etesync/syncadapter/ui/JournalItemActivity.kt

@@ -4,11 +4,11 @@ import android.accounts.Account
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.support.design.widget.TabLayout
+import com.google.android.material.tabs.TabLayout
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
-import android.support.v4.app.FragmentManager
+import androidx.fragment.app.FragmentManager
-import android.support.v4.app.FragmentPagerAdapter
+import androidx.fragment.app.FragmentPagerAdapter
-import android.support.v4.view.ViewPager
+import androidx.viewpager.widget.ViewPager
 import android.text.format.DateFormat
 import android.text.format.DateUtils
 import android.text.format.Time

app/src/main/java/com/etesync/syncadapter/ui/PermissionsActivity.kt

@@ -12,8 +12,8 @@ import android.Manifest
 import android.app.Activity
 import android.content.pm.PackageManager
 import android.os.Bundle
-import android.support.v4.app.ActivityCompat
+import androidx.core.app.ActivityCompat
-import android.support.v4.app.NotificationManagerCompat
+import androidx.core.app.NotificationManagerCompat
 import android.view.View
 
 import com.etesync.syncadapter.Constants

app/src/main/java/com/etesync/syncadapter/ui/RemoveMemberFragment.kt

@@ -5,8 +5,8 @@ import android.app.Dialog
 import android.app.ProgressDialog
 import android.os.AsyncTask
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
+import androidx.fragment.app.DialogFragment
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import com.etesync.syncadapter.*
 import com.etesync.syncadapter.journalmanager.JournalManager
 import com.etesync.syncadapter.model.CollectionInfo

app/src/main/java/com/etesync/syncadapter/ui/StartupDialogFragment.kt

@@ -17,8 +17,8 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.os.PowerManager
-import android.support.v4.app.DialogFragment
+import androidx.fragment.app.DialogFragment
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import com.etesync.syncadapter.BuildConfig
 import com.etesync.syncadapter.Constants
 import com.etesync.syncadapter.R

app/src/main/java/com/etesync/syncadapter/ui/ViewCollectionActivity.kt

@@ -15,7 +15,7 @@ import android.os.AsyncTask
 import android.os.Bundle
 import android.provider.CalendarContract
 import android.provider.ContactsContract
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import android.view.Gravity
 import android.view.Menu
 import android.view.MenuItem

app/src/main/java/com/etesync/syncadapter/ui/WebViewActivity.kt

@@ -7,7 +7,7 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
-import android.support.v7.app.ActionBar
+import androidx.appcompat.app.ActionBar
 import android.view.KeyEvent
 import android.view.View
 import android.webkit.*

app/src/main/java/com/etesync/syncadapter/ui/importlocal/AccountResolver.kt

@@ -3,7 +3,7 @@ package com.etesync.syncadapter.ui.importlocal
 import android.content.Context
 import android.content.pm.PackageManager
 import android.graphics.drawable.Drawable
-import android.support.v4.content.ContextCompat
+import androidx.core.content.ContextCompat
 import com.etesync.syncadapter.App
 import com.etesync.syncadapter.R
 import java.util.*

app/src/main/java/com/etesync/syncadapter/ui/importlocal/ImportActivity.kt

@@ -6,7 +6,7 @@ import android.content.Context
 import android.content.DialogInterface
 import android.content.Intent
 import android.os.Bundle
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import android.view.*
 import android.widget.ImageView
 import android.widget.TextView

app/src/main/java/com/etesync/syncadapter/ui/importlocal/ImportFragment.kt

@@ -13,7 +13,7 @@ import android.os.Build
 import android.os.Bundle
 import android.provider.CalendarContract
 import android.provider.ContactsContract
-import android.support.v4.app.DialogFragment
+import androidx.fragment.app.DialogFragment
 import at.bitfire.ical4android.CalendarStorageException
 import at.bitfire.ical4android.Event
 import at.bitfire.ical4android.InvalidCalendarException

app/src/main/java/com/etesync/syncadapter/ui/importlocal/LocalCalendarImportFragment.kt

@@ -6,7 +6,7 @@ import android.content.Context
 import android.os.AsyncTask
 import android.os.Bundle
 import android.provider.CalendarContract
-import android.support.v4.app.ListFragment
+import androidx.fragment.app.ListFragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup

app/src/main/java/com/etesync/syncadapter/ui/importlocal/LocalContactImportFragment.kt

@@ -11,9 +11,9 @@ import android.graphics.drawable.Drawable
 import android.os.AsyncTask
 import android.os.Bundle
 import android.provider.ContactsContract
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
-import android.support.v7.widget.LinearLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
@@ -253,7 +253,7 @@ class LocalContactImportFragment : Fragment() {
             a.recycle()
         }
 
-        override fun onDrawOver(c: Canvas, parent: RecyclerView, state: RecyclerView.State?) {
+        override fun onDrawOver(c: Canvas, parent: RecyclerView, state: RecyclerView.State) {
             drawVertical(c, parent)
         }
 
@@ -273,7 +273,7 @@ class LocalContactImportFragment : Fragment() {
             }
         }
 
-        override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State?) {
+        override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
             outRect.set(0, 0, 0, mDivider!!.intrinsicHeight)
         }
 

app/src/main/java/com/etesync/syncadapter/ui/importlocal/ResultFragment.kt

@@ -3,8 +3,8 @@ package com.etesync.syncadapter.ui.importlocal
 import android.app.Dialog
 import android.content.DialogInterface
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
+import androidx.fragment.app.DialogFragment
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import com.etesync.syncadapter.R
 import java.io.Serializable
 

app/src/main/java/com/etesync/syncadapter/ui/journalviewer/ListEntriesFragment.kt

@@ -11,7 +11,7 @@ package com.etesync.syncadapter.ui.journalviewer
 import android.accounts.Account
 import android.content.Context
 import android.os.Bundle
-import android.support.v4.app.ListFragment
+import androidx.fragment.app.ListFragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup

app/src/main/java/com/etesync/syncadapter/ui/setup/DetectConfigurationFragment.kt

@@ -13,11 +13,11 @@ import android.app.ProgressDialog
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
+import androidx.fragment.app.DialogFragment
-import android.support.v4.app.LoaderManager
+import androidx.loader.app.LoaderManager
-import android.support.v4.content.AsyncTaskLoader
+import androidx.loader.content.AsyncTaskLoader
-import android.support.v4.content.Loader
+import androidx.loader.content.Loader
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import com.etesync.syncadapter.App
 import com.etesync.syncadapter.R
 import com.etesync.syncadapter.ui.DebugInfoActivity

app/src/main/java/com/etesync/syncadapter/ui/setup/EncryptionDetailsFragment.kt

@@ -9,8 +9,8 @@
 package com.etesync.syncadapter.ui.setup
 
 import android.os.Bundle
-import android.support.design.widget.TextInputLayout
+import com.google.android.material.textfield.TextInputLayout
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup

app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsChangeFragment.kt

@@ -14,11 +14,11 @@ import android.app.ProgressDialog
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
+import androidx.fragment.app.DialogFragment
-import android.support.v4.app.LoaderManager
+import androidx.loader.app.LoaderManager
-import android.support.v4.content.AsyncTaskLoader
+import androidx.loader.content.AsyncTaskLoader
-import android.support.v4.content.Loader
+import androidx.loader.content.Loader
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import com.etesync.syncadapter.AccountSettings
 import com.etesync.syncadapter.App
 import com.etesync.syncadapter.InvalidAccountException

app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsFragment.kt

@@ -9,8 +9,8 @@
 package com.etesync.syncadapter.ui.setup
 
 import android.os.Bundle
-import android.support.design.widget.TextInputLayout
+import com.google.android.material.textfield.TextInputLayout
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup

app/src/main/java/com/etesync/syncadapter/ui/setup/SetupEncryptionFragment.kt

@@ -18,8 +18,8 @@ import android.content.Context
 import android.os.AsyncTask
 import android.os.Bundle
 import android.provider.CalendarContract
-import android.support.v4.app.DialogFragment
+import androidx.fragment.app.DialogFragment
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import at.bitfire.ical4android.TaskProvider
 import com.etesync.syncadapter.*
 import com.etesync.syncadapter.journalmanager.Crypto

app/src/main/java/com/etesync/syncadapter/ui/setup/SetupUserInfoFragment.kt

@@ -6,8 +6,8 @@ import android.app.ProgressDialog
 import android.content.Context
 import android.os.AsyncTask
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
+import androidx.fragment.app.DialogFragment
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import com.etesync.syncadapter.*
 import com.etesync.syncadapter.Constants.KEY_ACCOUNT
 import com.etesync.syncadapter.journalmanager.Constants

app/src/main/res/layout/account_list_item.xml

@@ -8,7 +8,7 @@
     android:gravity="center_horizontal"
     android:descendantFocusability="blocksDescendants">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
             style="@style/account_list_card"
             android:layout_margin="8dp"
             android:layout_height="wrap_content"
@@ -38,5 +38,5 @@
                 tools:text="Account Name"/>
 
         </LinearLayout>
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 </LinearLayout>

app/src/main/res/layout/accounts_content.xml

@@ -7,7 +7,7 @@
   ~ http://www.gnu.org/licenses/gpl.html
   -->
 
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -16,18 +16,18 @@
     android:layout_height="match_parent"
     tools:context="com.etesync.syncadapter.ui.AccountsActivity">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             app:theme="@style/ThemeOverlay.AppCompat.ActionBar"
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"/>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <fragment
         class="com.etesync.syncadapter.ui.AccountListFragment"
@@ -38,7 +38,7 @@
         app:layout_scrollFlags="scroll"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
-    <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"
@@ -46,4 +46,4 @@
         android:layout_margin="@dimen/fab_margin"
         android:src="@drawable/ic_add_light"/>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/activity_about.xml

@@ -7,24 +7,24 @@
   ~ http://www.gnu.org/licenses/gpl.html
   -->
 
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
                                                  xmlns:app="http://schemas.android.com/apk/res-auto"
                                                  android:orientation="vertical"
                                                  android:fitsSystemWindows="true"
                                                  android:layout_width="match_parent"
                                                  android:layout_height="match_parent">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:theme="@style/ThemeOverlay.AppCompat.ActionBar">
         
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"/>
 
-        <android.support.design.widget.TabLayout
+        <com.google.android.material.tabs.TabLayout
             android:id="@+id/tabs"
             app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
             style="@style/tablayout"
@@ -32,12 +32,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/viewpager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/activity_account.xml

@@ -19,7 +19,7 @@
                   android:layout_height="wrap_content"
                   android:padding="@dimen/activity_margin">
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:id="@+id/carddav"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <android.support.v7.widget.Toolbar
+                <androidx.appcompat.widget.Toolbar
                     android:id="@+id/carddav_menu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -58,9 +58,9 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:id="@+id/caldav"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -72,7 +72,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <android.support.v7.widget.Toolbar
+                <androidx.appcompat.widget.Toolbar
                     android:id="@+id/caldav_menu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -99,9 +99,9 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:id="@+id/taskdav"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -113,7 +113,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <android.support.v7.widget.Toolbar
+                <androidx.appcompat.widget.Toolbar
                     android:id="@+id/taskdav_menu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -140,6 +140,6 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
     </LinearLayout>
 </ScrollView>

app/src/main/res/layout/activity_accounts.xml

@@ -7,7 +7,7 @@
   ~ http://www.gnu.org/licenses/gpl.html
   -->
 
-<android.support.v4.widget.DrawerLayout
+<androidx.drawerlayout.widget.DrawerLayout
     android:id="@+id/drawer_layout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -19,7 +19,7 @@
 
     <include layout="@layout/accounts_content"/>
 
-    <android.support.design.widget.NavigationView
+    <com.google.android.material.navigation.NavigationView
         android:id="@+id/nav_view"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
@@ -28,4 +28,4 @@
         app:headerLayout="@layout/nav_header_accounts"
         app:menu="@menu/activity_accounts_drawer"/>
 
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>

app/src/main/res/layout/activity_webview.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -21,4 +21,4 @@
         android:layout_marginTop="-8dp"
         android:max="100"
         android:maxHeight="1dp" />
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/change_encryption_password.xml

@@ -36,31 +36,31 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"/>
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/encryption_password"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:passwordToggleEnabled="true">
-                <android.support.design.widget.TextInputEditText
+                <com.google.android.material.textfield.TextInputEditText
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:fontFamily="monospace"
                     android:inputType="textPassword"
                     android:hint="@string/login_encryption_password"/>
-            </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_encryption_password"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:passwordToggleEnabled="true">
-                <android.support.design.widget.TextInputEditText
+                <com.google.android.material.textfield.TextInputEditText
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:fontFamily="monospace"
                     android:inputType="textPassword"
                     android:hint="@string/change_encryption_password_new_password"/>
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
             <TextView
                 android:layout_width="match_parent"

app/src/main/res/layout/contact_info_item_group.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -40,4 +40,4 @@
 
         </LinearLayout>
     </LinearLayout>
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>

app/src/main/res/layout/fragment_local_contact_import.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.RecyclerView
+<androidx.recyclerview.widget.RecyclerView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/recyclerView"
     android:layout_width="match_parent"

app/src/main/res/layout/import_actions_list_item.xml

@@ -7,7 +7,7 @@
     android:descendantFocusability="blocksDescendants"
     android:gravity="center_horizontal">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         style="@style/account_list_card"
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
@@ -38,5 +38,5 @@
                 tools:text="Import Local" />
 
         </LinearLayout>
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 </LinearLayout>

app/src/main/res/layout/journal_item_activity.xml

@@ -5,7 +5,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
-    <android.support.design.widget.TabLayout
+    <com.google.android.material.tabs.TabLayout
         android:id="@+id/tabs"
         app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
         style="@style/tablayout"
@@ -19,7 +19,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/viewpager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

app/src/main/res/layout/login_credentials_fragment.xml

@@ -41,18 +41,18 @@
                 android:layout_height="wrap_content"
                 android:hint="@string/login_email_address"
                 android:inputType="textEmailAddress"/>
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/url_password"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:passwordToggleEnabled="true">
-                <android.support.design.widget.TextInputEditText
+                <com.google.android.material.textfield.TextInputEditText
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:fontFamily="monospace"
                     android:inputType="textPassword"
                     android:hint="@string/login_password"/>
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
 
             <TextView

app/src/main/res/layout/login_encryption_details.xml

@@ -36,18 +36,18 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"/>
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/encryption_password"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:passwordToggleEnabled="true">
-                <android.support.design.widget.TextInputEditText
+                <com.google.android.material.textfield.TextInputEditText
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:fontFamily="monospace"
                     android:inputType="textPassword"
                     android:hint="@string/login_encryption_password"/>
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
             <TextView
                 android:layout_width="match_parent"

gradle.properties

@@ -1 +1,3 @@
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx2048M