From c88a7b718a35167d7d4812d028aab9aa6f5f53f4 Mon Sep 17 00:00:00 2001 From: Khaled Date: Fri, 5 Jul 2024 21:14:06 +0600 Subject: [PATCH] chore: Remove unused Annotations --- .idea/misc.xml | 7 ++----- README.md | 2 +- app/build.gradle.kts | 6 +++--- .../leanstream/channels/ChannelPickerScreen.kt | 4 +--- .../khaled/leanstream/channels/ChannelViewModel.kt | 12 +++--------- .../leanstream/channels/filter/ChannelFilterRow.kt | 1 - .../channels/importer/ImportPlaylistDialog.kt | 2 +- .../leanstream/channels/item/ChannelGridItem.kt | 1 - 8 files changed, 11 insertions(+), 24 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 8978d23..8f5c8ae 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,9 +1,6 @@ + - - + - - \ No newline at end of file diff --git a/README.md b/README.md index 9a65859..3cf5993 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ - +logo # LeanStream diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 96b89eb..46b54ca 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -87,9 +87,6 @@ android { dependencies { implementation("androidx.core:core-ktx:1.13.1") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-cbor:1.6.3") - implementation("androidx.core:core-splashscreen:1.0.1") implementation(platform("androidx.compose:compose-bom:2024.06.00")) @@ -108,6 +105,9 @@ dependencies { implementation("com.github.anilbeesetti.nextlib:nextlib-media3ext:0.7.1") implementation("com.github.anilbeesetti.nextlib:nextlib-mediainfo:0.7.1") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-cbor:1.6.3") + implementation("com.github.bjoernpetersen:m3u-parser:1.4.0") coreLibraryDesugaring("com.android.tools:desugar_jdk_libs_nio:2.0.4") diff --git a/app/src/main/java/dev/khaled/leanstream/channels/ChannelPickerScreen.kt b/app/src/main/java/dev/khaled/leanstream/channels/ChannelPickerScreen.kt index 2883714..8769bda 100644 --- a/app/src/main/java/dev/khaled/leanstream/channels/ChannelPickerScreen.kt +++ b/app/src/main/java/dev/khaled/leanstream/channels/ChannelPickerScreen.kt @@ -41,7 +41,6 @@ import dev.khaled.leanstream.channels.item.ChannelsGrid import dev.khaled.leanstream.isRunningOnTV import dev.khaled.leanstream.playSoundEffectOnFocus import dev.khaled.leanstream.ui.Branding -import kotlinx.serialization.ExperimentalSerializationApi @OptIn(ExperimentalMaterial3Api::class) @@ -133,12 +132,11 @@ fun ChannelPickerScreen( } } -@OptIn(ExperimentalSerializationApi::class) fun resetChannelsListConfirmation(context: Context, viewModel: ChannelViewModel) { AlertDialog.Builder(context).setTitle("Reset Channels") .setMessage("Do you really want to remove imported channels?") .setPositiveButton("Yes") { _, _ -> - viewModel.savePlaylistToDisk(context, emptyList()); + viewModel.savePlaylistToDisk(context, emptyList()) Toast.makeText(context, "Restart Application To Take Effect", Toast.LENGTH_SHORT).show() }.setNegativeButton("No", null).show() } \ No newline at end of file diff --git a/app/src/main/java/dev/khaled/leanstream/channels/ChannelViewModel.kt b/app/src/main/java/dev/khaled/leanstream/channels/ChannelViewModel.kt index 065421e..fa04359 100644 --- a/app/src/main/java/dev/khaled/leanstream/channels/ChannelViewModel.kt +++ b/app/src/main/java/dev/khaled/leanstream/channels/ChannelViewModel.kt @@ -8,7 +8,6 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.viewModelScope -import androidx.media3.common.util.UnstableApi import kotlinx.coroutines.launch import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable @@ -19,9 +18,6 @@ import net.bjoernpetersen.m3u.M3uParser import net.bjoernpetersen.m3u.model.M3uEntry import java.io.File import java.net.URL -import kotlin.OptIn -import androidx.annotation.OptIn as AndroidxAnnotationOptIn - @Serializable data class Channel(val title: String?, val url: String, val icon: String?, val category: String?) @@ -71,7 +67,6 @@ class ChannelViewModel(application: Application) : AndroidViewModel(application) viewModelScope.launch { load(application.applicationContext) } } - @OptIn(ExperimentalSerializationApi::class) fun load(context: Context) { _isLoading = true @@ -87,7 +82,7 @@ class ChannelViewModel(application: Application) : AndroidViewModel(application) _isLoading = false } - @ExperimentalSerializationApi + @OptIn(ExperimentalSerializationApi::class) fun savePlaylistToDisk(context: Context, channels: List = _channels) { if (!channelFile(context).exists()) channelFile(context).createNewFile() val outputStream = context.openFileOutput( @@ -97,8 +92,8 @@ class ChannelViewModel(application: Application) : AndroidViewModel(application) outputStream.close() } - @ExperimentalSerializationApi - fun loadPlaylistFromDisk(context: Context) { + @OptIn(ExperimentalSerializationApi::class) + private fun loadPlaylistFromDisk(context: Context) { if (!channelFile(context).exists()) channelFile(context).createNewFile() val fileInputStream = context.openFileInput(channelFile(context).name) val bytes = fileInputStream.readBytes() @@ -108,7 +103,6 @@ class ChannelViewModel(application: Application) : AndroidViewModel(application) _channels.addAll(Cbor.decodeFromByteArray>(bytes)) } - @AndroidxAnnotationOptIn(UnstableApi::class) fun parsePlaylist(playlistUrl: String): List { val input = URL(playlistUrl).openStream().reader() val streamEntries: List = M3uParser.parse(input) diff --git a/app/src/main/java/dev/khaled/leanstream/channels/filter/ChannelFilterRow.kt b/app/src/main/java/dev/khaled/leanstream/channels/filter/ChannelFilterRow.kt index d183531..3f6ebb6 100644 --- a/app/src/main/java/dev/khaled/leanstream/channels/filter/ChannelFilterRow.kt +++ b/app/src/main/java/dev/khaled/leanstream/channels/filter/ChannelFilterRow.kt @@ -24,7 +24,6 @@ import androidx.compose.ui.unit.dp import dev.khaled.leanstream.channels.ChannelCategory import dev.khaled.leanstream.playSoundEffectOnFocus -@OptIn(ExperimentalComposeUiApi::class) @Composable fun CategoryFilterRow( channelCategories: List, diff --git a/app/src/main/java/dev/khaled/leanstream/channels/importer/ImportPlaylistDialog.kt b/app/src/main/java/dev/khaled/leanstream/channels/importer/ImportPlaylistDialog.kt index 54f840c..4a49e35 100644 --- a/app/src/main/java/dev/khaled/leanstream/channels/importer/ImportPlaylistDialog.kt +++ b/app/src/main/java/dev/khaled/leanstream/channels/importer/ImportPlaylistDialog.kt @@ -32,7 +32,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.serialization.ExperimentalSerializationApi -@OptIn(ExperimentalSerializationApi::class, ExperimentalMaterial3Api::class) +@OptIn(ExperimentalSerializationApi::class) @Composable fun ImportPlaylistDialog( onDismiss: (success: Boolean) -> Unit, diff --git a/app/src/main/java/dev/khaled/leanstream/channels/item/ChannelGridItem.kt b/app/src/main/java/dev/khaled/leanstream/channels/item/ChannelGridItem.kt index d779fc9..b84896b 100644 --- a/app/src/main/java/dev/khaled/leanstream/channels/item/ChannelGridItem.kt +++ b/app/src/main/java/dev/khaled/leanstream/channels/item/ChannelGridItem.kt @@ -39,7 +39,6 @@ import dev.khaled.leanstream.conditional import dev.khaled.leanstream.isRunningOnTV import dev.khaled.leanstream.playSoundEffectOnFocus -@OptIn(ExperimentalTvMaterial3Api::class) @Composable fun GridItem( channel: Channel,