0.9.0_rename

This commit is contained in:
Mateusz Gruszczyński committed 2026-11-17 17:29:00 +01:00
1 parent e55ce0ee29
commit 271ad2a492
30 files changed
+120 -112

No files matched your search

+4 -4
View File
@@ -13,15 +13,15 @@ val signing = Properties().apply {
}
android {
namespace = "io.simplydvb.tv"
namespace = "io.simplytv"
compileSdk = 34
defaultConfig {
applicationId = "io.simplydvb.tv"
applicationId = "io.simplytv"
minSdk = 26
targetSdk = 34
versionCode = 9
versionName = "0.8.0"
versionCode = 10
versionName = "0.9.0"
}
signingConfigs {
@@ -1,4 +1,4 @@
package io.simplydvb.tv
package io.simplytv
import android.app.Notification
import android.app.NotificationChannel
@@ -16,7 +16,7 @@ import android.os.IBinder
import android.os.Looper
import android.provider.Settings
import android.util.Log
import io.simplydvb.tv.ui.LiveActivity
import io.simplytv.ui.LiveActivity
/**
* Optional autostart of the own player: when the TV starts and when it wakes up from
@@ -1,9 +1,9 @@
package io.simplydvb.tv
package io.simplytv
import android.content.Context
import io.simplydvb.tv.htsp.HtsMsg
import io.simplydvb.tv.tif.HDvr
import io.simplydvb.tv.tif.HEvent
import io.simplytv.htsp.HtsMsg
import io.simplytv.tif.HDvr
import io.simplytv.tif.HEvent
/** Recording requests on the server (shared by the guide and the player). */
object Dvr {
@@ -1,4 +1,4 @@
package io.simplydvb.tv
package io.simplytv
import android.content.Context
@@ -1,9 +1,9 @@
package io.simplydvb.tv
package io.simplytv
import android.content.Context
import android.net.Uri
import io.simplydvb.tv.htsp.HtsMsg
import io.simplydvb.tv.htsp.HtspClient
import io.simplytv.htsp.HtsMsg
import io.simplytv.htsp.HtspClient
import org.json.JSONArray
import org.json.JSONObject
import java.util.UUID
@@ -1,4 +1,4 @@
package io.simplydvb.tv.htsp
package io.simplytv.htsp
import java.io.ByteArrayOutputStream
import java.nio.charset.StandardCharsets
@@ -1,4 +1,4 @@
package io.simplydvb.tv.htsp
package io.simplytv.htsp
import android.util.Log
import java.io.BufferedInputStream
@@ -1,4 +1,4 @@
package io.simplydvb.tv.player
package io.simplytv.player
import android.content.Context
import androidx.annotation.OptIn
@@ -1,4 +1,4 @@
package io.simplydvb.tv.tif
package io.simplytv.tif
import android.content.ComponentName
import android.content.ContentProviderOperation
@@ -8,8 +8,8 @@ import android.content.Context
import android.media.tv.TvContract
import android.net.Uri
import android.util.Log
import io.simplydvb.tv.Server
import io.simplydvb.tv.htsp.HtsMsg
import io.simplytv.Server
import io.simplytv.htsp.HtsMsg
import java.net.HttpURLConnection
import java.net.URL
import java.util.concurrent.CountDownLatch
@@ -57,7 +57,7 @@ object EpgSync {
ctx: Context,
epgDays: Int = 7,
withEpg: Boolean = true,
server: io.simplydvb.tv.ServerConfig = io.simplydvb.tv.ServerConfig.load(ctx),
server: io.simplytv.ServerConfig = io.simplytv.ServerConfig.load(ctx),
): Snapshot = Server.session(ctx, server) { client ->
val channels = ArrayList<HChannel>()
val events = ArrayList<HEvent>()
@@ -117,11 +117,11 @@ object EpgSync {
fun key(serverId: String, id: Long) = "$serverId:$id"
/** Splits a key back into (server, id); old single-server rows have no server part. */
fun parseKey(ctx: Context, key: String?): Pair<io.simplydvb.tv.ServerConfig, Long>? {
fun parseKey(ctx: Context, key: String?): Pair<io.simplytv.ServerConfig, Long>? {
if (key.isNullOrEmpty()) return null
val i = key.lastIndexOf(':')
val id = key.substring(i + 1).toLongOrNull() ?: return null
val server = if (i > 0) io.simplydvb.tv.ServerConfig.byId(ctx, key.substring(0, i)) else io.simplydvb.tv.ServerConfig.load(ctx)
val server = if (i > 0) io.simplytv.ServerConfig.byId(ctx, key.substring(0, i)) else io.simplytv.ServerConfig.load(ctx)
return (server ?: return null) to id
}
@@ -132,7 +132,7 @@ object EpgSync {
* Returns the number of channels in the TV.
*/
fun run(ctx: Context): Int {
val servers = io.simplydvb.tv.ServerConfig.all(ctx)
val servers = io.simplytv.ServerConfig.all(ctx)
val enabled = servers.filter { it.tvInput && it.configured }
val keepServers = enabled.map { it.id }.toMutableSet()
val errors = ArrayList<String>()
@@ -189,7 +189,7 @@ object EpgSync {
return out
}
private fun writeChannels(ctx: Context, srv: io.simplydvb.tv.ServerConfig, channels: List<HChannel>): Map<Long, Long> {
private fun writeChannels(ctx: Context, srv: io.simplytv.ServerConfig, channels: List<HChannel>): Map<Long, Long> {
val cr = ctx.contentResolver
val input = inputId(ctx)
val existing = channelRows(ctx).filterKeys { it.startsWith(srv.id + ":") }
@@ -274,7 +274,7 @@ object EpgSync {
return TvContract.Programs.Genres.encode(g)
}
private fun writePrograms(ctx: Context, srv: io.simplydvb.tv.ServerConfig, rows: Map<Long, Long>, events: List<HEvent>) {
private fun writePrograms(ctx: Context, srv: io.simplytv.ServerConfig, rows: Map<Long, Long>, events: List<HEvent>) {
val cr = ctx.contentResolver
val now = System.currentTimeMillis()
val ops = ArrayList<ContentProviderOperation>()
@@ -329,7 +329,7 @@ object EpgSync {
}
}
private fun writeRecordings(ctx: Context, srv: io.simplydvb.tv.ServerConfig, rows: Map<Long, Long>, dvr: List<HDvr>) {
private fun writeRecordings(ctx: Context, srv: io.simplytv.ServerConfig, rows: Map<Long, Long>, dvr: List<HDvr>) {
val cr = ctx.contentResolver
val input = inputId(ctx)
val existing = HashMap<Long, Long>()
@@ -1,4 +1,4 @@
package io.simplydvb.tv.tif
package io.simplytv.tif
import android.content.Context
import android.media.PlaybackParams
@@ -25,11 +25,11 @@ import androidx.media3.common.Tracks
import androidx.media3.common.text.CueGroup
import androidx.media3.common.util.UnstableApi
import androidx.media3.ui.SubtitleView
import io.simplydvb.tv.R
import io.simplydvb.tv.Server
import io.simplydvb.tv.ServerConfig
import io.simplydvb.tv.htsp.HtsMsg
import io.simplydvb.tv.player.Players
import io.simplytv.R
import io.simplytv.Server
import io.simplytv.ServerConfig
import io.simplytv.htsp.HtsMsg
import io.simplytv.player.Players
import java.util.concurrent.Executors
/**
@@ -1,4 +1,4 @@
package io.simplydvb.tv.tif
package io.simplytv.tif
import android.content.Context
import android.util.Log
@@ -11,7 +11,7 @@ import androidx.work.PeriodicWorkRequestBuilder
import androidx.work.WorkManager
import androidx.work.Worker
import androidx.work.WorkerParameters
import io.simplydvb.tv.ServerConfig
import io.simplytv.ServerConfig
import java.util.concurrent.TimeUnit
/** Background sync of channels, programme guide and recordings (hourly + on demand). */
@@ -1,4 +1,4 @@
package io.simplydvb.tv.ui
package io.simplytv.ui
import android.content.Context
import android.graphics.Canvas
@@ -14,9 +14,9 @@ import android.util.AttributeSet
import android.util.TypedValue
import android.view.KeyEvent
import android.view.View
import io.simplydvb.tv.R
import io.simplydvb.tv.tif.HChannel
import io.simplydvb.tv.tif.HEvent
import io.simplytv.R
import io.simplytv.tif.HChannel
import io.simplytv.tif.HEvent
import java.text.DateFormat
import java.util.Date
@@ -1,4 +1,4 @@
package io.simplydvb.tv.ui
package io.simplytv.ui
import android.app.Activity
import android.app.AlertDialog
@@ -9,15 +9,15 @@ import android.os.Looper
import android.view.View
import android.widget.TextView
import android.widget.Toast
import io.simplydvb.tv.R
import io.simplydvb.tv.Server
import io.simplydvb.tv.ServerConfig
import io.simplydvb.tv.htsp.HtsMsg
import io.simplydvb.tv.tif.EpgSync
import io.simplydvb.tv.tif.HChannel
import io.simplydvb.tv.tif.HDvr
import io.simplydvb.tv.tif.HEvent
import io.simplydvb.tv.tif.SyncWorker
import io.simplytv.R
import io.simplytv.Server
import io.simplytv.ServerConfig
import io.simplytv.htsp.HtsMsg
import io.simplytv.tif.EpgSync
import io.simplytv.tif.HChannel
import io.simplytv.tif.HDvr
import io.simplytv.tif.HEvent
import io.simplytv.tif.SyncWorker
import java.text.DateFormat
import java.util.Date
import kotlin.concurrent.thread
@@ -1,4 +1,4 @@
package io.simplydvb.tv.ui
package io.simplytv.ui
import android.app.Activity
import android.app.AlertDialog
@@ -30,17 +30,17 @@ import androidx.media3.common.util.UnstableApi
import androidx.media3.exoplayer.analytics.AnalyticsListener
import androidx.media3.exoplayer.ExoPlayer
import androidx.media3.ui.PlayerView
import io.simplydvb.tv.Dvr
import io.simplydvb.tv.Prefs
import io.simplydvb.tv.R
import io.simplydvb.tv.Server
import io.simplydvb.tv.ServerConfig
import io.simplydvb.tv.player.ByteMeter
import io.simplydvb.tv.player.Players
import io.simplydvb.tv.tif.EpgSync
import io.simplydvb.tv.tif.HChannel
import io.simplydvb.tv.tif.HDvr
import io.simplydvb.tv.tif.HEvent
import io.simplytv.Dvr
import io.simplytv.Prefs
import io.simplytv.R
import io.simplytv.Server
import io.simplytv.ServerConfig
import io.simplytv.player.ByteMeter
import io.simplytv.player.Players
import io.simplytv.tif.EpgSync
import io.simplytv.tif.HChannel
import io.simplytv.tif.HDvr
import io.simplytv.tif.HEvent
import org.json.JSONObject
import java.text.DateFormat
import java.util.Date
@@ -1,4 +1,4 @@
package io.simplydvb.tv.ui
package io.simplytv.ui
import android.content.Context
import android.graphics.Bitmap
@@ -7,7 +7,7 @@ import android.os.Handler
import android.os.Looper
import android.util.LruCache
import android.widget.ImageView
import io.simplydvb.tv.Server
import io.simplytv.Server
import java.util.concurrent.Executors
/** Channel logos from the server, loaded in the background and kept in memory. */
@@ -1,4 +1,4 @@
package io.simplydvb.tv.ui
package io.simplytv.ui
import android.app.Activity
import android.content.Context
@@ -13,12 +13,12 @@ import android.view.View
import android.widget.ProgressBar
import android.widget.TextView
import android.widget.Toast
import io.simplydvb.tv.AutoStart
import io.simplydvb.tv.R
import io.simplydvb.tv.Server
import io.simplydvb.tv.ServerConfig
import io.simplydvb.tv.tif.EpgSync
import io.simplydvb.tv.tif.SyncWorker
import io.simplytv.AutoStart
import io.simplytv.R
import io.simplytv.Server
import io.simplytv.ServerConfig
import io.simplytv.tif.EpgSync
import io.simplytv.tif.SyncWorker
import java.security.MessageDigest
import java.text.DateFormat
import java.util.Date
@@ -1,4 +1,4 @@
package io.simplydvb.tv.ui
package io.simplytv.ui
import android.app.Activity
import android.os.Bundle
@@ -14,9 +14,9 @@ import androidx.media3.common.Player
import androidx.media3.common.util.UnstableApi
import androidx.media3.exoplayer.ExoPlayer
import androidx.media3.ui.PlayerView
import io.simplydvb.tv.R
import io.simplydvb.tv.Server
import io.simplydvb.tv.player.Players
import io.simplytv.R
import io.simplytv.Server
import io.simplytv.player.Players
import kotlin.concurrent.thread
/** Plays a recording from the server (seeking with the remote's arrows). */
@@ -1,4 +1,4 @@
package io.simplydvb.tv.ui
package io.simplytv.ui
import android.app.Activity
import android.app.AlertDialog
@@ -11,12 +11,12 @@ import android.view.View
import android.widget.ListView
import android.widget.TextView
import android.widget.Toast
import io.simplydvb.tv.R
import io.simplydvb.tv.Server
import io.simplydvb.tv.htsp.HtsMsg
import io.simplydvb.tv.tif.EpgSync
import io.simplydvb.tv.tif.HDvr
import io.simplydvb.tv.tif.SyncWorker
import io.simplytv.R
import io.simplytv.Server
import io.simplytv.htsp.HtsMsg
import io.simplytv.tif.EpgSync
import io.simplytv.tif.HDvr
import io.simplytv.tif.SyncWorker
import java.text.DateFormat
import java.util.Date
import kotlin.concurrent.thread
@@ -1,4 +1,4 @@
package io.simplydvb.tv.ui
package io.simplytv.ui
import android.content.Context
import android.view.LayoutInflater
@@ -7,7 +7,7 @@ import android.view.ViewGroup
import android.widget.BaseAdapter
import android.widget.ImageView
import android.widget.TextView
import io.simplydvb.tv.R
import io.simplytv.R
/** One list row: icon (optional), two lines of text and a badge on the right. */
data class Row(
@@ -1,4 +1,4 @@
package io.simplydvb.tv.ui
package io.simplytv.ui
import android.app.Activity
import android.app.AlertDialog
@@ -9,10 +9,10 @@ import android.os.Looper
import android.widget.Button
import android.widget.ListView
import android.widget.TextView
import io.simplydvb.tv.R
import io.simplydvb.tv.ServerConfig
import io.simplydvb.tv.tif.EpgSync
import io.simplydvb.tv.tif.SyncWorker
import io.simplytv.R
import io.simplytv.ServerConfig
import io.simplytv.tif.EpgSync
import io.simplytv.tif.SyncWorker
import kotlin.concurrent.thread
/**
@@ -1,4 +1,4 @@
package io.simplydvb.tv.ui
package io.simplytv.ui
import android.app.Activity
import android.app.AlertDialog
@@ -10,10 +10,10 @@ import android.widget.ImageView
import android.widget.LinearLayout
import android.widget.TextView
import android.widget.Toast
import io.simplydvb.tv.AutoStart
import io.simplydvb.tv.Prefs
import io.simplydvb.tv.R
import io.simplydvb.tv.ServerConfig
import io.simplytv.AutoStart
import io.simplytv.Prefs
import io.simplytv.R
import io.simplytv.ServerConfig
/**
* Settings: OSD, player, start-up and servers. Rows on the right; the left column explains
@@ -1,4 +1,4 @@
package io.simplydvb.tv.ui
package io.simplytv.ui
import android.app.Activity
import android.os.Bundle
@@ -18,11 +18,11 @@ import java.net.URL
import android.widget.Button
import android.widget.EditText
import android.widget.TextView
import io.simplydvb.tv.R
import io.simplydvb.tv.ServerConfig
import io.simplydvb.tv.htsp.HtspClient
import io.simplydvb.tv.tif.EpgSync
import io.simplydvb.tv.tif.SyncWorker
import io.simplytv.R
import io.simplytv.ServerConfig
import io.simplytv.htsp.HtspClient
import io.simplytv.tif.EpgSync
import io.simplytv.tif.SyncWorker
import kotlin.concurrent.thread
/**
@@ -1,4 +1,4 @@
package io.simplydvb.tv.ui
package io.simplytv.ui
import android.content.Context
import android.graphics.Canvas
+1 -1
View File
@@ -4,7 +4,7 @@
android:layout_height="match_parent"
android:background="@color/bg">
<io.simplydvb.tv.ui.EpgGridView
<io.simplytv.ui.EpgGridView
android:id="@+id/grid"
android:layout_width="match_parent"
android:layout_height="match_parent"
+4 -4
View File
@@ -121,7 +121,7 @@
<TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:text="@string/t_signal_snr" android:textColor="@color/muted" android:textSize="9sp" />
<TextView android:id="@+id/t_signal" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:textColor="@color/green" android:textSize="14sp" android:fontFamily="monospace" />
</LinearLayout>
<io.simplydvb.tv.ui.SparkView android:id="@+id/t_spark" android:layout_width="0dp" android:layout_height="30dp" android:layout_weight="1" />
<io.simplytv.ui.SparkView android:id="@+id/t_spark" android:layout_width="0dp" android:layout_height="30dp" android:layout_weight="1" />
</LinearLayout>
<LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="6dp" android:gravity="center_vertical" android:orientation="horizontal">
<LinearLayout android:layout_width="96dp" android:layout_height="wrap_content" android:orientation="vertical">
@@ -129,7 +129,7 @@
<TextView android:id="@+id/t_cpu" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:textColor="@color/accent" android:textSize="14sp" android:fontFamily="monospace" />
<TextView android:id="@+id/t_cpu_sub" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:textColor="@color/muted" android:textSize="9sp" android:fontFamily="monospace" />
</LinearLayout>
<io.simplydvb.tv.ui.SparkView android:id="@+id/t_cpu_spark" android:layout_width="0dp" android:layout_height="30dp" android:layout_weight="1" />
<io.simplytv.ui.SparkView android:id="@+id/t_cpu_spark" android:layout_width="0dp" android:layout_height="30dp" android:layout_weight="1" />
</LinearLayout>
<LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="6dp" android:gravity="center_vertical" android:orientation="horizontal">
<LinearLayout android:layout_width="96dp" android:layout_height="wrap_content" android:orientation="vertical">
@@ -137,7 +137,7 @@
<TextView android:id="@+id/t_rate" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:textColor="@color/blue" android:textSize="14sp" android:fontFamily="monospace" />
<TextView android:id="@+id/t_rate_sub" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:textColor="@color/muted" android:textSize="9sp" android:fontFamily="monospace" />
</LinearLayout>
<io.simplydvb.tv.ui.SparkView android:id="@+id/t_rate_spark" android:layout_width="0dp" android:layout_height="30dp" android:layout_weight="1" />
<io.simplytv.ui.SparkView android:id="@+id/t_rate_spark" android:layout_width="0dp" android:layout_height="30dp" android:layout_weight="1" />
</LinearLayout>
<TextView android:id="@+id/t_video" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="5dp" android:singleLine="true" android:ellipsize="end" android:textColor="@color/text" android:textSize="9sp" android:fontFamily="monospace" />
@@ -160,7 +160,7 @@
</LinearLayout>
<!-- programme grid (GUIDE, right arrow) -->
<io.simplydvb.tv.ui.EpgGridView
<io.simplytv.ui.EpgGridView
android:id="@+id/epg_grid"
android:layout_width="match_parent"
android:layout_height="match_parent"
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<tv-input xmlns:android="http://schemas.android.com/apk/res/android"
android:canRecord="true"
android:setupActivity="io.simplydvb.tv.ui.ServersActivity"
android:setupActivity="io.simplytv.ui.ServersActivity"
android:tunerCount="2" />
@@ -1,4 +1,4 @@
package io.simplydvb.tv.htsp
package io.simplytv.htsp
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue