diff options
46 files changed, 126 insertions, 123 deletions
diff --git a/Android-SingleSignOn b/Android-SingleSignOn new file mode 160000 +Subproject b14f926519affeb52c3cc82ede5f06f63256f20 diff --git a/app/build.gradle b/app/build.gradle index 547df6fa..f1043628 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 28 - buildToolsVersion '27.0.3' + buildToolsVersion '28.0.3' defaultConfig { applicationId "it.niedermann.owncloud.notes" @@ -34,12 +34,10 @@ dependencies { implementation 'com.jakewharton:butterknife:8.8.1' annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1' - def supportLibVersion = '28.0.0' - - implementation "com.android.support:appcompat-v7:${supportLibVersion}" - implementation "com.android.support:design:${supportLibVersion}" - implementation "com.android.support:recyclerview-v7:${supportLibVersion}" + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'com.google.android.material:material:1.1.0-alpha01' + implementation 'androidx.recyclerview:recyclerview:1.0.0' // needed for cert4android (conflict resolution) - implementation "com.android.support:cardview-v7:${supportLibVersion}" + implementation 'androidx.cardview:cardview:1.0.0' implementation fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/app/release/app-release.apk b/app/release/app-release.apk Binary files differnew file mode 100644 index 00000000..6540c6a2 --- /dev/null +++ b/app/release/app-release.apk diff --git a/app/release/output.json b/app/release/output.json new file mode 100644 index 00000000..63754a0b --- /dev/null +++ b/app/release/output.json @@ -0,0 +1 @@ +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":37,"versionName":"0.22.3","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/AlwaysAutoCompleteTextView.java b/app/src/main/java/it/niedermann/owncloud/notes/android/AlwaysAutoCompleteTextView.java index 3255633a..6a6a312b 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/AlwaysAutoCompleteTextView.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/AlwaysAutoCompleteTextView.java @@ -1,7 +1,7 @@ package it.niedermann.owncloud.notes.android; import android.content.Context; -import android.support.v7.widget.AppCompatAutoCompleteTextView; +import androidx.appcompat.widget.AppCompatAutoCompleteTextView; import android.util.AttributeSet; import android.util.Log; import android.view.WindowManager; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/AboutActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/AboutActivity.java index e7296491..937d2a20 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/AboutActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/AboutActivity.java @@ -1,12 +1,12 @@ package it.niedermann.owncloud.notes.android.activity; import android.os.Bundle; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.app.AppCompatActivity; +import com.google.android.material.tabs.TabLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.app.AppCompatActivity; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/EditNoteActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/EditNoteActivity.java index 43ffd59b..10a687bb 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/EditNoteActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/EditNoteActivity.java @@ -5,8 +5,8 @@ import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import android.view.Menu; import android.view.MenuItem; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java index c289a633..daeee690 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java @@ -10,20 +10,20 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.Handler; import android.preference.PreferenceManager; -import android.support.annotation.Nullable; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v4.widget.DrawerLayout; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.app.ActionBarDrawerToggle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.view.ActionMode; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.SearchView; -import android.support.v7.widget.Toolbar; -import android.support.v7.widget.helper.ItemTouchHelper; -import android.support.v7.widget.helper.ItemTouchHelper.SimpleCallback; +import androidx.annotation.Nullable; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.view.ActionMode; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.SearchView; +import androidx.appcompat.widget.Toolbar; +import androidx.recyclerview.widget.ItemTouchHelper; +import androidx.recyclerview.widget.ItemTouchHelper.SimpleCallback; import android.util.Log; import android.view.Menu; import android.view.MenuItem; @@ -517,7 +517,7 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap final MenuItem item = menu.findItem(R.id.search); searchView = (SearchView) item.getActionView(); - final LinearLayout searchEditFrame = searchView.findViewById(android.support.v7.appcompat.R.id + final LinearLayout searchEditFrame = searchView.findViewById(androidx.appcompat.appcompat.R.id .search_edit_frame); searchEditFrame.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() { diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/PreferencesActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/PreferencesActivity.java index 1bb54f1e..2d64d596 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/PreferencesActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/PreferencesActivity.java @@ -1,8 +1,8 @@ package it.niedermann.owncloud.notes.android.activity; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import it.niedermann.owncloud.notes.android.fragment.PreferencesFragment; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SelectSingleNoteActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SelectSingleNoteActivity.java index cd0b5526..2e1e1d86 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SelectSingleNoteActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SelectSingleNoteActivity.java @@ -6,7 +6,7 @@ import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import android.view.Menu; import android.view.View; @@ -34,7 +34,7 @@ public class SelectSingleNoteActivity extends NotesListViewActivity { ButterKnife.bind(this); fabCreate.setVisibility(View.GONE); - android.support.v7.app.ActionBar ab = getSupportActionBar(); + androidx.appcompat.app.ActionBar ab = getSupportActionBar(); if (ab != null) { ab.setTitle(R.string.activity_select_single_note); } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SettingsActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SettingsActivity.java index 756f482b..ea9d1777 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SettingsActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SettingsActivity.java @@ -6,9 +6,9 @@ import android.graphics.drawable.Drawable; import android.os.AsyncTask; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.design.widget.TextInputLayout; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; +import com.google.android.material.textfield.TextInputLayout; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.AppCompatActivity; import android.text.Editable; import android.text.TextWatcher; import android.util.Log; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SplashscreenActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SplashscreenActivity.java index 14195efc..295cd193 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SplashscreenActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SplashscreenActivity.java @@ -2,7 +2,7 @@ package it.niedermann.owncloud.notes.android.activity; import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; /** * Created by stefan on 18.04.17. diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/NoteListWidgetConfiguration.java b/app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/NoteListWidgetConfiguration.java index da875d11..92fda731 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/NoteListWidgetConfiguration.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/NoteListWidgetConfiguration.java @@ -7,10 +7,10 @@ import android.content.SharedPreferences; import android.os.AsyncTask; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.widget.Toast; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/BaseNoteFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/BaseNoteFragment.java index e46092a9..a8ef664e 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/BaseNoteFragment.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/BaseNoteFragment.java @@ -6,9 +6,9 @@ import android.app.FragmentManager; import android.content.Intent; import android.os.Build; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.view.MenuItemCompat; -import android.support.v7.widget.ShareActionProvider; +import androidx.annotation.Nullable; +import androidx.core.view.MenuItemCompat; +import androidx.appcompat.widget.ShareActionProvider; import android.util.Log; import android.view.Menu; import android.view.MenuInflater; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/CategoryDialogFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/CategoryDialogFragment.java index 283782a1..7d6f7d83 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/CategoryDialogFragment.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/CategoryDialogFragment.java @@ -8,7 +8,7 @@ import android.content.Context; import android.content.DialogInterface; import android.os.AsyncTask; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import android.view.WindowManager; import android.widget.ArrayAdapter; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteEditFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteEditFragment.java index 159c86dd..d5a9c94d 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteEditFragment.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteEditFragment.java @@ -3,7 +3,7 @@ package it.niedermann.owncloud.notes.android.fragment; import android.os.Bundle; import android.os.Handler; import android.os.Looper; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.Editable; import android.text.TextWatcher; import android.util.Log; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NotePreviewFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NotePreviewFragment.java index 857ec7d5..6ad7f99d 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NotePreviewFragment.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NotePreviewFragment.java @@ -1,11 +1,11 @@ package it.niedermann.owncloud.notes.android.fragment; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.content.res.ResourcesCompat; -import android.support.v4.content.res.TypedArrayUtils; -import android.support.v4.text.TextUtilsCompat; -import android.text.TextUtils; +import androidx.annotation.Nullable; +import androidx.core.content.res.ResourcesCompat; +import androidx.core.content.res.TypedArrayUtils; +import androidx.core.text.TextUtilsCompat; + import android.text.method.LinkMovementMethod; import android.util.Log; import android.view.LayoutInflater; @@ -14,16 +14,13 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.yydcdut.markdown.callback.OnTodoClickCallback; import com.yydcdut.markdown.syntax.text.TextFactory; -import com.yydcdut.rxmarkdown.RxMDConfiguration; import com.yydcdut.rxmarkdown.RxMDTextView; import com.yydcdut.rxmarkdown.RxMarkdown; import butterknife.BindView; import butterknife.ButterKnife; import it.niedermann.owncloud.notes.R; -import it.niedermann.owncloud.notes.util.ICallback; import it.niedermann.owncloud.notes.util.MarkDownUtil; import rx.Subscriber; import rx.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/PreferencesFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/PreferencesFragment.java index 6a3bb05b..e3cb0a6f 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/PreferencesFragment.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/PreferencesFragment.java @@ -7,7 +7,7 @@ import android.preference.Preference; import android.preference.PreferenceFragment; import android.preference.PreferenceManager; import android.preference.SwitchPreference; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.widget.Toast; import at.bitfire.cert4android.CustomCertManager; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/about/AboutFragmentContributingTab.java b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/about/AboutFragmentContributingTab.java index ea439116..3d4358d7 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/about/AboutFragmentContributingTab.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/about/AboutFragmentContributingTab.java @@ -1,7 +1,7 @@ package it.niedermann.owncloud.notes.android.fragment.about; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/about/AboutFragmentCreditsTab.java b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/about/AboutFragmentCreditsTab.java index 91ac1570..f725393c 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/about/AboutFragmentCreditsTab.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/about/AboutFragmentCreditsTab.java @@ -1,7 +1,7 @@ package it.niedermann.owncloud.notes.android.fragment.about; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/about/AboutFragmentLicenseTab.java b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/about/AboutFragmentLicenseTab.java index 1093269e..cf8fe07b 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/about/AboutFragmentLicenseTab.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/about/AboutFragmentLicenseTab.java @@ -3,7 +3,7 @@ package it.niedermann.owncloud.notes.android.fragment.about; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/model/Category.java b/app/src/main/java/it/niedermann/owncloud/notes/model/Category.java index 336ce23f..72f176c8 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/model/Category.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/model/Category.java @@ -1,6 +1,6 @@ package it.niedermann.owncloud.notes.model; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import java.io.Serializable; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/model/ItemAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/model/ItemAdapter.java index 9dd9e693..dc80dbba 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/model/ItemAdapter.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/model/ItemAdapter.java @@ -1,7 +1,7 @@ package it.niedermann.owncloud.notes.model; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.text.Html; import android.view.LayoutInflater; import android.view.View; @@ -16,7 +16,7 @@ import butterknife.BindView; import butterknife.ButterKnife; import it.niedermann.owncloud.notes.R; -import static android.support.v7.widget.RecyclerView.NO_POSITION; +import static androidx.recyclerview.widget.RecyclerView.NO_POSITION; public class ItemAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> { diff --git a/app/src/main/java/it/niedermann/owncloud/notes/model/NavigationAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/model/NavigationAdapter.java index bf8c08e6..a59a6bcf 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/model/NavigationAdapter.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/model/NavigationAdapter.java @@ -1,10 +1,10 @@ package it.niedermann.owncloud.notes.model; import android.graphics.Color; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/LoadNotesListTask.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/LoadNotesListTask.java index af50f9ec..ac4a9278 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/LoadNotesListTask.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/LoadNotesListTask.java @@ -2,9 +2,9 @@ package it.niedermann.owncloud.notes.persistence; import android.content.Context; import android.os.AsyncTask; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; import android.text.Html; import android.text.SpannableString; import android.text.TextUtils; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteSQLiteOpenHelper.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteSQLiteOpenHelper.java index 812cdbe9..b92d29cc 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteSQLiteOpenHelper.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteSQLiteOpenHelper.java @@ -6,9 +6,9 @@ import android.content.Intent; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; import android.text.TextUtils; import android.util.Log; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/util/MarkDownUtil.java b/app/src/main/java/it/niedermann/owncloud/notes/util/MarkDownUtil.java index b55b26ee..7d2c2c1c 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/util/MarkDownUtil.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/util/MarkDownUtil.java @@ -1,7 +1,7 @@ package it.niedermann.owncloud.notes.util; import android.content.Context; -import android.support.v4.content.res.ResourcesCompat; +import androidx.core.content.res.ResourcesCompat; import com.yydcdut.rxmarkdown.RxMDConfiguration; import com.yydcdut.rxmarkdown.RxMDConfiguration.Builder; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/util/NoteUtil.java b/app/src/main/java/it/niedermann/owncloud/notes/util/NoteUtil.java index 99bdb847..47c0a58f 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/util/NoteUtil.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/util/NoteUtil.java @@ -1,8 +1,8 @@ package it.niedermann.owncloud.notes.util; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.regex.Pattern; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/util/Notes.java b/app/src/main/java/it/niedermann/owncloud/notes/util/Notes.java index 0b6015d1..75f43f05 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/util/Notes.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/util/Notes.java @@ -4,7 +4,7 @@ import android.app.Application; import android.content.Context; import android.content.SharedPreferences; import android.preference.PreferenceManager; -import android.support.v7.app.AppCompatDelegate; +import androidx.appcompat.app.AppCompatDelegate; public class Notes extends Application { private static final String DARK_THEME = "darkTheme"; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/util/NotesClient.java b/app/src/main/java/it/niedermann/owncloud/notes/util/NotesClient.java index aab3c1c2..87c3b6e5 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/util/NotesClient.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/util/NotesClient.java @@ -1,6 +1,6 @@ package it.niedermann.owncloud.notes.util; -import android.support.annotation.WorkerThread; +import androidx.annotation.WorkerThread; import android.util.Base64; import android.util.Log; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/util/NotesClientUtil.java b/app/src/main/java/it/niedermann/owncloud/notes/util/NotesClientUtil.java index 242d17e5..ef192eae 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/util/NotesClientUtil.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/util/NotesClientUtil.java @@ -1,6 +1,6 @@ package it.niedermann.owncloud.notes.util; -import android.support.annotation.StringRes; +import androidx.annotation.StringRes; import android.util.Base64; import android.util.Log; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/util/SupportUtil.java b/app/src/main/java/it/niedermann/owncloud/notes/util/SupportUtil.java index 28ba7b75..48792a8a 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/util/SupportUtil.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/util/SupportUtil.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.SharedPreferences; import android.os.Build; import android.preference.PreferenceManager; -import android.support.annotation.WorkerThread; +import androidx.annotation.WorkerThread; import android.text.Html; import android.text.Spanned; import android.text.method.LinkMovementMethod; diff --git a/app/src/main/res/drawable/ic_library_music_black_24dp.xml b/app/src/main/res/drawable/ic_library_music_black_24dp.xml new file mode 100644 index 00000000..e90b1c40 --- /dev/null +++ b/app/src/main/res/drawable/ic_library_music_black_24dp.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" android:tint="#757575" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="#FF757575" android:pathData="M20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM18,7h-3v5.5c0,1.38 -1.12,2.5 -2.5,2.5S10,13.88 10,12.5s1.12,-2.5 2.5,-2.5c0.57,0 1.08,0.19 1.5,0.51L14,5h4v2zM4,6L2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6z"/> +</vector> diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 00f694ef..78e17475 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -4,12 +4,12 @@ android:layout_height="match_parent" android:orientation="vertical"> - <android.support.design.widget.TabLayout + <com.google.android.material.tabs.TabLayout android:id="@+id/tabs" android:layout_width="match_parent" android:layout_height="wrap_content" /> - <android.support.v4.view.ViewPager + <androidx.viewpager.widget.ViewPager android:id="@+id/pager" android:layout_width="match_parent" android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/activity_note_list_configuration.xml b/app/src/main/res/layout/activity_note_list_configuration.xml index 019b7224..209ab66a 100644 --- a/app/src/main/res/layout/activity_note_list_configuration.xml +++ b/app/src/main/res/layout/activity_note_list_configuration.xml @@ -4,10 +4,10 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/nlw_config_recyclerv" android:layout_width="match_parent" android:layout_height="match_parent" - app:layoutManager="android.support.v7.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> </RelativeLayout> diff --git a/app/src/main/res/layout/activity_notes_list_view.xml b/app/src/main/res/layout/activity_notes_list_view.xml index 4bfa1c02..816903ba 100644 --- a/app/src/main/res/layout/activity_notes_list_view.xml +++ b/app/src/main/res/layout/activity_notes_list_view.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"> @@ -9,7 +9,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - <android.support.v7.widget.Toolbar + <androidx.appcompat.widget.Toolbar android:id="@+id/notesListActivityActionBar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" @@ -17,7 +17,7 @@ android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:elevation="4dp" /> - <android.support.v4.widget.SwipeRefreshLayout xmlns:tools="http://schemas.android.com/tools" + <androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:tools="http://schemas.android.com/tools" android:id="@+id/swiperefreshlayout" android:layout_width="match_parent" android:layout_height="match_parent" @@ -25,22 +25,22 @@ tools:context="it.niedermann.owncloud.notes.android.activity.NotesListViewActivity" tools:ignore="MergeRootFrame"> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/recycler_view" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/bg_highlighted" android:scrollbars="vertical" /> - </android.support.v4.widget.SwipeRefreshLayout> + </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> </LinearLayout> - <android.support.design.widget.FloatingActionButton + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/fab_create" style="@style/fab" android:src="@drawable/ic_add_white_24dp" android:title="@string/action_create" app:backgroundTint="@color/primary" app:rippleColor="@color/primary_dark" /> -</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file +</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index ee39da1c..405b48b8 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -8,7 +8,7 @@ android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"> - <android.support.design.widget.TextInputLayout + <com.google.android.material.textfield.TextInputLayout android:id="@+id/settings_url_wrapper" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -21,7 +21,7 @@ android:hint="@string/settings_url" android:inputType="textUri" android:textColor="@color/fg_default" /> - </android.support.design.widget.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> <TextView android:id="@+id/settings_url_warn_http" @@ -35,7 +35,7 @@ android:textColor="@color/fg_contrast" android:visibility="gone" /> - <android.support.design.widget.TextInputLayout + <com.google.android.material.textfield.TextInputLayout android:id="@+id/settings_username_wrapper" android:layout_width="match_parent" android:layout_height="wrap_content"> @@ -47,9 +47,9 @@ android:hint="@string/settings_username" android:inputType="text" android:textColor="@color/fg_default" /> - </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/settings_password_wrapper" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -62,7 +62,7 @@ android:hint="@string/settings_password" android:inputType="textPassword" android:textColor="@color/fg_default" /> - </android.support.design.widget.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> <Button android:id="@+id/settings_submit" diff --git a/app/src/main/res/layout/drawer_layout.xml b/app/src/main/res/layout/drawer_layout.xml index d249ac6a..fa6a14ee 100644 --- a/app/src/main/res/layout/drawer_layout.xml +++ b/app/src/main/res/layout/drawer_layout.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/drawerLayout" android:layout_width="match_parent" @@ -11,14 +11,14 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - <android.support.design.widget.NavigationView + <com.google.android.material.navigation.NavigationView android:id="@+id/navigationView" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="start" android:fitsSystemWindows="true"> - <android.support.v4.widget.NestedScrollView + <androidx.core.widget.NestedScrollView android:layout_width="match_parent" android:layout_height="match_parent"> @@ -45,7 +45,7 @@ android:contentDescription="@string/app_name" /> - <android.support.v7.widget.LinearLayoutCompat + <androidx.appcompat.widget.LinearLayoutCompat android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center_vertical" @@ -63,10 +63,10 @@ android:id="@+id/account" android:layout_width="match_parent" android:layout_height="wrap_content"/> - </android.support.v7.widget.LinearLayoutCompat> + </androidx.appcompat.widget.LinearLayoutCompat> </LinearLayout> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/navigationList" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -80,7 +80,7 @@ android:layout_height="1dp" android:background="@color/separator" /> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/navigationMenu" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -91,8 +91,8 @@ </LinearLayout> - </android.support.v4.widget.NestedScrollView> + </androidx.core.widget.NestedScrollView> - </android.support.design.widget.NavigationView> + </com.google.android.material.navigation.NavigationView> -</android.support.v4.widget.DrawerLayout>
\ No newline at end of file +</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_notes_list_note_item.xml b/app/src/main/res/layout/fragment_notes_list_note_item.xml index fc86116d..a1cc0a56 100644 --- a/app/src/main/res/layout/fragment_notes_list_note_item.xml +++ b/app/src/main/res/layout/fragment_notes_list_note_item.xml @@ -25,7 +25,7 @@ android:contentDescription="@string/menu_delete" android:src="@drawable/ic_delete_white_32dp" /> - <android.support.v7.widget.LinearLayoutCompat + <androidx.appcompat.widget.LinearLayoutCompat android:id="@+id/noteSwipeable" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -58,7 +58,7 @@ </FrameLayout> - <android.support.v7.widget.LinearLayoutCompat + <androidx.appcompat.widget.LinearLayoutCompat android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -68,7 +68,7 @@ android:orientation="vertical" android:background="@drawable/list_item_background_selector"> - <android.support.v7.widget.LinearLayoutCompat + <androidx.appcompat.widget.LinearLayoutCompat android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/list_item_background_selector"> @@ -81,10 +81,10 @@ android:layout_weight="1" android:textColor="@drawable/list_item_color_selector" android:textSize="@dimen/primary_font_size" /> - </android.support.v7.widget.LinearLayoutCompat> + </androidx.appcompat.widget.LinearLayoutCompat> - <android.support.v7.widget.LinearLayoutCompat + <androidx.appcompat.widget.LinearLayoutCompat android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/list_item_background_selector"> @@ -121,9 +121,9 @@ android:singleLine="true" android:textColor="@drawable/list_item_color_selector" android:textSize="@dimen/secondary_font_size" /> - </android.support.v7.widget.LinearLayoutCompat> - </android.support.v7.widget.LinearLayoutCompat> - </android.support.v7.widget.LinearLayoutCompat> + </androidx.appcompat.widget.LinearLayoutCompat> + </androidx.appcompat.widget.LinearLayoutCompat> + </androidx.appcompat.widget.LinearLayoutCompat> <ImageView android:layout_width="match_parent" diff --git a/app/src/main/res/menu/menu_list_view.xml b/app/src/main/res/menu/menu_list_view.xml index 957c6574..70103414 100644 --- a/app/src/main/res/menu/menu_list_view.xml +++ b/app/src/main/res/menu/menu_list_view.xml @@ -7,6 +7,6 @@ android:id="@+id/search" android:title="@string/action_search" android:icon="@drawable/ic_search_white_24dp" - app:actionViewClass="android.support.v7.widget.SearchView" + app:actionViewClass="androidx.appcompat.widget.SearchView" app:showAsAction="collapseActionView|always" /> </menu>
\ No newline at end of file diff --git a/app/src/main/res/menu/menu_note_fragment.xml b/app/src/main/res/menu/menu_note_fragment.xml index 337b8ff3..50a32ab7 100644 --- a/app/src/main/res/menu/menu_note_fragment.xml +++ b/app/src/main/res/menu/menu_note_fragment.xml @@ -19,7 +19,7 @@ android:orderInCategory="100" android:title="@string/menu_share" app:showAsAction="never" - app:actionProviderClass="android.support.v7.widget.ShareActionProvider" /> + app:actionProviderClass="androidx.appcompat.widget.ShareActionProvider" /> <item android:id="@+id/menu_cancel" android:icon="@drawable/ic_clear_white_24dp" diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 7f8f724e..c26bfe02 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -45,7 +45,7 @@ <string name="settings_note_mode">Display tilstand for noter</string> <string name="settings_cert_trust_system">Stol på systemcertifikater</string> <string name="settings_cert_trust_system_on">System og bruger tilføjede CA\'er stoles der på (anbefalet)</string> - <string name="settings_cert_trust_system_off">System og bruger tilføjede CA\\'er stoles der ikke på</string> + <string name="settings_cert_trust_system_off">System og bruger tilføjede CA\'er stoles der ikke på</string> <string name="settings_cert_reset">Nulstil (ikke)betroede certifikater</string> <string name="settings_cert_reset_summary">Nulstiller alle brugerdefinerede certifikater</string> <string name="settings_cert_reset_toast">Alle brugerdefinerede certifikater er fjernet</string> diff --git a/build.gradle b/build.gradle index d809082e..90213f2c 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { apply plugin: 'maven' - classpath 'com.android.tools.build:gradle:3.1.3' + classpath 'com.android.tools.build:gradle:3.2.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/cert4android b/cert4android -Subproject 0d12bf44ec340004f1f062d2f6b8a12e13a4938 +Subproject 4e9e20885e31b9c9738cb30e684d9f43f2534fb diff --git a/gradle.properties b/gradle.properties index 9b6ae2a0..bdda067b 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 784a3436..e94daa56 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Apr 06 20:28:39 CEST 2018 +#Sun Nov 04 12:05:52 CET 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip |