From e7ddddb426da961507665a381791c1ae94071a72 Mon Sep 17 00:00:00 2001 From: Prerak Mann Date: Sat, 26 Dec 2020 11:51:39 +0530 Subject: [PATCH] Migrate to androidx, upgdate dependencies --- .idea/caches/build_file_checksums.ser | Bin 533 -> 540 bytes .idea/compiler.xml | 6 +++ .idea/gradle.xml | 3 ++ .idea/jarRepositories.xml | 45 ++++++++++++++++++ .idea/misc.xml | 2 +- app/build.gradle | 26 +++++----- .../activitydo/ExampleInstrumentedTest.java | 4 +- app/src/main/AndroidManifest.xml | 2 +- .../pkmnapps/activitydo/ActivityChoser.java | 17 +++---- .../com/pkmnapps/activitydo/HomeFragment.java | 13 +++-- .../activitydo/ImageViewFullscreen.java | 11 ++--- .../com/pkmnapps/activitydo/ListActivity.java | 14 +++--- .../com/pkmnapps/activitydo/MainActivity.java | 20 ++++---- .../com/pkmnapps/activitydo/NoteActivity.java | 12 ++--- .../activitydo/QuickNotesFragment.java | 18 +++---- .../com/pkmnapps/activitydo/TabFragment.java | 11 ++--- .../com/pkmnapps/activitydo/TaskActivity.java | 26 ++++------ .../activitydo/adapters/ActivityAdapter.java | 5 +- .../adapters/ActivityContentAdapter.java | 8 ++-- .../adapters/ColorThemeAdapter.java | 4 +- .../adapters/InViewListAdapter.java | 7 +-- .../activitydo/adapters/ListAdapter.java | 13 ++--- .../adapters/SimpleActivityAdapter.java | 12 ++--- app/src/main/res/layout/activity_choser.xml | 10 ++-- app/src/main/res/layout/activity_list.xml | 10 ++-- app/src/main/res/layout/activity_main.xml | 6 +-- app/src/main/res/layout/activity_note.xml | 10 ++-- app/src/main/res/layout/activity_task.xml | 10 ++-- app/src/main/res/layout/app_bar_main.xml | 10 ++-- .../res/layout/content_activity_choser.xml | 6 +-- app/src/main/res/layout/content_list.xml | 6 +-- app/src/main/res/layout/content_task.xml | 2 +- app/src/main/res/layout/fragment_home.xml | 2 +- .../main/res/layout/fragment_quick_notes.xml | 2 +- app/src/main/res/layout/fragment_tab.xml | 4 +- app/src/main/res/layout/image_widget_view.xml | 4 +- .../main/res/layout/new_activity_alertbox.xml | 2 +- .../res/layout/recycler_activity_layout.xml | 4 +- .../res/layout/recycler_list_in_task_view.xml | 10 ++-- app/src/main/res/layout/simple_note_view.xml | 8 ++-- app/src/main/res/values-v21/styles.xml | 2 +- app/src/main/res/values/styles.xml | 2 +- build.gradle | 2 +- gradle.properties | 2 + gradle/wrapper/gradle-wrapper.properties | 4 +- 45 files changed, 205 insertions(+), 192 deletions(-) create mode 100644 .idea/compiler.xml create mode 100644 .idea/jarRepositories.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 5a12e3b9cbefb418591b0f59ea6b9f0d1e816c4e..fa3a2f7660a85cf85bec708a64dfa09d38414bd4 100644 GIT binary patch delta 125 zcmV-@0D}LO1e^qrmj!m6vPp}PoQMGolkNc)5I@N`bwjIbHQh_u?c3`&?vsoG9U~^D zLj!+P$k)Xp-qAcrU*U8BD=$@ZWpZ;baB^jGVQXz+Zj&wnH)H8Mw3ec9T1@)JGsEn5lzGO8y#>Pp81o&0Ui(# oyLM2|?J4*;szAYT@?tNO?g1SU9jBho + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 7ac24c7..9bba60d 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,8 +1,10 @@ + diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..70916f2 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index c0f68ed..cc51e58 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -25,7 +25,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index c281b4a..d7ad4e6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,14 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 + compileSdkVersion 30 defaultConfig { applicationId "com.pkmnapps.activitydo" minSdkVersion 19 - targetSdkVersion 27 + targetSdkVersion 30 versionCode 3 versionName "2.1" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' multiDexEnabled true } @@ -22,16 +22,16 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support:design:27.1.1' - implementation 'com.android.support.constraint:constraint-layout:1.1.0' - implementation 'com.android.support:support-v4:27.1.1' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'com.google.android.material:material:1.2.1' + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' - implementation 'com.android.support:recyclerview-v7:27.1.1' - implementation 'com.android.support:cardview-v7:27.1.1' + implementation 'androidx.recyclerview:recyclerview:1.1.0' + implementation 'androidx.cardview:cardview:1.0.0' implementation 'com.flipboard:bottomsheet-core:1.5.3' implementation 'com.flipboard:bottomsheet-commons:1.5.3' @@ -41,9 +41,9 @@ dependencies { implementation 'com.github.chrisbanes:PhotoView:2.0.0' - implementation 'com.android.support:multidex:1.0.3' + implementation 'androidx.multidex:multidex:2.0.1' - implementation 'com.google.firebase:firebase-core:16.0.0' + implementation 'com.google.firebase:firebase-core:18.0.0' } diff --git a/app/src/androidTest/java/com/pkmnapps/activitydo/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/pkmnapps/activitydo/ExampleInstrumentedTest.java index 1c2cc31..dc70ac8 100644 --- a/app/src/androidTest/java/com/pkmnapps/activitydo/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/pkmnapps/activitydo/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package com.pkmnapps.activitydo; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2da8a7e..b55b584 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,7 +17,7 @@ android:supportsRtl="true" android:theme="@style/AppTheme"> diff --git a/app/src/main/java/com/pkmnapps/activitydo/ActivityChoser.java b/app/src/main/java/com/pkmnapps/activitydo/ActivityChoser.java index 4c216ae..31c00bf 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/ActivityChoser.java +++ b/app/src/main/java/com/pkmnapps/activitydo/ActivityChoser.java @@ -1,17 +1,14 @@ package com.pkmnapps.activitydo; import android.os.Bundle; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; -import android.util.Log; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; + import android.view.MenuItem; -import android.view.MotionEvent; -import android.view.View; import android.widget.Toast; import com.pkmnapps.activitydo.adapters.SimpleActivityAdapter; diff --git a/app/src/main/java/com/pkmnapps/activitydo/HomeFragment.java b/app/src/main/java/com/pkmnapps/activitydo/HomeFragment.java index 7b6f4b8..d20cb9f 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/HomeFragment.java +++ b/app/src/main/java/com/pkmnapps/activitydo/HomeFragment.java @@ -7,18 +7,17 @@ import android.graphics.Color; import android.net.Uri; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; -import android.util.Log; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.DefaultItemAnimator; +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; import android.widget.Button; import android.widget.EditText; -import android.widget.ListView; import com.pkmnapps.activitydo.adapters.ActivityAdapter; diff --git a/app/src/main/java/com/pkmnapps/activitydo/ImageViewFullscreen.java b/app/src/main/java/com/pkmnapps/activitydo/ImageViewFullscreen.java index b915fd1..c459698 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/ImageViewFullscreen.java +++ b/app/src/main/java/com/pkmnapps/activitydo/ImageViewFullscreen.java @@ -1,21 +1,16 @@ package com.pkmnapps.activitydo; import android.annotation.SuppressLint; -import android.content.Intent; import android.net.Uri; import android.os.Bundle; import android.os.Handler; -import android.support.v4.content.FileProvider; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; + +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; -import android.widget.ImageButton; import com.bumptech.glide.Glide; import com.github.chrisbanes.photoview.PhotoView; -import com.pkmnapps.activitydo.contentproviders.ImageProvider; - -import java.io.File; /** * An example full-screen activity that shows and hides the system UI (i.e. diff --git a/app/src/main/java/com/pkmnapps/activitydo/ListActivity.java b/app/src/main/java/com/pkmnapps/activitydo/ListActivity.java index a65a786..0c0e3a8 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/ListActivity.java +++ b/app/src/main/java/com/pkmnapps/activitydo/ListActivity.java @@ -3,18 +3,17 @@ import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; -import android.util.Log; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; + import android.view.KeyEvent; import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.WindowManager; -import android.view.inputmethod.EditorInfo; import android.widget.EditText; import android.widget.TextView; @@ -24,7 +23,6 @@ import com.pkmnapps.activitydo.databasehelpers.DBHelperList; import com.pkmnapps.activitydo.databasehelpers.DBHelperListItems; import com.pkmnapps.activitydo.dataclasses.ListItem; -import com.pkmnapps.activitydo.dataclasses.ListWidget; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/pkmnapps/activitydo/MainActivity.java b/app/src/main/java/com/pkmnapps/activitydo/MainActivity.java index d8f7c87..0f5a994 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/MainActivity.java +++ b/app/src/main/java/com/pkmnapps/activitydo/MainActivity.java @@ -1,21 +1,18 @@ package com.pkmnapps.activitydo; import android.content.Intent; -import android.graphics.Color; -import android.graphics.ColorFilter; -import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Bundle; import android.os.Environment; -import android.support.design.widget.NavigationView; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; -import android.support.v4.view.GravityCompat; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBarDrawerToggle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import com.google.android.material.navigation.NavigationView; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; +import androidx.core.view.GravityCompat; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; import android.view.SubMenu; @@ -29,7 +26,6 @@ import com.pkmnapps.activitydo.dataclasses.ActivityData; import java.io.File; -import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.InputStream; import java.io.OutputStream; diff --git a/app/src/main/java/com/pkmnapps/activitydo/NoteActivity.java b/app/src/main/java/com/pkmnapps/activitydo/NoteActivity.java index 89d0473..d6acace 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/NoteActivity.java +++ b/app/src/main/java/com/pkmnapps/activitydo/NoteActivity.java @@ -3,20 +3,16 @@ import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import android.os.PersistableBundle; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; -import android.util.Log; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; + import android.view.Menu; import android.view.MenuItem; -import android.view.View; import android.widget.EditText; import com.google.firebase.analytics.FirebaseAnalytics; import com.pkmnapps.activitydo.databasehelpers.DBHelperText; -import com.pkmnapps.activitydo.dataclasses.SimpleTextWidget; public class NoteActivity extends AppCompatActivity { String uid,head,body; diff --git a/app/src/main/java/com/pkmnapps/activitydo/QuickNotesFragment.java b/app/src/main/java/com/pkmnapps/activitydo/QuickNotesFragment.java index 0d63aff..27d6b1e 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/QuickNotesFragment.java +++ b/app/src/main/java/com/pkmnapps/activitydo/QuickNotesFragment.java @@ -11,15 +11,15 @@ import android.os.Bundle; import android.os.Environment; import android.provider.MediaStore; -import android.support.annotation.Nullable; -import android.support.v4.app.ActivityCompat; -import android.support.v4.app.Fragment; -import android.support.v4.content.FileProvider; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.annotation.Nullable; +import androidx.core.app.ActivityCompat; +import androidx.fragment.app.Fragment; +import androidx.core.content.FileProvider; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; +import androidx.recyclerview.widget.ItemTouchHelper; import android.util.Log; import android.view.LayoutInflater; import android.view.MenuItem; diff --git a/app/src/main/java/com/pkmnapps/activitydo/TabFragment.java b/app/src/main/java/com/pkmnapps/activitydo/TabFragment.java index 4fe9176..0ff4bea 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/TabFragment.java +++ b/app/src/main/java/com/pkmnapps/activitydo/TabFragment.java @@ -3,15 +3,14 @@ import android.content.Context; import android.net.Uri; 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 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 android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.Adapter; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/pkmnapps/activitydo/TaskActivity.java b/app/src/main/java/com/pkmnapps/activitydo/TaskActivity.java index 2629d91..29170f8 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/TaskActivity.java +++ b/app/src/main/java/com/pkmnapps/activitydo/TaskActivity.java @@ -7,29 +7,25 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; -import android.graphics.Rect; import android.net.Uri; import android.os.Bundle; import android.os.Environment; import android.provider.MediaStore; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.FileProvider; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.ActivityCompat; +import androidx.core.content.FileProvider; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; +import androidx.recyclerview.widget.ItemTouchHelper; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; -import android.view.MotionEvent; import android.view.View; -import android.widget.Button; -import android.widget.EditText; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.TextView; @@ -42,10 +38,8 @@ import com.google.firebase.analytics.FirebaseAnalytics; import com.pkmnapps.activitydo.adapters.ActivityContentAdapter; import com.pkmnapps.activitydo.custominterfaces.TaskActivityInterface; -import com.pkmnapps.activitydo.databasehelpers.DBHelper; import com.pkmnapps.activitydo.databasehelpers.DBHelperImage; import com.pkmnapps.activitydo.databasehelpers.DBHelperList; -import com.pkmnapps.activitydo.databasehelpers.DBHelperListItems; import com.pkmnapps.activitydo.databasehelpers.DBHelperText; import com.pkmnapps.activitydo.databasehelpers.DBHelperWidgets; import com.pkmnapps.activitydo.dataclasses.ActivityData; diff --git a/app/src/main/java/com/pkmnapps/activitydo/adapters/ActivityAdapter.java b/app/src/main/java/com/pkmnapps/activitydo/adapters/ActivityAdapter.java index f920fb2..d61b49c 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/adapters/ActivityAdapter.java +++ b/app/src/main/java/com/pkmnapps/activitydo/adapters/ActivityAdapter.java @@ -2,12 +2,11 @@ import android.content.Intent; -import android.content.res.ColorStateList; import android.graphics.Color; import android.graphics.PorterDuff; import android.os.Bundle; -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.MenuItem; import android.view.View; diff --git a/app/src/main/java/com/pkmnapps/activitydo/adapters/ActivityContentAdapter.java b/app/src/main/java/com/pkmnapps/activitydo/adapters/ActivityContentAdapter.java index d865811..d94328a 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/adapters/ActivityContentAdapter.java +++ b/app/src/main/java/com/pkmnapps/activitydo/adapters/ActivityContentAdapter.java @@ -2,10 +2,10 @@ import android.content.Intent; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/com/pkmnapps/activitydo/adapters/ColorThemeAdapter.java b/app/src/main/java/com/pkmnapps/activitydo/adapters/ColorThemeAdapter.java index 20f4ee5..9b9c493 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/adapters/ColorThemeAdapter.java +++ b/app/src/main/java/com/pkmnapps/activitydo/adapters/ColorThemeAdapter.java @@ -1,8 +1,8 @@ package com.pkmnapps.activitydo.adapters; import android.graphics.Color; -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/pkmnapps/activitydo/adapters/InViewListAdapter.java b/app/src/main/java/com/pkmnapps/activitydo/adapters/InViewListAdapter.java index 31c5a21..b2cbff6 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/adapters/InViewListAdapter.java +++ b/app/src/main/java/com/pkmnapps/activitydo/adapters/InViewListAdapter.java @@ -1,17 +1,14 @@ package com.pkmnapps.activitydo.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.View; import android.view.ViewGroup; import android.widget.CheckBox; -import android.widget.EditText; -import android.widget.ImageButton; import android.widget.TextView; import com.pkmnapps.activitydo.R; -import com.pkmnapps.activitydo.custominterfaces.ListActivityInterface; import com.pkmnapps.activitydo.dataclasses.ListItem; import java.util.List; diff --git a/app/src/main/java/com/pkmnapps/activitydo/adapters/ListAdapter.java b/app/src/main/java/com/pkmnapps/activitydo/adapters/ListAdapter.java index 93c9deb..619df73 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/adapters/ListAdapter.java +++ b/app/src/main/java/com/pkmnapps/activitydo/adapters/ListAdapter.java @@ -1,25 +1,18 @@ package com.pkmnapps.activitydo.adapters; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; -import android.text.Editable; -import android.text.TextWatcher; -import android.util.Log; -import android.view.KeyEvent; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.view.inputmethod.EditorInfo; -import android.widget.Button; import android.widget.CheckBox; import android.widget.EditText; import android.widget.ImageButton; -import android.widget.TextView; import com.pkmnapps.activitydo.R; import com.pkmnapps.activitydo.custominterfaces.ListActivityInterface; -import com.pkmnapps.activitydo.databasehelpers.DBHelperList; import com.pkmnapps.activitydo.databasehelpers.DBHelperListItems; import com.pkmnapps.activitydo.dataclasses.ListItem; diff --git a/app/src/main/java/com/pkmnapps/activitydo/adapters/SimpleActivityAdapter.java b/app/src/main/java/com/pkmnapps/activitydo/adapters/SimpleActivityAdapter.java index 3e32a66..c5e81d2 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/adapters/SimpleActivityAdapter.java +++ b/app/src/main/java/com/pkmnapps/activitydo/adapters/SimpleActivityAdapter.java @@ -1,26 +1,20 @@ package com.pkmnapps.activitydo.adapters; -import android.content.Intent; import android.graphics.Color; import android.graphics.PorterDuff; -import android.os.Bundle; -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.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.CheckBox; import android.widget.ImageButton; import android.widget.ImageView; -import android.widget.PopupMenu; import android.widget.TextView; import com.pkmnapps.activitydo.R; -import com.pkmnapps.activitydo.TaskActivity; import com.pkmnapps.activitydo.custominterfaces.ChangeActivityInterface; -import com.pkmnapps.activitydo.custominterfaces.HomeFragInterace; -import com.pkmnapps.activitydo.databasehelpers.DBHelper; import com.pkmnapps.activitydo.dataclasses.ActivityData; import java.util.List; diff --git a/app/src/main/res/layout/activity_choser.xml b/app/src/main/res/layout/activity_choser.xml index c06557f..186c2f4 100644 --- a/app/src/main/res/layout/activity_choser.xml +++ b/app/src/main/res/layout/activity_choser.xml @@ -1,25 +1,25 @@ - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml index 16212f4..e6abd37 100644 --- a/app/src/main/res/layout/activity_list.xml +++ b/app/src/main/res/layout/activity_list.xml @@ -1,24 +1,24 @@ - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index a61d8a6..8e69e22 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_note.xml b/app/src/main/res/layout/activity_note.xml index da0eacf..125b5d7 100644 --- a/app/src/main/res/layout/activity_note.xml +++ b/app/src/main/res/layout/activity_note.xml @@ -1,25 +1,25 @@ - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_task.xml b/app/src/main/res/layout/activity_task.xml index 1640009..88cd382 100644 --- a/app/src/main/res/layout/activity_task.xml +++ b/app/src/main/res/layout/activity_task.xml @@ -1,25 +1,25 @@ - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml index 1b78829..9c96440 100644 --- a/app/src/main/res/layout/app_bar_main.xml +++ b/app/src/main/res/layout/app_bar_main.xml @@ -1,25 +1,25 @@ - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/content_activity_choser.xml b/app/src/main/res/layout/content_activity_choser.xml index 874887b..844263d 100644 --- a/app/src/main/res/layout/content_activity_choser.xml +++ b/app/src/main/res/layout/content_activity_choser.xml @@ -1,5 +1,5 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/content_list.xml b/app/src/main/res/layout/content_list.xml index e080d73..4e71779 100644 --- a/app/src/main/res/layout/content_list.xml +++ b/app/src/main/res/layout/content_list.xml @@ -1,5 +1,5 @@ - @@ -24,7 +24,7 @@ android:padding="10dp" android:textStyle="bold" /> - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/content_task.xml b/app/src/main/res/layout/content_task.xml index 95b215b..b5910b7 100644 --- a/app/src/main/res/layout/content_task.xml +++ b/app/src/main/res/layout/content_task.xml @@ -16,7 +16,7 @@ tools:showIn="@layout/activity_task" android:paddingTop="?attr/actionBarSize"> - - - - - diff --git a/app/src/main/res/layout/image_widget_view.xml b/app/src/main/res/layout/image_widget_view.xml index b10242d..d2cd79a 100644 --- a/app/src/main/res/layout/image_widget_view.xml +++ b/app/src/main/res/layout/image_widget_view.xml @@ -1,6 +1,6 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/new_activity_alertbox.xml b/app/src/main/res/layout/new_activity_alertbox.xml index 4b0f9eb..832c606 100644 --- a/app/src/main/res/layout/new_activity_alertbox.xml +++ b/app/src/main/res/layout/new_activity_alertbox.xml @@ -31,7 +31,7 @@ android:textColor="@color/colorTextAddBox" android:layout_height="wrap_content" /> - - + diff --git a/app/src/main/res/layout/recycler_list_in_task_view.xml b/app/src/main/res/layout/recycler_list_in_task_view.xml index 0f347fb..613faec 100644 --- a/app/src/main/res/layout/recycler_list_in_task_view.xml +++ b/app/src/main/res/layout/recycler_list_in_task_view.xml @@ -1,6 +1,6 @@ - - @@ -45,7 +45,7 @@ card_view:layout_constraintTop_toTopOf="parent" /> - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/simple_note_view.xml b/app/src/main/res/layout/simple_note_view.xml index 7fef491..a916017 100644 --- a/app/src/main/res/layout/simple_note_view.xml +++ b/app/src/main/res/layout/simple_note_view.xml @@ -1,6 +1,6 @@ - - @@ -58,5 +58,5 @@ card_view:layout_constraintEnd_toEndOf="parent" card_view:layout_constraintStart_toStartOf="@+id/head_textView" card_view:layout_constraintTop_toBottomOf="@+id/head_textView" /> - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml index d2b79dc..0a33c98 100644 --- a/app/src/main/res/values-v21/styles.xml +++ b/app/src/main/res/values-v21/styles.xml @@ -1,7 +1,7 @@ diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 196bb20..e8e4748 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -9,7 +9,7 @@ diff --git a/build.gradle b/build.gradle index 4c36de9..f7db4de 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:4.1.0' classpath 'com.google.gms:google-services:4.0.0' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle.properties b/gradle.properties index 743d692..8de5058 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,6 +6,8 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d08ee79..e950271 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat May 19 13:15:29 IST 2018 +#Sat Dec 26 11:38:12 IST 2020 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-6.5-all.zip