diff --git a/app/build.gradle b/app/build.gradle index 0fc3990..3643d4d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "me.lucky.red" minSdk 29 targetSdk 32 - versionCode 5 - versionName "1.0.4" + versionCode 6 + versionName "1.0.5" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/me/lucky/red/MainActivity.kt b/app/src/main/java/me/lucky/red/MainActivity.kt index cf2d784..14f1564 100644 --- a/app/src/main/java/me/lucky/red/MainActivity.kt +++ b/app/src/main/java/me/lucky/red/MainActivity.kt @@ -8,6 +8,8 @@ import android.os.Bundle import android.provider.Settings import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AppCompatActivity +import androidx.core.widget.doAfterTextChanged +import java.lang.NumberFormatException import me.lucky.red.databinding.ActivityMainBinding @@ -45,6 +47,7 @@ class MainActivity : AppCompatActivity() { roleManager = getSystemService(RoleManager::class.java) binding.apply { redirectionDelay.value = (prefs.redirectionDelay / 1000).toFloat() + popupPosition.editText?.setText(prefs.popupPosition.toString()) toggle.isChecked = prefs.isServiceEnabled } } @@ -57,6 +60,11 @@ class MainActivity : AppCompatActivity() { redirectionDelay.addOnChangeListener { _, value, _ -> prefs.redirectionDelay = (value * 1000).toLong() } + popupPosition.editText?.doAfterTextChanged { + try { + prefs.popupPosition = it?.toString()?.toInt() ?: return@doAfterTextChanged + } catch (exc: NumberFormatException) {} + } toggle.setOnCheckedChangeListener { _, isChecked -> if (isChecked && !hasPermissions()) { toggle.isChecked = false diff --git a/app/src/main/java/me/lucky/red/PopupWindow.kt b/app/src/main/java/me/lucky/red/PopupWindow.kt index 07009b2..7bfafe0 100644 --- a/app/src/main/java/me/lucky/red/PopupWindow.kt +++ b/app/src/main/java/me/lucky/red/PopupWindow.kt @@ -31,7 +31,7 @@ class PopupWindow(private val service: CallRedirectionService) { gravity = Gravity.BOTTOM width = WindowManager.LayoutParams.WRAP_CONTENT height = WindowManager.LayoutParams.WRAP_CONTENT - y = 333 + y = service.prefs.popupPosition } private var timer: Timer? = null diff --git a/app/src/main/java/me/lucky/red/Preferences.kt b/app/src/main/java/me/lucky/red/Preferences.kt index 0ac37f5..e75288e 100644 --- a/app/src/main/java/me/lucky/red/Preferences.kt +++ b/app/src/main/java/me/lucky/red/Preferences.kt @@ -8,6 +8,7 @@ class Preferences(ctx: Context) { companion object { private const val SERVICE_ENABLED = "service_enabled" private const val REDIRECTION_DELAY = "redirection_delay" + private const val POPUP_POSITION = "popup_position_y" } private val prefs = PreferenceManager.getDefaultSharedPreferences(ctx) @@ -19,4 +20,8 @@ class Preferences(ctx: Context) { var redirectionDelay: Long get() = prefs.getLong(REDIRECTION_DELAY, 2000L) set(value) = prefs.edit { putLong(REDIRECTION_DELAY, value) } + + var popupPosition: Int + get() = prefs.getInt(POPUP_POSITION, 333) + set(value) = prefs.edit { putInt(POPUP_POSITION, value) } } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 1a2bb9c..b24c9e1 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -46,6 +46,24 @@ android:layout_height="wrap_content" android:text="@string/redirection_delay_description" /> + + + + + + + + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index da0528e..1008539 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -7,4 +7,5 @@ Telegram Threema Задержка до того, как звонок будет перенаправлен. + Позиция всплывающего окна \ 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 a1a8706..bb96707 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -7,4 +7,5 @@ Telegram Threema Delay before a call will be redirected. + Popup position \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/6.txt b/fastlane/metadata/android/en-US/changelogs/6.txt new file mode 100644 index 0000000..9e6a546 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/6.txt @@ -0,0 +1 @@ +popup position changer diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png index e5beb8c..fba57b5 100644 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png differ