diff --git a/build.gradle b/build.gradle index 5a4edaa7e..3243739b4 100644 --- a/build.gradle +++ b/build.gradle @@ -30,9 +30,9 @@ plugins { ext { android_build_tools_version = "30.0.2" - android_compile_sdk_version = 31 + android_compile_sdk_version = 33 android_min_sdk_version = 24 - android_target_sdk_version = 31 + android_target_sdk_version = 33 // Required for some dependencies only available from our private S3 // diff --git a/simplified-cardcreator/src/main/java/org/nypl/simplified/cardcreator/ui/LocationFragment.kt b/simplified-cardcreator/src/main/java/org/nypl/simplified/cardcreator/ui/LocationFragment.kt index 04fa02db2..317974850 100644 --- a/simplified-cardcreator/src/main/java/org/nypl/simplified/cardcreator/ui/LocationFragment.kt +++ b/simplified-cardcreator/src/main/java/org/nypl/simplified/cardcreator/ui/LocationFragment.kt @@ -107,7 +107,7 @@ class LocationFragment : Fragment(), LocationListener { if (isNewYork || locationMock != null) { locationMock?.let { location -> activityModel.userLocationAddress = - geocoder.getFromLocation(location.latitude, location.longitude, 1)[0] + geocoder.getFromLocation(location.latitude, location.longitude, 1)?.get(0) } logger.debug("User navigated to the next screen") @@ -230,7 +230,7 @@ class LocationFragment : Fragment(), LocationListener { try { if (location != null) { - address = geocoder.getFromLocation(location.latitude, location.longitude, maxResults)[0] + address = geocoder.getFromLocation(location.latitude, location.longitude, maxResults)!![0] logger.debug("Region is: ${address.adminArea} ${address.countryCode} ") binding.regionEt.setText("${address.adminArea} ${address.countryCode}", TextView.BufferType.EDITABLE) @@ -292,7 +292,7 @@ class LocationFragment : Fragment(), LocationListener { val address: Address? try { - address = geocoder.getFromLocation(location.latitude, location.longitude, maxResults)[0] + address = geocoder.getFromLocation(location.latitude, location.longitude, maxResults)!![0] logger.debug("Region is: ${address.adminArea} ${address.countryCode} ") binding.regionEt.setText("${address.adminArea} ${address.countryCode}", TextView.BufferType.EDITABLE) diff --git a/simplified-ui-accounts/src/main/java/org/nypl/simplified/ui/accounts/AccountListRegistryFragment.kt b/simplified-ui-accounts/src/main/java/org/nypl/simplified/ui/accounts/AccountListRegistryFragment.kt index 75b169309..9196840a4 100644 --- a/simplified-ui-accounts/src/main/java/org/nypl/simplified/ui/accounts/AccountListRegistryFragment.kt +++ b/simplified-ui-accounts/src/main/java/org/nypl/simplified/ui/accounts/AccountListRegistryFragment.kt @@ -192,12 +192,12 @@ class AccountListRegistryFragment : Fragment(R.layout.account_list_registry) { }) search.setOnActionExpandListener(object : OnActionExpandListener { - override fun onMenuItemActionExpand(item: MenuItem?): Boolean { + override fun onMenuItemActionExpand(item: MenuItem): Boolean { // Do nothing return true } - override fun onMenuItemActionCollapse(item: MenuItem?): Boolean { + override fun onMenuItemActionCollapse(item: MenuItem): Boolean { this@AccountListRegistryFragment.accountListAdapter.resetFilter() return true } diff --git a/simplified-ui-errorpage/src/main/java/org/nypl/simplified/ui/errorpage/ErrorPageFragment.kt b/simplified-ui-errorpage/src/main/java/org/nypl/simplified/ui/errorpage/ErrorPageFragment.kt index 0a11cdaa6..b3baeb18b 100644 --- a/simplified-ui-errorpage/src/main/java/org/nypl/simplified/ui/errorpage/ErrorPageFragment.kt +++ b/simplified-ui-errorpage/src/main/java/org/nypl/simplified/ui/errorpage/ErrorPageFragment.kt @@ -6,14 +6,12 @@ import android.text.Spannable import android.text.SpannableStringBuilder import android.text.style.StyleSpan import android.view.View -import android.widget.Button import android.widget.TextView import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.SimpleItemAnimator import org.nypl.simplified.android.ktx.supportActionBar -import org.nypl.simplified.reports.Reports import org.slf4j.LoggerFactory /** @@ -49,7 +47,6 @@ class ErrorPageFragment : Fragment(R.layout.error_page) { private lateinit var errorDetails: TextView private lateinit var errorStepsList: RecyclerView private lateinit var parameters: ErrorPageParameters - private lateinit var sendButton: Button override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) @@ -58,8 +55,6 @@ class ErrorPageFragment : Fragment(R.layout.error_page) { view.findViewById(R.id.errorDetails) this.errorStepsList = view.findViewById(R.id.errorSteps) - this.sendButton = - view.findViewById(R.id.errorSendButton) this.parameters = this.arguments!!.getSerializable(PARAMETERS_ID) @@ -97,18 +92,6 @@ class ErrorPageFragment : Fragment(R.layout.error_page) { override fun onStart() { super.onStart() this.configureToolbar() - - this.sendButton.isEnabled = true - this.sendButton.setOnClickListener { - this.sendButton.isEnabled = false - - Reports.sendReportsDefault( - context = requireContext(), - address = parameters.emailAddress, - subject = parameters.subject, - body = parameters.report - ) - } } private fun configureToolbar() { diff --git a/simplified-ui-errorpage/src/main/res/layout/error_page.xml b/simplified-ui-errorpage/src/main/res/layout/error_page.xml index c032dd537..7c3651b16 100644 --- a/simplified-ui-errorpage/src/main/res/layout/error_page.xml +++ b/simplified-ui-errorpage/src/main/res/layout/error_page.xml @@ -53,14 +53,14 @@ -