From 2dd3709e78d241eca24d0283b8ad0e3d65f3332d Mon Sep 17 00:00:00 2001 From: Finn M Glas Date: Mon, 17 Aug 2020 12:46:21 +0200 Subject: [PATCH] Create date-formats-spinner --- .../launcher/SettingsFragmentLauncher.kt | 25 ++++++++++++++++--- ...ttings_theme.xml => settings_launcher.xml} | 23 +++++++++++++++-- app/src/main/res/values/strings.xml | 9 +++++++ 3 files changed, 52 insertions(+), 5 deletions(-) rename app/src/main/res/layout/{settings_theme.xml => settings_launcher.xml} (88%) diff --git a/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt b/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt index 8d06b45..432d59c 100644 --- a/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt +++ b/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt @@ -7,16 +7,19 @@ import android.os.Build import android.os.Bundle import android.provider.MediaStore import android.util.DisplayMetrics -import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ArrayAdapter +import android.widget.Spinner import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat +import androidx.fragment.app.Fragment import androidx.palette.graphics.Palette import com.finnmglas.launcher.* import com.finnmglas.launcher.settings.intendedSettingsPause -import kotlinx.android.synthetic.main.settings_theme.* +import kotlinx.android.synthetic.main.settings_launcher.* + /** * The [SettingsFragmentLauncher] is a used as a tab in the SettingsActivity. @@ -29,12 +32,28 @@ class SettingsFragmentLauncher : Fragment(), UIObject { inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - return inflater.inflate(R.layout.settings_theme, container, false) + return inflater.inflate(R.layout.settings_launcher, container, false) } override fun onStart(){ super.onStart() super.onStart() + + val staticSpinner = activity!!.findViewById(R.id.settings_launcher_format_spinner) as Spinner + + // Create an ArrayAdapter using the string array and a default spinner + val staticAdapter = ArrayAdapter + .createFromResource( + activity!!, R.array.settings_launcher_time_formats, + android.R.layout.simple_spinner_item + ) + + // Specify the layout to use when the list of choices appears + staticAdapter + .setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) + + // Apply the adapter to the spinner + staticSpinner.adapter = staticAdapter } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { diff --git a/app/src/main/res/layout/settings_theme.xml b/app/src/main/res/layout/settings_launcher.xml similarity index 88% rename from app/src/main/res/layout/settings_theme.xml rename to app/src/main/res/layout/settings_launcher.xml index 5ee0463..b673dd5 100644 --- a/app/src/main/res/layout/settings_theme.xml +++ b/app/src/main/res/layout/settings_launcher.xml @@ -18,8 +18,8 @@ android:id="@+id/settings_theme_scroller" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_marginBottom="32dp" - app:layout_constraintBottom_toTopOf="@id/settings_launcher_text_screen_timeout" + android:layout_marginBottom="16dp" + app:layout_constraintBottom_toTopOf="@id/settings_launcher_text_time_format" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> @@ -139,6 +139,25 @@ + + + + Change Image Examples Keep screen on + Date format + + + default + inverse + time only + german + german inv + https://github.com/finnmglas/Launcher#en https://www.finnmglas.com