diff --git a/app/src/androidTest/java/org/obd/graphs/DataLoggerWifiTest.kt b/app/src/androidTest/java/org/obd/graphs/DataLoggerWifiTest.kt
index 7f13b21ea..9354a3576 100644
--- a/app/src/androidTest/java/org/obd/graphs/DataLoggerWifiTest.kt
+++ b/app/src/androidTest/java/org/obd/graphs/DataLoggerWifiTest.kt
@@ -65,9 +65,9 @@ class DataLoggerWifiTest {
 
         tcpTestRunner(
             assert = {
-                assertTrue(vehicleCapabilitiesManager.getDTC().contains("26E400"))
-                assertTrue(vehicleCapabilitiesManager.getDTC().contains("D00800"))
-                assertTrue(vehicleCapabilitiesManager.getDTC().contains("2BC100"))
+                assertTrue(vehicleCapabilitiesManager.getDiagnosticTroubleCodes().contains("26E400"))
+                assertTrue(vehicleCapabilitiesManager.getDiagnosticTroubleCodes().contains("D00800"))
+                assertTrue(vehicleCapabilitiesManager.getDiagnosticTroubleCodes().contains("2BC100"))
             },
             arrange = {
                 // arrange
diff --git a/app/src/main/java/org/obd/graphs/activity/Receivers.kt b/app/src/main/java/org/obd/graphs/activity/Receivers.kt
index c025bf589..2785f59eb 100644
--- a/app/src/main/java/org/obd/graphs/activity/Receivers.kt
+++ b/app/src/main/java/org/obd/graphs/activity/Receivers.kt
@@ -177,8 +177,8 @@ internal fun MainActivity.receive(intent: Intent?) {
             }
 
         REQUEST_PERMISSIONS_BT -> Permissions.requestBluetoothPermissions(this)
-        TOOLBAR_HIDE -> Toolbar.hide(this,true)
-        TOOLBAR_SHOW -> Toolbar.hide(this,false)
+        TOOLBAR_HIDE -> Toolbar.hide(this, true)
+        TOOLBAR_SHOW -> Toolbar.hide(this, false)
         TOOLBAR_TOGGLE_ACTION -> Toolbar.toggle(this)
 
         PROFILE_NAME_CHANGED_EVENT -> updateVehicleProfile()
@@ -220,9 +220,12 @@ internal fun MainActivity.receive(intent: Intent?) {
                     )
             }
 
-            FabButtons.view(this).connectFab.let{
+            FabButtons.view(this).connectFab.let {
                 it.backgroundTintList =
-                    ContextCompat.getColorStateList(applicationContext, org.obd.graphs.commons.R.color.cardinal)
+                    ContextCompat.getColorStateList(
+                        applicationContext,
+                        org.obd.graphs.commons.R.color.cardinal,
+                    )
                 it.setOnClickListener {
                     Log.i(LOG_TAG, "Stop data logging ")
                     withDataLogger {
@@ -257,7 +260,7 @@ internal fun MainActivity.receive(intent: Intent?) {
                 it.start()
             }
 
-            Toolbar.hide(this,true)
+            Toolbar.hide(this, true)
             updateAdapterConnectionType()
         }
 
@@ -293,12 +296,15 @@ private fun MainActivity.handleStop() {
         it.visibility = View.GONE
     }
 
-    FabButtons.view(this).connectFab.let{
+    FabButtons.view(this).connectFab.let {
         it.backgroundTintList =
-            ContextCompat.getColorStateList(applicationContext, org.obd.graphs.commons.R.color.philippine_green)
+            ContextCompat.getColorStateList(
+                applicationContext,
+                org.obd.graphs.commons.R.color.philippine_green,
+            )
     }
 
-    Toolbar.hide(this,false)
+    Toolbar.hide(this, false)
 
     timer {
         it.stop()
@@ -380,12 +386,11 @@ internal fun MainActivity.registerReceiver() {
         it.addAction(PROFILE_NAME_CHANGED_EVENT)
     }
 
-   registerReceiver(this, DataLoggerRepository.broadcastReceivers()) {
+    registerReceiver(this, DataLoggerRepository.broadcastReceivers()) {
         it.addAction(MODULES_LIST_CHANGED_EVENT)
         it.addAction(PROFILE_CHANGED_EVENT)
     }
 
-
     registerReceiver(this, powerReceiver) {
         it.addAction("android.intent.action.ACTION_POWER_CONNECTED")
         it.addAction("android.intent.action.ACTION_POWER_DISCONNECTED")
diff --git a/app/src/main/java/org/obd/graphs/preferences/CoreDialogFragment.kt b/app/src/main/java/org/obd/graphs/preferences/CoreDialogFragment.kt
index 01e856d8a..d9c3be64e 100644
--- a/app/src/main/java/org/obd/graphs/preferences/CoreDialogFragment.kt
+++ b/app/src/main/java/org/obd/graphs/preferences/CoreDialogFragment.kt
@@ -36,7 +36,7 @@ abstract class CoreDialogFragment : DialogFragment() {
         root: View,
         func: () -> Unit = {},
     ) {
-        root.findViewById<Button>(R.id.trip_action_close_window).apply {
+        root.findViewById<Button>(R.id.action_close_window).apply {
             setOnClickListener {
                 func()
                 dialog?.dismiss()
diff --git a/app/src/main/java/org/obd/graphs/preferences/dtc/DiagnosticTroubleCodeListPreferences.kt b/app/src/main/java/org/obd/graphs/preferences/dtc/DiagnosticTroubleCodeListPreferences.kt
index 0a7cb97b1..6e1df22c7 100644
--- a/app/src/main/java/org/obd/graphs/preferences/dtc/DiagnosticTroubleCodeListPreferences.kt
+++ b/app/src/main/java/org/obd/graphs/preferences/dtc/DiagnosticTroubleCodeListPreferences.kt
@@ -20,7 +20,7 @@ import android.content.Context
 import android.util.AttributeSet
 import androidx.preference.DialogPreference
 
-class DiagnosticTroubleCodeListPreferences(
+ internal class DiagnosticTroubleCodeListPreferences(
     context: Context,
     attrs: AttributeSet?,
 ) : DialogPreference(context, attrs)
diff --git a/app/src/main/java/org/obd/graphs/preferences/dtc/DiagnosticTroubleCodePreferenceDialogFragment.kt b/app/src/main/java/org/obd/graphs/preferences/dtc/DiagnosticTroubleCodePreferenceDialogFragment.kt
index b4f4d4fa5..9f243a969 100644
--- a/app/src/main/java/org/obd/graphs/preferences/dtc/DiagnosticTroubleCodePreferenceDialogFragment.kt
+++ b/app/src/main/java/org/obd/graphs/preferences/dtc/DiagnosticTroubleCodePreferenceDialogFragment.kt
@@ -16,17 +16,42 @@
  */
 package org.obd.graphs.preferences.dtc
 
+import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import org.obd.graphs.R
-import org.obd.graphs.bl.datalogger.vehicleCapabilitiesManager
+import org.obd.graphs.bl.datalogger.DATA_LOGGER_DTC_ACTION_COMPLETED
+import org.obd.graphs.bl.datalogger.DataLoggerRepository
+import org.obd.graphs.bl.datalogger.VehicleCapabilitiesManager
 import org.obd.graphs.preferences.CoreDialogFragment
+import org.obd.graphs.registerReceiver
+import org.obd.graphs.ui.common.toast
+import org.obd.graphs.ui.withDataLogger
+import org.obd.metrics.api.model.DiagnosticTroubleCode
+import org.obd.metrics.command.dtc.DtcComponent
+
+internal class DiagnosticTroubleCodePreferenceDialogFragment : CoreDialogFragment() {
+    private lateinit var adapter: DiagnosticTroubleCodeViewAdapter
+    private lateinit var clearButton: Button
+    private lateinit var shareButton: Button
+
+    private val dtcNotificationsReceiver =
+        object : android.content.BroadcastReceiver() {
+            override fun onReceive(
+                context: android.content.Context?,
+                intent: Intent?,
+            ) {
+                if (intent?.action == DATA_LOGGER_DTC_ACTION_COMPLETED) {
+                    handleDTCChangedNotification()
+                }
+            }
+        }
 
-class DiagnosticTroubleCodePreferenceDialogFragment : CoreDialogFragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -35,18 +60,177 @@ class DiagnosticTroubleCodePreferenceDialogFragment : CoreDialogFragment() {
         requestWindowFeatures()
 
         val root = inflater.inflate(R.layout.dialog_dtc, container, false)
-        val dtc = vehicleCapabilitiesManager.getDTC()
-
-        if (dtc.isEmpty()) {
-            dtc.add(resources.getString(R.string.pref_dtc_no_dtc_found))
-        }
+        val sortedDtcList = diagnosticTroubleCodes()
 
-        val adapter = DiagnosticTroubleCodeViewAdapter(context, dtc)
+        adapter = DiagnosticTroubleCodeViewAdapter(context)
+        adapter.submitList(sortedDtcList)
         val recyclerView: RecyclerView = root.findViewById(R.id.recycler_view)
         recyclerView.layoutManager = GridLayoutManager(context, 1)
         recyclerView.adapter = adapter
 
+        attachButtons(root, sortedDtcList)
         attachCloseButton(root)
+
         return root
     }
+
+    private fun attachButtons(
+        root: View,
+        sortedDtcList: List<DiagnosticTroubleCode>,
+    ) {
+        val refreshButton: Button = root.findViewById(R.id.action_refresh_dtc)
+        shareButton = root.findViewById(R.id.action_share)
+        clearButton = root.findViewById(R.id.action_clear_dtc)
+
+        shareButton.visibility = View.VISIBLE
+        clearButton.visibility = View.VISIBLE
+
+        if (isDtcAvailable(sortedDtcList)) {
+            shareButton.isEnabled = false
+            clearButton.isEnabled = false
+        }
+
+        shareButton.setOnClickListener {
+            shareDtcReport(sortedDtcList)
+        }
+
+        refreshButton.setOnClickListener {
+            if (DataLoggerRepository.isRunning()) {
+                withDataLogger {
+                    scheduleDTCRead()
+                }
+            } else {
+                toast(R.string.pref_dtc_no_connection_established)
+            }
+        }
+
+        clearButton.setOnClickListener {
+            android.app.AlertDialog
+                .Builder(requireContext())
+                .setTitle(resources.getString(R.string.pref_dtc_clean_dialog_title))
+                .setMessage(
+                    resources.getString(R.string.pref_dtc_clean_dialog_confirm_message),
+                ).setPositiveButton("Clear Codes") { dialog, _ ->
+                    if (DataLoggerRepository.isRunning()) {
+                        withDataLogger {
+                            scheduleDTCCleanup()
+                        }
+
+                        toast(R.string.pref_dtc_clean_dialog_send_message)
+                        clearButton.isEnabled = false
+                        clearButton.text = "Clearing..."
+                        dialog.dismiss()
+                    } else {
+                        toast(R.string.pref_dtc_no_connection_established)
+                    }
+                }.setNegativeButton("Cancel", null)
+                .show()
+        }
+    }
+
+    private fun shareDtcReport(dtcList: List<DiagnosticTroubleCode>) {
+        val reportBuilder = StringBuilder()
+        reportBuilder.append("Vehicle Diagnostic Report\n")
+        reportBuilder.append("-------------------------\n\n")
+
+        for (code in dtcList) {
+            if (code.standardCode.isEmpty()) continue
+
+            val formattedCode =
+                if (!code.failureType?.code.isNullOrEmpty()) {
+                    "${code.standardCode}-${code.failureType.code}"
+                } else {
+                    code.standardCode
+                }
+
+            reportBuilder.append("DTC: $formattedCode\n")
+            reportBuilder.append("Description: ${code.description ?: "Unknown"}\n")
+
+            val systemTxt = code.system?.description
+            val categoryTxt = code.category?.description
+            if (!systemTxt.isNullOrBlank() || !categoryTxt.isNullOrBlank()) {
+                reportBuilder.append("System: ${systemTxt ?: "N/A"} | Category: ${categoryTxt ?: "N/A"}\n")
+            }
+
+            val hex = code.rawHex ?: "N/A"
+            val activeStatuses = code.activeStatuses?.joinToString(", ") ?: "None"
+            reportBuilder.append("Status: $activeStatuses (Hex: $hex)\n")
+            reportBuilder.append("\n") // Blank line between codes
+        }
+
+        val sendIntent: Intent =
+            Intent().apply {
+                action = Intent.ACTION_SEND
+                putExtra(Intent.EXTRA_TEXT, reportBuilder.toString())
+                type = "text/plain"
+            }
+
+        val shareIntent = Intent.createChooser(sendIntent, "Share Diagnostic Report")
+        startActivity(shareIntent)
+    }
+
+    private fun diagnosticTroubleCodes(): List<DiagnosticTroubleCode> =
+        VehicleCapabilitiesManager
+            .getDiagnosticTroubleCodes()
+            .apply {
+                if (isEmpty()) {
+                    add(
+                        DiagnosticTroubleCode(
+                            "",
+                            "",
+                            null,
+                            resources.getString(R.string.pref_dtc_no_dtc_found),
+                            0,
+                            null,
+                            null,
+                            null,
+                            null,
+                            DtcComponent("", ""),
+                        ),
+                    )
+                }
+            }.sortedWith(
+                compareBy<DiagnosticTroubleCode> { code ->
+                    val desc = code.description
+                    val isUnknown =
+                        desc.isNullOrBlank() ||
+                            desc.contains(
+                                "Unknown DTC Description",
+                                ignoreCase = true,
+                            )
+                    if (isUnknown) 1 else 0
+                }.thenBy { code ->
+                    code.standardCode
+                },
+            ).toMutableList()
+
+    override fun onResume() {
+        super.onResume()
+        registerReceiver(requireContext(), dtcNotificationsReceiver) {
+            it.addAction(DATA_LOGGER_DTC_ACTION_COMPLETED)
+        }
+    }
+
+    override fun onPause() {
+        super.onPause()
+        requireContext().unregisterReceiver(dtcNotificationsReceiver)
+    }
+
+    private fun handleDTCChangedNotification() {
+        val newCodes = diagnosticTroubleCodes()
+        adapter.submitList(newCodes)
+
+        if (isDtcAvailable(newCodes)) {
+            shareButton.isEnabled = false
+            clearButton.isEnabled = false
+        } else {
+            shareButton.isEnabled = true
+            clearButton.isEnabled = true
+        }
+
+        clearButton.text = "Clear Codes"
+    }
+
+    private fun isDtcAvailable(newCodes: List<DiagnosticTroubleCode>): Boolean =
+        newCodes.size == 1 && newCodes.first().standardCode.isEmpty()
 }
diff --git a/app/src/main/java/org/obd/graphs/preferences/dtc/DiagnosticTroubleCodeViewAdapter.kt b/app/src/main/java/org/obd/graphs/preferences/dtc/DiagnosticTroubleCodeViewAdapter.kt
index 6828b428b..c84cc972d 100644
--- a/app/src/main/java/org/obd/graphs/preferences/dtc/DiagnosticTroubleCodeViewAdapter.kt
+++ b/app/src/main/java/org/obd/graphs/preferences/dtc/DiagnosticTroubleCodeViewAdapter.kt
@@ -16,24 +16,35 @@
  */
 package org.obd.graphs.preferences.dtc
 
+import android.content.ClipData
+import android.content.ClipboardManager
 import android.content.Context
+import android.content.Intent
 import android.graphics.Color
 import android.graphics.Typeface
+import android.net.Uri
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
+import android.widget.LinearLayout
 import android.widget.TextView
+import android.widget.Toast
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import org.obd.graphs.R
 import org.obd.graphs.ui.common.COLOR_CARDINAL
 import org.obd.graphs.ui.common.setText
+import org.obd.metrics.api.model.DiagnosticTroubleCode
 
-class DiagnosticTroubleCodeViewAdapter internal constructor(
+internal class DiagnosticTroubleCodeViewAdapter internal constructor(
     context: Context?,
-    private var data: MutableCollection<String>,
-) : RecyclerView.Adapter<DiagnosticTroubleCodeViewAdapter.ViewHolder>() {
+) : ListAdapter<DiagnosticTroubleCode, DiagnosticTroubleCodeViewAdapter.ViewHolder>(DiffCallback) {
     private val mInflater: LayoutInflater = LayoutInflater.from(context)
 
+    private var expandedPosition = RecyclerView.NO_POSITION
+
     override fun onCreateViewHolder(
         parent: ViewGroup,
         viewType: Int,
@@ -43,18 +54,126 @@ class DiagnosticTroubleCodeViewAdapter internal constructor(
         holder: ViewHolder,
         position: Int,
     ) {
-        data.elementAt(position).run {
-            holder.code.setText(this, COLOR_CARDINAL, Typeface.NORMAL, 1f)
+        val dtc = getItem(position)
+
+        val formattedCode =
+            if (!dtc.failureType?.code.isNullOrEmpty()) {
+                "${dtc.standardCode}-${dtc.failureType.code}"
+            } else {
+                dtc.standardCode
+            }
+
+        var finalDescription = dtc.description
+        var isUnknown = false
+
+        if (finalDescription.isNullOrBlank() ||
+            finalDescription.contains(
+                "Unknown DTC Description",
+                ignoreCase = true,
+            )
+        ) {
+            isUnknown = true
+            val fallbackParts =
+                listOfNotNull(
+                    dtc.system?.description,
+                    dtc.category?.description,
+                    dtc.subsystem?.description,
+                ).filter { it.isNotBlank() }
+
+            finalDescription =
+                if (fallbackParts.isNotEmpty()) {
+                    fallbackParts.joinToString(" → ") + " (Unknown specific fault)"
+                } else {
+                    "Unknown DTC Description"
+                }
         }
-        holder.description.setText("", Color.GRAY, Typeface.NORMAL, 1f)
-    }
 
-    override fun getItemCount(): Int = data.size
+        if (dtc.standardCode.isEmpty()) {
+            holder.code.setText("", Color.GRAY, Typeface.NORMAL, 1f)
+            holder.description.setText(finalDescription, Color.DKGRAY, Typeface.NORMAL, 1f)
+            holder.expandedContainer.visibility = View.GONE
+            holder.itemView.setOnClickListener(null)
+            return
+        } else {
+            holder.code.setText(formattedCode, COLOR_CARDINAL, Typeface.BOLD, 1f)
+            if (isUnknown) {
+                holder.description.setText(finalDescription, Color.GRAY, Typeface.ITALIC, 1f)
+            } else {
+                holder.description.setText(finalDescription, Color.DKGRAY, Typeface.NORMAL, 1f)
+            }
+        }
+
+        val systemTxt = dtc.system?.description ?: "N/A"
+        val categoryTxt = dtc.category?.description ?: "N/A"
+        holder.detailSystemInfo.text = "System: $systemTxt | Category: $categoryTxt"
+
+        val hex = dtc.rawHex ?: "N/A"
+        val statusMask = String.format("0x%02X", dtc.statusMask)
+        val activeStatuses = dtc.activeStatuses?.joinToString(", ") ?: "None"
+        holder.detailHexStatus.text = "Hex: $hex | Mask: $statusMask\nStatus: $activeStatuses"
+
+        val isExpanded = position == expandedPosition
+        holder.expandedContainer.visibility = if (isExpanded) View.VISIBLE else View.GONE
+
+        holder.itemView.setOnClickListener {
+            val previousExpandedPosition = expandedPosition
+            expandedPosition = if (isExpanded) RecyclerView.NO_POSITION else position
+
+            notifyItemChanged(previousExpandedPosition)
+            notifyItemChanged(expandedPosition)
+        }
+
+        holder.actionSearchWeb.setOnClickListener {
+            val query = "OBD2 DTC $formattedCode ${dtc.description ?: ""}".trim()
+            val url = "https://www.google.com/search?q=${Uri.encode(query)}"
+            val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+            holder.itemView.context.startActivity(intent)
+        }
+
+        holder.actionCopyCode.setOnClickListener {
+            val clipboard =
+                holder.itemView.context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+            val clipText =
+                "DTC: $formattedCode\nDescription: ${dtc.description ?: "Unknown"}\nSystem: $systemTxt\nStatus: $activeStatuses"
+            val clip = ClipData.newPlainText("DTC Info", clipText)
+            clipboard.setPrimaryClip(clip)
+
+            Toast
+                .makeText(
+                    holder.itemView.context,
+                    "Copied $formattedCode to clipboard",
+                    Toast.LENGTH_SHORT,
+                ).show()
+        }
+    }
 
     inner class ViewHolder internal constructor(
         itemView: View,
     ) : RecyclerView.ViewHolder(itemView) {
-        var code: TextView = itemView.findViewById(R.id.metadata_value)
+        var code: TextView = itemView.findViewById(R.id.dtc_value)
         var description: TextView = itemView.findViewById(R.id.dtc_description)
+
+        var expandedContainer: LinearLayout =
+            itemView.findViewById(R.id.dtc_expanded_details_container)
+        var detailSystemInfo: TextView = itemView.findViewById(R.id.dtc_detail_system_info)
+        var detailHexStatus: TextView = itemView.findViewById(R.id.dtc_detail_hex_status)
+
+        var actionSearchWeb: Button = itemView.findViewById(R.id.dtc_action_search_web)
+        var actionCopyCode: Button = itemView.findViewById(R.id.dtc_action_copy_code)
+    }
+
+    companion object {
+        private val DiffCallback =
+            object : DiffUtil.ItemCallback<DiagnosticTroubleCode>() {
+                override fun areItemsTheSame(
+                    oldItem: DiagnosticTroubleCode,
+                    newItem: DiagnosticTroubleCode,
+                ): Boolean = oldItem.standardCode == newItem.standardCode && oldItem.rawHex == newItem.rawHex
+
+                override fun areContentsTheSame(
+                    oldItem: DiagnosticTroubleCode,
+                    newItem: DiagnosticTroubleCode,
+                ): Boolean = oldItem == newItem
+            }
     }
 }
diff --git a/app/src/main/java/org/obd/graphs/preferences/metadata/VehicleMetadataPreferenceDialogFragment.kt b/app/src/main/java/org/obd/graphs/preferences/metadata/VehicleMetadataPreferenceDialogFragment.kt
index 66ec437b6..85518d7fc 100644
--- a/app/src/main/java/org/obd/graphs/preferences/metadata/VehicleMetadataPreferenceDialogFragment.kt
+++ b/app/src/main/java/org/obd/graphs/preferences/metadata/VehicleMetadataPreferenceDialogFragment.kt
@@ -23,7 +23,7 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import org.obd.graphs.R
-import org.obd.graphs.bl.datalogger.vehicleCapabilitiesManager
+import org.obd.graphs.bl.datalogger.VehicleCapabilitiesManager
 import org.obd.graphs.preferences.CoreDialogFragment
 
 class VehicleMetadataPreferenceDialogFragment : CoreDialogFragment() {
@@ -35,7 +35,7 @@ class VehicleMetadataPreferenceDialogFragment : CoreDialogFragment() {
         requestWindowFeatures()
 
         val root = inflater.inflate(R.layout.dialog_vehicle_metadata, container, false)
-        val adapter = VehicleMetadataViewAdapter(context, vehicleCapabilitiesManager.getVehicleCapabilities())
+        val adapter = VehicleMetadataViewAdapter(context, VehicleCapabilitiesManager.getVehicleMetadata())
         val recyclerView: RecyclerView = root.findViewById(R.id.recycler_view)
         recyclerView.layoutManager = GridLayoutManager(context, 1)
         recyclerView.adapter = adapter
diff --git a/app/src/main/java/org/obd/graphs/preferences/pid/PidDefinitionPreferenceDialogFragment.kt b/app/src/main/java/org/obd/graphs/preferences/pid/PidDefinitionPreferenceDialogFragment.kt
index 6601adf4b..05c824369 100644
--- a/app/src/main/java/org/obd/graphs/preferences/pid/PidDefinitionPreferenceDialogFragment.kt
+++ b/app/src/main/java/org/obd/graphs/preferences/pid/PidDefinitionPreferenceDialogFragment.kt
@@ -36,9 +36,9 @@ import androidx.recyclerview.widget.RecyclerView
 import org.obd.graphs.R
 import org.obd.graphs.ViewPreferencesSerializer
 import org.obd.graphs.bl.datalogger.DataLoggerRepository
+import org.obd.graphs.bl.datalogger.VehicleCapabilitiesManager
 import org.obd.graphs.bl.datalogger.dataLoggerSettings
 import org.obd.graphs.bl.datalogger.serialize
-import org.obd.graphs.bl.datalogger.vehicleCapabilitiesManager
 import org.obd.graphs.bl.query.Query
 import org.obd.graphs.bl.query.QueryStrategyType
 import org.obd.graphs.preferences.CoreDialogFragment
@@ -185,7 +185,7 @@ open class PidDefinitionPreferenceDialogFragment(
             }
         }
 
-        root.findViewById<Button>(R.id.trip_action_close_window).apply {
+        root.findViewById<Button>(R.id.action_close_window).apply {
             setOnClickListener {
                 dialog?.dismiss()
                 onDialogCloseListener.invoke()
@@ -422,7 +422,7 @@ open class PidDefinitionPreferenceDialogFragment(
         source: Collection<PidDefinition>,
         predicate: (PidDefinition) -> Boolean,
     ): List<PidDefinitionDetails> {
-        val ecuSupportedPIDs = vehicleCapabilitiesManager.getCapabilities()
+        val ecuSupportedPIDs = VehicleCapabilitiesManager.getSupportedPIDs()
         val ecuSupportedPIDsEnabled = Prefs.getBoolean(FILTER_BY_ECU_SUPPORTED_PIDS_PREF, false)
         val stablePIDsEnabled = Prefs.getBoolean(FILTER_BY_STABLE_PIDS_PREF, false)
 
diff --git a/app/src/main/java/org/obd/graphs/ui/Extensions.kt b/app/src/main/java/org/obd/graphs/ui/Extensions.kt
index 3d4d963d7..249d5c3de 100644
--- a/app/src/main/java/org/obd/graphs/ui/Extensions.kt
+++ b/app/src/main/java/org/obd/graphs/ui/Extensions.kt
@@ -19,18 +19,26 @@ package org.obd.graphs.ui
 import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.core.content.ContextCompat
+import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import org.obd.graphs.activity.FabButtons
 import org.obd.graphs.bl.datalogger.DataLoggerRepository
 import org.obd.graphs.bl.datalogger.DataLoggerService
 import org.obd.graphs.bl.query.Query
 
+fun DialogFragment.withDataLogger(action: DataLoggerService.() -> Unit) {
+    org.obd.graphs.bl.datalogger
+        .withDataLogger(requireContext(), action)
+}
+
 fun Fragment.withDataLogger(action: DataLoggerService.() -> Unit) {
-    org.obd.graphs.bl.datalogger.withDataLogger(requireContext(), action)
+    org.obd.graphs.bl.datalogger
+        .withDataLogger(requireContext(), action)
 }
 
 fun ComponentActivity.withDataLogger(action: DataLoggerService.() -> Unit) {
-    org.obd.graphs.bl.datalogger.withDataLogger(this, action)
+    org.obd.graphs.bl.datalogger
+        .withDataLogger(this, action)
 }
 
 fun Fragment.configureActionButton(query: Query) {
diff --git a/app/src/main/res/drawable/ic_action_execute.xml b/app/src/main/res/drawable/ic_action_execute.xml
new file mode 100644
index 000000000..94099fc6d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_execute.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,16.5v-9l6,4.5L10,16.5z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_dtc.xml b/app/src/main/res/layout/dialog_dtc.xml
index 434c72b15..ec90e7072 100644
--- a/app/src/main/res/layout/dialog_dtc.xml
+++ b/app/src/main/res/layout/dialog_dtc.xml
@@ -1,82 +1,125 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minWidth="350dp"
+    android:background="@color/white">
 
-    <TableLayout android:background="@color/white"
-        android:id="@+id/tablelayout"
-        android:layout_width="fill_parent"
+    <TextView
+        android:id="@+id/header_code"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
+        android:minWidth="80dp"
+        android:padding="8dp"
+        android:text="@string/pref.dtc.code"
+        android:textColor="@color/gray_dark"
+        android:textSize="16sp"
+        android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="parent" />
 
-        <TableRow
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_weight="1.0"
-                android:gravity="start"
-                android:paddingStart="4dp"
-                android:paddingEnd="0dp"
-                android:text="@string/pref.dtc.code"
-                android:textColor="@color/gray_dark"
-                android:textSize="16sp"
-                android:textStyle="bold" />
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_weight="1.0"
-                android:gravity="start"
-                android:text="@string/pref.dtc.description"
-                android:textAllCaps="false"
-                android:textColor="@color/gray_dark"
-                android:textSize="16sp"
-                android:textStyle="bold" />
-        </TableRow>
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-             <View
-                android:layout_width="match_parent"
-                android:layout_height="2dip"
-                android:layout_weight="2"
-                android:background="#FF909090"
-                android:padding="2dip" />
-        </TableRow>
+    <TextView
+        android:id="@+id/header_description"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:padding="8dp"
+        android:text="@string/pref.dtc.description"
+        android:textColor="@color/gray_dark"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/header_code"
+        app:layout_constraintTop_toTopOf="parent" />
 
-    </TableLayout>
+    <View
+        android:id="@+id/header_divider"
+        android:layout_width="0dp"
+        android:layout_height="2dp"
+        android:background="#FF909090"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/header_code" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_below="@id/tablelayout"
-        android:background="@color/white" />
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:layout_constrainedHeight="true"
+        app:layout_constraintBottom_toTopOf="@+id/button_container"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/header_divider" />
 
     <LinearLayout
-        android:id="@+id/status_panel"
-        android:layout_width="fill_parent"
+        android:id="@+id/button_container"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:gravity="end"
-        android:orientation="horizontal">
+        android:orientation="vertical"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
 
-        <Button
-            android:id="@+id/trip_action_close_window"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:backgroundTint="@color/rainbow_indigo"
-            android:text="@string/dialog_close_window_action"
-            android:textSize="12sp" />
+            android:orientation="horizontal">
 
-    </LinearLayout>
+            <Button
+                android:id="@+id/action_refresh_dtc"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_marginEnd="4dp"
+                android:backgroundTint="@color/rainbow_indigo"
+                android:text="Refresh"
+                android:textSize="12sp" />
+
+            <Button
+                android:id="@+id/action_clear_dtc"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_marginStart="4dp"
+                android:backgroundTint="#D32F2F"
+                android:text="Clear Codes"
+                android:textColor="@android:color/white"
+                android:textSize="12sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:orientation="horizontal">
+
+            <Button
+                android:id="@+id/action_share"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_marginEnd="4dp"
+                android:backgroundTint="@color/rainbow_indigo"
+                android:text="Share"
+                android:textSize="12sp" />
 
-</RelativeLayout>
+            <Button
+                android:id="@+id/action_close_window"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_marginStart="4dp"
+                android:backgroundTint="@color/rainbow_indigo"
+                android:text="@string/dialog_close_window_action"
+                android:textSize="12sp" />
+        </LinearLayout>
+
+    </LinearLayout>
 
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_pid.xml b/app/src/main/res/layout/dialog_pid.xml
index 4c0058ef0..50647849b 100644
--- a/app/src/main/res/layout/dialog_pid.xml
+++ b/app/src/main/res/layout/dialog_pid.xml
@@ -274,7 +274,7 @@
             tools:ignore="SmallSp" />
 
         <Button
-            android:id="@+id/trip_action_close_window"
+            android:id="@+id/action_close_window"
             style="?android:attr/buttonBarButtonStyle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_trip.xml b/app/src/main/res/layout/dialog_trip.xml
index c309dcbcb..85ad46ae1 100644
--- a/app/src/main/res/layout/dialog_trip.xml
+++ b/app/src/main/res/layout/dialog_trip.xml
@@ -104,7 +104,7 @@
         android:padding="4dp">
 
         <Button
-            android:id="@+id/trip_action_close_window"
+            android:id="@+id/action_close_window"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="4dp"
diff --git a/app/src/main/res/layout/dialog_vehicle_metadata.xml b/app/src/main/res/layout/dialog_vehicle_metadata.xml
index b44128f70..4fde052bf 100644
--- a/app/src/main/res/layout/dialog_vehicle_metadata.xml
+++ b/app/src/main/res/layout/dialog_vehicle_metadata.xml
@@ -67,7 +67,7 @@
         android:orientation="horizontal">
 
         <Button
-            android:id="@+id/trip_action_close_window"
+            android:id="@+id/action_close_window"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
diff --git a/app/src/main/res/layout/item_dtc.xml b/app/src/main/res/layout/item_dtc.xml
index e7b07db48..2236062a2 100644
--- a/app/src/main/res/layout/item_dtc.xml
+++ b/app/src/main/res/layout/item_dtc.xml
@@ -1,55 +1,103 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:clickable="true"
+    android:focusable="true">
+    <TextView
+        android:id="@+id/dtc_value"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minWidth="80dp"
+        android:padding="8dp"
+        android:text="@string/pref.dtc.code"
+        android:textColor="@color/gray_light"
+        android:textSize="16sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/dtc_description"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:paddingTop="8dp"
+        android:paddingEnd="8dp"
+        android:paddingStart="8dp"
+        android:paddingBottom="8dp"
+        android:text="@string/pref.dtc.description"
+        android:textAllCaps="false"
+        android:textColor="@color/gray_light"
+        android:textSize="16sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/dtc_value"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <LinearLayout
+        android:id="@+id/dtc_expanded_details_container"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:visibility="gone"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
+        android:paddingBottom="12dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/dtc_value"
+        app:layout_constraintTop_toBottomOf="@+id/dtc_description">
+
+        <TextView
+            android:id="@+id/dtc_detail_system_info"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/gray_dark"
+            android:textSize="13sp" />
+
+        <TextView
+            android:id="@+id/dtc_detail_hex_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/gray_dark"
+            android:textSize="13sp"
+            android:layout_marginTop="4dp" />
 
-    <TableLayout android:background="@color/white"
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginTop="8dp">
+
+            <Button
+                android:id="@+id/dtc_action_search_web"
+                style="?android:attr/borderlessButtonStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Google Issue"
+                android:textColor="@color/rainbow_indigo"
+                android:textSize="12sp" />
+
+            <Button
+                android:id="@+id/dtc_action_copy_code"
+                style="?android:attr/borderlessButtonStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Copy"
+                android:textColor="@color/gray_dark"
+                android:textSize="12sp" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <View
+        android:id="@+id/item_divider"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:background="#E0E0E0"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:id="@+id/tablelayout"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" android:paddingEnd="2dip"  android:paddingStart="0dp">
-
-        <TableRow
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:paddingStart="0dp"
-            android:paddingEnd="8dp">
-
-            <TextView
-                android:id="@+id/metadata_value"
-                android:layout_width="0dp"
-                android:layout_weight="1.0"
-                android:gravity="start"
-                android:paddingStart="4dp"
-                android:paddingEnd="0dp"
-                android:text="@string/pref.dtc.code"
-                android:textColor="@color/gray_light"
-                android:textSize="16sp" />
-
-            <TextView
-                android:id="@+id/dtc_description"
-                android:layout_width="0dp"
-                android:layout_weight="1.0"
-                android:gravity="start"
-                android:text="@string/pref.dtc.description"
-                android:textAllCaps="false"
-                android:textColor="@color/gray_light"
-                android:textSize="16sp" />
-        </TableRow>
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-             <View
-                android:layout_width="match_parent"
-                android:layout_height="1dip"
-                android:layout_weight="1"
-                android:background="#FF909090"
-                android:padding="2dip" />
-        </TableRow>
-    </TableLayout>
+        app:layout_constraintTop_toBottomOf="@+id/dtc_expanded_details_container" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 86a4766b1..db138d4d4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -127,16 +127,7 @@
     <string name="pref.pids.group.enableCapabilitiesReadings">Enable Vehicle supported OBD2 PIDs/Sensors readings</string>
     <string name="pref.pids.group.enableMetadataReadings">Enable Vehicle metadata readings</string>
     <string name="pref.pids.group.dtc.available_message">DTC are available.Please check DTC section</string>
-    <string name="pref.pids.group.enableDTCReadings">Enable DTC readings</string>
-    <string name="pref.pids.group.show_notification">Enable DTC notifications</string>
-    <string name="pref.pids.group.enableDTCCleanup">Perform DTC cleanup after the session starts</string>
 
-    <string name="pref.pids.group.show_notification_summary">When enabled, you will receive notification whenever DTC becomes available.</string>
-
-    <string name="pref.pids.group.enableDTCCleanup_summary">When enabled, this option will automatically erase Diagnostic Trouble Codes (DTCs) from the ECU memory.</string>
-
-
-    <string name="pref.pids.group.enableDTCReadings_summary">When enabled, Diagnostic Trouble Codes (DTCs) will be read during the ECU session.</string>
     <string name="pref.pids.group.enableMetadataReadings_summary">When enabled, vehicle metadata will be retrieved during the ECU session.</string>
     <string name="pref.pids.group.enableCapabilitiesReadings_summary">Enabling this option will allow supported OBD2 PIDs/Sensors to be read during the session with the ECU.</string>
 
@@ -285,10 +276,25 @@
     <string name="pref.aa.theme.dynamic_selector.enabled">Dynamic selector enabled</string>
     <string name="pref.aa.theme.dynamic_selector.enabled_summary">When enabled, colors are applied according to the selected dynamic mode: SPORT, NORMAL, or ECO.</string>
 
-    <string name="pref.dtc.title">Diagnostic Trouble Code</string>
+    <!-- DTC -->
+    <string name="pref.dtc.title">Diagnostic Trouble Codes</string>
     <string name="pref.dtc.code">Code</string>
     <string name="pref.dtc.description">Description</string>
     <string name="pref.dtc.no_dtc_found">No Diagnosis Trouble Code (DTC) found.</string>
+    <string name="pref.dtc.enable_automaticDTCCleanup">Enable DTC cleanup</string>
+    <string name="pref.dtc.enable_automaticDTCCleanup_summary">Automatically clears Diagnostic Trouble Codes (DTCs) from the ECU memory.</string>
+    <string name="pref.dtc.settings_summary"><b>Tap</b> to view active Diagnostic Trouble Codes (DTCs) retrieved from the ECU.</string>
+    <string name="pref.dtc.settings">View Current DTCs</string>
+    <string name="pref.dtc.enable_DTCReadings">Enable DTC readings</string>
+    <string name="pref.dtc.enable_DTCReadings_summary">Read Diagnostic Trouble Codes (DTCs) while connected to the ECU.</string>
+    <string name="pref.dtc.show_notification">Enable DTC notifications</string>
+    <string name="pref.dtc.show_notification_summary">Sends an alert when new Diagnostic Trouble Codes (DTCs) are found.</string>
+
+    <string name="pref.dtc.clean_dialog.confirm_message">Are you sure you want to clear all DTCs from the ECU?\n\nMake sure the engine is OFF, but the ignition is ON.</string>
+    <string name="pref.dtc.clean_dialog.send_message">Clear command sent to ECU</string>
+    <string name="pref.dtc.clean_dialog.title">Clear Diagnostic Codes?</string>
+
+    <string name="pref.dtc.no_connection_established">There is no ECU connection established. Please connect first.</string>
 
     <string name="pref.vehicle.metadata_title">Vehicle Metadata</string>
     <string name="pref.vehicle.metadata.name">Name</string>
@@ -526,8 +532,6 @@
     <string name="pref_vehicle_metadata_summary">In this section, you can view vehicle metadata fetched from the ECU, including VIN, ECU type, hardware serial number, etc.</string>
     <string name="pref_vehicle_profile_settings_summary">This section contains preferences related to Vehicle Profiles. You can change the vehicle profile here.</string>
     <string name="pref_power_settings_summary">Power-related settings are available in this section, allowing you to define the application’s behavior when the charger is plugged in or removed.</string>
-    <string name="pref_dtc_settings_summary">Diagnostic Trouble Codes (DTCs) retrieved from the ECU are displayed in this section.</string>
-
 
     <string name="pids_stable">Stable</string>
     <string name="pids_alert_lower_threshold">Alert\nlower threshold</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 6691dbf2d..7b7f1e1ef 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -554,39 +554,40 @@
         android:title="@string/pref.dtc.title">
         <PreferenceScreen
             android:key="pref.dtc"
-            android:summary="@string/pref_dtc_settings_summary"
+            android:summary="@string/pref.dtc.settings_summary"
             android:title="@string/pref.settings"
             app:singleLineTitle="false">
             <PreferenceCategory android:title="@string/pref.dtc.title">
                 <org.obd.graphs.preferences.dtc.DiagnosticTroubleCodeListPreferences
+                    app:icon="@drawable/ic_action_execute"
                     android:dialogTitle="@string/pref.dtc.title"
                     android:key="pref.dtc.list"
-                    android:summary="@string/pref_dtc_settings_summary"
-                    android:title="@string/pref.dtc.title"
+                    android:summary="@string/pref.dtc.settings_summary"
+                    android:title="@string/pref.dtc.settings"
                     app:singleLineTitle="false" />
 
                 <SwitchPreferenceCompat
                     android:defaultValue="false"
-                    android:dialogTitle="@string/pref.pids.group.enableDTCCleanup"
+                    android:dialogTitle="@string/pref.dtc.enable_automaticDTCCleanup"
                     android:key="pref.adapter.init.cleanDTC"
-                    android:summary="@string/pref.pids.group.enableDTCCleanup_summary"
-                    android:title="@string/pref.pids.group.enableDTCCleanup"
+                    android:summary="@string/pref.dtc.enable_automaticDTCCleanup_summary"
+                    android:title="@string/pref.dtc.enable_automaticDTCCleanup"
                     app:singleLineTitle="false" />
 
                 <SwitchPreferenceCompat
                     android:defaultValue="false"
-                    android:dialogTitle="@string/pref.pids.group.enableDTCReadings"
+                    android:dialogTitle="@string/pref.dtc.enable_DTCReadings"
                     android:key="pref.adapter.init.fetchDTC"
-                    android:summary="@string/pref.pids.group.enableDTCReadings_summary"
-                    android:title="@string/pref.pids.group.enableDTCReadings"
+                    android:summary="@string/pref.dtc.enable_DTCReadings_summary"
+                    android:title="@string/pref.dtc.enable_DTCReadings"
                     app:singleLineTitle="false" />
 
                 <SwitchPreferenceCompat
                     android:defaultValue="false"
-                    android:dialogTitle="@string/pref.pids.group.show_notification"
+                    android:dialogTitle="@string/pref.dtc.show_notification"
                     android:key="pref.dtc.show_notification"
-                    android:summary="@string/pref.pids.group.show_notification_summary"
-                    android:title="@string/pref.pids.group.show_notification"
+                    android:summary="@string/pref.dtc.show_notification_summary"
+                    android:title="@string/pref.dtc.show_notification"
                     app:singleLineTitle="false" />
 
             </PreferenceCategory>
diff --git a/datalogger/src/main/java/org/obd/graphs/bl/datalogger/DataLoggerConstants.kt b/datalogger/src/main/java/org/obd/graphs/bl/datalogger/DataLoggerConstants.kt
index bb08480a0..0802b568c 100644
--- a/datalogger/src/main/java/org/obd/graphs/bl/datalogger/DataLoggerConstants.kt
+++ b/datalogger/src/main/java/org/obd/graphs/bl/datalogger/DataLoggerConstants.kt
@@ -24,6 +24,8 @@ const val DATA_LOGGER_WIFI_NOT_CONNECTED = "data.logger.error.wifi.not.connected
 const val DATA_LOGGER_CONNECTED_EVENT = "data.logger.connected"
 const val DATA_LOGGER_SCHEDULED_STOP_EVENT = "data.logger.scheduled.stop"
 
+const val DATA_LOGGER_DTC_ACTION_COMPLETED = "data.logger.dtc.action.completed.event"
+
 const val DATA_LOGGER_DTC_AVAILABLE = "data.logger.dtc.available"
 const val DATA_LOGGER_CONNECTING_EVENT = "data.logger.connecting"
 const val DATA_LOGGER_STOPPED_EVENT = "data.logger.stopped"
diff --git a/datalogger/src/main/java/org/obd/graphs/bl/datalogger/DataLoggerService.kt b/datalogger/src/main/java/org/obd/graphs/bl/datalogger/DataLoggerService.kt
index 854d7c871..f6578284c 100644
--- a/datalogger/src/main/java/org/obd/graphs/bl/datalogger/DataLoggerService.kt
+++ b/datalogger/src/main/java/org/obd/graphs/bl/datalogger/DataLoggerService.kt
@@ -36,6 +36,10 @@ import org.obd.graphs.REQUEST_NOTIFICATION_PERMISSIONS
 import org.obd.graphs.bl.query.Query
 import org.obd.graphs.sendBroadcastEvent
 
+private const val ACTION_DTC_CLEANUP = "org.obd.graphs.logger.DTC.cleanup"
+
+private const val ACTION_DTC_READ = "org.obd.graphs.logger.DTC.read"
+
 private const val ACTION_START = "org.obd.graphs.logger.START"
 private const val ACTION_STOP = "org.obd.graphs.logger.STOP"
 
@@ -43,7 +47,6 @@ private const val UPDATE_QUERY = "org.obd.graphs.logger.UPDATE_QUERY"
 private const val QUERY = "org.obd.graphs.logger.QUERY"
 private const val EXECUTE_ROUTINE = "org.obd.graphs.logger.EXECUTE_ROUTINE"
 
-
 class DataLoggerService : Service() {
     private val binder = LocalBinder()
 
@@ -86,6 +89,14 @@ class DataLoggerService : Service() {
                 query?.let { DataLoggerRepository.workflowOrchestrator.start(it) }
             }
 
+            ACTION_DTC_CLEANUP -> {
+                DataLoggerRepository.workflowOrchestrator.scheduleDTCCleanup()
+            }
+
+            ACTION_DTC_READ -> {
+                DataLoggerRepository.workflowOrchestrator.scheduleDTCRead()
+            }
+
             EXECUTE_ROUTINE -> {
                 val query = intent.extras?.get(QUERY) as? Query
                 query?.let { DataLoggerRepository.workflowOrchestrator.executeRoutine(it) }
@@ -104,10 +115,16 @@ class DataLoggerService : Service() {
         if (DataLoggerRepository.isRunning()) {
             if (DataLoggerRepository.workflowOrchestrator.isSameQuery(query)) {
                 if (Log.isLoggable(LOG_TAG, Log.DEBUG)) {
-                    Log.d(LOG_TAG, "Do not update the query for strategy=${query.getStrategy()}. It is the same query that already running")
+                    Log.d(
+                        LOG_TAG,
+                        "Do not update the query for strategy=${query.getStrategy()}. It is the same query that already running",
+                    )
                 }
             } else {
-                Log.i(LOG_TAG, "Updating query for strategy=${query.getStrategy()}. PIDs=${query.getIDs()}")
+                Log.i(
+                    LOG_TAG,
+                    "Updating query for strategy=${query.getStrategy()}. PIDs=${query.getIDs()}",
+                )
                 enqueueWork(UPDATE_QUERY) { it.putExtra(QUERY, query) }
             }
         } else {
@@ -115,7 +132,6 @@ class DataLoggerService : Service() {
         }
     }
 
-
     fun executeRoutine(query: Query) {
         enqueueWork(EXECUTE_ROUTINE) { it.putExtra(QUERY, query) }
     }
@@ -124,6 +140,15 @@ class DataLoggerService : Service() {
         enqueueWork(ACTION_START) { it.putExtra(QUERY, query) }
     }
 
+    fun scheduleDTCCleanup() {
+        enqueueWork(ACTION_DTC_CLEANUP)
+    }
+
+    fun scheduleDTCRead() {
+        enqueueWork(ACTION_DTC_READ)
+    }
+
+
     fun stop() {
         enqueueWork(ACTION_STOP)
     }
@@ -138,7 +163,10 @@ class DataLoggerService : Service() {
                 if (Permissions.hasLocationPermissions(this)) {
                     serviceTypes = serviceTypes or ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION
                 } else {
-                    Log.w(LOG_TAG, "Location permission missing. Starting Service without GPS capabilities.")
+                    Log.w(
+                        LOG_TAG,
+                        "Location permission missing. Starting Service without GPS capabilities.",
+                    )
                 }
 
                 startForeground(NOTIFICATION_ID, notification, serviceTypes)
@@ -197,9 +225,11 @@ class DataLoggerService : Service() {
                 )
             }
 
-        return org.obd.graphs.Notification.notification(this,
+        return org.obd.graphs.Notification.notification(
+            this,
             "Logging OBD data in background...",
-            contentIntent)
+            contentIntent,
+        )
     }
 
     private fun createNotificationChannel() {
diff --git a/datalogger/src/main/java/org/obd/graphs/bl/datalogger/VehicleCapabilitiesManager.kt b/datalogger/src/main/java/org/obd/graphs/bl/datalogger/VehicleCapabilitiesManager.kt
index 3da309b07..d14933caa 100644
--- a/datalogger/src/main/java/org/obd/graphs/bl/datalogger/VehicleCapabilitiesManager.kt
+++ b/datalogger/src/main/java/org/obd/graphs/bl/datalogger/VehicleCapabilitiesManager.kt
@@ -18,73 +18,108 @@ package org.obd.graphs.bl.datalogger
 
 import android.util.Log
 import com.fasterxml.jackson.core.JsonParser
+import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.KotlinModule
 import com.fasterxml.jackson.module.kotlin.readValue
 import org.obd.graphs.preferences.Prefs
+import org.obd.metrics.api.model.DiagnosticTroubleCode
 import org.obd.metrics.api.model.VehicleCapabilities
 
-class VehicleMetadata(var name: String, var value: String)
+class VehicleMetadata(
+    var name: String,
+    var value: String,
+)
 
-private const val PREF_VEHICLE_CAPABILITIES = "pref.datalogger.supported.pids"
+private const val PREF_VEHICLE_SUPPORTED_PIDS = "pref.datalogger.supported.pids"
 private const val PREF_VEHICLE_METADATA = "pref.datalogger.vehicle.properties"
 private const val PREF_DTC = "pref.datalogger.dtc"
 
-class VehicleCapabilitiesManager {
-
-    private val mapper = ObjectMapper().apply {
-        registerModule(KotlinModule())
-        configure(JsonParser.Feature.ALLOW_UNQUOTED_FIELD_NAMES, true)
-        configure(JsonParser.Feature.ALLOW_UNQUOTED_CONTROL_CHARS, true)
-    }
+object VehicleCapabilitiesManager {
+    private val mapper =
+        ObjectMapper().apply {
+            registerModule(KotlinModule())
+            configure(JsonParser.Feature.ALLOW_UNQUOTED_FIELD_NAMES, true)
+            configure(JsonParser.Feature.ALLOW_UNQUOTED_CONTROL_CHARS, true)
+            configure(JsonParser.Feature.IGNORE_UNDEFINED, true)
+            configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+        }
 
     internal fun updateCapabilities(vehicleCapabilities: VehicleCapabilities) {
-
         Prefs.edit().apply {
-
             Log.i(
                 LOG_TAG,
                 "Property `vehicleCapabilitiesReadingEnabled` is " +
-                        "`${dataLoggerSettings.instance().adapter.vehicleCapabilitiesReadingEnabled}`"
+                    "`${dataLoggerSettings.instance().adapter.vehicleCapabilitiesReadingEnabled}`",
             )
             if (dataLoggerSettings.instance().adapter.vehicleCapabilitiesReadingEnabled) {
                 if (vehicleCapabilities.capabilities.isEmpty()) {
-                    Log.i(LOG_TAG, "Did not receive Vehicle Capabilities. Do not update preferences.")
+                    Log.i(
+                        LOG_TAG,
+                        "Did not receive Vehicle Capabilities. Do not update preferences.",
+                    )
                 } else {
-                    Log.i(LOG_TAG, "Received Vehicle Capabilities. Updating preferences with=${vehicleCapabilities.capabilities}")
-                    putStringSet(PREF_VEHICLE_CAPABILITIES, vehicleCapabilities.capabilities)
+                    Log.i(
+                        LOG_TAG,
+                        "Received Vehicle Capabilities. Updating preferences with=${vehicleCapabilities.capabilities}",
+                    )
+                    putStringSet(PREF_VEHICLE_SUPPORTED_PIDS, vehicleCapabilities.capabilities)
                 }
             }
 
-            putString(PREF_VEHICLE_METADATA, mapper.writeValueAsString(vehicleCapabilities.metadata))
-            putStringSet(PREF_DTC, vehicleCapabilities.dtc.map { it.code }.toHashSet())
-            apply()
+            putString(
+                PREF_VEHICLE_METADATA,
+                mapper.writeValueAsString(vehicleCapabilities.metadata),
+            )
+            commit()
         }
+        updateDTC(vehicleCapabilities.dtc)
     }
 
-    fun getCapabilities(): MutableList<String> {
-        val pidList = DataLoggerRepository.getPidDefinitionRegistry().findAll()
-        return Prefs.getStringSet(PREF_VEHICLE_CAPABILITIES, emptySet())!!.toMutableList()
-            .sortedWith(compareBy { t -> pidList.firstOrNull { a -> a.pid == t.uppercase() } }).toMutableList()
+
+    internal fun updateDTC(dtc: Set<DiagnosticTroubleCode>) {
+        Prefs.edit().apply {
+            Log.i(
+                LOG_TAG,
+                "Updating DTC, size: ${dtc.size}",
+            )
+            putString(PREF_DTC, mapper.writeValueAsString(dtc))
+            commit()
+        }
     }
 
-    fun getDTC(): MutableList<String> {
-        return Prefs.getStringSet(PREF_DTC, emptySet())!!.toMutableList()
+    fun getSupportedPIDs(): MutableList<String> {
+        val pidList = DataLoggerRepository.getPidDefinitionRegistry().findAll()
+        return Prefs
+            .getStringSet(PREF_VEHICLE_SUPPORTED_PIDS, emptySet())!!
+            .toMutableList()
+            .sortedWith(compareBy { t -> pidList.firstOrNull { a -> a.pid == t.uppercase() } })
+            .toMutableList()
     }
 
-    fun getVehicleCapabilities(): MutableList<VehicleMetadata> {
-        val preferences = Prefs.getString(PREF_VEHICLE_METADATA, "")!!
+    fun getDiagnosticTroubleCodes(): MutableList<DiagnosticTroubleCode> =
+        try {
+            var preferences = Prefs.getString(PREF_DTC, "")!!
+            if (preferences.startsWith("\"") && preferences.endsWith("\"")) {
+                preferences = mapper.readValue<String>(preferences)
+            }
+            mapper.readValue<List<DiagnosticTroubleCode>>(preferences).toMutableList()
+        } catch (e: Throwable) {
+            Log.e(LOG_TAG, "Failed to read Diagnostic Trouble Code from preferences", e)
+            mutableListOf()
+        }
 
+    fun getVehicleMetadata(): MutableList<VehicleMetadata> =
         try {
-            return if (preferences.isEmpty()) mutableListOf() else {
+            val preferences = Prefs.getString(PREF_VEHICLE_METADATA, "")!!
+            if (preferences.isEmpty()) {
+                mutableListOf()
+            } else {
                 val map: Map<String, String> = mapper.readValue(preferences)
-                return map.map { (k, v) -> VehicleMetadata(k, v) }.toMutableList()
+                map.map { (k, v) -> VehicleMetadata(k, v) }.toMutableList()
             }
-        } catch (e: Throwable){
-            Log.e(LOG_TAG, "Failed to read vehicle capabilities from prefs: '${preferences}'",e)
+        } catch (e: Throwable) {
+            Log.e(LOG_TAG, "Failed to read vehicle capabilities from prefs", e)
+            mutableListOf()
         }
-        return mutableListOf()
-    }
 }
-
-val vehicleCapabilitiesManager = VehicleCapabilitiesManager()
diff --git a/datalogger/src/main/java/org/obd/graphs/bl/datalogger/WorkflowOrchestrator.kt b/datalogger/src/main/java/org/obd/graphs/bl/datalogger/WorkflowOrchestrator.kt
index 2b3d03cfb..e1cd198ea 100644
--- a/datalogger/src/main/java/org/obd/graphs/bl/datalogger/WorkflowOrchestrator.kt
+++ b/datalogger/src/main/java/org/obd/graphs/bl/datalogger/WorkflowOrchestrator.kt
@@ -21,9 +21,6 @@ import android.content.Context
 import android.content.Intent
 import android.util.Log
 import androidx.lifecycle.LifecycleOwner
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
 import org.obd.graphs.*
 import org.obd.graphs.bl.datalogger.connectors.ConnectionManager
 import org.obd.graphs.bl.query.Query
@@ -33,6 +30,7 @@ import org.obd.metrics.api.Workflow
 import org.obd.metrics.api.WorkflowExecutionStatus
 import org.obd.metrics.api.model.*
 import org.obd.metrics.codec.formula.FormulaEvaluatorConfig
+import org.obd.metrics.command.dtc.DiagnosticTroubleCodeClearStatus
 import org.obd.metrics.command.group.DefaultCommandGroup
 import org.obd.metrics.command.routine.RoutineCommand
 import org.obd.metrics.command.routine.RoutineExecutionStatus
@@ -78,6 +76,14 @@ internal class WorkflowOrchestrator internal constructor() {
             sendBroadcastEvent(DATA_LOGGER_CONNECTING_EVENT)
         }
 
+        override fun onDTCCompleted(
+            dtc: Set<DiagnosticTroubleCode>,
+            status: DiagnosticTroubleCodeClearStatus?
+        ) {
+            VehicleCapabilitiesManager.updateDTC(dtc)
+            sendBroadcastEvent(DATA_LOGGER_DTC_ACTION_COMPLETED)
+        }
+
         override fun onRoutineCompleted(
             routineCommand: RoutineCommand,
             status: RoutineExecutionStatus
@@ -95,7 +101,7 @@ internal class WorkflowOrchestrator internal constructor() {
         override fun onRunning(vehicleCapabilities: VehicleCapabilities) {
             status = WorkflowStatus.Connected
             Log.i(LOG_TAG, "We are connected to the vehicle: $vehicleCapabilities")
-            vehicleCapabilitiesManager.updateCapabilities(vehicleCapabilities)
+            VehicleCapabilitiesManager.updateCapabilities(vehicleCapabilities)
             sendBroadcastEvent(DATA_LOGGER_CONNECTED_EVENT)
 
             // notify about DTC
@@ -212,6 +218,19 @@ internal class WorkflowOrchestrator internal constructor() {
         }
     }
 
+    fun scheduleDTCCleanup() {
+        Log.i(LOG_TAG,"Schedule DTC cleanup")
+        val result = workflow.scheduleDTCAction(setOf(DtcAction.CLEAR, DtcAction.READ))
+        Log.i(LOG_TAG,"DTC cleanup is scheduled: $result")
+    }
+
+    fun scheduleDTCRead() {
+        Log.i(LOG_TAG,"Schedule DTC read")
+        val result = workflow.scheduleDTCAction(setOf(DtcAction.READ))
+        Log.i(LOG_TAG,"DTC read is scheduled: $result")
+    }
+
+
     fun executeRoutine(query: Query) {
         currentQuery = query
         val init = init()
diff --git a/gradle.properties b/gradle.properties
index 0f73a4988..4a7441872 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,4 +19,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-obdMetricVersion=11.14.0-SNAPSHOT
+obdMetricVersion=11.16.0-SNAPSHOT