From 0cd1db06254518f94289a549ec02fbc72e064350 Mon Sep 17 00:00:00 2001
From: Abhay Sood <soodabhay23@gmail.com>
Date: Wed, 15 Jan 2025 16:06:08 +0530
Subject: [PATCH] chore(android): redesign demo app

---
 android/sample/src/main/AndroidManifest.xml   |   3 +-
 .../measure/sample/ExceptionDemoActivity.kt   |  67 +++-
 .../main/res/drawable/ic_chevron_right.xml    |   9 +
 .../res/layout/activity_exception_demo.xml    | 319 +++++++++++++-----
 .../src/main/res/values-night/colors.xml      |   4 +
 .../src/main/res/values-night/themes.xml      |   8 +-
 android/sample/src/main/res/values/colors.xml |   1 +
 .../sample/src/main/res/values/strings.xml    |   7 +-
 android/sample/src/main/res/values/themes.xml |  15 +-
 9 files changed, 325 insertions(+), 108 deletions(-)
 create mode 100644 android/sample/src/main/res/drawable/ic_chevron_right.xml
 create mode 100644 android/sample/src/main/res/values-night/colors.xml

diff --git a/android/sample/src/main/AndroidManifest.xml b/android/sample/src/main/AndroidManifest.xml
index 5bb61931a..42fe3ca7b 100644
--- a/android/sample/src/main/AndroidManifest.xml
+++ b/android/sample/src/main/AndroidManifest.xml
@@ -48,7 +48,8 @@
             android:theme="@style/Theme.MeasureAndroid" />
         <activity
             android:name=".ExceptionDemoActivity"
-            android:exported="true">
+            android:exported="true"
+            android:theme="@style/Theme.MeasureAndroid">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/android/sample/src/main/java/sh/measure/sample/ExceptionDemoActivity.kt b/android/sample/src/main/java/sh/measure/sample/ExceptionDemoActivity.kt
index 044a52cef..93d8456d0 100644
--- a/android/sample/src/main/java/sh/measure/sample/ExceptionDemoActivity.kt
+++ b/android/sample/src/main/java/sh/measure/sample/ExceptionDemoActivity.kt
@@ -1,13 +1,18 @@
 package sh.measure.sample
 
 import android.content.Intent
+import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
-import android.widget.Button
+import android.widget.ScrollView
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import com.google.android.material.switchmaterial.SwitchMaterial
+import com.google.android.material.textview.MaterialTextView
 import sh.measure.android.Measure
 import sh.measure.android.tracing.SpanStatus
 import sh.measure.sample.fragments.AndroidXFragmentNavigationActivity
@@ -25,58 +30,59 @@ class ExceptionDemoActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         val span = Measure.startSpan("activity.onCreate")
         setContentView(R.layout.activity_exception_demo)
-        findViewById<Button>(R.id.btn_single_exception).setOnClickListener {
+        handleEdgeToEdgeDisplay()
+        findViewById<MaterialTextView>(R.id.btn_single_exception).setOnClickListener {
             throw IllegalAccessException("This is a new exception")
         }
-        findViewById<Button>(R.id.btn_chained_exception).setOnClickListener {
+        findViewById<MaterialTextView>(R.id.btn_chained_exception).setOnClickListener {
             throw IOException("This is a test exception").initCause(
                 CustomException(message = "This is a nested custom exception")
             )
         }
-        findViewById<Button>(R.id.btn_oom_exception).setOnClickListener {
+        findViewById<MaterialTextView>(R.id.btn_oom_exception).setOnClickListener {
             val list = mutableListOf<ByteArray>()
             while (true) {
                 val byteArray = ByteArray(1024 * 1024 * 100) // Allocate 100MB of memory
                 list.add(byteArray)
             }
         }
-        findViewById<Button>(R.id.btn_stack_overflow_exception).setOnClickListener {
+        findViewById<MaterialTextView>(R.id.btn_stack_overflow_exception).setOnClickListener {
             recursiveFunction()
         }
-        findViewById<Button>(R.id.btn_infinite_loop).setOnClickListener {
+        findViewById<MaterialTextView>(R.id.btn_infinite_loop).setOnClickListener {
             infiniteLoop()
         }
-        findViewById<Button>(R.id.btn_deadlock).setOnClickListener {
+        findViewById<MaterialTextView>(R.id.btn_deadlock).setOnClickListener {
             deadLock()
         }
-        findViewById<Button>(R.id.btn_okhttp).setOnClickListener {
+        findViewById<MaterialTextView>(R.id.btn_okhttp).setOnClickListener {
             startActivity(Intent(this, OkHttpActivity::class.java))
         }
-        findViewById<Button>(R.id.btn_compose).setOnClickListener {
+        findViewById<MaterialTextView>(R.id.btn_compose).setOnClickListener {
             startActivity(Intent(this, ComposeActivity::class.java))
         }
-        findViewById<Button>(R.id.btn_compose_navigation).setOnClickListener {
+        findViewById<MaterialTextView>(R.id.btn_compose_navigation).setOnClickListener {
             startActivity(Intent(this, ComposeNavigationActivity::class.java))
         }
-        findViewById<Button>(R.id.btn_view_screenshot).setOnClickListener {
+        findViewById<MaterialTextView>(R.id.btn_view_screenshot).setOnClickListener {
             startActivity(Intent(this, ViewScreenshotActivity::class.java))
         }
-        findViewById<Button>(R.id.btn_compose_screenshot).setOnClickListener {
+        findViewById<MaterialTextView>(R.id.btn_compose_screenshot).setOnClickListener {
             startActivity(Intent(this, ComposeScreenshotActivity::class.java))
         }
-        findViewById<Button>(R.id.btn_nested_fragments).setOnClickListener {
+        findViewById<MaterialTextView>(R.id.btn_nested_fragments).setOnClickListener {
             startActivity(Intent(this, NestedFragmentActivity::class.java))
         }
-        findViewById<Button>(R.id.btn_fragment_navigation).setOnClickListener {
+        findViewById<MaterialTextView>(R.id.btn_fragment_navigation).setOnClickListener {
             startActivity(Intent(this, FragmentNavigationActivity::class.java))
         }
-        findViewById<Button>(R.id.btn_fragment_androidx_navigation).setOnClickListener {
+        findViewById<MaterialTextView>(R.id.btn_fragment_androidx_navigation).setOnClickListener {
             startActivity(Intent(this, AndroidXFragmentNavigationActivity::class.java))
         }
-        findViewById<Button>(R.id.btn_bug_report).setOnClickListener {
+        findViewById<MaterialTextView>(R.id.btn_bug_report).setOnClickListener {
             Measure.launchBugReportActivity(this)
         }
-        val spanButton = findViewById<Button>(R.id.btn_generate_span)
+        val spanButton = findViewById<MaterialTextView>(R.id.btn_generate_span)
         spanButton.setOnClickListener {
             spanButton.isEnabled = false
             thread {
@@ -152,6 +158,33 @@ class ExceptionDemoActivity : AppCompatActivity() {
             e.printStackTrace()
         }
     }
+
+    private fun handleEdgeToEdgeDisplay() {
+        val container = findViewById<ScrollView>(R.id.sv_container)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            ViewCompat.setOnApplyWindowInsetsListener(container) { view, windowInsets ->
+                val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
+                view.updatePadding(
+                    left = insets.left,
+                    top = insets.top,
+                    right = insets.right,
+                    bottom = insets.bottom
+                )
+                windowInsets
+            }
+        } else {
+            ViewCompat.setOnApplyWindowInsetsListener(container) { view, windowInsets ->
+                @Suppress("DEPRECATION") val insets = windowInsets.systemWindowInsets
+                view.updatePadding(
+                    left = insets.left,
+                    top = insets.top,
+                    right = insets.right,
+                    bottom = insets.bottom
+                )
+                windowInsets
+            }
+        }
+    }
 }
 
 class CustomException(override val message: String? = null) : Exception()
\ No newline at end of file
diff --git a/android/sample/src/main/res/drawable/ic_chevron_right.xml b/android/sample/src/main/res/drawable/ic_chevron_right.xml
new file mode 100644
index 000000000..de56527cc
--- /dev/null
+++ b/android/sample/src/main/res/drawable/ic_chevron_right.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/chevron"
+        android:pathData="M9.29,6.71C8.9,7.1 8.9,7.73 9.29,8.12L13.17,12L9.29,15.88C8.9,16.27 8.9,16.9 9.29,17.29C9.68,17.68 10.31,17.68 10.7,17.29L15.29,12.7C15.68,12.31 15.68,11.68 15.29,11.29L10.7,6.7C10.31,6.31 9.68,6.31 9.29,6.7Z"/>
+</vector>
\ No newline at end of file
diff --git a/android/sample/src/main/res/layout/activity_exception_demo.xml b/android/sample/src/main/res/layout/activity_exception_demo.xml
index 955f5e984..5195e8b09 100644
--- a/android/sample/src/main/res/layout/activity_exception_demo.xml
+++ b/android/sample/src/main/res/layout/activity_exception_demo.xml
@@ -2,121 +2,282 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/sv_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center"
         android:orientation="vertical"
         tools:context="sh.measure.sample.ExceptionDemoActivity">
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/btn_sdk_switch"
-            android:layout_width="wrap_content"
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
-            android:padding="16dp"
-            android:text="@string/start_tracking"
-            app:switchPadding="16dp" />
-
-        <Button
-            android:id="@+id/btn_single_exception"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/single_exception" />
+            android:layout_margin="16dp"
+            app:cardCornerRadius="16dp"
+            app:cardElevation="4dp"
+            app:strokeColor="?attr/colorPrimary"
+            app:strokeWidth="2dp">
 
-        <Button
-            android:id="@+id/btn_chained_exception"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/chained_exceptions" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/colorPrimary"
+                android:orientation="vertical">
 
-        <Button
-            android:id="@+id/btn_oom_exception"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/oom_exception" />
 
-        <Button
-            android:id="@+id/btn_stack_overflow_exception"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/stack_overflow_exception" />
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/btn_sdk_switch"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="16dp"
+                    android:text="@string/enable_tracking"
+                    android:textColor="?attr/colorOnPrimary"
+                    app:switchPadding="16dp" />
+            </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
 
-        <Button
-            android:id="@+id/btn_infinite_loop"
-            android:layout_width="wrap_content"
+        <TextView
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/infinite_loop" />
+            android:fontFamily="sans-serif-condensed-medium"
+            android:paddingHorizontal="8dp"
+            android:paddingTop="8dp"
+            android:text="@string/exception_tests"
+            android:textAppearance="?attr/textAppearanceCaption" />
 
-        <Button
-            android:id="@+id/btn_deadlock"
-            android:layout_width="wrap_content"
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/deadlock" />
+            android:layout_marginVertical="8dp"
+            app:cardCornerRadius="0dp">
 
-        <Button
-            android:id="@+id/btn_okhttp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/okhttp" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/btn_single_exception"
+                    style="@style/Widget.Material3.TextView.SettingsItem"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/single_exception"
+                    app:drawableEndCompat="@drawable/ic_chevron_right" />
 
-        <Button
-            android:id="@+id/btn_compose"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/compose" />
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/btn_chained_exception"
+                    style="@style/Widget.Material3.TextView.SettingsItem"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/chained_exceptions"
+                    app:drawableEndCompat="@drawable/ic_chevron_right" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/btn_oom_exception"
+                    style="@style/Widget.Material3.TextView.SettingsItem"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/oom_exception"
+                    app:drawableEndCompat="@drawable/ic_chevron_right" />
 
-        <Button
-            android:id="@+id/btn_compose_navigation"
-            android:layout_width="wrap_content"
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/btn_stack_overflow_exception"
+                    style="@style/Widget.Material3.TextView.SettingsItem"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/stack_overflow_exception"
+                    app:drawableEndCompat="@drawable/ic_chevron_right" />
+            </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
+
+        <TextView
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/compose_navigation" />
+            android:fontFamily="sans-serif-condensed-medium"
+            android:paddingHorizontal="8dp"
+            android:paddingTop="8dp"
+            android:text="@string/anrs"
+            android:textAppearance="?attr/textAppearanceCaption" />
 
-        <Button
-            android:id="@+id/btn_view_screenshot"
-            android:layout_width="wrap_content"
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/view_screenshot" />
+            android:layout_marginVertical="8dp"
+            app:cardCornerRadius="0dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/btn_infinite_loop"
+                    style="@style/Widget.Material3.TextView.SettingsItem"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/infinite_loop"
+                    app:drawableEndCompat="@drawable/ic_chevron_right" />
 
-        <Button
-            android:id="@+id/btn_compose_screenshot"
-            android:layout_width="wrap_content"
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/btn_deadlock"
+                    style="@style/Widget.Material3.TextView.SettingsItem"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/deadlock"
+                    app:drawableEndCompat="@drawable/ic_chevron_right" />
+
+            </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
+
+        <TextView
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/compose_screenshot" />
+            android:fontFamily="sans-serif-condensed-medium"
+            android:paddingHorizontal="8dp"
+            android:paddingTop="8dp"
+            android:text="@string/navigation"
+            android:textAppearance="?attr/textAppearanceCaption" />
 
-        <Button
-            android:id="@+id/btn_nested_fragments"
-            android:layout_width="wrap_content"
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/nested_fragments" />
+            android:layout_marginVertical="8dp"
+            app:cardCornerRadius="0dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
-        <Button
-            android:id="@+id/btn_fragment_navigation"
-            android:layout_width="wrap_content"
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/btn_compose"
+                    style="@style/Widget.Material3.TextView.SettingsItem"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/compose"
+                    app:drawableEndCompat="@drawable/ic_chevron_right" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/btn_compose_navigation"
+                    style="@style/Widget.Material3.TextView.SettingsItem"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/compose_navigation"
+                    app:drawableEndCompat="@drawable/ic_chevron_right" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/btn_fragment_navigation"
+                    style="@style/Widget.Material3.TextView.SettingsItem"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/fragment_navigation"
+                    app:drawableEndCompat="@drawable/ic_chevron_right" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/btn_fragment_androidx_navigation"
+                    style="@style/Widget.Material3.TextView.SettingsItem"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/androidx_fragment_navigation"
+                    app:drawableEndCompat="@drawable/ic_chevron_right" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/btn_nested_fragments"
+                    style="@style/Widget.Material3.TextView.SettingsItem"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/nested_fragments"
+                    app:drawableEndCompat="@drawable/ic_chevron_right" />
+            </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
+
+        <TextView
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/fragment_navigation" />
+            android:fontFamily="sans-serif-condensed-medium"
+            android:paddingHorizontal="8dp"
+            android:paddingTop="8dp"
+            android:text="@string/screenshot"
+            android:textAppearance="?attr/textAppearanceCaption" />
 
-        <Button
-            android:id="@+id/btn_fragment_androidx_navigation"
-            android:layout_width="wrap_content"
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/androidx_fragment_navigation" />
+            android:layout_marginVertical="8dp"
+            app:cardCornerRadius="0dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/btn_view_screenshot"
+                    style="@style/Widget.Material3.TextView.SettingsItem"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/view_screenshot"
+                    app:drawableEndCompat="@drawable/ic_chevron_right" />
 
-        <Button
-            android:id="@+id/btn_generate_span"
-            android:layout_width="wrap_content"
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/btn_compose_screenshot"
+                    style="@style/Widget.Material3.TextView.SettingsItem"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/compose_screenshot"
+                    app:drawableEndCompat="@drawable/ic_chevron_right" />
+
+            </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
+
+        <TextView
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/create_span" />
+            android:fontFamily="sans-serif-condensed-medium"
+            android:paddingHorizontal="8dp"
+            android:paddingTop="8dp"
+            android:text="@string/misc_tests"
+            android:textAppearance="?attr/textAppearanceCaption" />
 
-        <Button
-            android:id="@+id/btn_bug_report"
-            android:layout_width="wrap_content"
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/report_a_bug" />
+            android:layout_marginVertical="8dp"
+            app:cardCornerRadius="0dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/btn_okhttp"
+                    style="@style/Widget.Material3.TextView.SettingsItem"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/okhttp"
+                    app:drawableEndCompat="@drawable/ic_chevron_right" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/btn_generate_span"
+                    style="@style/Widget.Material3.TextView.SettingsItem"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/create_span"
+                    app:drawableEndCompat="@drawable/ic_chevron_right" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/btn_bug_report"
+                    style="@style/Widget.Material3.TextView.SettingsItem"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/report_a_bug"
+                    app:drawableEndCompat="@drawable/ic_chevron_right" />
+            </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
 
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/android/sample/src/main/res/values-night/colors.xml b/android/sample/src/main/res/values-night/colors.xml
new file mode 100644
index 000000000..4b72e74a0
--- /dev/null
+++ b/android/sample/src/main/res/values-night/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="chevron">#C4C6D0</color>
+</resources>
\ No newline at end of file
diff --git a/android/sample/src/main/res/values-night/themes.xml b/android/sample/src/main/res/values-night/themes.xml
index 17fa34340..47c3f80a6 100644
--- a/android/sample/src/main/res/values-night/themes.xml
+++ b/android/sample/src/main/res/values-night/themes.xml
@@ -1,16 +1,14 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Base application theme. -->
     <style name="Theme.MeasureAndroid" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_200</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
         <item name="colorOnPrimary">@color/black</item>
-        <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>
         <item name="colorSecondaryVariant">@color/teal_200</item>
         <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
         <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/android/sample/src/main/res/values/colors.xml b/android/sample/src/main/res/values/colors.xml
index 3ef22891e..af1bcdcde 100644
--- a/android/sample/src/main/res/values/colors.xml
+++ b/android/sample/src/main/res/values/colors.xml
@@ -7,4 +7,5 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="msr_white">#FFFFFFFF</color>
+    <color name="chevron">#C4C6D0</color>
 </resources>
\ No newline at end of file
diff --git a/android/sample/src/main/res/values/strings.xml b/android/sample/src/main/res/values/strings.xml
index bd2ae8add..aa3e44fb5 100644
--- a/android/sample/src/main/res/values/strings.xml
+++ b/android/sample/src/main/res/values/strings.xml
@@ -29,6 +29,11 @@
     <string name="open_fragment_3">Open Fragment 3</string>
     <string name="androidx_fragment_navigation">AndroidX Fragment Navigation</string>
     <string name="create_span">Create span</string>
-    <string name="start_tracking">Start tracking</string>
+    <string name="enable_tracking">Enable tracking</string>
     <string name="report_a_bug">Report a bug</string>
+    <string name="exception_tests">Crashes</string>
+    <string name="anrs">ANRs</string>
+    <string name="navigation">Navigation</string>
+    <string name="misc_tests">Others</string>
+    <string name="screenshot">Screenshot</string>
 </resources>
\ No newline at end of file
diff --git a/android/sample/src/main/res/values/themes.xml b/android/sample/src/main/res/values/themes.xml
index 98322b341..5b57ec61a 100644
--- a/android/sample/src/main/res/values/themes.xml
+++ b/android/sample/src/main/res/values/themes.xml
@@ -1,16 +1,21 @@
 <resources>
     <!-- Base application theme. -->
     <style name="Theme.MeasureAndroid" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
         <item name="colorOnPrimary">@color/msr_white</item>
-        <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>
         <item name="colorSecondaryVariant">@color/teal_700</item>
         <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
         <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
     </style>
-</resources>
\ No newline at end of file
+
+    <style name="Widget.Material3.TextView.SettingsItem" parent="Widget.MaterialComponents.TextView">
+        <item name="android:padding">16dp</item>
+        <item name="android:background">?attr/selectableItemBackground</item>
+        <item name="android:clickable">true</item>
+        <item name="android:focusable">true</item>
+    </style>
+</resources>