Stream Mask and DB Updates #144

themodfatherinc · 2024-05-09T20:35:56Z

add tags to database, live and new icons added to stream mask
Stream Mask adjustments, current program showing instead of playlist title

2 methods for detection, Substring Annotation on the Title, or XMLTV tags, add previously-shown tag start time to database add live and new tags to stream mask in full information player mode only adjust stream mask add currently playing program from epg data to stream mask

# Conflicts: # features/playlist/src/main/java/com/m3u/features/playlist/components/SmartphoneStreamItem.kt # features/stream/src/main/java/com/m3u/features/stream/StreamMask.kt # features/stream/src/main/java/com/m3u/features/stream/StreamScreen.kt

2 methods for detection, Substring Annotation on the Title, or XMLTV tags, add previously-shown tag start time to database add live and new tags to stream mask in full information player mode only adjust stream mask add currently playing program from epg data to stream mask

oxyroid · 2024-05-10T00:21:12Z

@themodfatherinc There is a lot of code that needs to be modified

androidApp/src/main/java/com/m3u/androidApp/ui/AppNavHost.kt

data/schemas/com.m3u.data.database.M3UDatabase/16.json

data/src/main/java/com/m3u/data/database/dao/ProgrammeDao.kt

oxyroid · 2024-05-10T00:29:17Z

data/src/main/java/com/m3u/data/parser/epg/EpgParserImpl.kt

                else -> skip()
            }
        }
        require(XmlPullParser.END_TAG, ns, "programme")
+        // Add logic to determine whether the program is new based on title
+        val isNew = title?.contains("ᴺᵉʷ") ?: false
+        val isLive = title?.contains("ᴸᶦᵛᵉ") ?: false


Is that a standard? 🤔

its not xmltv standard but it is added by some providers instead of the and tags. this is just an additional method to find this data if its included, and the logic to decide looks at this and the tag and if either is true it will set it to true. this method will just support more users i think

First time on British TV Last time on this channel these are all official xmltv tags which i added , will add the others.

Not standard should not be adopted

features/playlist/src/main/java/com/m3u/features/playlist/components/SmartphoneStreamItem.kt

features/stream/src/main/java/com/m3u/features/stream/PlayerActivity.kt

features/stream/src/main/java/com/m3u/features/stream/StreamScreen.kt

oxyroid · 2024-05-10T00:39:43Z

features/stream/src/main/java/com/m3u/features/stream/StreamViewModel.kt

@@ -60,6 +61,7 @@ import kotlin.time.Duration.Companion.minutes
 class StreamViewModel @Inject constructor(
    private val playlistRepository: PlaylistRepository,
    private val streamRepository: StreamRepository,
+    private val programmeDao: ProgrammeDao,


Don't use dao in the viewmodel.

features/stream/src/main/java/com/m3u/features/stream/components/CustomTextIcon.kt

oxyroid · 2024-05-10T00:43:21Z

features/stream/src/main/java/com/m3u/features/stream/components/CustomTextIcon.kt

+@Composable
+fun CustomTextIcon(
+    text: String,
+    textColor: Color,


It should have a default value, Color.Unspecified
And in the code block, use takeOrElse method to get the LocalContentColor(maybe tv platform) if it's unspecified.

example:
val actualContentColor = contentColor.takeOrElse {
if(!tv)
LocalContentColor.current
else
// import alias
LocalTvContentColor.current
}

features/stream/src/main/java/com/m3u/features/stream/components/CustomTextIcon.kt

ui/src/main/java/com/m3u/ui/Player.kt

oxyroid · 2024-05-10T00:44:55Z

And you need to squash commits finally

data/src/main/java/com/m3u/data/parser/epg/EpgData.kt

features/stream/src/main/java/com/m3u/features/stream/StreamMask.kt

oxyroid · 2024-05-10T00:53:29Z

features/stream/src/main/java/com/m3u/features/stream/StreamMask.kt

+
+
+        if (isNew) {
+            val indexOfSubstring = title.indexOf("ᴺᵉʷ")


whats wrong? im using it to remove this line where i have the custom text icon because it doesnt need this information on both sides of the title. i did not want to edit it in the database as you suggested not to. you can choose to not include this code if you like

save the origin whatever it is.

Your code will always drop the word after the "new". If some title start with it, the result will be a blank.

features/stream/src/main/java/com/m3u/features/stream/StreamScreen.kt

oxyroid · 2024-05-10T00:56:35Z

features/stream/src/main/java/com/m3u/features/stream/StreamViewModel.kt

@@ -320,6 +322,19 @@ class StreamViewModel @Inject constructor(
        }
    }

+    internal suspend fun getProgrammeCurrently(channelId: String): Programme? {


remove the param. We can know that in the viewmodel

oxyroid · 2024-05-10T13:11:38Z

I think one PR should not make so many adjustments. Document research or parsing rule code adjustments can be submitted through PR.

Just let me do the UI adjustments or database migrations. It is very simple but requires special attention.

In addition, if the master branch is refactored before you submit your large PR, it will be difficult for you to deal with the conflict.

mac added 8 commits May 9, 2024 15:11

oxyroid reviewed May 10, 2024

View reviewed changes

themodfatherinc added 4 commits May 10, 2024 14:35

fixes

9a8e17d

fix mask animation

6114132

fix database entry, mask adjustment

d45677e

missing brackets

50b45cf

oxyroid closed this May 13, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Stream Mask and DB Updates #144

Stream Mask and DB Updates #144

themodfatherinc commented May 9, 2024

oxyroid commented May 10, 2024

oxyroid May 10, 2024

themodfatherinc May 10, 2024

themodfatherinc May 10, 2024

oxyroid May 10, 2024

oxyroid May 10, 2024

oxyroid May 10, 2024

oxyroid May 10, 2024

oxyroid commented May 10, 2024

oxyroid May 10, 2024

themodfatherinc May 10, 2024

oxyroid May 10, 2024

oxyroid May 10, 2024

oxyroid May 10, 2024

oxyroid commented May 10, 2024



		if (isNew) {
		val indexOfSubstring = title.indexOf("ᴺᵉʷ")

Stream Mask and DB Updates #144

Stream Mask and DB Updates #144

Conversation

themodfatherinc commented May 9, 2024

oxyroid commented May 10, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

oxyroid commented May 10, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

oxyroid commented May 10, 2024