diff --git a/README.md b/README.md index 3cd27d5..99e8e85 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # simply-tv -Android TV app for [simply-dvb](../simply-dvb) (works with tvheadend too). It makes the DVB +Android TV app for [simply-dvb](../simple-dvbt) (works with tvheadend too). It makes the DVB server a **source of the TV's own live-TV app** (Android TV Input Framework): channels with logos and the programme guide appear in the TV's channel list and guide, and playback runs in the TV's player with hardware decoding (HEVC, AC-3/E-AC-3, MPEG-2…). @@ -56,6 +56,10 @@ simply-tv keeps a list of servers (*Servers* on the start screen, also opened by * **TV app source on/off** – whether its channels are loaded into the TV's own live-TV app. Several servers can feed the TV app at once; the server name is shown as the channel's network. Switching a server off removes its channels (and recordings) from the TV app on the next sync. * **Load channels into the TV app** syncs all enabled servers right away. +## Moving from 0.8 and older (`io.simplydvb.tv`) + +From 0.9 the app id is `io.simplytv`, so Android installs it as a new app next to the old one. After installing: add the server again (QR pairing), switch autostart on again if you used it, set up the channels in the TV app (the input is new), then uninstall the old one: `adb uninstall io.simplydvb.tv`. + ## Start screen The player comes first: *Watch TV* has the focus, so OK opens it on the last channel. Under the title the screen shows that channel and what is on it right now, with a progress bar – read from the server (`/api/epg/events/grid`), refreshed when the programme ends. Below: Programme guide, Recordings, TV app (the TV's built-in live-TV app with the simply-tv channels), Servers and Settings; then the active server's state with a Sync button; at the bottom the remote's keys in the player. @@ -78,7 +82,7 @@ The tuner card (top right, optional) shows the adapter, frequency, lock, three s **Smooth video:** *Tunnelled video playback* (*Settings*, on by default) lets the TV's own video pipeline decode and sync the picture – the same path the built-in tuner uses. If a channel shows no picture with it, switch it off. The tuner card's white line shows what the TV does with the stream: resolution, frames shown per second, dropped frames (red), buffer and decoder; the last line shows simply-dvb's driver timing (time of a signal statistics read and the longest pause in the stream). -**Start with the TV:** *Start the player with the TV* (*Settings*) opens the own player on the last channel when the TV boots and when it wakes up from standby. Android only lets an app open a screen from the background with the *Display over other apps* permission – the app opens that settings screen; if the TV has none, grant it once from a computer: `adb shell appops set io.simplydvb.tv SYSTEM_ALERT_WINDOW allow`. The home screen also has a second tile, *simply-tv Live*, that goes straight into the player. The TV button on the remote always opens the TV's own TV app – simply-tv channels play there too (via the TV input). +**Start with the TV:** *Start the player with the TV* (*Settings*) opens the own player on the last channel when the TV boots and when it wakes up from standby. Android only lets an app open a screen from the background with the *Display over other apps* permission – the app opens that settings screen; if the TV has none, grant it once from a computer: `adb shell appops set io.simplytv SYSTEM_ALERT_WINDOW allow`. The home screen also has a second tile, *simply-tv Live*, that goes straight into the player. The TV button on the remote always opens the TV's own TV app – simply-tv channels play there too (via the TV input). ## First start @@ -96,7 +100,7 @@ Manually: ## Layout ``` -app/src/main/java/io/simplydvb/tv/ +app/src/main/java/io/simplytv/ htsp/ HTSMSG codec and HTSP client (hello, SHA-1 auth, request/response, async) tif/ TvInputService (playback + recording sessions), EPG/channel sync, WorkManager job player/ ExoPlayer setup for DVB MPEG-TS diff --git a/README.pl.md b/README.pl.md index d41c75b..3f157b3 100644 --- a/README.pl.md +++ b/README.pl.md @@ -55,6 +55,10 @@ simply-tv trzyma listę serwerów (*Serwery* na ekranie startowym, otwiera się * **Źródło aplikacji TV wł./wył.** – czy kanały tego serwera trafiają do wbudowanej aplikacji TV telewizora. Kilka serwerów może zasilać ją jednocześnie; nazwa serwera widnieje jako sieć kanału. Wyłączenie serwera usuwa jego kanały (i nagrania) z aplikacji TV przy następnej synchronizacji. * **Wczytaj kanały do aplikacji TV** od razu synchronizuje wszystkie włączone serwery. +## Przejście z wersji 0.8 i starszych (`io.simplydvb.tv`) + +Od 0.9 identyfikator aplikacji to `io.simplytv`, więc Android instaluje ją jako nową aplikację obok starej. Po instalacji: dodaj serwer ponownie (parowanie kodem QR), w razie potrzeby włącz ponownie autostart, skonfiguruj kanały w aplikacji TV (wejście jest nowe), a potem odinstaluj starą: `adb uninstall io.simplydvb.tv`. + ## Ekran startowy Najpierw odtwarzacz: *Oglądaj telewizję* ma fokus, więc OK otwiera go na ostatnim kanale. Pod tytułem widać ten kanał i to, co na nim teraz leci, z paskiem postępu – dane z serwera (`/api/epg/events/grid`), odświeżane po zakończeniu audycji. Niżej: Program TV, Nagrania, Aplikacja TV (wbudowana aplikacja telewizora z kanałami simply-tv), Serwery i Ustawienia; dalej stan aktywnego serwera z przyciskiem Synchronizuj, a na dole klawisze pilota w odtwarzaczu. @@ -77,7 +81,7 @@ Karta tunera (prawy górny róg, opcjonalna) pokazuje adapter, częstotliwość, **Płynny obraz:** *Tunelowanie wideo* (*Ustawienia*, domyślnie włączone) przekazuje dekodowanie i synchronizację obrazu do toru wideo telewizora – tego samego, którego używa wbudowany tuner. Jeśli na jakimś kanale nie ma wtedy obrazu, wyłącz je. Biała linia na karcie tunera pokazuje, co telewizor robi ze strumieniem: rozdzielczość, wyświetlane klatki na sekundę, gubione klatki (na czerwono), bufor i dekoder; ostatnia linia to czasy sterownika w simply-dvb (odczyt statystyk sygnału i najdłuższa przerwa w strumieniu). -**Start razem z telewizorem:** *Uruchamiaj odtwarzacz z telewizorem* (*Ustawienia*) otwiera własny odtwarzacz na ostatnim kanale po starcie telewizora i po wybudzeniu ze stanu czuwania. Android pozwala otworzyć ekran z tła tylko z uprawnieniem *Wyświetlanie nad innymi aplikacjami* – aplikacja otwiera ten ekran ustawień; jeśli telewizor go nie ma, nadaj je raz z komputera: `adb shell appops set io.simplydvb.tv SYSTEM_ALERT_WINDOW allow`. Na ekranie głównym jest też drugi kafelek, *simply-tv Na żywo*, który od razu otwiera odtwarzacz. Przycisk TV na pilocie zawsze otwiera wbudowaną aplikację TV telewizora – kanały simply-tv też w niej działają (przez wejście TV). +**Start razem z telewizorem:** *Uruchamiaj odtwarzacz z telewizorem* (*Ustawienia*) otwiera własny odtwarzacz na ostatnim kanale po starcie telewizora i po wybudzeniu ze stanu czuwania. Android pozwala otworzyć ekran z tła tylko z uprawnieniem *Wyświetlanie nad innymi aplikacjami* – aplikacja otwiera ten ekran ustawień; jeśli telewizor go nie ma, nadaj je raz z komputera: `adb shell appops set io.simplytv SYSTEM_ALERT_WINDOW allow`. Na ekranie głównym jest też drugi kafelek, *simply-tv Na żywo*, który od razu otwiera odtwarzacz. Przycisk TV na pilocie zawsze otwiera wbudowaną aplikację TV telewizora – kanały simply-tv też w niej działają (przez wejście TV). ## Pierwsze uruchomienie diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e083696..004f768 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -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 { diff --git a/app/src/main/java/io/simplydvb/tv/AutoStart.kt b/app/src/main/java/io/simplytv/AutoStart.kt similarity index 98% rename from app/src/main/java/io/simplydvb/tv/AutoStart.kt rename to app/src/main/java/io/simplytv/AutoStart.kt index ef4b366..646a534 100644 --- a/app/src/main/java/io/simplydvb/tv/AutoStart.kt +++ b/app/src/main/java/io/simplytv/AutoStart.kt @@ -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 diff --git a/app/src/main/java/io/simplydvb/tv/Dvr.kt b/app/src/main/java/io/simplytv/Dvr.kt similarity index 91% rename from app/src/main/java/io/simplydvb/tv/Dvr.kt rename to app/src/main/java/io/simplytv/Dvr.kt index d683b5d..ca01f68 100644 --- a/app/src/main/java/io/simplydvb/tv/Dvr.kt +++ b/app/src/main/java/io/simplytv/Dvr.kt @@ -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 { diff --git a/app/src/main/java/io/simplydvb/tv/Prefs.kt b/app/src/main/java/io/simplytv/Prefs.kt similarity index 98% rename from app/src/main/java/io/simplydvb/tv/Prefs.kt rename to app/src/main/java/io/simplytv/Prefs.kt index dc5de51..1e3eda6 100644 --- a/app/src/main/java/io/simplydvb/tv/Prefs.kt +++ b/app/src/main/java/io/simplytv/Prefs.kt @@ -1,4 +1,4 @@ -package io.simplydvb.tv +package io.simplytv import android.content.Context diff --git a/app/src/main/java/io/simplydvb/tv/Server.kt b/app/src/main/java/io/simplytv/Server.kt similarity index 98% rename from app/src/main/java/io/simplydvb/tv/Server.kt rename to app/src/main/java/io/simplytv/Server.kt index 0b48eb0..7ee087e 100644 --- a/app/src/main/java/io/simplydvb/tv/Server.kt +++ b/app/src/main/java/io/simplytv/Server.kt @@ -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 diff --git a/app/src/main/java/io/simplydvb/tv/htsp/HtsMsg.kt b/app/src/main/java/io/simplytv/htsp/HtsMsg.kt similarity index 99% rename from app/src/main/java/io/simplydvb/tv/htsp/HtsMsg.kt rename to app/src/main/java/io/simplytv/htsp/HtsMsg.kt index d287499..6b11464 100644 --- a/app/src/main/java/io/simplydvb/tv/htsp/HtsMsg.kt +++ b/app/src/main/java/io/simplytv/htsp/HtsMsg.kt @@ -1,4 +1,4 @@ -package io.simplydvb.tv.htsp +package io.simplytv.htsp import java.io.ByteArrayOutputStream import java.nio.charset.StandardCharsets diff --git a/app/src/main/java/io/simplydvb/tv/htsp/HtspClient.kt b/app/src/main/java/io/simplytv/htsp/HtspClient.kt similarity index 99% rename from app/src/main/java/io/simplydvb/tv/htsp/HtspClient.kt rename to app/src/main/java/io/simplytv/htsp/HtspClient.kt index 7f93d5d..2bbde77 100644 --- a/app/src/main/java/io/simplydvb/tv/htsp/HtspClient.kt +++ b/app/src/main/java/io/simplytv/htsp/HtspClient.kt @@ -1,4 +1,4 @@ -package io.simplydvb.tv.htsp +package io.simplytv.htsp import android.util.Log import java.io.BufferedInputStream diff --git a/app/src/main/java/io/simplydvb/tv/player/Players.kt b/app/src/main/java/io/simplytv/player/Players.kt similarity index 99% rename from app/src/main/java/io/simplydvb/tv/player/Players.kt rename to app/src/main/java/io/simplytv/player/Players.kt index 0f317b0..9cf4efb 100644 --- a/app/src/main/java/io/simplydvb/tv/player/Players.kt +++ b/app/src/main/java/io/simplytv/player/Players.kt @@ -1,4 +1,4 @@ -package io.simplydvb.tv.player +package io.simplytv.player import android.content.Context import androidx.annotation.OptIn diff --git a/app/src/main/java/io/simplydvb/tv/tif/EpgSync.kt b/app/src/main/java/io/simplytv/tif/EpgSync.kt similarity index 95% rename from app/src/main/java/io/simplydvb/tv/tif/EpgSync.kt rename to app/src/main/java/io/simplytv/tif/EpgSync.kt index e708dc8..a25766e 100644 --- a/app/src/main/java/io/simplydvb/tv/tif/EpgSync.kt +++ b/app/src/main/java/io/simplytv/tif/EpgSync.kt @@ -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() val events = ArrayList() @@ -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? { + fun parseKey(ctx: Context, key: String?): Pair? { 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() @@ -189,7 +189,7 @@ object EpgSync { return out } - private fun writeChannels(ctx: Context, srv: io.simplydvb.tv.ServerConfig, channels: List): Map { + private fun writeChannels(ctx: Context, srv: io.simplytv.ServerConfig, channels: List): Map { 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, events: List) { + private fun writePrograms(ctx: Context, srv: io.simplytv.ServerConfig, rows: Map, events: List) { val cr = ctx.contentResolver val now = System.currentTimeMillis() val ops = ArrayList() @@ -329,7 +329,7 @@ object EpgSync { } } - private fun writeRecordings(ctx: Context, srv: io.simplydvb.tv.ServerConfig, rows: Map, dvr: List) { + private fun writeRecordings(ctx: Context, srv: io.simplytv.ServerConfig, rows: Map, dvr: List) { val cr = ctx.contentResolver val input = inputId(ctx) val existing = HashMap() diff --git a/app/src/main/java/io/simplydvb/tv/tif/SimplyTvInputService.kt b/app/src/main/java/io/simplytv/tif/SimplyTvInputService.kt similarity index 98% rename from app/src/main/java/io/simplydvb/tv/tif/SimplyTvInputService.kt rename to app/src/main/java/io/simplytv/tif/SimplyTvInputService.kt index d25e860..8fce8c9 100644 --- a/app/src/main/java/io/simplydvb/tv/tif/SimplyTvInputService.kt +++ b/app/src/main/java/io/simplytv/tif/SimplyTvInputService.kt @@ -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 /** diff --git a/app/src/main/java/io/simplydvb/tv/tif/SyncWorker.kt b/app/src/main/java/io/simplytv/tif/SyncWorker.kt similarity index 96% rename from app/src/main/java/io/simplydvb/tv/tif/SyncWorker.kt rename to app/src/main/java/io/simplytv/tif/SyncWorker.kt index 6c142a8..6bceb32 100644 --- a/app/src/main/java/io/simplydvb/tv/tif/SyncWorker.kt +++ b/app/src/main/java/io/simplytv/tif/SyncWorker.kt @@ -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). */ diff --git a/app/src/main/java/io/simplydvb/tv/ui/EpgGridView.kt b/app/src/main/java/io/simplytv/ui/EpgGridView.kt similarity index 99% rename from app/src/main/java/io/simplydvb/tv/ui/EpgGridView.kt rename to app/src/main/java/io/simplytv/ui/EpgGridView.kt index beb2de6..dad05f8 100644 --- a/app/src/main/java/io/simplydvb/tv/ui/EpgGridView.kt +++ b/app/src/main/java/io/simplytv/ui/EpgGridView.kt @@ -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 diff --git a/app/src/main/java/io/simplydvb/tv/ui/GuideActivity.kt b/app/src/main/java/io/simplytv/ui/GuideActivity.kt similarity index 94% rename from app/src/main/java/io/simplydvb/tv/ui/GuideActivity.kt rename to app/src/main/java/io/simplytv/ui/GuideActivity.kt index 531e0ec..04368d9 100644 --- a/app/src/main/java/io/simplydvb/tv/ui/GuideActivity.kt +++ b/app/src/main/java/io/simplytv/ui/GuideActivity.kt @@ -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 diff --git a/app/src/main/java/io/simplydvb/tv/ui/LiveActivity.kt b/app/src/main/java/io/simplytv/ui/LiveActivity.kt similarity index 98% rename from app/src/main/java/io/simplydvb/tv/ui/LiveActivity.kt rename to app/src/main/java/io/simplytv/ui/LiveActivity.kt index 2e67e95..af5b7d3 100644 --- a/app/src/main/java/io/simplydvb/tv/ui/LiveActivity.kt +++ b/app/src/main/java/io/simplytv/ui/LiveActivity.kt @@ -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 diff --git a/app/src/main/java/io/simplydvb/tv/ui/Logos.kt b/app/src/main/java/io/simplytv/ui/Logos.kt similarity index 96% rename from app/src/main/java/io/simplydvb/tv/ui/Logos.kt rename to app/src/main/java/io/simplytv/ui/Logos.kt index f243584..d9ac8fb 100644 --- a/app/src/main/java/io/simplydvb/tv/ui/Logos.kt +++ b/app/src/main/java/io/simplytv/ui/Logos.kt @@ -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. */ diff --git a/app/src/main/java/io/simplydvb/tv/ui/MainActivity.kt b/app/src/main/java/io/simplytv/ui/MainActivity.kt similarity index 97% rename from app/src/main/java/io/simplydvb/tv/ui/MainActivity.kt rename to app/src/main/java/io/simplytv/ui/MainActivity.kt index 39f2c68..f39aa56 100644 --- a/app/src/main/java/io/simplydvb/tv/ui/MainActivity.kt +++ b/app/src/main/java/io/simplytv/ui/MainActivity.kt @@ -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 diff --git a/app/src/main/java/io/simplydvb/tv/ui/PlayerActivity.kt b/app/src/main/java/io/simplytv/ui/PlayerActivity.kt similarity index 95% rename from app/src/main/java/io/simplydvb/tv/ui/PlayerActivity.kt rename to app/src/main/java/io/simplytv/ui/PlayerActivity.kt index 7f4daf5..7df7f05 100644 --- a/app/src/main/java/io/simplydvb/tv/ui/PlayerActivity.kt +++ b/app/src/main/java/io/simplytv/ui/PlayerActivity.kt @@ -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). */ diff --git a/app/src/main/java/io/simplydvb/tv/ui/RecordingsActivity.kt b/app/src/main/java/io/simplytv/ui/RecordingsActivity.kt similarity index 95% rename from app/src/main/java/io/simplydvb/tv/ui/RecordingsActivity.kt rename to app/src/main/java/io/simplytv/ui/RecordingsActivity.kt index 3265ced..0701da1 100644 --- a/app/src/main/java/io/simplydvb/tv/ui/RecordingsActivity.kt +++ b/app/src/main/java/io/simplytv/ui/RecordingsActivity.kt @@ -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 diff --git a/app/src/main/java/io/simplydvb/tv/ui/Rows.kt b/app/src/main/java/io/simplytv/ui/Rows.kt similarity index 96% rename from app/src/main/java/io/simplydvb/tv/ui/Rows.kt rename to app/src/main/java/io/simplytv/ui/Rows.kt index 27f89be..c9269c6 100644 --- a/app/src/main/java/io/simplydvb/tv/ui/Rows.kt +++ b/app/src/main/java/io/simplytv/ui/Rows.kt @@ -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( diff --git a/app/src/main/java/io/simplydvb/tv/ui/ServersActivity.kt b/app/src/main/java/io/simplytv/ui/ServersActivity.kt similarity index 96% rename from app/src/main/java/io/simplydvb/tv/ui/ServersActivity.kt rename to app/src/main/java/io/simplytv/ui/ServersActivity.kt index 5028b41..7c42664 100644 --- a/app/src/main/java/io/simplydvb/tv/ui/ServersActivity.kt +++ b/app/src/main/java/io/simplytv/ui/ServersActivity.kt @@ -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 /** diff --git a/app/src/main/java/io/simplydvb/tv/ui/SettingsActivity.kt b/app/src/main/java/io/simplytv/ui/SettingsActivity.kt similarity index 97% rename from app/src/main/java/io/simplydvb/tv/ui/SettingsActivity.kt rename to app/src/main/java/io/simplytv/ui/SettingsActivity.kt index 7b4d5b8..3515e0a 100644 --- a/app/src/main/java/io/simplydvb/tv/ui/SettingsActivity.kt +++ b/app/src/main/java/io/simplytv/ui/SettingsActivity.kt @@ -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 diff --git a/app/src/main/java/io/simplydvb/tv/ui/SetupActivity.kt b/app/src/main/java/io/simplytv/ui/SetupActivity.kt similarity index 98% rename from app/src/main/java/io/simplydvb/tv/ui/SetupActivity.kt rename to app/src/main/java/io/simplytv/ui/SetupActivity.kt index e0762b5..daa5b51 100644 --- a/app/src/main/java/io/simplydvb/tv/ui/SetupActivity.kt +++ b/app/src/main/java/io/simplytv/ui/SetupActivity.kt @@ -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 /** diff --git a/app/src/main/java/io/simplydvb/tv/ui/SparkView.kt b/app/src/main/java/io/simplytv/ui/SparkView.kt similarity index 99% rename from app/src/main/java/io/simplydvb/tv/ui/SparkView.kt rename to app/src/main/java/io/simplytv/ui/SparkView.kt index d3071c7..6173c3f 100644 --- a/app/src/main/java/io/simplydvb/tv/ui/SparkView.kt +++ b/app/src/main/java/io/simplytv/ui/SparkView.kt @@ -1,4 +1,4 @@ -package io.simplydvb.tv.ui +package io.simplytv.ui import android.content.Context import android.graphics.Canvas diff --git a/app/src/main/res/layout/activity_guide.xml b/app/src/main/res/layout/activity_guide.xml index b50b5ff..e955357 100644 --- a/app/src/main/res/layout/activity_guide.xml +++ b/app/src/main/res/layout/activity_guide.xml @@ -4,7 +4,7 @@ android:layout_height="match_parent" android:background="@color/bg"> - - + @@ -129,7 +129,7 @@ - + @@ -137,7 +137,7 @@ - + @@ -160,7 +160,7 @@ - diff --git a/app/src/test/java/io/simplydvb/tv/htsp/HtspTest.kt b/app/src/test/java/io/simplytv/htsp/HtspTest.kt similarity index 99% rename from app/src/test/java/io/simplydvb/tv/htsp/HtspTest.kt rename to app/src/test/java/io/simplytv/htsp/HtspTest.kt index 39ee829..ef7e236 100644 --- a/app/src/test/java/io/simplydvb/tv/htsp/HtspTest.kt +++ b/app/src/test/java/io/simplytv/htsp/HtspTest.kt @@ -1,4 +1,4 @@ -package io.simplydvb.tv.htsp +package io.simplytv.htsp import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue diff --git a/scripts/install-tv.sh b/scripts/install-tv.sh index 64675aa..acbd208 100755 --- a/scripts/install-tv.sh +++ b/scripts/install-tv.sh @@ -15,7 +15,7 @@ APK="${2:-$(ls -t dist/simply-tv-*.apk 2>/dev/null | head -1)}" [ -f "$APK" ] || { echo "no APK – run scripts/build-apk.sh first" >&2; exit 1; } case "$TV" in *:*) ;; *) TV="$TV:5555" ;; esac -STEPS="adb connect $TV && sleep 2 && adb -s $TV install -r '$APK' && adb -s $TV shell am start -n io.simplydvb.tv/.ui.MainActivity" +STEPS="adb connect $TV && sleep 2 && adb -s $TV install -r '$APK' && adb -s $TV shell am start -n io.simplytv/.ui.MainActivity" echo ">> connecting to $TV (confirm on the TV if asked) and installing $APK" if command -v adb >/dev/null 2>&1; then bash -c "$STEPS"