Skip to content

Commit a5b254e

Browse files
oxyroidoxyroid
committed
Merge remote-tracking branch 'origin/master'
2 parents de9a9a4 + 4617fce commit a5b254e

25 files changed

+550
-10
lines changed

‎README.md‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
# 🚀 M3UAndroid - Modern Streaming Player for Android
1+
<a href="https://github.com/oxyroid/M3UAndroid">
2+
<picture>
3+
<source media="(prefers-color-scheme: dark)" srcset="https://socialify.git.ci/oxyroid/M3UAndroid/image?font=Raleway&forks=1&issues=1&logo=https%3A%2F%2Fraw.githubusercontent.com%2Foxyroid%2FM3UAndroid%2Fmaster%2Fapp%2Fsmartphone%2Ficon.png&name=1&pattern=Plus&pulls=1&stargazers=1&theme=Dark" />
4+
<source media="(prefers-color-scheme: light)" srcset="https://socialify.git.ci/oxyroid/M3UAndroid/image?font=Raleway&forks=1&issues=1&logo=https%3A%2F%2Fraw.githubusercontent.com%2Foxyroid%2FM3UAndroid%2Fmaster%2Fapp%2Fsmartphone%2Ficon.png&name=1&pattern=Plus&pulls=1&stargazers=1&theme=Light" />
5+
<img alt="Star History Chart" src="https://socialify.git.ci/oxyroid/M3UAndroid/image?font=Raleway&forks=1&issues=1&logo=https%3A%2F%2Fraw.githubusercontent.com%2Foxyroid%2FM3UAndroid%2Fmaster%2Fapp%2Fsmartphone%2Ficon.png&name=1&pattern=Plus&pulls=1&stargazers=1" />
6+
7+
<source src="https://socialify.git.ci/oxyroid/M3UAndroid/image?font=Raleway&forks=1&issues=1&logo=https%3A%2F%2Fraw.githubusercontent.com%2Foxyroid%2FM3UAndroid%2Fmaster%2Fapp%2Fsmartphone%2Ficon.png&name=1&pattern=Plus&pulls=1&stargazers=1&theme=Auto" alt="M3UAndroid" width="640" height="320" />
8+
</picture>
9+
</a>
210

311
<a href="https://t.me/m3u_android"><img src="https://img.shields.io/badge/Telegram-Channel-2CA5E0?style=flat&logo=telegram"></a>
412
<a href="https://t.me/m3u_android_chat"><img src="https://img.shields.io/badge/Telegram-Discussion-2CA5E0?style=flat&logo=telegram"></a>
@@ -7,10 +15,6 @@
715

816
**M3UAndroid** is a feature-rich streaming media player built with modern Android development practices. Perfect for phones, tablets, and TV devices, delivering a seamless viewing experience powered by Jetpack Compose.
917

10-
<div align="center">
11-
<img src=".github/images/phone/deviceframes.png" width="85%">
12-
</div>
13-
1418
## ✨ Key Features
1519

1620
- 📺 Adaptive UI for mobile & TV

‎data/src/main/java/com/m3u/data/parser/xtream/XtreamData.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ fun XtreamVod.toChannel(
120120
playlistUrl: String,
121121
category: String
122122
): Channel = Channel(
123-
url = "$basicUrl/channel/$username/$password/$streamId.${containerExtension}",
123+
url = "$basicUrl/movie/$username/$password/$streamId.${containerExtension}",
124124
category = category,
125125
title = name.orEmpty(),
126126
cover = streamIcon,

‎gradle/libs.versions.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ androidx-core = "1.16.0"
33
androidx-core-splashscreen = "1.0.1"
44
androidx-appcompat = "1.7.0"
55
androidx-activity = "1.10.1"
6-
androidx-lifecycle = "2.8.7"
7-
androidx-compose-bom = "2025.04.01"
6+
androidx-lifecycle = "2.9.0"
7+
androidx-compose-bom = "2025.05.00"
88
androidx-compose-material3-adaptive = "1.1.0"
99
androidx-constraintlayout-compose = "1.1.1"
10-
androidx-navigation = "2.8.9"
10+
androidx-navigation = "2.9.0"
1111
androidx-hilt = "1.2.0"
1212
androidx-tv = "1.1.0-alpha01"
1313
androidx-media3 = "1.6.1"
@@ -22,7 +22,7 @@ glance = "1.1.1"
2222
google-accompanist = "0.37.3"
2323
google-dagger = "2.56.2"
2424

25-
haze = "1.5.4"
25+
haze = "1.6.0"
2626
io-coil = "2.7.0"
2727
kotlinpoet = "2.1.0"
2828
kotlinx-serialization-json = "1.8.1"

‎i18n/src/main/res/values-id-rID/app.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="app_label_crash">Aplikasi Tidak Berfungsi</string>
4+
<string name="app_shortcut_channel_recently_short_label">Baru saja</string>
5+
<string name="app_shortcut_channel_recently_long_label">Putar yang Baru Saja Diputar</string>
6+
<string name="app_shortcut_channel_recently_disabled">Tidak Tersedia</string>
7+
</resources>

‎i18n/src/main/res/values-id-rID/data.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="data_error_file_not_found">file tidak ditemukan</string>
4+
<string name="data_error_empty_title">Nama Playlist kosong</string>
5+
<string name="data_channel_name_stream_download_service">Layanan Unduhan Streaming</string>
6+
<string name="data_channel_description_stream_download_service">Deskripsi Layanan Unduhan Streaming</string>
7+
8+
<string name="data_worker_subscription_action_cancel">Batal</string>
9+
<string name="data_worker_subscription_action_retry">Coba Ulang</string>
10+
<string name="data_worker_subscription_content_completed">Selesai (+%d)</string>
11+
<string name="data_worker_subscription_content_channel_progress">%d saluran telah diunduh</string>
12+
<string name="data_worker_subscription_content_programme_progress">%d program telah diunduh</string>
13+
</resources>

‎i18n/src/main/res/values-id-rID/feat_about.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="feat_about_title">Tentang Projek</string>
4+
</resources>

‎i18n/src/main/res/values-id-rID/feat_console.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="feat_console_title">Editor Konsol</string>
4+
</resources>

‎i18n/src/main/res/values-id-rID/feat_favourite.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="feat_favorite_scheme_unknown">Tidak diketahui</string>
4+
<string name="feat_favorite_play_randomly">Putar acak</string>
5+
</resources>

‎i18n/src/main/res/values-id-rID/feat_foryou.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="feat_foryou_hidden_channels_playlist">Saluran Tersembunyi</string>
4+
<string name="feat_foryou_unsubscribe_playlist">Hapus Langganan</string>
5+
<string name="feat_foryou_copy_playlist_url">Salin URL</string>
6+
<string name="feat_foryou_rename_playlist">Ganti nama</string>
7+
<string name="feat_foryou_imported_playlist_title">Ditambahkan</string>
8+
<string name="feat_foryou_prompt_add_playlist">Tambahkan Playlist</string>
9+
<string name="feat_foryou_recommend_unseen_label">Favorit yang ingin Anda tonton lagi</string>
10+
<string name="feat_foryou_recommend_unseen_more_than_days">lebih dari %d hari</string>
11+
<string name="feat_foryou_recommend_unseen_days">%d Hari</string>
12+
<string name="feat_foryou_recommend_unseen_hours">%d Jam</string>
13+
<string name="feat_foryou_recommend_cw_label">Lanjutkan menonton</string>
14+
<string name="feat_foryou_new_release">Rilis Terbaru</string>
15+
<string name="feat_foryou_connect_title">Masukkan kode dari TV</string>
16+
<string name="feat_foryou_connect_subtitle">Pastikan terhubung ke Wi-Fi yang sama</string>
17+
</resources>

‎i18n/src/main/res/values-id-rID/feat_playlist.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="feat_playlist_scheme_unknown">tidak diketahui</string>
4+
<string name="feat_playlist_dialog_favourite_title">sukai</string>
5+
<string name="feat_playlist_dialog_favourite_cancel_title">batal sukai</string>
6+
<string name="feat_playlist_dialog_hide_title">sembunyikan</string>
7+
<string name="feat_playlist_dialog_save_picture_title">simpan ke galeri</string>
8+
<string name="feat_playlist_dialog_create_shortcut_title">buat pintasan</string>
9+
<string name="feat_playlist_error_playlist_not_found">playlist tidak ditemukan (%s)</string>
10+
<string name="feat_playlist_query_placeholder">masukkan kata kunci</string>
11+
<string name="feat_playlist_error_playlist_url_not_found">URL playlist tidak ditemukan</string>
12+
<string name="feat_playlist_error_channel_cover_not_found">gambar sampul tidak ditemukan</string>
13+
<string name="feat_playlist_error_channel_not_found">saluran tidak ditemukan</string>
14+
<string name="feat_playlist_success_save_cover">tersimpan di (%s)</string>
15+
<string name="feat_playlist_scroll_up">gulir ke atas</string>
16+
</resources>

0 commit comments

Comments
 (0)