From cc8ae3246f0441ae09dcce3ec9bcdf11800e2222 Mon Sep 17 00:00:00 2001 From: Armin Date: Wed, 13 Sep 2023 15:36:36 +0200 Subject: [PATCH] Rename classes --- .../ProblematicManufacturerWarningDialog.kt | 4 ++-- .../kotlin/de/cyface/energy_settings/TrackingSettings.kt | 7 ++++--- .../settings/{CustomSettings.kt => EnergySettings.kt} | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) rename energy_settings/src/main/kotlin/de/cyface/energy_settings/settings/{CustomSettings.kt => EnergySettings.kt} (96%) diff --git a/energy_settings/src/main/kotlin/de/cyface/energy_settings/ProblematicManufacturerWarningDialog.kt b/energy_settings/src/main/kotlin/de/cyface/energy_settings/ProblematicManufacturerWarningDialog.kt index 24df4fc..d1a548d 100644 --- a/energy_settings/src/main/kotlin/de/cyface/energy_settings/ProblematicManufacturerWarningDialog.kt +++ b/energy_settings/src/main/kotlin/de/cyface/energy_settings/ProblematicManufacturerWarningDialog.kt @@ -32,7 +32,7 @@ import com.afollestad.materialdialogs.MaterialDialog import de.cyface.energy_settings.Constants.TAG import de.cyface.energy_settings.GnssDisabledWarningDialog.Companion.create import de.cyface.energy_settings.ProblematicManufacturerWarningDialog.Companion.create -import de.cyface.energy_settings.settings.CustomSettings +import de.cyface.energy_settings.settings.EnergySettings import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import java.util.Locale @@ -172,7 +172,7 @@ internal class ProblematicManufacturerWarningDialog(private val recipientEmail: * Saves the user's preference to disable auto-popup of this dialog */ private suspend fun onNegativeButtonCall(context: Context?) { - CustomSettings().setManufacturerWarningShown(true) + EnergySettings().setManufacturerWarningShown(true) } /** diff --git a/energy_settings/src/main/kotlin/de/cyface/energy_settings/TrackingSettings.kt b/energy_settings/src/main/kotlin/de/cyface/energy_settings/TrackingSettings.kt index 2280359..8d3e8a4 100644 --- a/energy_settings/src/main/kotlin/de/cyface/energy_settings/TrackingSettings.kt +++ b/energy_settings/src/main/kotlin/de/cyface/energy_settings/TrackingSettings.kt @@ -33,7 +33,7 @@ import androidx.datastore.core.DataStoreFactory import androidx.datastore.dataStoreFile import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager -import de.cyface.energy_settings.settings.CustomSettings +import de.cyface.energy_settings.settings.EnergySettings import de.cyface.energy_settings.settings.PreferencesMigrationFactory import de.cyface.energy_settings.settings.SettingsSerializer import de.cyface.energy_settings.settings.StoreMigration @@ -58,7 +58,7 @@ object TrackingSettings { /** * Custom settings used by this library. */ - private lateinit var settings: CustomSettings + private lateinit var settings: EnergySettings // FIXME: see if we can also mice the datastore to CustomSettings like everywhere else. /** @@ -91,7 +91,8 @@ object TrackingSettings { StoreMigration() ) ) - settings = CustomSettings() // Depends on dataStore to be initialized + settings = + EnergySettings() // Depends on dataStore to be initialized } /** diff --git a/energy_settings/src/main/kotlin/de/cyface/energy_settings/settings/CustomSettings.kt b/energy_settings/src/main/kotlin/de/cyface/energy_settings/settings/EnergySettings.kt similarity index 96% rename from energy_settings/src/main/kotlin/de/cyface/energy_settings/settings/CustomSettings.kt rename to energy_settings/src/main/kotlin/de/cyface/energy_settings/settings/EnergySettings.kt index 361d3dc..4fa912d 100644 --- a/energy_settings/src/main/kotlin/de/cyface/energy_settings/settings/CustomSettings.kt +++ b/energy_settings/src/main/kotlin/de/cyface/energy_settings/settings/EnergySettings.kt @@ -23,13 +23,13 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map /** - * Custom settings used by this library. + * Settings used by this library. * * @author Armin Schnabel * @version 2.0.0 * @since 3.3.4 */ -class CustomSettings { +class EnergySettings { /** * Saves whether the user marked the manufacturer-specific warning as "don't show again".