From 09433d6a4f6a8066a3179db01579610be7e3e872 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Sun, 24 Apr 2022 17:40:16 +0200 Subject: [PATCH] WatchfaceSettingsPreference -> kt --- .../interaction/utils/VersionPreference.kt | 1 + .../utils/WatchfaceSettingsPreference.java | 33 ------------------- .../utils/WatchfaceSettingsPreference.kt | 25 ++++++++++++++ wear/src/main/res/values/strings.xml | 2 +- 4 files changed, 27 insertions(+), 34 deletions(-) delete mode 100644 wear/src/main/java/info/nightscout/androidaps/interaction/utils/WatchfaceSettingsPreference.java create mode 100644 wear/src/main/java/info/nightscout/androidaps/interaction/utils/WatchfaceSettingsPreference.kt diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/VersionPreference.kt b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/VersionPreference.kt index 9f5ce4968c..d63d7ca252 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/VersionPreference.kt +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/VersionPreference.kt @@ -9,6 +9,7 @@ import info.nightscout.androidaps.BuildConfig /** * Created by adrian on 07/08/17. */ +@Suppress("unused") class VersionPreference(context: Context?, attrs: AttributeSet?) : WearListPreference(context, attrs) { override fun getSummary(context: Context): CharSequence { diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/WatchfaceSettingsPreference.java b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/WatchfaceSettingsPreference.java deleted file mode 100644 index eba3b79033..0000000000 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/WatchfaceSettingsPreference.java +++ /dev/null @@ -1,33 +0,0 @@ -package info.nightscout.androidaps.interaction.utils; - -import android.content.Context; -import android.util.AttributeSet; -import android.widget.Toast; - -import androidx.annotation.NonNull; - -import preference.WearListPreference; - - -public class WatchfaceSettingsPreference extends WearListPreference { - private final String pref_moreWatchfaceSettings; - private final String pref_lookInYourWatchfaceConfiguration; - - public WatchfaceSettingsPreference(Context context, AttributeSet attrs) { - super(context, attrs); - - this.pref_moreWatchfaceSettings =context.getResources().getString(context.getResources().getIdentifier("pref_moreWatchfaceSettings", "string", context.getApplicationContext().getPackageName())); - this.pref_lookInYourWatchfaceConfiguration=context.getResources().getString(context.getResources().getIdentifier("pref_lookInYourWatchfaceConfiguration", "string", context.getApplicationContext().getPackageName())); - - entries = new CharSequence[]{pref_moreWatchfaceSettings}; - entryValues = new CharSequence[]{""}; - } - - @Override public CharSequence getSummary(@NonNull final Context context) { - return ""; - } - @Override - public void onPreferenceClick(@NonNull Context context) { - Toast.makeText(context, pref_lookInYourWatchfaceConfiguration, Toast.LENGTH_LONG).show(); - } -} diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/WatchfaceSettingsPreference.kt b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/WatchfaceSettingsPreference.kt new file mode 100644 index 0000000000..6ae373d8e8 --- /dev/null +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/WatchfaceSettingsPreference.kt @@ -0,0 +1,25 @@ +package info.nightscout.androidaps.interaction.utils + +import android.content.Context +import android.util.AttributeSet +import android.widget.Toast +import info.nightscout.androidaps.R +import preference.WearListPreference + +@Suppress("unused") +class WatchfaceSettingsPreference(context: Context, attrs: AttributeSet?) : WearListPreference(context, attrs) { + + private val prefMoreWatchfaceSettings: String = context.getString(R.string.pref_moreWatchfaceSettings) + private val prefLookInYourWatchfaceConfiguration: String = context.getString(R.string.pref_lookInYourWatchfaceConfiguration) + + override fun getSummary(context: Context): CharSequence = "" + + override fun onPreferenceClick(context: Context) { + Toast.makeText(context, prefLookInYourWatchfaceConfiguration, Toast.LENGTH_LONG).show() + } + + init { + entries = arrayOf(prefMoreWatchfaceSettings) + entryValues = arrayOf("") + } +} \ No newline at end of file diff --git a/wear/src/main/res/values/strings.xml b/wear/src/main/res/values/strings.xml index 2b019792f2..bc56b0bb46 100644 --- a/wear/src/main/res/values/strings.xml +++ b/wear/src/main/res/values/strings.xml @@ -70,7 +70,7 @@ Complication Tap Action Unicode in Complications Version: - more Watchface settings + More Watchface settings Look into Watchface configuration, please. TempT