diff --git a/app/src/main/kotlin/com/tutpro/baresip/AboutActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AboutActivity.kt
index 7f76473e..8cb4ecb4 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AboutActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AboutActivity.kt
@@ -2,12 +2,19 @@ package com.tutpro.baresip
import android.app.Activity
import android.content.Intent
+import android.os.Build
import android.os.Bundle
import androidx.core.text.HtmlCompat
import androidx.appcompat.app.AppCompatActivity
import android.text.method.LinkMovementMethod
import android.view.MenuItem
+import android.view.View
import androidx.activity.OnBackPressedCallback
+import androidx.core.graphics.Insets
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowInsetsControllerCompat
+import androidx.core.view.updatePadding
import com.tutpro.baresip.databinding.ActivityAboutBinding
class AboutActivity : AppCompatActivity() {
@@ -22,14 +29,24 @@ class AboutActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
- theme.applyStyle(R.style.OptOutEdgeToEdgeEnforcement,false)
-
super.onCreate(savedInstanceState)
binding = ActivityAboutBinding.inflate(layoutInflater)
setContentView(binding.root)
+ ViewCompat.setOnApplyWindowInsetsListener(window.decorView) { v: View, insets: WindowInsetsCompat ->
+ val systemBars: Insets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+ v.setPadding(0, systemBars.top, 0, systemBars.bottom)
+ WindowInsetsCompat.CONSUMED
+ }
+
+ if (!Utils.isDarkTheme(this))
+ WindowInsetsControllerCompat(window, binding.root).isAppearanceLightStatusBars = true
+
Utils.addActivity("about")
+ if (Build.VERSION.SDK_INT >= 35)
+ binding.aboutText.updatePadding(top = 172)
+
val text = String.format(getString(R.string.about_text),
BuildConfig.VERSION_NAME)
binding.aboutText.text = HtmlCompat.fromHtml(text, HtmlCompat.FROM_HTML_MODE_LEGACY)
diff --git a/app/src/main/kotlin/com/tutpro/baresip/Utils.kt b/app/src/main/kotlin/com/tutpro/baresip/Utils.kt
index a22e41b1..18335867 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Utils.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Utils.kt
@@ -5,6 +5,7 @@ import android.app.KeyguardManager
import android.content.Context
import android.content.Intent
import android.content.pm.PackageManager
+import android.content.res.Configuration
import android.graphics.Bitmap
import android.graphics.Bitmap.createScaledBitmap
import android.graphics.BitmapFactory
@@ -1041,4 +1042,9 @@ object Utils {
}
}
+ fun isDarkTheme(ctx: Context): Boolean {
+ return ctx.resources.configuration.uiMode and
+ Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
+ }
+
}
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 218f8d4b..6b98067b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -8,6 +8,7 @@
- @style/Spinner
- @style/Spinner
- @color/colorBackground
+ - @color/colorBackground