From 7ea996a5bb2be0e02e265a58e14baea4d9a932b0 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Fri, 2 Apr 2021 13:31:59 +0530 Subject: [PATCH 01/48] gradle: Upgrade gradle version to 4.1.3 --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 94b22f3c7..502598041 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.2' + classpath 'com.android.tools.build:gradle:4.1.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e33f429c3..203edccb4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Apr 09 18:08:31 IST 2020 +#Fri Apr 02 13:26:19 IST 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip -- GitLab From 2f06bb9a1a38dcfec53b2d3fd7588b77a102dc07 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Fri, 2 Apr 2021 17:30:45 +0530 Subject: [PATCH 02/48] gradle: Bump kotlin version to 1.4.32 Release notes: https://kotlinlang.org/docs/releases.html#release-details --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 502598041..80fc339b6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.30' + ext.kotlin_version = '1.4.32' repositories { google() jcenter() -- GitLab From 6dde17a1c913f710537e5bdb7353dfaba9d018f0 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Fri, 2 Apr 2021 18:00:11 +0530 Subject: [PATCH 03/48] gradle: Drop non-required dataBinding flag --- app/build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index dd817fcb6..318f48d20 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,9 +23,6 @@ android { } } - dataBinding { - enabled = true - } lintOptions { lintConfig file("lint.xml") disable 'MissingTranslation' -- GitLab From 62995acb4b1f52dd887bd119d2b78ad583d88d29 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Mon, 5 Apr 2021 12:39:32 +0530 Subject: [PATCH 04/48] gradle: Enable java 8 language feature support References: - [1]: https://developer.android.com/studio/write/java8-support Signed-off-by: Aayush Gupta --- app/build.gradle | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 318f48d20..c0cb88271 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,7 +37,13 @@ android { aaptOptions{ additionalParameters '-I', 'app/e-ui-sdk.jar' } - + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } } dependencies { -- GitLab From 41ba24bebe65600c96d30efe0b89a66a662542e6 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Mon, 5 Apr 2021 12:42:46 +0530 Subject: [PATCH 05/48] gradle: Enable kotlin annotation processor support References: - [1]: https://kotlinlang.org/docs/kapt.html Signed-off-by: Aayush Gupta --- app/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/app/build.gradle b/app/build.gradle index c0cb88271..7a93cf975 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,6 +3,7 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-kapt' android { compileSdkVersion 28 -- GitLab From b3899c502c645f38f1356efc8194d776245115bb Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Mon, 5 Apr 2021 12:50:18 +0530 Subject: [PATCH 06/48] Apps: Upstream lifecycle dependencies - ViewModelProviders.of() which was part of lifecycle-extensions has been deprecated - Switch to latest version of lifecycle-viewmodel-ktx as dependency and migrate required code to use ViewModelProvider() References: - [1]: https://developer.android.com/jetpack/androidx/releases/lifecycle#declaring_dependencies - [2]: https://twitter.com/ianhlake/status/1159159590476382208 Signed-off-by: Aayush Gupta --- app/build.gradle | 4 ++-- .../java/foundation/e/apps/categories/ApplicationsFragment.kt | 4 ++-- .../main/java/foundation/e/apps/categories/GamesFragment.kt | 4 ++-- .../main/java/foundation/e/apps/categories/PwasFragment.kt | 4 ++-- .../foundation/e/apps/categories/category/CategoryActivity.kt | 4 ++-- app/src/main/java/foundation/e/apps/home/HomeFragment.kt | 4 ++-- app/src/main/java/foundation/e/apps/search/SearchFragment.kt | 4 ++-- .../java/foundation/e/apps/settings/AppRequestActivity.kt | 4 ++-- .../main/java/foundation/e/apps/updates/UpdatesFragment.kt | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7a93cf975..10176775f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,7 +56,6 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:1.1.3' // implementation 'com.android.support:design:27.1.1' implementation 'androidx.recyclerview:recyclerview:1.0.0' - implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0' testImplementation 'junit:junit:4.12' implementation 'org.bouncycastle:bcpg-jdk15on:1.60' @@ -71,7 +70,8 @@ dependencies { implementation "androidx.preference:preference-ktx:1.1.0" - implementation 'androidx.lifecycle:lifecycle-viewmodel:2.0.0' + // Lifecycle + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1" diff --git a/app/src/main/java/foundation/e/apps/categories/ApplicationsFragment.kt b/app/src/main/java/foundation/e/apps/categories/ApplicationsFragment.kt index f351e0ffa..181197a8c 100644 --- a/app/src/main/java/foundation/e/apps/categories/ApplicationsFragment.kt +++ b/app/src/main/java/foundation/e/apps/categories/ApplicationsFragment.kt @@ -25,7 +25,7 @@ import android.view.ViewGroup import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.LinearLayoutManager import foundation.e.apps.R import foundation.e.apps.categories.model.Category @@ -39,7 +39,7 @@ class ApplicationsFragment() : Fragment() { var color:Int = 0; override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { - categoriesViewModel = ViewModelProviders.of(activity!!).get(CategoriesViewModel::class.java) + categoriesViewModel = ViewModelProvider(this).get(CategoriesViewModel::class.java) val view = inflater.inflate(R.layout.fragment_application_categories, container, false) view.categories_list.layoutManager = LinearLayoutManager(context) diff --git a/app/src/main/java/foundation/e/apps/categories/GamesFragment.kt b/app/src/main/java/foundation/e/apps/categories/GamesFragment.kt index ab675a803..ba58ca492 100644 --- a/app/src/main/java/foundation/e/apps/categories/GamesFragment.kt +++ b/app/src/main/java/foundation/e/apps/categories/GamesFragment.kt @@ -25,7 +25,7 @@ import android.view.ViewGroup import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.LinearLayoutManager import foundation.e.apps.R import foundation.e.apps.categories.viewmodel.CategoriesViewModel @@ -38,7 +38,7 @@ class GamesFragment() : Fragment() { var color:Int = 0; override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { - categoriesViewModel = ViewModelProviders.of(activity!!).get(CategoriesViewModel::class.java) + categoriesViewModel = ViewModelProvider(this).get(CategoriesViewModel::class.java) val view = inflater.inflate(R.layout.fragment_games_categories, container, false) view.categories_list.layoutManager = LinearLayoutManager(context) diff --git a/app/src/main/java/foundation/e/apps/categories/PwasFragment.kt b/app/src/main/java/foundation/e/apps/categories/PwasFragment.kt index 260dacd83..12bcf3025 100644 --- a/app/src/main/java/foundation/e/apps/categories/PwasFragment.kt +++ b/app/src/main/java/foundation/e/apps/categories/PwasFragment.kt @@ -7,7 +7,7 @@ import android.view.ViewGroup import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.LinearLayoutManager import foundation.e.apps.R import foundation.e.apps.categories.viewmodel.CategoriesViewModel @@ -18,7 +18,7 @@ class PwasFragment : Fragment() { private lateinit var categoriesViewModel: CategoriesViewModel override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { - categoriesViewModel = ViewModelProviders.of(activity!!).get(CategoriesViewModel::class.java) + categoriesViewModel = ViewModelProvider(this).get(CategoriesViewModel::class.java) val view = inflater.inflate(R.layout.fragment_application_categories, container, false) view.categories_list.layoutManager = LinearLayoutManager(context) diff --git a/app/src/main/java/foundation/e/apps/categories/category/CategoryActivity.kt b/app/src/main/java/foundation/e/apps/categories/category/CategoryActivity.kt index 0de57c59a..1b1edfd6d 100644 --- a/app/src/main/java/foundation/e/apps/categories/category/CategoryActivity.kt +++ b/app/src/main/java/foundation/e/apps/categories/category/CategoryActivity.kt @@ -32,7 +32,7 @@ import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.view.ContextThemeWrapper import androidx.appcompat.widget.Toolbar import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.google.android.material.snackbar.Snackbar @@ -75,7 +75,7 @@ class CategoryActivity : AppCompatActivity(), ApplicationManagerServiceConnectio category = intent.getSerializableExtra(CATEGORY_KEY) as Category supportActionBar?.title = category.getTitle() - categoryViewModel = ViewModelProviders.of(this).get(CategoryViewModel::class.java) + categoryViewModel = ViewModelProvider(this).get(CategoryViewModel::class.java) recyclerView = findViewById(R.id.app_list) val loadMoreContainer = findViewById(R.id.load_more_container) progressBar = findViewById(R.id.progress_bar) diff --git a/app/src/main/java/foundation/e/apps/home/HomeFragment.kt b/app/src/main/java/foundation/e/apps/home/HomeFragment.kt index e9c5a1ce2..73ca1b545 100644 --- a/app/src/main/java/foundation/e/apps/home/HomeFragment.kt +++ b/app/src/main/java/foundation/e/apps/home/HomeFragment.kt @@ -30,7 +30,7 @@ import android.widget.ProgressBar import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.viewpager.widget.ViewPager @@ -70,7 +70,7 @@ class HomeFragment : Fragment() { view.findViewById(R.id.tv_featured).setTextColor(accentColorOS); }*/ - homeViewModel = ViewModelProviders.of(activity!!).get(HomeViewModel::class.java) + homeViewModel = ViewModelProvider(this).get(HomeViewModel::class.java) imageCarousel = view.findViewById(R.id.image_carousel) divider = view.findViewById(R.id.divider) categoryList = view.findViewById(R.id.category_list) diff --git a/app/src/main/java/foundation/e/apps/search/SearchFragment.kt b/app/src/main/java/foundation/e/apps/search/SearchFragment.kt index c880059b2..062db24c0 100644 --- a/app/src/main/java/foundation/e/apps/search/SearchFragment.kt +++ b/app/src/main/java/foundation/e/apps/search/SearchFragment.kt @@ -33,7 +33,7 @@ import androidx.cursoradapter.widget.CursorAdapter import androidx.cursoradapter.widget.SimpleCursorAdapter import androidx.fragment.app.Fragment import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import foundation.e.apps.R @@ -71,7 +71,7 @@ class SearchFragment : Fragment(), SearchView.OnQueryTextListener, SearchView.On val view = inflater.inflate(R.layout.fragment_search, container, false) - searchViewModel = ViewModelProviders.of(activity!!).get(SearchViewModel::class.java) + searchViewModel = ViewModelProvider(this).get(SearchViewModel::class.java) focusView = view.findViewById(R.id.view) searchView = view.findViewById(R.id.search_view) recyclerView = view.findViewById(R.id.app_list) diff --git a/app/src/main/java/foundation/e/apps/settings/AppRequestActivity.kt b/app/src/main/java/foundation/e/apps/settings/AppRequestActivity.kt index c97bef585..3a4085a31 100644 --- a/app/src/main/java/foundation/e/apps/settings/AppRequestActivity.kt +++ b/app/src/main/java/foundation/e/apps/settings/AppRequestActivity.kt @@ -25,7 +25,7 @@ import android.view.View import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.Toolbar import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProvider import foundation.e.apps.R import foundation.e.apps.settings.viewmodel.AppRequestViewModel import foundation.e.apps.utils.Error @@ -43,7 +43,7 @@ class AppRequestActivity : AppCompatActivity(), TextWatcher { setSupportActionBar(toolbar) supportActionBar?.setDisplayHomeAsUpEnabled(true) - viewModel = ViewModelProviders.of(this).get(AppRequestViewModel::class.java) + viewModel = ViewModelProvider(this).get(AppRequestViewModel::class.java) progress_bar.visibility = View.GONE app_request_error_text_view.visibility = View.GONE package_name_edit_text.addTextChangedListener(this) diff --git a/app/src/main/java/foundation/e/apps/updates/UpdatesFragment.kt b/app/src/main/java/foundation/e/apps/updates/UpdatesFragment.kt index e202493ff..458d44f1b 100644 --- a/app/src/main/java/foundation/e/apps/updates/UpdatesFragment.kt +++ b/app/src/main/java/foundation/e/apps/updates/UpdatesFragment.kt @@ -31,7 +31,7 @@ import android.widget.ProgressBar import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import foundation.e.apps.R @@ -64,7 +64,7 @@ class UpdatesFragment() : Fragment() { val view = inflater.inflate(R.layout.fragment_updates, container, false) - updatesViewModel = ViewModelProviders.of(activity!!).get(UpdatesViewModel::class.java) + updatesViewModel = ViewModelProvider(this).get(UpdatesViewModel::class.java) recyclerView = view.findViewById(R.id.app_list) progressBar2 = view.findViewById(R.id.progress_bar2) val updateAll = view.findViewById