From 28b32b4d3c4578a2d57632b6fb2c04c8b8789830 Mon Sep 17 00:00:00 2001 From: Arty Bishop Date: Wed, 13 May 2020 12:39:36 +0100 Subject: [PATCH] Minor fixes for TLE import dialog --- .../com/rtbishop/look4sat/ui/MainActivity.kt | 31 +++++++++---------- .../rtbishop/look4sat/ui/SharedViewModel.kt | 1 + app/src/main/res/layout/dialog_tle_url.xml | 6 ++-- app/src/main/res/values/strings.xml | 5 +-- 4 files changed, 20 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt b/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt index f6622129..39fc116b 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt @@ -21,8 +21,6 @@ package com.rtbishop.look4sat.ui import android.Manifest import android.annotation.SuppressLint -import android.app.Activity -import android.app.AlertDialog import android.content.Intent import android.content.pm.ActivityInfo import android.content.pm.PackageManager @@ -30,6 +28,7 @@ import android.net.Uri import android.os.Bundle import android.view.View import android.view.WindowManager +import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat @@ -88,7 +87,6 @@ class MainActivity : AppCompatActivity() { @SuppressLint("SourceLockedOrientationActivity") private fun setupComponents() { val navController = findNavController(R.id.nav_host) - val navView = mainBinding.navView val toolbar = mainBinding.includeAppBar.toolbar setSupportActionBar(toolbar) @@ -98,7 +96,7 @@ class MainActivity : AppCompatActivity() { ) setupActionBarWithNavController(navController, appBarConfig) - navView.setupWithNavController(navController) + mainBinding.navView.setupWithNavController(navController) navController.addOnDestinationChangedListener { _, destination, _ -> when (destination.id) { @@ -184,24 +182,23 @@ class MainActivity : AppCompatActivity() { } private fun showTleUrlDialog() { - var tleUrl = "" - val dialogBinding = DialogTleUrlBinding.inflate(layoutInflater).apply { - dialogTleInput.addTextChangedListener { - tleUrl = it.toString() + val dialogBinding = DialogTleUrlBinding.inflate(layoutInflater) + val dialog = AlertDialog.Builder(this).setView(dialogBinding.root).create() + dialogBinding.apply { + var tleUrl = String() + dialogTleInput.apply { + hint = viewModel.getTleUrl() + addTextChangedListener { tleUrl = it.toString() } } dialogTleNeg.setOnClickListener { - + dialog.dismiss() } dialogTlePos.setOnClickListener { - + viewModel.updateEntriesFromWeb(tleUrl) + dialog.dismiss() } } - - AlertDialog.Builder(this).apply { - setView(dialogBinding.root) - create() - show() - } + dialog.show() } private fun View.lockButton() { @@ -240,7 +237,7 @@ class MainActivity : AppCompatActivity() { } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { - if (requestCode == pickFileReqCode && resultCode == Activity.RESULT_OK) { + if (requestCode == pickFileReqCode && resultCode == RESULT_OK) { data?.data?.also { uri -> viewModel.updateEntriesFromFile(uri) } diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt index 1ccbc01e..9368337e 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt @@ -59,6 +59,7 @@ class SharedViewModel @Inject constructor( fun getRefreshRate() = prefsManager.getRefreshRate() fun getHoursAhead() = prefsManager.getHoursAhead() fun getMinElevation() = prefsManager.getMinElevation() + fun getTleUrl() = prefsManager.getTleUrl() fun setPositionFromPref() = _gsp.postValue(Result.Success(prefsManager.getPosition())) suspend fun getAllEntries() = repository.getAllEntries() diff --git a/app/src/main/res/layout/dialog_tle_url.xml b/app/src/main/res/layout/dialog_tle_url.xml index da106c7c..05ad3793 100644 --- a/app/src/main/res/layout/dialog_tle_url.xml +++ b/app/src/main/res/layout/dialog_tle_url.xml @@ -11,7 +11,7 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginTop="12dp" - android:text="TextView" + android:text="@string/pref_tle_url_title" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -19,8 +19,7 @@ android:id="@+id/dialogTleInput" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:hint="https://server/with/tle.txt" + android:hint="@string/placeholder" android:importantForAutofill="no" android:inputType="textWebEditText" app:layout_constraintEnd_toEndOf="@+id/dialogTlePos" @@ -41,7 +40,6 @@ android:id="@+id/dialogTlePos" style="@style/SatEntryDialogText" android:layout_width="36dp" - android:layout_marginTop="8dp" android:layout_marginEnd="16dp" android:layout_marginBottom="12dp" android:gravity="end" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 72fef424..0f3bcd4c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -28,9 +28,9 @@ Update location Location was updated Check your Location settings - Update TLE from file + Import TLE from file TLE was updated - Update TLE from URL + Import TLE from WEB TLE was updated Update transceivers Transceivers database was updated @@ -73,6 +73,7 @@ Set the value between 250ms and 10000ms compass Use sensors to rotate PolarView + Please, enter the HTTPS URL: Mode: Null Uplink: Null