Merge pull request #176 from andreknieriem/setting-wizard

Setting wizard

Author: andreknieriem

CHANGELOG.md

@@ -1,4 +1,11 @@
 # Changelog
+### v.1.15.1
+- New Feature: Added **Auto-Optimization Wizard** to automatically find the best Resolution, DPI, and Codec settings for your hardware.
+- Bugfix: Fixed **Self Mode** failing to start in offline/hotspot scenarios (Network ID 0 fix).
+- Bugfix: Improved **Audio Routing**. The phone is now more likely to route audio to the headunit immediately upon connection by using an early-initialized MediaSession with remote playback metadata.
+- Bugfix: Fixed **GPS Speed** calculation. Speeds were previously doubled due to an incorrect unit conversion (knots instead of mm/s).
+- UI: Improved Settings readability on small screens by allowing multi-line descriptions.
+
 ### v.1.15.0
 - Added arabic language thanks to A5H0
 - Added new intent for setting day/night mode for maps

README.md

@@ -67,6 +67,13 @@ adb shell am start -a android.intent.action.VIEW -d "headunit://connect?ip=192.1
 - **Google Maps in Portrait Mode:** Touch interactions (searching, scrolling) within Google Maps may not work as expected when using Portrait Mode. While visual feedback (like ripple effects) might appear, the map itself may remain unresponsive. This appears to be an internal Android Auto / Google Maps limitation or bug in vertical orientations.
 
 ## Changelog
+### v.1.15.1
+- New Feature: Added **Auto-Optimization Wizard** to automatically find the best Resolution, DPI, and Codec settings for your hardware.
+- Bugfix: Fixed **Self Mode** failing to start in offline/hotspot scenarios (Network ID 0 fix).
+- Bugfix: Improved **Audio Routing**. The phone is now more likely to route audio to the headunit immediately upon connection by using an early-initialized MediaSession with remote playback metadata.
+- Bugfix: Fixed **GPS Speed** calculation. Speeds were previously doubled due to an incorrect unit conversion (knots instead of mm/s).
+- UI: Improved Settings readability on small screens by allowing multi-line descriptions.
+
 ### v.1.15.0
 - Added arabic language thanks to A5H0
 - Added new intent for setting day/night mode for maps

app/build.gradle.kts

@@ -96,8 +96,8 @@ android {
         minSdk = 16
 //        minSdk = 21 // 21 only for google play console. App should work in minSDK 16
         targetSdk = 36
-        versionCode = 48
-        versionName = "1.15.0"
+        versionCode = 49
+        versionName = "1.15.1"
         setProperty("archivesBaseName", "${applicationId}_${versionName}")
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled = true

app/src/main/java/com/andrerinas/headunitrevived/aap/AapService.kt

@@ -125,6 +125,23 @@ class AapService : Service(), UsbReceiver.Listener {
 
         usbReceiver = UsbReceiver(this);
 
+        // Initialize MediaSession early to be ready for early focus requests
+        mediaSession = MediaSessionCompat(this, "HeadunitRevived").apply {
+            setCallback(object : MediaSessionCompat.Callback() {})
+            setPlaybackToRemote(object : androidx.media.VolumeProviderCompat(
+                androidx.media.VolumeProviderCompat.VOLUME_CONTROL_RELATIVE, 100, 50
+            ) {
+                override fun onAdjustVolume(direction: Int) {
+                    // Handle volume buttons from phone if needed
+                }
+            })
+            setMetadata(android.support.v4.media.MediaMetadataCompat.Builder()
+                .putString(android.support.v4.media.MediaMetadataCompat.METADATA_KEY_TITLE, "Android Auto")
+                .putString(android.support.v4.media.MediaMetadataCompat.METADATA_KEY_ARTIST, "Connected")
+                .build())
+            isActive = true
+        }
+
         nightModeManager = NightModeManager(this, App.provide(this).settings) { isNight ->
             AppLog.i("NightMode update: $isNight")
             App.provide(this).transport.send(NightModeEvent(isNight))
@@ -641,7 +658,7 @@ class AapService : Service(), UsbReceiver.Listener {
 
         val connectivityManager = getSystemService(CONNECTIVITY_SERVICE) as ConnectivityManager;
         val activeNetwork = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) connectivityManager.activeNetwork else null;
-        val networkToUse = activeNetwork ?: createFakeNetwork(99999);
+        val networkToUse = activeNetwork ?: createFakeNetwork(0);
         val fakeWifiInfo = createFakeWifiInfo();
 
         val magicalIntent = Intent().apply {
@@ -705,11 +722,6 @@ class AapService : Service(), UsbReceiver.Listener {
                     updateNotification();
                     sendBroadcast(ConnectedIntent());
 
-                    // Create MediaSession to get higher audio priority
-                    mediaSession = MediaSessionCompat(this@AapService, "HeadunitRevived").apply {
-                        isActive = true
-                    }
-
                     transport.onAudioFocusStateChanged = { isPlaying ->
                         updateMediaSessionState(isPlaying)
                     }
@@ -761,13 +773,13 @@ class AapService : Service(), UsbReceiver.Listener {
         // Invalidate any in-flight attempts
         connectionAttemptId.incrementAndGet();
 
-        if (wirelessServer != null) {
+        if (wirelessServer != null && !isClean && !isDestroying) {
             AppLog.i("AapService: Disconnected. Restarting discovery loop in 2s...");
             serviceScope.launch {
                 delay(2000);
                 if (!isConnected) startDiscovery();
             }
-        } else if (!isClean) {
+        } else if (!isClean && !isDestroying) {
              val mode = App.provide(this).settings.wifiConnectionMode
              val lastType = App.provide(this).settings.lastConnectionType
              if (mode == 1 && lastType == Settings.CONNECTION_TYPE_WIFI) { // Auto Mode, WiFi only

app/src/main/java/com/andrerinas/headunitrevived/aap/protocol/messages/LocationUpdateEvent.kt

@@ -17,8 +17,8 @@ class LocationUpdateEvent(location: Location)
                             longitude = (location.longitude * 1E7).toInt()
                             altitude = (location.altitude * 1E2).toInt()
                             bearing = (location.bearing * 1E6).toInt()
-                            // AA expects speed in knots, so convert back
-                            speed = (location.speed * 1.94384 * 1E3).toInt()
+                            // AA expects speed in mm/s (m/s * 1000)
+                            speed = (location.speed * 1E3).toInt()
                             accuracy = (location.accuracy * 1E3).toInt()
                         }
                 )

app/src/main/java/com/andrerinas/headunitrevived/main/HomeFragment.kt

@@ -84,11 +84,6 @@ class HomeFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        // Check Safety Disclaimer
-        if (!App.provide(requireContext()).settings.hasAcceptedDisclaimer) {
-            SafetyDisclaimerDialog.show(childFragmentManager)
-        }
-
         self_mode_button = view.findViewById(R.id.self_mode_button)
         usb = view.findViewById(R.id.usb_button)
         settings = view.findViewById(R.id.settings_button)

app/src/main/java/com/andrerinas/headunitrevived/main/MainActivity.kt

@@ -18,6 +18,8 @@ import com.andrerinas.headunitrevived.aap.AapService
 import com.andrerinas.headunitrevived.app.BaseActivity
 import com.andrerinas.headunitrevived.utils.AppLog
 import com.andrerinas.headunitrevived.utils.Settings
+import com.andrerinas.headunitrevived.utils.SetupWizard
+import com.andrerinas.headunitrevived.utils.SystemUI
 
 class MainActivity : BaseActivity() {
 
@@ -121,13 +123,15 @@ class MainActivity : BaseActivity() {
     private fun setFullscreen() {
         val root = findViewById<View>(R.id.root)
         val appSettings = Settings(this)
-        com.andrerinas.headunitrevived.utils.SystemUI.apply(window, root, appSettings.startInFullscreenMode)
+        SystemUI.apply(window, root, appSettings.startInFullscreenMode)
     }
 
     override fun onResume() {
         super.onResume()
         setFullscreen()
 
+        checkSetupFlow()
+
         // If an Android Auto session is active, bring the projection activity to front
         if (AapService.isConnected) {
             AppLog.i("MainActivity: Active session detected, bringing projection to front")
@@ -139,6 +143,18 @@ class MainActivity : BaseActivity() {
         }
     }
 
+    fun checkSetupFlow() {
+        val appSettings = Settings(this)
+        if (!appSettings.hasAcceptedDisclaimer) {
+            SafetyDisclaimerDialog.show(supportFragmentManager)
+        } else if (!appSettings.hasCompletedSetupWizard) {
+            SetupWizard(this) {
+                // Refresh activity after setup
+                recreate()
+            }.start()
+        }
+    }
+
     override fun onWindowFocusChanged(hasFocus: Boolean) {
         super.onWindowFocusChanged(hasFocus)
         if (hasFocus) {
@@ -163,7 +179,7 @@ class MainActivity : BaseActivity() {
         super.onDestroy()
         if (isFinishing) {
             AppLog.i("MainActivity finishing, resetting auto-start flag.")
-            com.andrerinas.headunitrevived.main.HomeFragment.resetAutoStart()
+            HomeFragment.resetAutoStart()
         }
     }
 

app/src/main/java/com/andrerinas/headunitrevived/main/SafetyDisclaimerDialog.kt

@@ -41,6 +41,7 @@ class SafetyDisclaimerDialog : DialogFragment() {
             // Save setting
             App.provide(requireContext()).settings.hasAcceptedDisclaimer = true
             dismiss()
+            (activity as? MainActivity)?.checkSetupFlow()
         }
 
         return view

app/src/main/java/com/andrerinas/headunitrevived/main/SettingsFragment.kt

@@ -380,6 +380,18 @@ class SettingsFragment : Fragment() {
         // --- General Settings ---
         items.add(SettingItem.CategoryHeader("general", R.string.category_general))
 
+        // Auto-Optimize Wizard
+        items.add(SettingItem.SettingEntry(
+            stableId = "autoOptimize",
+            nameResId = R.string.auto_optimize,
+            value = getString(R.string.auto_optimize_desc),
+            onClick = { _ ->
+                com.andrerinas.headunitrevived.utils.SetupWizard(requireContext()) {
+                    requireActivity().recreate()
+                }.start()
+            }
+        ))
+
         // Language Selector
         val availableLocales = LocaleHelper.getAvailableLocales(requireContext())
         val currentLocale = LocaleHelper.stringToLocale(pendingAppLanguage ?: "")
@@ -454,29 +466,20 @@ class SettingsFragment : Fragment() {
                 nameResId = R.string.night_mode_threshold,
                 value = "$currentValue $unit",
                 onClick = { _ ->
-                    val editView = EditText(requireContext())
-                    editView.inputType = InputType.TYPE_CLASS_NUMBER
-                    editView.setText(currentValue.toString())
-                    
-                    MaterialAlertDialogBuilder(requireContext(), R.style.DarkAlertDialog)
-                        .setTitle(R.string.enter_threshold_value)
-                        .setMessage(desc)
-                        .setView(editView)
-                        .setPositiveButton(android.R.string.ok) { dialog, _ ->
-                            val newVal = editView.text.toString().toIntOrNull()
-                            if (newVal != null && newVal >= 0) {
-                                if (isSensor) {
-                                    pendingThresholdLux = newVal
-                                } else {
-                                    pendingThresholdBrightness = newVal
-                                }
-                                checkChanges()
-                                updateSettingsList()
+                    showNumericInputDialog(
+                        title = getString(R.string.enter_threshold_value),
+                        message = desc,
+                        initialValue = currentValue ?: 0,
+                        onConfirm = { newVal ->
+                            if (isSensor) {
+                                pendingThresholdLux = newVal
+                            } else {
+                                pendingThresholdBrightness = newVal
                             }
-                            dialog.dismiss()
+                            checkChanges()
+                            updateSettingsList()
                         }
-                        .setNegativeButton(android.R.string.cancel, null)
-                        .show()
+                    )
                 }
             ))
         }
@@ -684,30 +687,16 @@ class SettingsFragment : Fragment() {
             nameResId = R.string.dpi,
             value = if (pendingDpi == 0) getString(R.string.auto) else pendingDpi.toString(),
             onClick = { _ ->
-                val editView = EditText(requireContext())
-                editView.inputType = InputType.TYPE_CLASS_NUMBER
-                if (pendingDpi != 0) {
-                    editView.setText(pendingDpi.toString())
-                }
-
-                AlertDialog.Builder(requireContext())
-                    .setTitle(R.string.enter_dpi_value)
-                    .setView(editView)
-                    .setPositiveButton(android.R.string.ok) { dialog, _ ->
-                        val inputText = editView.text.toString().trim()
-                        val newDpi = inputText.toIntOrNull()
-                        if (newDpi != null && newDpi >= 0) {
-                            pendingDpi = newDpi
-                        } else {
-                            pendingDpi = 0
-                        }
+                showNumericInputDialog(
+                    title = getString(R.string.enter_dpi_value),
+                    message = null,
+                    initialValue = pendingDpi ?: 0,
+                    onConfirm = { newVal ->
+                        pendingDpi = newVal
                         checkChanges()
-                        dialog.dismiss()
                         updateSettingsList()
                     }
-                                    .setNegativeButton(R.string.cancel) { dialog, _ ->
-                                        dialog.cancel()
-                                    }                    .show()
+                )
             }
         ))
 
@@ -1245,6 +1234,43 @@ class SettingsFragment : Fragment() {
             .show()
     }
 
+    private fun showNumericInputDialog(
+        title: String,
+        message: String?,
+        initialValue: Int,
+        onConfirm: (Int) -> Unit
+    ) {
+        val context = requireContext()
+        val editView = EditText(context).apply {
+            inputType = InputType.TYPE_CLASS_NUMBER
+            setText(if (initialValue == 0 && title.contains("DPI", true)) "" else initialValue.toString())
+        }
+
+        // Use a container to add padding around the EditText
+        val container = android.widget.FrameLayout(context)
+        val params = android.widget.FrameLayout.LayoutParams(
+            android.widget.FrameLayout.LayoutParams.MATCH_PARENT,
+            android.widget.FrameLayout.LayoutParams.WRAP_CONTENT
+        )
+        val margin = (24 * context.resources.displayMetrics.density).toInt()
+        params.setMargins(margin, 8, margin, 8)
+        container.addView(editView, params)
+
+        MaterialAlertDialogBuilder(context, R.style.DarkAlertDialog)
+            .setTitle(title)
+            .apply { if (message != null) setMessage(message) }
+            .setView(container)
+            .setPositiveButton(android.R.string.ok) { dialog, _ ->
+                val newVal = (editView.text.toString().toIntOrNull() ?: 0).coerceAtLeast(0)
+                onConfirm(newVal)
+                dialog.dismiss()
+            }
+            .setNegativeButton(android.R.string.cancel) { dialog, _ ->
+                dialog.cancel()
+            }
+            .show()
+    }
+
     companion object {
         private val SAVE_ITEM_ID = 1001
     }

app/src/main/java/com/andrerinas/headunitrevived/utils/Settings.kt

@@ -205,6 +205,10 @@ class Settings(context: Context) {
         get() = prefs.getBoolean("has-accepted-disclaimer", false)
         set(value) { prefs.edit().putBoolean("has-accepted-disclaimer", value).apply() }
 
+    var hasCompletedSetupWizard: Boolean
+        get() = prefs.getBoolean("has-completed-setup-wizard", false)
+        set(value) { prefs.edit().putBoolean("has-completed-setup-wizard", value).apply() }
+
     var autoConnectLastSession: Boolean
         get() = prefs.getBoolean("auto-connect-last-session", false)
         set(value) { prefs.edit().putBoolean("auto-connect-last-session", value).apply() }