diff --git a/build.gradle.kts b/build.gradle.kts index f4e6ca3..4394ff2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ buildscript { mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:7.3.1") + classpath("com.android.tools.build:gradle:7.4.2") // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -12,8 +12,8 @@ buildscript { } plugins { - id("com.android.application") version "7.3.1" apply false - id("com.android.library") version "7.3.1" apply false + id("com.android.application") version "7.4.2" apply false + id("com.android.library") version "7.4.2" apply false id("org.jetbrains.kotlin.android") version "1.7.0" apply false } diff --git a/library/build.gradle.kts b/library/build.gradle.kts index 04606c9..8ece8ad 100644 --- a/library/build.gradle.kts +++ b/library/build.gradle.kts @@ -24,7 +24,7 @@ publishing { } android { - namespace = "${group}.${artifact}" + namespace = "$group.$artifact" compileSdk = 33 buildToolsVersion = "33.0.0" @@ -35,7 +35,6 @@ android { minCompileSdk = 21 } - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } @@ -77,5 +76,5 @@ android { dependencies { // Necessary for the Activity (well to make it pretty :D) - implementation("com.google.android.material:material:1.6.1") -} \ No newline at end of file + implementation("com.google.android.material:material:1.8.0") +} diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index 89506de..f2bc7ab 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -20,7 +20,10 @@ android { buildTypes { release { isMinifyEnabled = true - proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) } } @@ -31,7 +34,7 @@ android { kotlinOptions { jvmTarget = "11" } - + buildFeatures { viewBinding = true } @@ -40,13 +43,13 @@ android { dependencies { implementation(project(":library")) - + // Material Design - implementation("com.google.android.material:material:1.6.1") + implementation("com.google.android.material:material:1.8.0") // Navigation because I don't want to maintain basic transactions and shit - implementation("androidx.navigation:navigation-fragment-ktx:2.5.1") + implementation("androidx.navigation:navigation-fragment-ktx:2.5.3") // preferences implementation("androidx.preference:preference-ktx:1.2.0") -} \ No newline at end of file +} diff --git a/sample/src/main/java/com/dzeio/crashhandlertest/Application.kt b/sample/src/main/java/com/dzeio/crashhandlertest/Application.kt index b6fa90f..68141e6 100644 --- a/sample/src/main/java/com/dzeio/crashhandlertest/Application.kt +++ b/sample/src/main/java/com/dzeio/crashhandlertest/Application.kt @@ -19,8 +19,4 @@ class Application : android.app.Application() { .withSuffix("WHYYYYY") .build().setup() } - - companion object { - const val TAG = "CrashHandlerTest" - } -} \ No newline at end of file +} diff --git a/sample/src/main/java/com/dzeio/crashhandlertest/ui/ErrorActivity.kt b/sample/src/main/java/com/dzeio/crashhandlertest/ui/ErrorActivity.kt index 731000a..cba8c05 100644 --- a/sample/src/main/java/com/dzeio/crashhandlertest/ui/ErrorActivity.kt +++ b/sample/src/main/java/com/dzeio/crashhandlertest/ui/ErrorActivity.kt @@ -9,16 +9,11 @@ import android.os.Process import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.core.view.WindowCompat -import com.dzeio.crashhandlertest.Application import com.dzeio.crashhandlertest.databinding.ActivityErrorBinding import kotlin.system.exitProcess class ErrorActivity : AppCompatActivity() { - companion object { - const val TAG = "${Application.TAG}/ErrorActivity" - } - private lateinit var binding: ActivityErrorBinding override fun onCreate(savedInstanceState: Bundle?) { @@ -31,7 +26,12 @@ class ErrorActivity : AppCompatActivity() { val data = intent.getStringExtra("error") // Get Application datas - val deviceToReport = if (Build.DEVICE.contains(Build.MANUFACTURER)) Build.DEVICE else "${Build.MANUFACTURER} ${Build.DEVICE}" + val deviceToReport = + if (Build.DEVICE.contains(Build.MANUFACTURER)) { + Build.DEVICE + } else { + "${Build.MANUFACTURER} ${Build.DEVICE}" + } val reportText = """ Crash Report (Thread: ${intent?.getLongExtra("threadId", -1) ?: "unknown"}) @@ -52,11 +52,9 @@ class ErrorActivity : AppCompatActivity() { // Handle the Email Button binding.errorSubmitEmail.setOnClickListener { - // Create Intent val intent = Intent(Intent.ACTION_SEND) - intent.data = Uri.parse("mailto:") - intent.type = "text/plain" + intent.setDataAndType(Uri.parse("mailto:"), "text/plain") intent.putExtra(Intent.EXTRA_EMAIL, arrayOf("report.openhealth@dzeio.com")) intent.putExtra(Intent.EXTRA_SUBJECT, "Error report for application crash") intent.putExtra(Intent.EXTRA_TEXT, "Send Report Email\n$reportText") @@ -70,7 +68,6 @@ class ErrorActivity : AppCompatActivity() { // Handle the GitHub Button binding.errorSubmitGithub.setOnClickListener { - // Build URL val url = "https://github.com/dzeiocom/OpenHealth/issues/new?title=Application Error&body=$reportText" diff --git a/sample/src/main/java/com/dzeio/crashhandlertest/ui/MainFragment.kt b/sample/src/main/java/com/dzeio/crashhandlertest/ui/MainFragment.kt index a2b5b39..ac7fef3 100644 --- a/sample/src/main/java/com/dzeio/crashhandlertest/ui/MainFragment.kt +++ b/sample/src/main/java/com/dzeio/crashhandlertest/ui/MainFragment.kt @@ -19,13 +19,12 @@ class MainFragment : Fragment() { private val binding get() = _binding!! override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, + inflater: LayoutInflater, + container: ViewGroup?, savedInstanceState: Bundle? - ): View? { - + ): View { _binding = FragmentMainBinding.inflate(inflater, container, false) return binding.root - } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { @@ -41,4 +40,4 @@ class MainFragment : Fragment() { super.onDestroyView() _binding = null } -} \ No newline at end of file +}