From 96ff19eab0886eef56bae614b36c608e72d21354 Mon Sep 17 00:00:00 2001 From: BONNEVILLE Geoffroy Date: Tue, 13 Nov 2018 12:23:13 +0100 Subject: [PATCH] Migrate Support Library to AndroidX --- .idea/caches/build_file_checksums.ser | Bin 535 -> 535 bytes app/build.gradle | 14 ++++++------ .../donext/activities/MainActivity.java | 8 +++---- .../donext/activities/SettingsActivity.java | 2 +- .../donext/activities/TodayActivity.java | 8 +++---- .../activities/ToolBarActivityBase.java | 4 ++-- .../donext/adapters/SectionsPagerAdapter.java | 6 +++--- .../SmartFragmentStatePagerAdapter.java | 8 +++---- .../adapters/TaskListRecyclerViewAdapter.java | 4 ++-- .../adapters/TaskRecyclerViewAdapter.java | 4 ++-- .../donext/adapters/TodayArrayAdapter.java | 4 ++-- .../com/wismna/geoffroy/donext/dao/Task.java | 2 +- .../wismna/geoffroy/donext/dao/TaskList.java | 2 +- .../donext/fragments/AboutDialogFragment.java | 2 +- .../fragments/ConfirmDialogFragment.java | 6 +++--- .../fragments/DynamicDialogFragment.java | 16 +++++++------- .../donext/fragments/MainFragment.java | 18 ++++++++-------- .../fragments/TaskFormDialogFragment.java | 4 ++-- .../fragments/TaskListsDialogFragment.java | 8 +++---- .../donext/fragments/TasksFragment.java | 20 +++++++++--------- .../fragments/TodayFormDialogFragment.java | 2 +- .../donext/helpers/TaskListTouchHelper.java | 6 +++--- .../donext/helpers/TaskTouchHelper.java | 6 +++--- .../listeners/RecyclerItemClickListener.java | 4 ++-- .../donext/widgets/DividerItemDecoration.java | 4 ++-- .../widgets/NoScrollingLayoutManager.java | 2 +- .../donext/widgets/NonSwipeableViewPager.java | 2 +- .../main/res/layout-w600dp/fragment_main.xml | 18 ++++++++-------- app/src/main/res/layout/activity_history.xml | 4 ++-- app/src/main/res/layout/activity_main.xml | 6 +++--- app/src/main/res/layout/activity_today.xml | 10 ++++----- app/src/main/res/layout/content_tasklists.xml | 2 +- .../res/layout/fragment_dynamic_dialog.xml | 8 +++---- app/src/main/res/layout/fragment_main.xml | 10 ++++----- app/src/main/res/layout/fragment_tasks.xml | 4 ++-- app/src/main/res/layout/toolbar.xml | 2 +- gradle.properties | 4 +++- 37 files changed, 117 insertions(+), 117 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 51d01d2de8308bc15b3f0f7c41b31c85f9cad0eb..1868e48e4e3df8389ab3d31d1dd2367980482ccb 100644 GIT binary patch delta 53 zcmV-50LuTD1eXMmm;?;NLGzKEcMwRhVoWYmX#{A^lsm6aNV$_E0pk$?8%3JLah3** L8lbk^I~HhoHkK7J delta 53 zcmV-50LuTD1eXMmm;?y=0cnw(cMt(&waLipSro!rnPViU{^ye;0pk%XS6cvfE~+Df Lo_$X@@KpJDT9OwY diff --git a/app/build.gradle b/app/build.gradle index 390b63d..178119f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -31,14 +31,14 @@ sonarqube { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support:design:28.0.0' - implementation 'com.android.support:support-v4:28.0.0' - implementation 'com.android.support:percent:28.0.0' - implementation 'com.android.support:recyclerview-v7:28.0.0' - implementation 'com.android.support:customtabs:28.0.0' + implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'com.google.android.material:material:1.1.0-alpha01' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.percentlayout:percentlayout:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.0.0' + implementation 'androidx.browser:browser:1.0.0' implementation 'net.danlew:android.joda:2.9.7' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2' testImplementation 'junit:junit:4.12' def appCenterSdkVersion = '1.9.0' implementation "com.microsoft.appcenter:appcenter-analytics:${appCenterSdkVersion}" diff --git a/app/src/main/java/com/wismna/geoffroy/donext/activities/MainActivity.java b/app/src/main/java/com/wismna/geoffroy/donext/activities/MainActivity.java index 6a53894..fb4a086 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/activities/MainActivity.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/activities/MainActivity.java @@ -4,9 +4,9 @@ import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.v4.app.FragmentManager; -import android.support.v4.view.ViewPager; -import android.support.v7.app.AppCompatActivity; +import androidx.fragment.app.FragmentManager; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.app.AppCompatActivity; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -22,8 +22,6 @@ import com.wismna.geoffroy.donext.fragments.TaskFormDialogFragment; import com.wismna.geoffroy.donext.fragments.TaskListsDialogFragment; import com.wismna.geoffroy.donext.fragments.TasksFragment; -import java.util.Objects; - /** * Main Activity class */ diff --git a/app/src/main/java/com/wismna/geoffroy/donext/activities/SettingsActivity.java b/app/src/main/java/com/wismna/geoffroy/donext/activities/SettingsActivity.java index 6179088..a75320c 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/activities/SettingsActivity.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/activities/SettingsActivity.java @@ -3,7 +3,7 @@ package com.wismna.geoffroy.donext.activities; import android.os.Bundle; import android.preference.PreferenceFragment; import android.preference.PreferenceManager; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import com.wismna.geoffroy.donext.R; diff --git a/app/src/main/java/com/wismna/geoffroy/donext/activities/TodayActivity.java b/app/src/main/java/com/wismna/geoffroy/donext/activities/TodayActivity.java index 5e194d2..9bf1c7c 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/activities/TodayActivity.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/activities/TodayActivity.java @@ -2,10 +2,10 @@ package com.wismna.geoffroy.donext.activities; import android.os.Build; import android.os.Bundle; -import android.support.design.widget.FloatingActionButton; -import android.support.v4.app.FragmentManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import androidx.fragment.app.FragmentManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/com/wismna/geoffroy/donext/activities/ToolBarActivityBase.java b/app/src/main/java/com/wismna/geoffroy/donext/activities/ToolBarActivityBase.java index aef7de3..bc69ee7 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/activities/ToolBarActivityBase.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/activities/ToolBarActivityBase.java @@ -1,7 +1,7 @@ package com.wismna.geoffroy.donext.activities; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; /** * Created by GBE on 27/12/2017. diff --git a/app/src/main/java/com/wismna/geoffroy/donext/adapters/SectionsPagerAdapter.java b/app/src/main/java/com/wismna/geoffroy/donext/adapters/SectionsPagerAdapter.java index d2f0901..99f7e30 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/adapters/SectionsPagerAdapter.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/adapters/SectionsPagerAdapter.java @@ -1,8 +1,8 @@ package com.wismna.geoffroy.donext.adapters; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; import com.wismna.geoffroy.donext.dao.TaskList; import com.wismna.geoffroy.donext.fragments.TasksFragment; diff --git a/app/src/main/java/com/wismna/geoffroy/donext/adapters/SmartFragmentStatePagerAdapter.java b/app/src/main/java/com/wismna/geoffroy/donext/adapters/SmartFragmentStatePagerAdapter.java index 1bbdde9..0db6b19 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/adapters/SmartFragmentStatePagerAdapter.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/adapters/SmartFragmentStatePagerAdapter.java @@ -1,9 +1,9 @@ package com.wismna.geoffroy.donext.adapters; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; import android.util.SparseArray; import android.view.ViewGroup; diff --git a/app/src/main/java/com/wismna/geoffroy/donext/adapters/TaskListRecyclerViewAdapter.java b/app/src/main/java/com/wismna/geoffroy/donext/adapters/TaskListRecyclerViewAdapter.java index b6229e4..794b092 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/adapters/TaskListRecyclerViewAdapter.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/adapters/TaskListRecyclerViewAdapter.java @@ -1,7 +1,7 @@ package com.wismna.geoffroy.donext.adapters; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; diff --git a/app/src/main/java/com/wismna/geoffroy/donext/adapters/TaskRecyclerViewAdapter.java b/app/src/main/java/com/wismna/geoffroy/donext/adapters/TaskRecyclerViewAdapter.java index b88a1bb..96bdb87 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/adapters/TaskRecyclerViewAdapter.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/adapters/TaskRecyclerViewAdapter.java @@ -2,8 +2,8 @@ package com.wismna.geoffroy.donext.adapters; import android.graphics.Color; import android.graphics.Typeface; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/wismna/geoffroy/donext/adapters/TodayArrayAdapter.java b/app/src/main/java/com/wismna/geoffroy/donext/adapters/TodayArrayAdapter.java index 6de141b..bba09f5 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/adapters/TodayArrayAdapter.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/adapters/TodayArrayAdapter.java @@ -3,8 +3,8 @@ package com.wismna.geoffroy.donext.adapters; import android.content.Context; import android.graphics.Color; import android.graphics.Typeface; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/wismna/geoffroy/donext/dao/Task.java b/app/src/main/java/com/wismna/geoffroy/donext/dao/Task.java index 106ac5c..2cfbc42 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/dao/Task.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/dao/Task.java @@ -1,6 +1,6 @@ package com.wismna.geoffroy.donext.dao; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.joda.time.LocalDate; diff --git a/app/src/main/java/com/wismna/geoffroy/donext/dao/TaskList.java b/app/src/main/java/com/wismna/geoffroy/donext/dao/TaskList.java index 4284515..a38ad2a 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/dao/TaskList.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/dao/TaskList.java @@ -1,6 +1,6 @@ package com.wismna.geoffroy.donext.dao; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /** * Created by geoffroy on 15-11-25. diff --git a/app/src/main/java/com/wismna/geoffroy/donext/fragments/AboutDialogFragment.java b/app/src/main/java/com/wismna/geoffroy/donext/fragments/AboutDialogFragment.java index 852ea27..d326f53 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/fragments/AboutDialogFragment.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/fragments/AboutDialogFragment.java @@ -3,7 +3,7 @@ package com.wismna.geoffroy.donext.fragments; import android.content.res.Resources; import android.os.Build; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/com/wismna/geoffroy/donext/fragments/ConfirmDialogFragment.java b/app/src/main/java/com/wismna/geoffroy/donext/fragments/ConfirmDialogFragment.java index b339e24..b394f9b 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/fragments/ConfirmDialogFragment.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/fragments/ConfirmDialogFragment.java @@ -3,9 +3,9 @@ package com.wismna.geoffroy.donext.fragments; import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.DialogFragment; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.fragment.app.DialogFragment; +import androidx.appcompat.app.AlertDialog; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/wismna/geoffroy/donext/fragments/DynamicDialogFragment.java b/app/src/main/java/com/wismna/geoffroy/donext/fragments/DynamicDialogFragment.java index 69d4ed3..15a3cb2 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/fragments/DynamicDialogFragment.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/fragments/DynamicDialogFragment.java @@ -6,14 +6,14 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; diff --git a/app/src/main/java/com/wismna/geoffroy/donext/fragments/MainFragment.java b/app/src/main/java/com/wismna/geoffroy/donext/fragments/MainFragment.java index 6758bdd..b4c3d3d 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/fragments/MainFragment.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/fragments/MainFragment.java @@ -6,15 +6,15 @@ import android.graphics.Point; import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.constraint.ConstraintLayout; -import android.support.constraint.Guideline; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; -import android.support.v4.view.ViewPager; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.constraintlayout.widget.Guideline; +import com.google.android.material.tabs.TabLayout; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskFormDialogFragment.java b/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskFormDialogFragment.java index 64140a8..c1c1725 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskFormDialogFragment.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskFormDialogFragment.java @@ -2,8 +2,8 @@ package com.wismna.geoffroy.donext.fragments; import android.app.Activity; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; import android.view.View; import android.widget.ArrayAdapter; import android.widget.CheckBox; diff --git a/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskListsDialogFragment.java b/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskListsDialogFragment.java index 57c7700..ea7c388 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskListsDialogFragment.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskListsDialogFragment.java @@ -5,10 +5,10 @@ import android.content.SharedPreferences; import android.os.AsyncTask; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.v4.app.DialogFragment; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.fragment.app.DialogFragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.ItemTouchHelper; import android.view.View; import android.widget.Button; import android.widget.CheckBox; diff --git a/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java b/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java index 069fe3e..ebf2522 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java @@ -6,16 +6,16 @@ import android.content.SharedPreferences; import android.content.res.Resources; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.content.ContextCompat; -import android.support.v4.view.ViewPager; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.annotation.NonNull; +import com.google.android.material.snackbar.Snackbar; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.core.content.ContextCompat; +import androidx.viewpager.widget.ViewPager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.ItemTouchHelper; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/wismna/geoffroy/donext/fragments/TodayFormDialogFragment.java b/app/src/main/java/com/wismna/geoffroy/donext/fragments/TodayFormDialogFragment.java index 14dec8d..fd54006 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/fragments/TodayFormDialogFragment.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/fragments/TodayFormDialogFragment.java @@ -3,7 +3,7 @@ package com.wismna.geoffroy.donext.fragments; import android.content.Context; import android.os.AsyncTask; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.Editable; import android.text.TextWatcher; import android.view.View; diff --git a/app/src/main/java/com/wismna/geoffroy/donext/helpers/TaskListTouchHelper.java b/app/src/main/java/com/wismna/geoffroy/donext/helpers/TaskListTouchHelper.java index 3e7e34d..82e4215 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/helpers/TaskListTouchHelper.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/helpers/TaskListTouchHelper.java @@ -1,9 +1,9 @@ package com.wismna.geoffroy.donext.helpers; import android.graphics.Color; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.ItemTouchHelper; /** * Created by geoffroy on 15-12-30. diff --git a/app/src/main/java/com/wismna/geoffroy/donext/helpers/TaskTouchHelper.java b/app/src/main/java/com/wismna/geoffroy/donext/helpers/TaskTouchHelper.java index f0027bf..50524ea 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/helpers/TaskTouchHelper.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/helpers/TaskTouchHelper.java @@ -4,9 +4,9 @@ import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; import android.graphics.Rect; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.ItemTouchHelper; import android.text.Layout; import android.text.StaticLayout; import android.text.TextPaint; diff --git a/app/src/main/java/com/wismna/geoffroy/donext/listeners/RecyclerItemClickListener.java b/app/src/main/java/com/wismna/geoffroy/donext/listeners/RecyclerItemClickListener.java index 325d996..d6d5942 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/listeners/RecyclerItemClickListener.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/listeners/RecyclerItemClickListener.java @@ -1,8 +1,8 @@ package com.wismna.geoffroy.donext.listeners; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.GestureDetector; import android.view.MotionEvent; import android.view.View; diff --git a/app/src/main/java/com/wismna/geoffroy/donext/widgets/DividerItemDecoration.java b/app/src/main/java/com/wismna/geoffroy/donext/widgets/DividerItemDecoration.java index 93ebc8d..a6a540c 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/widgets/DividerItemDecoration.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/widgets/DividerItemDecoration.java @@ -4,8 +4,8 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; /** diff --git a/app/src/main/java/com/wismna/geoffroy/donext/widgets/NoScrollingLayoutManager.java b/app/src/main/java/com/wismna/geoffroy/donext/widgets/NoScrollingLayoutManager.java index 58af071..74de893 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/widgets/NoScrollingLayoutManager.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/widgets/NoScrollingLayoutManager.java @@ -1,7 +1,7 @@ package com.wismna.geoffroy.donext.widgets; import android.content.Context; -import android.support.v7.widget.LinearLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; /** * Created by geoffroy on 15-12-21. diff --git a/app/src/main/java/com/wismna/geoffroy/donext/widgets/NonSwipeableViewPager.java b/app/src/main/java/com/wismna/geoffroy/donext/widgets/NonSwipeableViewPager.java index 9c4f457..4c4a728 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/widgets/NonSwipeableViewPager.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/widgets/NonSwipeableViewPager.java @@ -1,7 +1,7 @@ package com.wismna.geoffroy.donext.widgets; import android.content.Context; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import android.view.MotionEvent; diff --git a/app/src/main/res/layout-w600dp/fragment_main.xml b/app/src/main/res/layout-w600dp/fragment_main.xml index 6b0c0c6..0e771b6 100644 --- a/app/src/main/res/layout-w600dp/fragment_main.xml +++ b/app/src/main/res/layout-w600dp/fragment_main.xml @@ -1,38 +1,38 @@ - - - + - - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_history.xml b/app/src/main/res/layout/activity_history.xml index 2181eaa..52f2630 100644 --- a/app/src/main/res/layout/activity_history.xml +++ b/app/src/main/res/layout/activity_history.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index b5dc49f..61309b7 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - - + diff --git a/app/src/main/res/layout/activity_today.xml b/app/src/main/res/layout/activity_today.xml index 115202d..cb78dc8 100644 --- a/app/src/main/res/layout/activity_today.xml +++ b/app/src/main/res/layout/activity_today.xml @@ -1,5 +1,5 @@ - - @@ -20,7 +20,7 @@ android:layout_marginBottom="10dp" android:textAlignment="center" android:textSize="24sp"/> - + - - + diff --git a/app/src/main/res/layout/content_tasklists.xml b/app/src/main/res/layout/content_tasklists.xml index ce7fb63..ca3293f 100644 --- a/app/src/main/res/layout/content_tasklists.xml +++ b/app/src/main/res/layout/content_tasklists.xml @@ -32,7 +32,7 @@ style="@style/Widget.AppCompat.Button.Colored" android:text="@string/task_list_new_list_create"/> - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index 49d0641..18e9f4d 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -1,11 +1,11 @@ - - - - + - + diff --git a/app/src/main/res/layout/fragment_tasks.xml b/app/src/main/res/layout/fragment_tasks.xml index f334e8a..a023f80 100644 --- a/app/src/main/res/layout/fragment_tasks.xml +++ b/app/src/main/res/layout/fragment_tasks.xml @@ -24,12 +24,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="start|bottom" - android:layout_marginBottom="30dp" + android:layout_marginBottom="40dp" android:drawableEnd="@drawable/ic_arrow_right_light" android:drawablePadding="10dp" android:gravity="center_vertical" android:visibility="gone"/> - -