Add in-app update checker via Gitea API (v1.0.2)

- Check latest release on startup, show 'update available' dialog with
  Update/ Later buttons
- Download APK with progress and install via ACTION_VIEW + custom
  UpdateFileProvider (no androidx)
- Request unknown-app-sources permission if needed, resume download on
  return to the app

app/build.gradle.kts

@@ -11,8 +11,8 @@ android {
         applicationId = "ru.ua1zbe.svxremote"
         minSdk = 26
         targetSdk = 34
-        versionCode = 1
-        versionName = "1.0"
+        versionCode = 4
+        versionName = "1.0.2"
     }
 
     buildTypes {
@@ -21,6 +21,11 @@ android {
         }
     }
 
+    lint {
+        checkReleaseBuilds = false
+        abortOnError = false
+    }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
@@ -39,8 +44,11 @@ dependencies {
 
 android {
     testOptions {
-        unitTests.all {
-            it.maxHeapSize = "256m"
+        unitTests {
+            isReturnDefaultValues = true
+            all {
+                it.maxHeapSize = "256m"
+            }
         }
     }
 }

app/src/main/AndroidManifest.xml

@@ -4,6 +4,9 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
     <application
         android:label="@string/app_name"
@@ -12,20 +15,37 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.SvxRemote">
 
+        <service
+            android:name=".SvxService"
+            android:exported="false"
+            android:foregroundServiceType="mediaPlayback" />
+
         <activity
             android:name=".SettingsActivity"
             android:exported="false"
             android:label="@string/settings_title" />
 
         <activity
-            android:name=".MainActivity"
+            android:name=".SplashActivity"
             android:exported="true"
             android:screenOrientation="portrait"
-            android:configChanges="orientation|screenSize|keyboardHidden">
+            android:theme="@style/Theme.SvxRemote">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <activity
+            android:name=".MainActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"
+            android:configChanges="orientation|screenSize|keyboardHidden" />
+
+        <provider
+            android:name=".UpdateFileProvider"
+            android:authorities="ru.ua1zbe.svxremote.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true" />
     </application>
 </manifest>

app/src/main/java/ru/ua1zbe/svxremote/MainActivity.kt

@@ -2,27 +2,38 @@ package ru.ua1zbe.svxremote
 
 import android.Manifest
 import android.app.Activity
+import android.app.AlertDialog
+import android.content.ComponentName
+import android.content.Context
 import android.content.Intent
+import android.content.ServiceConnection
 import android.content.pm.PackageManager
+import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.os.Handler
+import android.os.IBinder
 import android.os.Looper
+import android.provider.Settings
 import android.util.Log
-import android.widget.Button
+import android.view.View
+import android.view.WindowManager
 import android.widget.ImageButton
+import android.widget.LinearLayout
+import android.widget.ProgressBar
 import android.widget.TextView
 import android.widget.Toast
-import ru.ua1zbe.svxremote.audio.OpusEngine
+import java.io.File
 import ru.ua1zbe.svxremote.prefs.ConnectionSettings
 import ru.ua1zbe.svxremote.prefs.Prefs
 import ru.ua1zbe.svxremote.proto.MsgParser
 import ru.ua1zbe.svxremote.proto.ReflectorClient
-import ru.ua1zbe.svxremote.ui.LevelMeter
 import ru.ua1zbe.svxremote.ui.PttButton
 
 private const val REQ_MIC = 1001
+private const val REQ_NOTIF = 1002
 
-class MainActivity : Activity(), ReflectorClient.Callbacks {
+class MainActivity : Activity(), SvxService.Listener {
 
     companion object {
         private const val TAG = "SVXRemote"
@@ -30,31 +41,46 @@ class MainActivity : Activity(), ReflectorClient.Callbacks {
 
     private lateinit var statusChip: TextView
     private lateinit var lblSubtitle: TextView
+    private lateinit var lblCallsign: TextView
+    private lateinit var lblTg: TextView
     private lateinit var lblTalkerTitle: TextView
     private lateinit var lblTalker: TextView
     private lateinit var lblPttHint: TextView
     private lateinit var lblTxState: TextView
-    private lateinit var btnConnect: Button
+    private lateinit var lblConnectHint: TextView
+    private lateinit var connectZone: View
+    private lateinit var rxBarFill: View
+    private lateinit var rxDb: TextView
+    private lateinit var micBarFill: View
+    private lateinit var micDb: TextView
     private lateinit var pttButton: PttButton
-    private lateinit var levelMeter: LevelMeter
     private lateinit var btnSettings: ImageButton
 
-    private lateinit var engine: OpusEngine
-    private lateinit var client: ReflectorClient
     private val mainHandler = Handler(Looper.getMainLooper())
 
     private var connected = false
     private var settings: ConnectionSettings = ConnectionSettings("", 5300, "", "", 11)
 
-    private val talkerTimeout = object : Runnable {
-        override fun run() {
-            clearTalker()
+    private var svc: SvxService? = null
+    private val svcConn = object : ServiceConnection {
+        override fun onServiceConnected(name: ComponentName, binder: IBinder) {
+            svc = (binder as SvxService.LocalBinder).service()
+            svc?.listener = this@MainActivity
+        }
+
+        override fun onServiceDisconnected(name: ComponentName) {
+            svc = null
         }
     }
 
+    private var pendingUpdate: UpdateChecker.UpdateInfo? = null
+    private var updateDialog: AlertDialog? = null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+        window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        checkForUpdates()
 
         statusChip = findViewById(R.id.status_chip)
         lblSubtitle = findViewById(R.id.lbl_subtitle)
@@ -62,23 +88,26 @@ class MainActivity : Activity(), ReflectorClient.Callbacks {
         lblTalker = findViewById(R.id.lbl_talker)
         lblPttHint = findViewById(R.id.lbl_ptt_hint)
         lblTxState = findViewById(R.id.lbl_tx_state)
-        btnConnect = findViewById(R.id.btn_connect)
+        lblConnectHint = findViewById(R.id.lbl_connect_hint)
+        connectZone = findViewById(R.id.connect_zone)
+        lblCallsign = findViewById(R.id.lbl_callsign)
+        lblTg = findViewById(R.id.lbl_tg)
+        rxBarFill = findViewById(R.id.rx_bar_fill)
+        rxDb = findViewById(R.id.rx_db)
+        micBarFill = findViewById(R.id.mic_bar_fill)
+        micDb = findViewById(R.id.mic_db)
         pttButton = findViewById(R.id.ptt_button)
-        levelMeter = findViewById(R.id.level_meter)
         btnSettings = findViewById(R.id.btn_settings)
-
-        engine = OpusEngine { source, level ->
-            levelMeter.setLevel(source, level)
-        }
-        client = ReflectorClient(this)
+        pttButton.enabled2 = false
 
         btnSettings.setOnClickListener {
             startActivity(Intent(this, SettingsActivity::class.java))
         }
 
-        btnConnect.setOnClickListener {
-            if (connected) {
-                client.disconnect()
+        connectZone.setOnClickListener {
+            val s = svc
+            if (connected && s != null) {
+                s.disconnect()
             } else {
                 settings = Prefs.load(this)
                 if (settings.host.isBlank() || settings.callsign.isBlank()) {
@@ -89,15 +118,24 @@ class MainActivity : Activity(), ReflectorClient.Callbacks {
                     requestPermissions(arrayOf(Manifest.permission.RECORD_AUDIO), REQ_MIC)
                     return@setOnClickListener
                 }
-                client.connect(
-                    ReflectorClient.Settings(
-                        host = settings.host,
-                        port = settings.port,
-                        callsign = settings.callsign,
-                        authKey = settings.authKey,
-                        talkGroup = settings.talkGroup
+                if (Build.VERSION.SDK_INT >= 33 &&
+                    checkSelfPermission(Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED
+                ) {
+                    requestPermissions(arrayOf(Manifest.permission.POST_NOTIFICATIONS), REQ_NOTIF)
+                }
+                startForegroundService(Intent(this, SvxService::class.java))
+                bindService(Intent(this, SvxService::class.java), svcConn, Context.BIND_AUTO_CREATE)
+                mainHandler.postDelayed({
+                    svc?.connect(
+                        ReflectorClient.Settings(
+                            host = settings.host,
+                            port = settings.port,
+                            callsign = settings.callsign,
+                            authKey = settings.authKey,
+                            talkGroup = settings.talkGroup
+                        )
                     )
-                )
+                }, 300)
             }
         }
 
@@ -111,18 +149,17 @@ class MainActivity : Activity(), ReflectorClient.Callbacks {
                     toast(getString(R.string.perm_mic))
                     return
                 }
-                lblTxState.visibility = TextView.VISIBLE
                 lblPttHint.text = getString(R.string.ptt_talking)
-                engine.startCapture { packet ->
-                    client.sendAudio(packet)
-                }
+                lblTxState.text = getString(R.string.status_big_talking)
+                svc?.startTx()
             }
 
             override fun onPttUp() {
-                engine.stopCapture()
-                client.sendAudioFlush()
-                lblTxState.visibility = TextView.GONE
-                lblPttHint.text = getString(R.string.ptt_hint)
+                svc?.stopTx()
+                lblPttHint.text = getString(R.string.hold_to_talk)
+                lblTxState.text =
+                    if (connected) getString(R.string.status_big_connected)
+                    else getString(R.string.status_big_disconnected)
             }
         })
 
@@ -135,6 +172,12 @@ class MainActivity : Activity(), ReflectorClient.Callbacks {
         refreshUi()
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+        svc?.listener = null
+        unbindService(svcConn)
+    }
+
     private fun refreshUi() {
         val host = settings.host
         lblSubtitle.text = if (host.isBlank()) {
@@ -142,9 +185,15 @@ class MainActivity : Activity(), ReflectorClient.Callbacks {
         } else {
             getString(R.string.server_subtitle, host, settings.port, settings.talkGroup)
         }
+        lblCallsign.text = if (settings.callsign.isBlank()) {
+            getString(R.string.settings_not_configured)
+        } else {
+            settings.callsign
+        }
+        lblTg.text = getString(R.string.tg_badge, settings.talkGroup)
     }
 
-    // ---------- Callbacks от ReflectorClient (фоновые потоки!) ----------
+    // ---------- Callbacks от SvxService (фоновые потоки!) ----------
 
     override fun onState(state: Int, detail: String?) {
         Log.d(TAG, "state=$state detail=$detail")
@@ -154,7 +203,11 @@ class MainActivity : Activity(), ReflectorClient.Callbacks {
                     connected = false
                     updatePttEnabled()
                     statusChip.text = getString(R.string.status_disconnected)
-                    btnConnect.text = getString(R.string.btn_connect)
+                    statusChip.setTextColor(getColor(R.color.danger))
+                    lblTxState.text = getString(R.string.status_big_disconnected)
+                    lblTxState.setTextColor(getColor(R.color.danger))
+                    lblConnectHint.text = getString(R.string.hint_connect)
+                    lblPttHint.text = getString(R.string.hold_to_talk)
                 }
 
                 ReflectorClient.STATE_CONNECTING,
@@ -163,7 +216,9 @@ class MainActivity : Activity(), ReflectorClient.Callbacks {
                 ReflectorClient.STATE_WAIT_AUTH_OK,
                 ReflectorClient.STATE_WAIT_SERVER_INFO -> {
                     statusChip.text = getString(R.string.status_connecting)
-                    btnConnect.text = getString(R.string.btn_disconnect)
+                    statusChip.setTextColor(getColor(R.color.warn))
+                    lblTxState.text = getString(R.string.status_connecting).uppercase()
+                    lblTxState.setTextColor(getColor(R.color.warn))
                     connected = false
                     updatePttEnabled()
                 }
@@ -172,14 +227,20 @@ class MainActivity : Activity(), ReflectorClient.Callbacks {
                     connected = true
                     updatePttEnabled()
                     statusChip.text = getString(R.string.status_connected)
-                    btnConnect.text = getString(R.string.btn_disconnect)
+                    statusChip.setTextColor(getColor(R.color.accent))
+                    lblTxState.text = getString(R.string.status_big_connected)
+                    lblTxState.setTextColor(getColor(R.color.accent))
+                    lblConnectHint.text = getString(R.string.hint_disconnect)
                 }
 
                 ReflectorClient.STATE_AUTH_FAILED -> {
                     connected = false
                     updatePttEnabled()
                     statusChip.text = getString(R.string.status_auth_failed)
-                    btnConnect.text = getString(R.string.btn_connect)
+                    statusChip.setTextColor(getColor(R.color.danger))
+                    lblTxState.text = getString(R.string.status_big_disconnected)
+                    lblTxState.setTextColor(getColor(R.color.danger))
+                    lblConnectHint.text = getString(R.string.hint_connect)
                     toast(getString(R.string.status_error, detail ?: ""))
                 }
 
@@ -187,7 +248,10 @@ class MainActivity : Activity(), ReflectorClient.Callbacks {
                     connected = false
                     updatePttEnabled()
                     statusChip.text = getString(R.string.status_error, detail ?: "")
-                    btnConnect.text = getString(R.string.btn_connect)
+                    statusChip.setTextColor(getColor(R.color.danger))
+                    lblTxState.text = getString(R.string.status_big_disconnected)
+                    lblTxState.setTextColor(getColor(R.color.danger))
+                    lblConnectHint.text = getString(R.string.hint_connect)
                 }
             }
         }
@@ -205,29 +269,34 @@ class MainActivity : Activity(), ReflectorClient.Callbacks {
         mainHandler.post {
             lblTalkerTitle.text = getString(R.string.talker_now, callsign)
             lblTalker.text = callsign
-            mainHandler.removeCallbacks(talkerTimeout)
-            mainHandler.postDelayed(talkerTimeout, 4000)
         }
     }
 
     override fun onTalkerStop(tg: Long, callsign: String) {
-        mainHandler.post {
-            clearTalker()
-        }
-    }
-
-    override fun onNodeJoined(callsign: String) {
-    }
-
-    override fun onNodeLeft(callsign: String) {
+        // последний говоривший остаётся на экране
     }
 
     override fun onAudioPacket(packet: ByteArray, seq: Int) {
-        engine.onAudioPacket(packet)
     }
 
     override fun onAudioFlush() {
-        engine.onAudioFlush()
+    }
+
+    override fun onLevel(source: Int, level: Float) {
+        mainHandler.post {
+            val db = if (level <= 0.001f) {
+                getString(R.string.meter_idle)
+            } else {
+                getString(R.string.meter_db, (level * 60).toInt().coerceIn(1, 60))
+            }
+            if (source == 0) { // SRC_MIC
+                micBarFill.scaleX = level.coerceIn(0f, 1f)
+                micDb.text = db
+            } else { // SRC_SPEAKER
+                rxBarFill.scaleX = level.coerceIn(0f, 1f)
+                rxDb.text = db
+            }
+        }
     }
 
     override fun onError(detail: String) {
@@ -236,25 +305,125 @@ class MainActivity : Activity(), ReflectorClient.Callbacks {
         }
     }
 
-    private fun clearTalker() {
-        lblTalkerTitle.text = getString(R.string.talker_none)
-        lblTalker.text = getString(R.string.talker_none)
-        mainHandler.removeCallbacks(talkerTimeout)
-    }
-
     private fun updatePttEnabled() {
         pttButton.enabled2 = connected
     }
 
-    private fun toast(msg: String) {
-        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
+    private fun checkForUpdates() {
+        Thread {
+            val version = try {
+                packageManager.getPackageInfo(packageName, 0).versionName
+            } catch (_: Exception) {
+                return@Thread
+            }
+            val info = try {
+                UpdateChecker.check(version)
+            } catch (e: Exception) {
+                Log.w(TAG, "update check failed: ${e.message}")
+                null
+            }
+            if (info != null) {
+                mainHandler.post { showUpdateDialog(info) }
+            } else {
+                Log.d(TAG, "update: no newer version")
+            }
+        }.start()
     }
 
-    override fun onDestroy() {
-        super.onDestroy()
-        mainHandler.removeCallbacks(talkerTimeout)
-        client.disconnect()
-        engine.releaseAll()
+    private fun showUpdateDialog(info: UpdateChecker.UpdateInfo) {
+        pendingUpdate = info
+        updateDialog = AlertDialog.Builder(this)
+            .setTitle(R.string.update_available_title)
+            .setMessage(getString(R.string.update_available_msg, info.version))
+            .setPositiveButton(R.string.update_btn) { _, _ -> startUpdate() }
+            .setNegativeButton(R.string.update_later) { _, _ ->
+                pendingUpdate = null
+                updateDialog = null
+            }
+            .setOnCancelListener {
+                pendingUpdate = null
+                updateDialog = null
+            }
+            .show()
+    }
+
+    private fun canInstall(): Boolean =
+        Build.VERSION.SDK_INT < Build.VERSION_CODES.O || packageManager.canRequestPackageInstalls()
+
+    private fun startUpdate() {
+        val info = pendingUpdate ?: return
+        if (!canInstall()) {
+            startActivity(
+                Intent(
+                    Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES,
+                    Uri.parse("package:$packageName")
+                )
+            )
+            return
+        }
+        val progress = ProgressBar(this, null, android.R.attr.progressBarStyleHorizontal)
+        progress.max = 100
+        val label = TextView(this)
+        label.setText(R.string.update_downloading)
+        label.setPadding(dp(20), dp(16), dp(20), 0)
+        val content = LinearLayout(this).apply {
+            orientation = LinearLayout.VERTICAL
+            addView(label)
+            addView(
+                progress,
+                LinearLayout.LayoutParams(
+                    LinearLayout.LayoutParams.MATCH_PARENT,
+                    LinearLayout.LayoutParams.WRAP_CONTENT
+                ).apply { topMargin = dp(12) }
+            )
+        }
+        updateDialog = AlertDialog.Builder(this)
+            .setTitle(R.string.update_available_title)
+            .setView(content)
+            .setCancelable(false)
+            .show()
+
+        val file = File(cacheDir, "updates/svxhomyak-${info.version}.apk")
+        file.parentFile?.mkdirs()
+        Thread {
+            try {
+                UpdateChecker.download(info.apkUrl, file) { p ->
+                    mainHandler.post { progress.progress = (p * 100).toInt() }
+                }
+                mainHandler.post {
+                    updateDialog?.dismiss()
+                    updateDialog = null
+                    pendingUpdate = null
+                    installApk(file)
+                }
+            } catch (e: Exception) {
+                mainHandler.post {
+                    updateDialog?.dismiss()
+                    updateDialog = null
+                    pendingUpdate = null
+                    toast(getString(R.string.update_failed, e.message))
+                }
+            }
+        }.start()
+    }
+
+    private fun installApk(file: File) {
+        val uri = Uri.Builder()
+            .scheme("content")
+            .authority("$packageName.fileprovider")
+            .path("updates/${file.name}")
+            .build()
+        val intent = Intent(Intent.ACTION_VIEW).apply {
+            setDataAndType(uri, "application/vnd.android.package-archive")
+            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+        }
+        startActivity(intent)
+    }
+
+    private fun dp(v: Int): Int = (v * resources.displayMetrics.density).toInt()
+
+    private fun toast(msg: String) {
+        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
     }
 
     override fun onRequestPermissionsResult(

app/src/main/java/ru/ua1zbe/svxremote/SplashActivity.kt

@@ -0,0 +1,53 @@
+package ru.ua1zbe.svxremote
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import android.view.animation.AccelerateDecelerateInterpolator
+
+/** Красивая заставка с плавным появлением логотипа. */
+class SplashActivity : Activity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_splash)
+
+        val title = findViewById<View>(R.id.splash_title)
+        val subtitle = findViewById<View>(R.id.splash_subtitle)
+        val line = findViewById<View>(R.id.splash_line)
+
+        val baseAlpha = title.alpha
+        title.alpha = 0f
+        subtitle.alpha = 0f
+        line.alpha = 0f
+
+        title.animate()
+            .alpha(1f)
+            .scaleX(1.0f)
+            .scaleY(1.0f)
+            .setStartDelay(150)
+            .setDuration(700)
+            .setInterpolator(AccelerateDecelerateInterpolator())
+            .start()
+
+        subtitle.animate()
+            .alpha(1f)
+            .setStartDelay(600)
+            .setDuration(600)
+            .start()
+
+        line.animate()
+            .alpha(1f)
+            .setStartDelay(900)
+            .setDuration(500)
+            .start()
+
+        window.decorView.postDelayed({
+            val intent = Intent(this, MainActivity::class.java)
+            startActivity(intent)
+            overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
+            finish()
+        }, 4000)
+    }
+}

app/src/main/java/ru/ua1zbe/svxremote/SvxService.kt

@@ -0,0 +1,127 @@
+package ru.ua1zbe.svxremote
+
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.Service
+import android.content.Intent
+import android.os.Binder
+import android.os.IBinder
+import ru.ua1zbe.svxremote.audio.OpusEngine
+import ru.ua1zbe.svxremote.proto.MsgParser
+import ru.ua1zbe.svxremote.proto.ReflectorClient
+
+/**
+ * Foreground-сервис: держит соединение с рефлектором и декодер
+ * живыми в фоне и при выключенном экране.
+ */
+class SvxService : Service(), ReflectorClient.Callbacks {
+
+    interface Listener {
+        fun onState(state: Int, detail: String?)
+        fun onServerInfo(info: MsgParser.ServerInfo)
+        fun onTalkerStart(tg: Long, callsign: String)
+        fun onTalkerStop(tg: Long, callsign: String)
+        fun onAudioPacket(packet: ByteArray, seq: Int)
+        fun onAudioFlush()
+        fun onError(detail: String)
+        fun onLevel(source: Int, level: Float)
+    }
+
+    var listener: Listener? = null
+
+    private val engine by lazy {
+        OpusEngine { source, level -> listener?.onLevel(source, level) }
+    }
+    val client: ReflectorClient by lazy { ReflectorClient(this) }
+
+    private val binder = LocalBinder()
+
+    inner class LocalBinder : Binder() {
+        fun service(): SvxService = this@SvxService
+    }
+
+    override fun onBind(intent: Intent): IBinder = binder
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        startForegroundCompat()
+        return START_STICKY
+    }
+
+    private fun startForegroundCompat() {
+        val nm = getSystemService(NotificationManager::class.java)
+        nm.createNotificationChannel(
+            NotificationChannel("svx", "SVXRemote", NotificationManager.IMPORTANCE_LOW)
+        )
+        val n = Notification.Builder(this, "svx")
+            .setContentTitle("SVXRemote")
+            .setContentText(getString(R.string.notif_connected))
+            .setSmallIcon(android.R.drawable.ic_menu_call)
+            .setOngoing(true)
+            .build()
+        startForeground(1, n)
+    }
+
+    fun connect(settings: ReflectorClient.Settings) {
+        startForegroundCompat()
+        client.connect(settings)
+    }
+
+    fun disconnect() {
+        client.disconnect()
+    }
+
+    fun isRunning(): Boolean = client.isRunning()
+
+    fun startTx() {
+        engine.startCapture { packet -> client.sendAudio(packet) }
+    }
+
+    fun stopTx() {
+        engine.stopCapture()
+        client.sendAudioFlush()
+    }
+
+    // ---------- Callbacks (фоновые потоки) ----------
+
+    override fun onState(state: Int, detail: String?) {
+        when (state) {
+            ReflectorClient.STATE_READY -> engine.startDecoder()
+            ReflectorClient.STATE_DISCONNECTED -> {
+                engine.stopDecoder()
+                stopForeground(STOP_FOREGROUND_REMOVE)
+            }
+        }
+        listener?.onState(state, detail)
+    }
+
+    override fun onServerInfo(info: MsgParser.ServerInfo) {
+        listener?.onServerInfo(info)
+    }
+
+    override fun onTalkerStart(tg: Long, callsign: String) {
+        listener?.onTalkerStart(tg, callsign)
+    }
+
+    override fun onTalkerStop(tg: Long, callsign: String) {
+        listener?.onTalkerStop(tg, callsign)
+    }
+
+    override fun onNodeJoined(callsign: String) {
+    }
+
+    override fun onNodeLeft(callsign: String) {
+    }
+
+    override fun onAudioPacket(packet: ByteArray, seq: Int) {
+        engine.onAudioPacket(packet)
+    }
+
+    override fun onAudioFlush() {
+        engine.onAudioFlush()
+    }
+
+    override fun onError(detail: String) {
+        listener?.onError(detail)
+    }
+}

app/src/main/java/ru/ua1zbe/svxremote/UpdateChecker.kt

@@ -0,0 +1,77 @@
+package ru.ua1zbe.svxremote
+
+import org.json.JSONArray
+import org.json.JSONObject
+import java.io.File
+import java.net.HttpURLConnection
+import java.net.URL
+
+/** Проверка и загрузка обновлений через API Gitea. */
+object UpdateChecker {
+
+    data class UpdateInfo(val version: String, val apkUrl: String)
+
+    private const val API_URL =
+        "https://git2.ua1zbe.ru/api/v1/repos/ua1zbe/svxhomyak/releases/latest"
+
+    /** Вернуть информацию об обновлении, если доступна более новая версия. */
+    fun check(currentVersion: String): UpdateInfo? {
+        val conn = URL(API_URL).openConnection() as HttpURLConnection
+        conn.connectTimeout = 10_000
+        conn.readTimeout = 10_000
+        return try {
+            if (conn.responseCode != 200) return null
+            val json = JSONObject(conn.inputStream.bufferedReader().readText())
+            val version = json.optString("tag_name", "").removePrefix("v")
+            if (!isNewer(version, currentVersion)) return null
+            val assets = json.optJSONArray("assets") ?: JSONArray()
+            var url: String? = null
+            for (i in 0 until assets.length()) {
+                val a = assets.getJSONObject(i)
+                if (a.optString("name").endsWith(".apk")) {
+                    url = a.optString("browser_download_url")
+                    break
+                }
+            }
+            url?.let { UpdateInfo(version, it) }
+        } finally {
+            conn.disconnect()
+        }
+    }
+
+    /** Скачать APK в файл, сообщая прогресс 0..1. */
+    fun download(url: String, target: File, onProgress: (Float) -> Unit) {
+        val conn = URL(url).openConnection() as HttpURLConnection
+        conn.connectTimeout = 15_000
+        conn.readTimeout = 15_000
+        try {
+            val total = conn.contentLengthLong
+            var done = 0L
+            conn.inputStream.use { input ->
+                target.outputStream().use { out ->
+                    val buf = ByteArray(64 * 1024)
+                    while (true) {
+                        val n = input.read(buf)
+                        if (n < 0) break
+                        out.write(buf, 0, n)
+                        done += n
+                        if (total > 0) onProgress(done.toFloat() / total)
+                    }
+                }
+            }
+        } finally {
+            conn.disconnect()
+        }
+    }
+
+    private fun isNewer(remote: String, current: String): Boolean {
+        val r = remote.split('.').mapNotNull { it.toIntOrNull() }
+        val c = current.split('.').mapNotNull { it.toIntOrNull() }
+        for (i in 0 until maxOf(r.size, c.size)) {
+            val a = r.getOrElse(i) { 0 }
+            val b = c.getOrElse(i) { 0 }
+            if (a != b) return a > b
+        }
+        return false
+    }
+}

app/src/main/java/ru/ua1zbe/svxremote/UpdateFileProvider.kt

@@ -0,0 +1,34 @@
+package ru.ua1zbe.svxremote
+
+import android.content.ContentProvider
+import android.content.ContentValues
+import android.database.Cursor
+import android.net.Uri
+import android.os.ParcelFileDescriptor
+import java.io.File
+
+/** Минимальный FileProvider для установки APK (без androidx). */
+class UpdateFileProvider : ContentProvider() {
+
+    override fun onCreate(): Boolean = true
+
+    override fun openFile(uri: Uri, mode: String): ParcelFileDescriptor {
+        val name = uri.lastPathSegment
+            ?: throw IllegalArgumentException("bad uri")
+        if (name != name.substringAfterLast('/')) {
+            throw IllegalArgumentException("bad uri")
+        }
+        val path = File(context?.cacheDir, "updates/$name")
+        return ParcelFileDescriptor.open(path, ParcelFileDescriptor.MODE_READ_ONLY)
+    }
+
+    override fun getType(uri: Uri): String = "application/vnd.android.package-archive"
+
+    override fun insert(uri: Uri, values: ContentValues?): Uri? = null
+    override fun delete(uri: Uri, selection: String?, selectionArgs: Array<out String>?): Int = 0
+    override fun query(
+        uri: Uri, projection: Array<out String>?, selection: String?,
+        selectionArgs: Array<out String>?, sortOrder: String?
+    ): Cursor? = null
+    override fun update(uri: Uri, values: ContentValues?, selection: String?, selectionArgs: Array<out String>?): Int = 0
+}

app/src/main/java/ru/ua1zbe/svxremote/audio/OpusEngine.kt

@@ -9,6 +9,7 @@ import android.media.MediaCodecInfo
 import android.media.MediaFormat
 import android.media.MediaRecorder
 import android.os.Build
+import android.util.Log
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
 import kotlin.math.abs
@@ -23,7 +24,9 @@ class OpusEngine(
 ) {
 
     companion object {
+        const val TAG = "SVXRemote"
         const val SAMPLE_RATE = 8000
+        const val OUT_SAMPLE_RATE = 48000 // декодер opus всегда выдаёт 48 кГц
         const val CHANNELS = 1
         const val FRAME_SIZE = 160 // 20 мс в 8 кГц
         const val BIT_RATE = 20000
@@ -32,7 +35,9 @@ class OpusEngine(
         const val SRC_SPEAKER = 1
     }
 
+    @Volatile
     private var encoder: MediaCodec? = null
+    @Volatile
     private var decoder: MediaCodec? = null
     private var recorder: AudioRecord? = null
     private var player: AudioTrack? = null
@@ -46,6 +51,11 @@ class OpusEngine(
 
     // ---------- Воспроизведение (RX) ----------
 
+    private var headSent = false
+    private val rxQueue = java.util.concurrent.ConcurrentLinkedQueue<ByteArray>()
+    private var drainThread: Thread? = null
+    private var ptsCounter = 0L
+
     fun startDecoder() {
         if (decoder != null) return
         val format = MediaFormat()
@@ -53,75 +63,164 @@ class OpusEngine(
         format.setInteger(MediaFormat.KEY_SAMPLE_RATE, SAMPLE_RATE)
         format.setInteger(MediaFormat.KEY_CHANNEL_COUNT, CHANNELS)
         format.setInteger(MediaFormat.KEY_MAX_INPUT_SIZE, 8192)
-        if (Build.VERSION.SDK_INT >= 29) {
-            // Не звонить GSM — приоритет медиа
-        }
+        // Android 16: c2.android.opus.decoder ждёт 3 конфиг-буфера:
+        // csd-0 OpusHead, csd-1 CodecDelay (int64 LE нс), csd-2 SeekPreRoll (int64 LE нс).
+        // Без csd-1/2 декодер берёт мусорные значения из пакетов и молча
+        // выкидывает весь вывод (mSamplesToDiscard).
+        format.setByteBuffer("csd-0", ByteBuffer.wrap(opusHead()))
+        // Прескип 312 сэмплов при 8 кГц = 39 мс = 39_000_000 нс (перекодируется в 48 кГц внутри)
+        format.setByteBuffer("csd-1", ByteBuffer.wrap(longBytes(39_000_000L)))
+        format.setByteBuffer("csd-2", ByteBuffer.wrap(longBytes(0L)))
         decoder = try {
             MediaCodec.createDecoderByType(MediaFormat.MIMETYPE_AUDIO_OPUS).also {
                 it.configure(format, null, null, 0)
                 it.start()
             }
         } catch (e: Exception) {
+            Log.e(TAG, "createDecoder failed: ${e.message}")
             null
         }
         if (decoder == null) return
         val minBuf = AudioTrack.getMinBufferSize(
-            SAMPLE_RATE,
+            OUT_SAMPLE_RATE,
             AudioFormat.CHANNEL_OUT_MONO,
             AudioFormat.ENCODING_PCM_16BIT
         )
-        player = AudioTrack(
-            AudioManager.STREAM_MUSIC,
-            SAMPLE_RATE,
-            AudioFormat.CHANNEL_OUT_MONO,
-            AudioFormat.ENCODING_PCM_16BIT,
-            maxOf(minBuf, FRAME_SIZE * 2 * 8),
-            AudioTrack.MODE_STREAM
-        ).also { it.play() }
+        player = try {
+            AudioTrack(
+                AudioManager.STREAM_MUSIC,
+                OUT_SAMPLE_RATE,
+                AudioFormat.CHANNEL_OUT_MONO,
+                AudioFormat.ENCODING_PCM_16BIT,
+                maxOf(minBuf, FRAME_SIZE * 2 * 8),
+                AudioTrack.MODE_STREAM
+            ).also { it.play() }
+        } catch (e: Exception) {
+            Log.e(TAG, "AudioTrack create failed: ${e.message}")
+            null
+        }
+        headSent = true // csd уходит через формат, не через буферы
+        drainThread = Thread({ drainLoop() }, "opus-out").also { it.start() }
+        Log.d(TAG, "decoder started")
+    }
+
+    /** int64 в little-endian. */
+    private fun longBytes(v: Long): ByteArray =
+        ByteBuffer.allocate(8).order(ByteOrder.LITTLE_ENDIAN).putLong(v).array()
+
+    /** Отдельный поток: голова + входная очередь + слив вывода. */
+    private fun drainLoop() {
+        val dec = decoder ?: return
+        var dbg = 0
+        while (decoder != null && decoder === dec) {
+            try {
+                // Монотонный pts обязателен: при pts==0 c2.opus.decoder
+                // считает каждый кадр «перемоткой в ноль» и выбрасывает
+                // mCodecDelay сэмплов (C2SoftOpusDec.cpp, "When seeking to zero").
+                var pts = ptsCounter
+                while (true) {
+                    val pkt = rxQueue.poll() ?: break
+                    val inIdx = dec.dequeueInputBuffer(5000)
+                    if (inIdx < 0) { rxQueue.add(pkt); break }
+                    val buf = dec.getInputBuffer(inIdx) ?: break
+                    buf.clear()
+                    buf.put(pkt)
+                    dec.queueInputBuffer(inIdx, 0, pkt.size, pts, 0)
+                    pts += 20_000L // 20 мс кадра
+                    ptsCounter = pts
+                    if (dbg < 5) { Log.d(TAG, "queued ${pkt.size}B"); dbg++ }
+                }
+                var outIdx = dec.dequeueOutputBuffer(decodeBufferInfo, 1000)
+                while (outIdx >= 0) {
+                    if (outIdx == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
+                        val f = dec.outputFormat
+                        Log.d(TAG, "dec out format: sr=${f.getInteger(MediaFormat.KEY_SAMPLE_RATE)} " +
+                            "ch=${f.getInteger(MediaFormat.KEY_CHANNEL_COUNT)}")
+                    } else {
+                        if (decodeBufferInfo.size > 0) {
+                            val outBuf = ByteBuffer.allocate(decodeBufferInfo.size)
+                            outBuf.order(ByteOrder.LITTLE_ENDIAN)
+                            dec.getOutputBuffer(outIdx)?.also { src ->
+                                src.position(decodeBufferInfo.offset)
+                                src.limit(decodeBufferInfo.offset + decodeBufferInfo.size)
+                                outBuf.put(src)
+                            }
+                            val pcm = outBuf.array()
+                            player?.write(pcm, 0, pcm.size)
+                            onLevel(SRC_SPEAKER, pcmLevel(pcm))
+                            if (dbg < 5) { Log.d(TAG, "out ${pcm.size}B"); dbg++ }
+                        }
+                        dec.releaseOutputBuffer(outIdx, false)
+                    }
+                    outIdx = dec.dequeueOutputBuffer(decodeBufferInfo, 0)
+                }
+            } catch (e: Exception) {
+                Log.e(TAG, "drain error: ${e.message}")
+            }
+        }
     }
 
     /** Подача одного Opus-пакета на декодер. */
     fun onAudioPacket(packet: ByteArray) {
-        val dec = decoder ?: return
-        val track = player ?: return
-        try {
-            val inIdx = dec.dequeueInputBuffer(10000)
-            if (inIdx >= 0) {
-                val buf = dec.getInputBuffer(inIdx) ?: return
-                buf.clear()
-                buf.put(packet)
-                dec.queueInputBuffer(inIdx, 0, packet.size, 0, 0)
-            }
-            var outIdx = dec.dequeueOutputBuffer(decodeBufferInfo, 0)
-            while (outIdx >= 0) {
-                if (decodeBufferInfo.size > 0) {
-                    val outBuf = ByteBuffer.allocate(decodeBufferInfo.size)
-                    outBuf.order(ByteOrder.LITTLE_ENDIAN)
-                    dec.getOutputBuffer(outIdx)?.also { src ->
-                        src.position(decodeBufferInfo.offset)
-                        src.limit(decodeBufferInfo.offset + decodeBufferInfo.size)
-                        outBuf.put(src)
-                    }
-                    val pcm = outBuf.array()
-                    track.write(pcm, 0, pcm.size)
-                    onLevel(SRC_SPEAKER, pcmLevel(pcm))
-                }
-                dec.releaseOutputBuffer(outIdx, false)
-                outIdx = dec.dequeueOutputBuffer(decodeBufferInfo, 0)
-            }
-        } catch (_: Exception) {
-        }
+        rxQueue.add(packet)
     }
 
     fun onAudioFlush() {
         try {
             decoder?.flush()
             player?.flush()
+            rxQueue.clear()
             onLevel(SRC_SPEAKER, 0f)
         } catch (_: Exception) {
         }
     }
 
+    /** Заголовок OpusHead (csd-0) для декодера: Opus, 1 канал, 8 кГц, прескип 312. */
+    private fun opusHead(): ByteArray {
+        val head = "OpusHead".toByteArray(Charsets.US_ASCII)
+        val out = ByteArray(19)
+        System.arraycopy(head, 0, out, 0, head.size)
+        out[8] = 1 // версия Opus
+        out[9] = 1 // каналов (моно)
+        out[10] = 0x38 // pre-skip LE = 312
+        out[11] = 0x01
+        out[12] = 0x40 // input sample rate LE = 8000
+        out[13] = 0x1F
+        out[14] = 0x00
+        out[15] = 0x00
+        out[16] = 0x00 // output gain
+        out[17] = 0x00
+        out[18] = 0x00 // channel mapping family = 0
+        return out
+    }
+
+    /** Остановить декодер и плеер (при отключении). */
+    fun stopDecoder() {
+        val dec = decoder
+        decoder = null // поток разбора выйдет из цикла до release
+        rxQueue.clear()
+        if (dec != null) {
+            try {
+                dec.stop()
+            } catch (_: Exception) {
+            }
+            try {
+                dec.release()
+            } catch (_: Exception) {
+            }
+        }
+        try {
+            player?.stop()
+        } catch (_: Exception) {
+        }
+        try {
+            player?.release()
+        } catch (_: Exception) {
+        }
+        player = null
+        onLevel(SRC_SPEAKER, 0f)
+    }
+
     // ---------- Захват (TX) ----------
 
     /** Начать PTT: запустить запись и кодирование. */
@@ -238,24 +337,7 @@ class OpusEngine(
 
     fun releaseAll() {
         stopCapture()
-        try {
-            decoder?.stop()
-        } catch (_: Exception) {
-        }
-        try {
-            decoder?.release()
-        } catch (_: Exception) {
-        }
-        decoder = null
-        try {
-            player?.stop()
-        } catch (_: Exception) {
-        }
-        try {
-            player?.release()
-        } catch (_: Exception) {
-        }
-        player = null
+        stopDecoder()
         onLevel(SRC_SPEAKER, 0f)
     }
 

app/src/main/java/ru/ua1zbe/svxremote/proto/ReflectorClient.kt

@@ -7,6 +7,7 @@ import java.net.InetSocketAddress
 import java.net.Socket
 import java.net.SocketTimeoutException
 import java.util.concurrent.atomic.AtomicBoolean
+import android.util.Log
 
 /**
  * Клиент рефлектора SVXLink (протокол v2, авторизация AUTH_KEY, аудио Opus по UDP).
@@ -31,6 +32,8 @@ class ReflectorClient(
     }
 
     companion object {
+        const val TAG = "SVXRemote"
+
         const val STATE_DISCONNECTED = 0
         const val STATE_CONNECTING = 1
         const val STATE_TCP_CONNECTED = 2
@@ -45,6 +48,9 @@ class ReflectorClient(
         const val TCP_HEARTBEAT_INTERVAL_MS = 2000L
         const val UDP_HEARTBEAT_INTERVAL_MS = 4000L
         const val RECONNECT_DELAY_MS = 5000L
+
+        const val CLIENT_SW_INFO = "SVXHomyak"
+        const val CLIENT_SW_VERSION = "1.0.0"
     }
 
     data class Settings(
@@ -350,7 +356,13 @@ class ReflectorClient(
                     callbacks.onServerInfo(info)
                     state = STATE_READY
                     callbacks.onState(STATE_READY)
+                    // Сначала сообщаем о себе (версия ПО для дашборда), затем
+                    // выбираем TG для передачи и подписываемся на прослушивание
+                    // (иначе сервер не шлёт аудио группы и не показывает
+                    // подписку в статусе: monitoredTGs остаётся пустым).
+                    sendTcp(socket, MsgBuilder.nodeInfo(CLIENT_SW_INFO, CLIENT_SW_VERSION))
                     sendTcp(socket, MsgBuilder.selectTg(s.talkGroup))
+                    sendTcp(socket, MsgBuilder.tgMonitor(listOf(s.talkGroup)))
                     openUdp(s)
                 }
 
@@ -471,11 +483,18 @@ class ReflectorClient(
             ReflectorProtocol.MSG_UDP_AUDIO -> {
                 val audio = MsgParser.udpAudio(payload)
                 if (audio != null && audio.isNotEmpty()) {
+                    Log.d(TAG, "UDP RX audio seq=$seq len=${audio.size}")
                     callbacks.onAudioPacket(audio, seq)
+                } else {
+                    Log.w(TAG, "UDP RX audio empty/null len=${payload.size}")
                 }
             }
-            ReflectorProtocol.MSG_UDP_FLUSH_SAMPLES -> callbacks.onAudioFlush()
+            ReflectorProtocol.MSG_UDP_FLUSH_SAMPLES -> {
+                Log.d(TAG, "UDP RX flush")
+                callbacks.onAudioFlush()
+            }
             ReflectorProtocol.MSG_UDP_ALL_SAMPLES_FLUSHED -> Unit
+            else -> Log.d(TAG, "UDP RX type=$type len=${data.size}")
         }
     }
 

app/src/main/java/ru/ua1zbe/svxremote/proto/ReflectorProtocol.kt

@@ -195,6 +195,12 @@ object MsgBuilder {
         return RcMessage(ReflectorProtocol.MSG_TG_MONITOR, w.toByteArray())
     }
 
+    /** MsgNodeInfo v2: JSON-строка с данными клиента (версия ПО и пр.). */
+    fun nodeInfo(swInfo: String, swVersion: String): RcMessage {
+        val json = "{\"swInfo\":\"$swInfo\",\"swVersion\":\"$swVersion\"}"
+        return RcMessage(ReflectorProtocol.MSG_NODE_INFO, BinWriter().str(json).toByteArray())
+    }
+
     /** UDP-датаграмма V2: [u16 тип][u16 client_id][u16 seq][payload]. */
     fun udpDatagram(type: Int, clientId: Int, seq: Int, payload: ByteArray = ByteArray(0)): ByteArray {
         val w = BinWriter().u16(type).u16(clientId).u16(seq).bytes(payload)

app/src/main/java/ru/ua1zbe/svxremote/ui/PttButton.kt

@@ -84,28 +84,46 @@ class PttButton @JvmOverloads constructor(
         canvas.drawCircle(centerX, centerY, r, paint)
         canvas.drawCircle(centerX, centerY, r, ringPaint)
 
-        // Иконка микрофона
+        // Иконка микрофона (как icons8: капсула + чашка + ножка + основание)
         val micPaint = Paint(Paint.ANTI_ALIAS_FLAG)
         micPaint.color = Color.WHITE
         micPaint.style = Paint.Style.FILL
-        val s = r * 0.55f
-        val path = Path()
-        // Простой микрофон
+
         val x = centerX
         val y = centerY
-        path.moveTo(x - s * 0.30f, y - s * 1.05f)
-        path.lineTo(x + s * 0.30f, y - s * 1.05f)
-        path.lineTo(x + s * 0.30f, y - s * 0.20f)
-        path.cubicTo(x + s * 0.30f, y + s * 0.55f, x - s * 0.30f, y + s * 0.55f, x - s * 0.30f, y - s * 0.20f)
-        path.close()
-        canvas.drawPath(path, micPaint)
-        canvas.drawRect(x - s * 0.06f, y - s * 1.15f, x + s * 0.06f, y - s * 0.28f, micPaint)
-        // ножка и дуга
-        canvas.drawRect(x - s * 0.05f, y + s * 0.28f, x + s * 0.05f, y + s * 0.55f, micPaint)
-        canvas.drawArc(
-            x - s * 0.55f, y + s * 0.30f,
-            x + s * 0.55f, y + s * 1.20f,
-            0f, 180f, false, micPaint
+        val s = r * 0.5f
+
+        // корпус-капсула
+        val halfW = s * 0.34f
+        canvas.drawRoundRect(
+            x - halfW, y - s * 0.85f, x + halfW, y + s * 0.10f,
+            halfW, halfW, micPaint
+        )
+        // чашка-держатель (U-образная, заполненная)
+        val cup = Path()
+        cup.fillType = Path.FillType.EVEN_ODD
+        cup.moveTo(x - s * 0.52f, y + s * 0.06f)
+        cup.lineTo(x - s * 0.52f, y + s * 0.48f)
+        cup.quadTo(x - s * 0.52f, y + s * 0.70f, x, y + s * 0.70f)
+        cup.quadTo(x + s * 0.52f, y + s * 0.70f, x + s * 0.52f, y + s * 0.48f)
+        cup.lineTo(x + s * 0.52f, y + s * 0.06f)
+        cup.close()
+        cup.moveTo(x - s * 0.38f, y + s * 0.06f)
+        cup.lineTo(x - s * 0.38f, y + s * 0.44f)
+        cup.quadTo(x - s * 0.38f, y + s * 0.56f, x, y + s * 0.56f)
+        cup.quadTo(x + s * 0.38f, y + s * 0.56f, x + s * 0.38f, y + s * 0.44f)
+        cup.lineTo(x + s * 0.38f, y + s * 0.06f)
+        cup.close()
+        canvas.drawPath(cup, micPaint)
+        // ножка
+        canvas.drawRoundRect(
+            x - s * 0.08f, y + s * 0.46f, x + s * 0.08f, y + s * 0.72f,
+            s * 0.08f, s * 0.08f, micPaint
+        )
+        // основание
+        canvas.drawRoundRect(
+            x - s * 0.30f, y + s * 0.66f, x + s * 0.30f, y + s * 0.90f,
+            s * 0.12f, s * 0.12f, micPaint
         )
     }
 

app/src/main/res/drawable/bg_meter.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="@color/surface" />
+    <stroke android:width="1dp" android:color="@color/surface_light" />
+    <corners android:radius="8dp" />
+</shape>

app/src/main/res/drawable/bg_meter_fill_mic.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="@color/danger" />
+    <corners android:radius="8dp" />
+</shape>

app/src/main/res/drawable/bg_meter_fill_rx.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="@color/info" />
+    <corners android:radius="8dp" />
+</shape>

app/src/main/res/drawable/bg_splash.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <gradient
+        android:angle="135"
+        android:startColor="#0D1117"
+        android:centerColor="#101826"
+        android:endColor="#0D1117" />
+</shape>

app/src/main/res/layout/activity_main.xml

@@ -4,24 +4,28 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="@color/bg"
+    android:gravity="center_horizontal"
     android:padding="16dp">
 
+    <!-- Верхняя панель -->
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:gravity="center_vertical">
 
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
+
         <TextView
-            android:id="@+id/status_chip"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingHorizontal="14dp"
-            android:paddingVertical="6dp"
+            android:text="@string/app_title"
             android:textColor="@color/text_primary"
-            android:textSize="14sp"
-            android:background="@drawable/bg_chip"
-            android:text="@string/status_disconnected" />
+            android:textSize="20sp"
+            android:textStyle="bold" />
 
         <Space
             android:layout_width="0dp"
@@ -38,83 +42,233 @@
             android:scaleType="centerInside" />
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/lbl_subtitle"
+    <!-- Позывной + комната + группа -->
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:textColor="@color/text_secondary"
-        android:textSize="13sp"
-        android:singleLine="true"
-        android:ellipsize="end"
-        android:text="@string/settings_not_configured" />
+        android:layout_marginTop="36dp"
+        android:orientation="horizontal"
+        android:gravity="center_vertical">
 
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/lbl_callsign"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="monospace"
+                android:textColor="@color/text_primary"
+                android:textSize="28sp"
+                android:textStyle="bold"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:text="@string/settings_not_configured" />
+
+            <TextView
+                android:id="@+id/lbl_subtitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:textColor="@color/text_secondary"
+                android:textSize="14sp"
+                android:singleLine="true"
+                android:ellipsize="end" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/lbl_tg"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
+            android:textColor="@color/warn"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            android:fontFamily="monospace" />
+    </LinearLayout>
+
+    <!-- Статус соединения -->
+    <TextView
+        android:id="@+id/status_chip"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:gravity="center"
+        android:textColor="@color/danger"
+        android:textSize="18sp"
+        android:textStyle="bold"
+        android:text="@string/status_disconnected" />
+
+    <!-- S-метры -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="28dp"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center_vertical">
+
+            <TextView
+                android:layout_width="34dp"
+                android:layout_height="wrap_content"
+                android:text="@string/meter_rx"
+                android:textColor="@color/text_secondary"
+                android:textSize="13sp"
+                android:textStyle="bold" />
+
+            <FrameLayout
+                android:layout_width="0dp"
+                android:layout_height="16dp"
+                android:layout_weight="1"
+                android:background="@drawable/bg_meter">
+
+                <View
+                    android:id="@+id/rx_bar_fill"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@drawable/bg_meter_fill_rx"
+                    android:pivotX="0"
+                    android:scaleX="0" />
+            </FrameLayout>
+
+            <TextView
+                android:id="@+id/rx_db"
+                android:layout_width="64dp"
+                android:layout_height="wrap_content"
+                android:gravity="end"
+                android:fontFamily="monospace"
+                android:text="@string/meter_idle"
+                android:textColor="@color/text_primary"
+                android:textSize="13sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:orientation="horizontal"
+            android:gravity="center_vertical">
+
+            <TextView
+                android:layout_width="34dp"
+                android:layout_height="wrap_content"
+                android:text="@string/meter_mic"
+                android:textColor="@color/text_secondary"
+                android:textSize="13sp"
+                android:textStyle="bold" />
+
+            <FrameLayout
+                android:layout_width="0dp"
+                android:layout_height="16dp"
+                android:layout_weight="1"
+                android:background="@drawable/bg_meter">
+
+                <View
+                    android:id="@+id/mic_bar_fill"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@drawable/bg_meter_fill_mic"
+                    android:pivotX="0"
+                    android:scaleX="0" />
+            </FrameLayout>
+
+            <TextView
+                android:id="@+id/mic_db"
+                android:layout_width="64dp"
+                android:layout_height="wrap_content"
+                android:gravity="end"
+                android:fontFamily="monospace"
+                android:text="@string/meter_idle"
+                android:textColor="@color/text_primary"
+                android:textSize="13sp" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <!-- Последний говоривший -->
     <TextView
         android:id="@+id/lbl_talker_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="28dp"
+        android:layout_marginTop="24dp"
+        android:gravity="center"
         android:textColor="@color/text_secondary"
-        android:textSize="14sp"
-        android:text="@string/talker_none" />
+        android:textSize="13sp"
+        android:text="@string/talker_last_none" />
 
     <TextView
         android:id="@+id/lbl_talker"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
+        android:gravity="center"
         android:textColor="@color/accent"
-        android:textSize="28sp"
+        android:textSize="22sp"
         android:textStyle="bold"
         android:singleLine="true"
-        android:ellipsize="end"
-        android:text="@string/talker_none" />
+        android:ellipsize="end" />
 
     <Space
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1" />
 
-    <ru.ua1zbe.svxremote.ui.LevelMeter
-        android:id="@+id/level_meter"
-        android:layout_width="match_parent"
-        android:layout_height="30dp" />
-
+    <!-- Кнопка PTT -->
     <ru.ua1zbe.svxremote.ui.PttButton
         android:id="@+id/ptt_button"
-        android:layout_width="match_parent"
-        android:layout_height="220dp"
-        android:layout_marginTop="24dp"
-        android:layout_marginBottom="12dp" />
+        android:layout_width="130dp"
+        android:layout_height="130dp" />
 
     <TextView
         android:id="@+id/lbl_ptt_hint"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="14dp"
         android:gravity="center"
         android:textColor="@color/text_secondary"
-        android:textSize="13sp"
-        android:text="@string/ptt_hint" />
-
-    <TextView
-        android:id="@+id/lbl_tx_state"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:textColor="@color/danger"
         android:textSize="14sp"
         android:textStyle="bold"
-        android:visibility="gone"
-        android:text="@string/ptt_talking" />
+        android:text="@string/hold_to_talk" />
 
-    <Button
-        android:id="@+id/btn_connect"
+    <Space
         android:layout_width="match_parent"
-        android:layout_height="52dp"
-        android:layout_marginTop="12dp"
-        android:text="@string/btn_connect"
-        android:textColor="#0D1117"
-        android:background="@drawable/bg_primary_btn"
-        android:textSize="16sp"
-        android:textStyle="bold" />
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+    <!-- Нижняя зона статуса (кликабельна) -->
+    <LinearLayout
+        android:id="@+id/connect_zone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="8dp"
+        android:clickable="true"
+        android:focusable="true">
+
+        <TextView
+            android:id="@+id/lbl_tx_state"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:textColor="@color/danger"
+            android:textSize="14sp"
+            android:textStyle="bold"
+            android:text="@string/status_big_disconnected" />
+
+        <TextView
+            android:id="@+id/lbl_connect_hint"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:gravity="center"
+            android:textColor="@color/text_secondary"
+            android:textSize="12sp"
+            android:textStyle="italic"
+            android:text="@string/hint_connect" />
+    </LinearLayout>
 </LinearLayout>

app/src/main/res/layout/activity_settings.xml

@@ -128,5 +128,15 @@
             android:background="@drawable/bg_primary_btn"
             android:textSize="16sp"
             android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/lbl_version"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:gravity="center"
+            android:text="@string/app_version"
+            android:textColor="@color/text_secondary"
+            android:textSize="12sp" />
     </LinearLayout>
 </ScrollView>

app/src/main/res/layout/activity_splash.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/bg_splash">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:orientation="vertical"
+        android:gravity="center">
+
+        <TextView
+            android:id="@+id/splash_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="SVXhomyak"
+            android:textColor="@color/text_primary"
+            android:textSize="34sp"
+            android:textStyle="bold"
+            android:letterSpacing="0.08"
+            android:alpha="0" />
+
+        <TextView
+            android:id="@+id/splash_subtitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="СВЯЗЬ ЧЕРЕЗ СЕРВЕР"
+            android:textColor="@color/text_secondary"
+            android:textSize="12sp"
+            android:letterSpacing="0.3"
+            android:alpha="0" />
+
+        <View
+            android:id="@+id/splash_line"
+            android:layout_width="48dp"
+            android:layout_height="2dp"
+            android:layout_marginTop="16dp"
+            android:background="@color/info"
+            android:alpha="0" />
+    </LinearLayout>
+</FrameLayout>

app/src/main/res/values/strings.xml

@@ -10,21 +10,36 @@
     <string name="pref_auth_key">Пароль (AUTH_KEY)</string>
     <string name="pref_tg">Группа вещания (TG)</string>
     <string name="btn_save">Сохранить</string>
+    <string name="app_version">SVXhomyak — v1.0.2</string>
     <string name="saved">Сохранено</string>
     <string name="pref_callsign_hint">например UA1ZBE</string>
 
     <string name="status_disconnected">Отключено</string>
+    <string name="app_title">SVXHomyak</string>
+    <string name="status_big_disconnected">DISCONNECTED</string>
+    <string name="status_big_connected">CONNECTED</string>
+    <string name="status_big_talking">ПЕРЕДАЧА</string>
+    <string name="hint_connect">Нажмите, чтобы подключиться</string>
+    <string name="hint_disconnect">Нажмите, чтобы отключиться</string>
+    <string name="hold_to_talk">HOLD TO TALK</string>
+    <string name="meter_rx">RX</string>
+    <string name="meter_mic">MIC</string>
+    <string name="meter_idle">---</string>
+    <string name="meter_db">-%1$d dB</string>
+    <string name="tg_badge">TG%1$d</string>
+    <string name="talker_last_none">Последний: —</string>
     <string name="status_connecting">Подключение…</string>
     <string name="status_connecting_ssl">Проверка ключа…</string>
     <string name="status_connected">На связи</string>
     <string name="status_auth_failed">Ошибка авторизации</string>
     <string name="status_error">Ошибка: %1$s</string>
+    <string name="notif_connected">Соединение с рефлектором активно</string>
 
     <string name="btn_connect">Подключиться</string>
     <string name="btn_disconnect">Отключиться</string>
 
     <string name="talker_none">—</string>
-    <string name="talker_now">Сейчас говорит: %1$s</string>
+    <string name="talker_now">Последний: %1$s</string>
     <string name="talker_on_tg">группа %1$d</string>
 
     <string name="ptt_hint">Удерживайте кнопку, чтобы говорить</string>
@@ -43,4 +58,11 @@
 
     <string name="settings_not_configured">Настройки не заданы</string>
     <string name="ptt_disabled">Нет связи</string>
+
+    <string name="update_available_title">Доступно обновление</string>
+    <string name="update_available_msg">Версия %1$s уже вышла. Обновить приложение?</string>
+    <string name="update_btn">Обновить</string>
+    <string name="update_later">Позже</string>
+    <string name="update_downloading">Загрузка обновления…</string>
+    <string name="update_failed">Не удалось загрузить обновление: %1$s</string>
 </resources>

app/src/test/java/ru/ua1zbe/svxremote/HandshakeTest.kt

@@ -150,22 +150,40 @@ class HandshakeTest {
             .u16(1).str(sentCodecs)
             .toByteArray()
         writeFrame(out, RcMessage(ReflectorProtocol.MSG_SERVER_INFO, info))
-        // Client должен прислать MsgSelectTG(11) и UDP-датаграмму
+        // Client должен прислать MsgSelectTG(11), MsgTgMonitor(11) и
+        // MsgNodeInfo с версией ПО, плюс UDP-датаграмму
         var gotTg = false
-        while (!gotTg) {
+        var gotMonitor = false
+        var gotNodeInfo = false
+        var tries = 0
+        while ((!gotTg || !gotMonitor || !gotNodeInfo) && tries++ < 100) {
             val frame3 = readFrame(input, buf)
             val msg3 = RcMessage.fromPayload(frame3)
             when (msg3.type) {
                 ReflectorProtocol.MSG_SELECT_TG -> {
                     val rr = BinReader(msg3.fields)
                     assertEquals(11L, rr.u32())
-gotTg = true
-                        sawSelectTg = true
-                        selectTgLatch.countDown()
+                    gotTg = true
+                    sawSelectTg = true
+                    selectTgLatch.countDown()
+                }
+                ReflectorProtocol.MSG_TG_MONITOR -> {
+                    val rr = BinReader(msg3.fields)
+                    assertEquals(1, rr.u16())
+                    assertEquals(11L, rr.u32())
+                    gotMonitor = true
+                }
+                ReflectorProtocol.MSG_NODE_INFO -> {
+                    val json = BinReader(msg3.fields).str()
+                    assertTrue("JSON: $json", json.contains("swVersion"))
+                    assertTrue("JSON: $json", json.contains("1.0.0"))
+                    gotNodeInfo = true
                 }
                 ReflectorProtocol.MSG_HEARTBEAT -> Unit
             }
         }
+        assertTrue("TgMonitor не получен", gotMonitor)
+        assertTrue("NodeInfo не получен", gotNodeInfo)
         // Ждём UDP-датаграмму (регистрация UDP)
         try {
             val ds = DatagramSocket(server.localPort)

app/src/test/java/ru/ua1zbe/svxremote/ProtocolTest.kt

@@ -87,6 +87,27 @@ class ProtocolTest {
         assertEquals(11L, r.u32())
     }
 
+    @Test
+    fun `tgMonitor roundtrip`() {
+        val parsed = RcMessage.tryParseFrame(MsgBuilder.tgMonitor(listOf(11, 22)).toFrame())
+        assertEquals(ReflectorProtocol.MSG_TG_MONITOR, parsed?.type)
+        val r = BinReader(parsed!!.fields)
+        assertEquals(2, r.u16())
+        assertEquals(11L, r.u32())
+        assertEquals(22L, r.u32())
+    }
+
+    @Test
+    fun `nodeInfo roundtrip и версия ПО`() {
+        val parsed = RcMessage.tryParseFrame(
+            MsgBuilder.nodeInfo("SVXHomyak", "1.0.0").toFrame()
+        )
+        assertEquals(ReflectorProtocol.MSG_NODE_INFO, parsed?.type)
+        val json = BinReader(parsed!!.fields).str()
+        assertTrue("JSON: $json", json.contains("\"swInfo\":\"SVXHomyak\""))
+        assertTrue("JSON: $json", json.contains("\"swVersion\":\"1.0.0\""))
+    }
+
     @Test
     fun `udp audio roundtrip`() {
         val audio = ByteArray(30) { (it and 0xFF).toByte() }