From 3260d482a4c7b321de7805507853742d15df5c5f Mon Sep 17 00:00:00 2001
From: Siddharth Kamble <96260439+siddharthsky@users.noreply.github.com>
Date: Thu, 21 Nov 2024 10:44:03 -0800
Subject: [PATCH] Release v1.1.0 (#10)

* Update README.md

* Rename .java to .kt

* Code Refactor #1

* Code Refactor #2

* Rename .java to .kt

* Code Refactor #3

* Use Semvar versioning

* Fix naming

* Implement auto scrolling in output box

* Fix EPG generation

* Update LICENSE

* Fix Overlay Permission issue

* Fix updaters

* Fix inverted colors

* Fix binary getting deleted automatically

* Fix reset function

* Always download the binary for the first time

* Fix update now messages

* Fix update mechanism

* Stop BinaryService correctly if binary was not found

* Check server run status on MainActivity resume

* Update SkySharedPref.kt

Set iptvLaunchCountdown default to 4 seconds.

* Fix: IPTV Redirect Timer

* Update build.gradle

* Fix: Duplicate channel data handling

* Update: UI and TV Navigation

- Fixed IPTV time selection via remote
- Updated drawables
- Added loading bars
- Update fav. channel icon in webtv

* Update WebPlayerActivity.kt

* Removed permission checker

* Update WebPlayerActivity.kt

- fix video size fit for phones
- changed formatted playID

* Update redirect IPTV strings

* Update output-metadata.json

---------

Co-authored-by: Ankan Pal <itsyourap@gmail.com>
---
 .idea/gradle.xml                              |    1 +
 LICENSE                                       |    2 +-
 README.md                                     |   13 +
 app/build.gradle                              |   31 +-
 app/release/output-metadata.json              |    4 +-
 app/src/main/AndroidManifest.xml              |   16 +-
 .../skylake/skytv/jgorunner/MainActivity.kt   | 1610 -----------------
 .../jgorunner/activities/AppListActivity.kt   |   42 +
 .../jgorunner/activities/MainActivity.kt      |  839 +++++++++
 .../jgorunner/activities/WebPlayerActivity.kt |  538 ++++++
 .../jgorunner/activity/AppListActivity.kt     |  171 --
 .../jgorunner/activity/WebPlayerActivity.java |  539 ------
 .../skytv/jgorunner/core/ServerUtils.kt       |   58 +
 .../jgorunner/core/data/JTVConfiguration.kt   |   32 +
 .../core/data/JTVConfigurationManager.kt      |   69 +
 .../core/execution/BinaryExecutor.kt          |  224 +++
 .../core/execution/ExecutionError.kt          |   17 +
 .../core/execution/ExecutionManager.kt        |   64 +
 .../core/update/ApplicationUpdater.kt         |  157 ++
 .../jgorunner/core/update/BinaryUpdater.kt    |   61 +
 .../jgorunner/core/update/DownloadAsset.kt    |   10 +
 .../jgorunner/core/update/DownloadProgress.kt |    6 +
 .../skytv/jgorunner/data/SkySharedPref.java   |   85 -
 .../skytv/jgorunner/data/SkySharedPref.kt     |  157 ++
 .../skytv/jgorunner/data/UserConfigHandler.kt |   89 -
 .../jgorunner/receivers/BootReceiver.java     |   82 -
 .../skytv/jgorunner/receivers/BootReceiver.kt |   76 +
 .../jgorunner/services/BinaryExecutor.java    |  287 ---
 .../jgorunner/services/BinaryService.java     |  171 --
 .../skytv/jgorunner/services/BinaryService.kt |  208 +++
 .../ui/components/BottomNavigationBar.kt      |   88 +
 .../jgorunner/ui/components/ButtonContent.kt  |   35 +
 .../jgorunner/ui/components/CustPopup.kt      |   41 +
 .../jgorunner/ui/components/ProgressPopup.kt  |   95 +
 .../jgorunner/ui/components/RedirectPopup.kt  |  140 ++
 .../jgorunner/ui/screens/AppListScreen.kt     |  151 ++
 .../{activity => ui/screens}/DebugScreen.kt   |   30 +-
 .../skytv/jgorunner/ui/screens/HomeScreen.kt  |  375 ++++
 .../{activity => ui/screens}/InfoScreen.kt    |   70 +-
 .../{activity => ui/screens}/LoginScreen.kt   |   48 +-
 .../{activity => ui/screens}/RunnerScreen.kt  |   61 +-
 .../screens}/SettingsScreen.kt                |  466 +++--
 .../skytv/jgorunner/utils/ConfigHandler.kt    |   68 -
 .../jgorunner/utils/ConfigSyncHandler.kt      |   88 -
 .../jgorunner/utils/RemoteBinaryFetcher.kt    |  257 ---
 app/src/main/res/drawable/cancel_24px.xml     |    7 +-
 .../main/res/drawable/notifications_24px.xml  |   13 +-
 app/src/main/res/raw/majorbin                 |    1 -
 gradle/libs.versions.toml                     |   24 +-
 gradle/wrapper/gradle-wrapper.properties      |    2 +-
 settings.gradle                               |    1 +
 51 files changed, 3833 insertions(+), 3887 deletions(-)
 delete mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/MainActivity.kt
 create mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/activities/AppListActivity.kt
 create mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/activities/MainActivity.kt
 create mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/activities/WebPlayerActivity.kt
 delete mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/activity/AppListActivity.kt
 delete mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/activity/WebPlayerActivity.java
 create mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/core/ServerUtils.kt
 create mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/core/data/JTVConfiguration.kt
 create mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/core/data/JTVConfigurationManager.kt
 create mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/core/execution/BinaryExecutor.kt
 create mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/core/execution/ExecutionError.kt
 create mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/core/execution/ExecutionManager.kt
 create mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/core/update/ApplicationUpdater.kt
 create mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/core/update/BinaryUpdater.kt
 create mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/core/update/DownloadAsset.kt
 create mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/core/update/DownloadProgress.kt
 delete mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/data/SkySharedPref.java
 create mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/data/SkySharedPref.kt
 delete mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/data/UserConfigHandler.kt
 delete mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/receivers/BootReceiver.java
 create mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/receivers/BootReceiver.kt
 delete mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/services/BinaryExecutor.java
 delete mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/services/BinaryService.java
 create mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/services/BinaryService.kt
 create mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/ui/components/BottomNavigationBar.kt
 create mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/ui/components/ButtonContent.kt
 create mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/ui/components/CustPopup.kt
 create mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/ui/components/ProgressPopup.kt
 create mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/ui/components/RedirectPopup.kt
 create mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/ui/screens/AppListScreen.kt
 rename app/src/main/java/com/skylake/skytv/jgorunner/{activity => ui/screens}/DebugScreen.kt (91%)
 create mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/ui/screens/HomeScreen.kt
 rename app/src/main/java/com/skylake/skytv/jgorunner/{activity => ui/screens}/InfoScreen.kt (68%)
 rename app/src/main/java/com/skylake/skytv/jgorunner/{activity => ui/screens}/LoginScreen.kt (89%)
 rename app/src/main/java/com/skylake/skytv/jgorunner/{activity => ui/screens}/RunnerScreen.kt (80%)
 rename app/src/main/java/com/skylake/skytv/jgorunner/{activity => ui/screens}/SettingsScreen.kt (51%)
 delete mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/utils/ConfigHandler.kt
 delete mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/utils/ConfigSyncHandler.kt
 delete mode 100644 app/src/main/java/com/skylake/skytv/jgorunner/utils/RemoteBinaryFetcher.kt
 delete mode 100644 app/src/main/res/raw/majorbin

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0897082..7b3006b 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,6 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
diff --git a/LICENSE b/LICENSE
index 7d39b0b..6327ba6 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Siddharth Kamble
+Copyright (c) 2024 JioTV-Go Team (https://github.com/JioTV-Go/)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 4f20618..08f6781 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,19 @@
 
 ---
 
+### ✨ Features
+**JTV-GO Server** offers all the features of CustTermux, plus additional enhancements:
+
+- ⚡️ **Smaller, Faster, and Lighter**: At around 1 MB, JTV-GO is optimized for minimal storage use, with no unnecessary clutter, making it faster and more efficient.
+- 📱 **One APK for All Devices**: Designed to work seamlessly across devices from Android 5 to the latest version, so there's no need for multiple versions.
+- 🛠 **No Dependency Hassles**: Unlike CustTermux, which may require additional dependencies, JTV-GO Server is a standalone, native app. No extra installations needed.
+- 🚀 **Enhanced Performance**: Built for efficient resource usage, JTV-GO provides a smooth, stable streaming experience.
+- 🔄 **Streamlined Design**: Focused exclusively on TV streaming, JTV-GO has a simple and user-friendly interface that’s easy to navigate.
+
+All the core features you enjoyed in CustTermux are here in JTV-GO Server, with extra optimizations for a better, faster experience.
+
+---
+
 ### 📥 Installation
 
 1. **Download the APK**: Grab the latest release from the [releases page](https://github.com/JioTV-Go/jiotv_go_app/releases).
diff --git a/app/build.gradle b/app/build.gradle
index 16389a9..7e91ee7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,10 +10,13 @@ android {
     defaultConfig {
         applicationId 'com.skylake.skytv.jgorunner'
         minSdk 21
+
+        // Required for binary execution
         //noinspection ExpiredTargetSdkVersion
         targetSdk 28
-        versionCode 1
-        versionName "1.0"
+        
+        versionCode 2
+        versionName "1.1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -29,19 +32,20 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
     buildFeatures {
+        buildConfig true
         compose true
     }
     composeOptions {
         kotlinCompilerExtensionVersion '1.5.1'
     }
-    packaging {
+    packagingOptions {
         resources {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
         }
@@ -49,27 +53,30 @@ android {
 }
 
 dependencies {
-
     implementation libs.androidx.core.ktx
     implementation libs.androidx.lifecycle.runtime.ktx
+    implementation libs.kotlin.reflect
     implementation libs.androidx.activity.compose
     implementation platform(libs.androidx.compose.bom)
     implementation libs.androidx.ui
     implementation libs.androidx.ui.graphics
     implementation libs.androidx.ui.tooling.preview
     implementation libs.androidx.material3
+    implementation libs.androidx.material.icons.extended
+    implementation libs.version.parser
+    implementation libs.okhttp
+    implementation libs.ketch
+    implementation libs.gson
+
     testImplementation libs.junit
+
     androidTestImplementation libs.androidx.junit
     androidTestImplementation libs.androidx.espresso.core
     androidTestImplementation platform(libs.androidx.compose.bom)
     androidTestImplementation libs.androidx.ui.test.junit4
+
     debugImplementation libs.androidx.ui.tooling
     debugImplementation libs.androidx.ui.test.manifest
     debugImplementation libs.androidx.customview.poolingcontainer
     debugImplementation libs.androidx.customview
-
-    def composeBom = libs.androidx.compose.bom
-    implementation composeBom
-    implementation libs.androidx.material.icons.extended
-
 }
\ No newline at end of file
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index b072dab..e0ae1e0 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 1,
-      "versionName": "1.0",
+      "versionCode": 2,
+      "versionName": "1.1.0",
       "outputFile": "app-release.apk"
     }
   ],
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 934cb35..2afc616 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,9 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
@@ -15,6 +12,7 @@
         tools:ignore="LeanbackUsesWifi" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"
         tools:ignore="LeanbackUsesWifi" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
 
     <!-- Declaring the Leanback feature -->
     <uses-feature android:name="android.software.leanback" android:required="false" />
@@ -33,7 +31,7 @@
         android:networkSecurityConfig="@xml/network_security_config"
         tools:targetApi="31">
         <activity
-            android:name=".MainActivity"
+            android:name=".activities.MainActivity"
             android:exported="true"
             android:theme="@style/Theme.JGO">
             <intent-filter>
@@ -46,21 +44,17 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".activity.AppListActivity"
+        <activity android:name=".activities.AppListActivity"
             android:exported="true">
         </activity>
 
         <activity
-            android:name=".activity.WebPlayerActivity"
+            android:name=".activities.WebPlayerActivity"
             android:configChanges="orientation|screenSize"
             android:resizeableActivity="true"
             android:supportsPictureInPicture="true" >
         </activity>
 
-        <activity android:name=".utils.ConfigSyncHandler"
-            android:exported="true">
-        </activity>
-
         <service
             android:name=".services.BinaryService"
             android:foregroundServiceType="mediaPlayback"
@@ -76,7 +70,5 @@
                 <action android:name="android.intent.action.QUICKBOOT_POWERON" />
             </intent-filter>
         </receiver>
-
     </application>
-
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/MainActivity.kt b/app/src/main/java/com/skylake/skytv/jgorunner/MainActivity.kt
deleted file mode 100644
index 5ed9c9e..0000000
--- a/app/src/main/java/com/skylake/skytv/jgorunner/MainActivity.kt
+++ /dev/null
@@ -1,1610 +0,0 @@
-package com.skylake.skytv.jgorunner
-
-import android.Manifest
-import android.app.Activity
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.content.pm.PackageManager
-import android.net.ConnectivityManager
-import android.net.LinkProperties
-import android.net.NetworkCapabilities
-import android.net.Uri
-import android.os.Build
-import android.os.Bundle
-import android.os.Environment
-import android.os.Handler
-import android.os.Looper
-import android.provider.Settings
-import android.util.Log
-import android.widget.Toast
-import androidx.activity.ComponentActivity
-import androidx.activity.OnBackPressedCallback
-import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.annotation.RequiresApi
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.RowScope
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.twotone.ExitToApp
-import androidx.compose.material.icons.filled.DeveloperMode
-import androidx.compose.material.icons.filled.Home
-import androidx.compose.material.icons.filled.Settings
-import androidx.compose.material.icons.outlined.DeveloperMode
-import androidx.compose.material.icons.outlined.Home
-import androidx.compose.material.icons.outlined.Settings
-import androidx.compose.material.icons.twotone.Deblur
-import androidx.compose.material.icons.twotone.LiveTv
-import androidx.compose.material.icons.twotone.PlayArrow
-import androidx.compose.material.icons.twotone.ResetTv
-import androidx.compose.material.icons.twotone.Stop
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.Badge
-import androidx.compose.material3.BadgedBox
-import androidx.compose.material3.Button
-import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.NavigationBar
-import androidx.compose.material3.NavigationBarItem
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.alpha
-import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.Shadow
-import androidx.compose.ui.graphics.asImageBitmap
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.platform.LocalClipboardManager
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.Font
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.window.DialogProperties
-import androidx.core.content.ContextCompat
-import androidx.core.graphics.drawable.toBitmap
-import com.skylake.skytv.jgorunner.activity.DebugScreen
-import com.skylake.skytv.jgorunner.activity.InfoScreen
-import com.skylake.skytv.jgorunner.activity.LoginScreen
-import com.skylake.skytv.jgorunner.activity.RunnerScreen
-import com.skylake.skytv.jgorunner.activity.SettingsScreen
-import com.skylake.skytv.jgorunner.activity.WebPlayerActivity
-import com.skylake.skytv.jgorunner.data.SkySharedPref
-import com.skylake.skytv.jgorunner.data.applyConfigurations
-import com.skylake.skytv.jgorunner.data.jsonmaker
-import com.skylake.skytv.jgorunner.services.BinaryExecutor
-import com.skylake.skytv.jgorunner.services.BinaryService
-import com.skylake.skytv.jgorunner.ui.theme.JGOTheme
-import com.skylake.skytv.jgorunner.utils.RemoteBinaryFetcher
-import com.skylake.skytv.jgorunner.utils.ConfigHandler
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import java.io.File
-import java.net.HttpURLConnection
-import java.net.Inet4Address
-import java.net.URL
-import java.util.concurrent.Executors
-
-
-class MainActivity : ComponentActivity() {
-
-    private var selectedBinaryUri: Uri? = null
-    private var isBinaryRunning by mutableStateOf(false)
-    private var isOutputShowing by mutableStateOf(false)
-    private var selectedBinaryName by mutableStateOf("JTV-GO SERVER")
-
-    // SharedPreferences for saving binary selection
-    private lateinit var preferenceManager: SkySharedPref
-
-    private val REQUEST_STORAGE_PERMISSION = 100
-
-    private val customFontFamily = FontFamily(Font(R.font.chakrapetch_bold))
-
-    // Receiver to handle binary stop action
-    private val binaryStoppedReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context?, intent: Intent?) {
-            if (intent?.action == BinaryService.ACTION_BINARY_STOPPED) {
-                isBinaryRunning = false
-                outputText = "Server stopped"
-            }
-        }
-    }
-
-    private val storagePermissionLauncher = registerForActivityResult(
-        ActivityResultContracts.RequestMultiplePermissions()
-    ) { permissions ->
-        val readGranted = permissions[Manifest.permission.READ_EXTERNAL_STORAGE] ?: false
-
-        if (readGranted) {
-            Toast.makeText(this, "Storage permission granted", Toast.LENGTH_SHORT).show()
-        } else {
-            Toast.makeText(this, "Storage permission is required to run the binary", Toast.LENGTH_SHORT).show()
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.TIRAMISU)
-    private val notificationPermissionLauncher = registerForActivityResult(
-        ActivityResultContracts.RequestMultiplePermissions()
-    ) { permissions ->
-        val notificationGranted = permissions[Manifest.permission.POST_NOTIFICATIONS] ?: false
-
-        if (notificationGranted) {
-            //Toast.makeText(this, "Notification permission granted", Toast.LENGTH_SHORT).show()
-        } else {
-            Toast.makeText(this, "Notification permission is required to show alerts", Toast.LENGTH_SHORT).show()
-        }
-    }
-
-    // To request the permission, you can call this function
-    @RequiresApi(Build.VERSION_CODES.TIRAMISU)
-    private fun requestNotificationPermissions() {
-        notificationPermissionLauncher.launch(arrayOf(Manifest.permission.POST_NOTIFICATIONS))
-    }
-
-
-
-    private var outputText by mutableStateOf("ℹ️ Output logs")
-    private var currentScreen by mutableStateOf("Home") // Manage current screen
-    private lateinit var backPressedCallback: OnBackPressedCallback
-
-    private val executor = Executors.newSingleThreadExecutor()
-
-    private var showCustUpdatePopup by mutableStateOf(false)
-    private var showCustENDPopup by mutableStateOf(false)
-    private var showAutoUpdatePopup by mutableStateOf(false)
-    private var showLoginPopup by mutableStateOf(false)
-    private var isServerLoginRunning by mutableStateOf(false)
-    private var isServerRunning by mutableStateOf(false)
-
-    private var isGlowBox by mutableStateOf(true)
-
-
-    private var showPARAM by mutableStateOf(false)
-
-    private var showRedirectPopup by mutableStateOf(false)
-    private var shouldLaunchIPTV by mutableStateOf(false)
-    private var countdownJob: Job? = null
-
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        enableEdgeToEdge()
-
-        preferenceManager = SkySharedPref(this)
-
-        checkStoragePermission()
-
-        val overlayRequestCounter: Int = preferenceManager.getKey("REQcounter")?.toIntOrNull() ?: 0
-        fun checkOverlayPermission() {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                if (overlayRequestCounter < 2) {
-                    requestOverlayPermission()
-                    preferenceManager.setKey("REQcounter", (overlayRequestCounter + 1).toString())
-                } else {
-                    Log.d("MainActivity", "Overlay permission request skipped")
-                }
-            }
-        }
-
-        checkOverlayPermission()
-
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            requestNotificationPermissions()
-        }
-
-
-        val preferenceManager = SkySharedPref(this)
-        applyConfigurations(this, preferenceManager)
-
-        val savedUriString = preferenceManager.getKey("selectedBinaryUri")
-        val savedName = preferenceManager.getKey("selectedBinaryName")
-
-        selectedBinaryUri = savedUriString?.let { Uri.parse(it) }
-        selectedBinaryName = savedName ?: "JTV-GO SERVER"
-
-        val selectBinaryLauncher = registerForActivityResult(
-            ActivityResultContracts.StartActivityForResult()
-        ) { result ->
-            if (result.resultCode == Activity.RESULT_OK) {
-                selectedBinaryUri = result.data?.data
-                selectedBinaryName =
-                    selectedBinaryUri?.path?.substringAfterLast('/') ?: "Unknown file"
-
-                preferenceManager.setKey("selectedBinaryUri", selectedBinaryUri.toString())
-                preferenceManager.setKey("selectedBinaryName", selectedBinaryName)
-            }
-        }
-
-//        registerReceiver(binaryStoppedReceiver, IntentFilter(BinaryService.ACTION_BINARY_STOPPED))
-
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            registerReceiver(binaryStoppedReceiver, IntentFilter(BinaryService.ACTION_BINARY_STOPPED), RECEIVER_NOT_EXPORTED)
-        } else {
-            registerReceiver(binaryStoppedReceiver, IntentFilter(BinaryService.ACTION_BINARY_STOPPED))
-        }
-
-
-        // Register the OnBackPressedCallback
-        backPressedCallback = object : OnBackPressedCallback(true) {
-            override fun handleOnBackPressed() {
-                when (currentScreen) {
-                    "Settings" -> {
-                        currentScreen = "Home"
-                    }
-                    "Debug" -> {
-                        currentScreen = "Home"
-                    }
-                    "Info" -> {
-                        currentScreen = "Debug"
-                    }
-                    "Runner" -> {
-                        currentScreen = "Debug"
-                    }
-                    "Login" -> {
-                        currentScreen = "Debug"
-                    }
-                    else -> {
-                        // Let the system handle the back press
-                        isEnabled = false
-                        onBackPressedDispatcher.onBackPressed()
-                    }
-                }
-
-            }
-        }
-        onBackPressedDispatcher.addCallback(this, backPressedCallback)
-
-
-        fun updateSizeIfExist(context: Context, fileName: String) {
-            val fileDir = context.filesDir
-            val file = File(fileDir, fileName)
-
-            if (file.exists()) {
-                val fileSize = file.length()
-                Log.d("DIX", "File size of $fileName: $fileSize bytes")
-                preferenceManager.setKey("expectedFileSize", fileSize.toString())
-
-            } else {
-                Log.e("DIX", "File not found: $fileName")
-                preferenceManager.setKey("expectedFileSize", "69")
-//                try {
-//                    context.resources.openRawResource(R.raw.majorbin).use { `in` ->
-//                        FileOutputStream(file).use { out ->
-//                            val buffer = ByteArray(1024)
-//                            var bytesRead: Int
-//                            while ((`in`.read(buffer).also { bytesRead = it }) != -1) {
-//                                out.write(buffer, 0, bytesRead)
-//                            }
-//                        }
-//                    }
-//                } catch (e: java.lang.Exception) {
-//                    Log.e("DIX", "Error copying binary from resources: ", e)
-//                }
-            }
-        }
-
-        val isCheckForUpdate = preferenceManager.getKey("isCheckForUpdate")
-
-        if (isCheckForUpdate.isNullOrEmpty() || isCheckForUpdate == "Yes") {
-            updateSizeIfExist(this@MainActivity,"majorbin")
-
-
-            val expectedFileSize: Int? = preferenceManager.getKey("expectedFileSize")?.toIntOrNull()
-            RemoteBinaryFetcher.isFileSizeSame(expectedFileSize) { result ->
-                if (result) {
-                    if (expectedFileSize == 69){
-                        isOutputShowing = true
-                        RemoteBinaryFetcher.startDownloadAndSave(this@MainActivity) { output ->
-                            Handler(Looper.getMainLooper()).post {
-                                outputText += "\n$output"
-                            }
-                        }
-                    } else {
-                        showAutoUpdatePopup = true
-                    }
-
-                }
-            }
-        } else {
-           Log.d("DIX","Auto Update OFF")
-        }
-
-
-
-
-        setContent {
-            JGOTheme {
-                Scaffold(
-                    modifier = Modifier.fillMaxSize(),
-                    bottomBar = { BottomNavigationBar(selectBinaryLauncher) },
-//                    floatingActionButton = {
-//                        FloatingActionButton(onClick = {  }) {
-//                            Icon(Icons.Default.Add, contentDescription = "Add")
-//                        }
-//                    }
-                ) { innerPadding ->
-                    Column(
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .padding(innerPadding)
-                    ) {
-                        when (currentScreen) {
-                            "Home" -> HomeScreen(
-                                selectedBinaryName = selectedBinaryName,
-                                selectedBinaryUri = selectedBinaryUri,
-                                isBinaryRunning = isBinaryRunning,
-                                outputText = outputText,
-                                selectBinaryLauncher = selectBinaryLauncher,
-                                onRunBinary = { uri, arguments ->
-                                    val intent = Intent(this@MainActivity, BinaryService::class.java).apply {
-                                        putExtra("binaryUri", uri.toString())
-                                        putExtra("arguments", arguments)
-                                    }
-                                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                                        startForegroundService(intent)
-                                    } else {
-                                        startService(intent)
-                                    }
-
-                                    outputText = "Server is running in the background"
-                                    isBinaryRunning = true
-
-                                    BinaryExecutor.executeBinary(
-                                        this@MainActivity,
-                                        arguments
-                                    ) { output ->
-                                        outputText += "\n$output"
-                                    }
-                                },
-                                onStopBinary = {
-                                    //BinaryExecutor.stopBinary()
-                                    val intent = Intent(this@MainActivity, BinaryService::class.java)
-                                    intent.action = BinaryService.ACTION_STOP_BINARY
-                                    startService(intent)
-                                    outputText = "Server stopped"
-                                    isBinaryRunning = false
-                                }
-                            )
-                            "Settings" -> SettingsScreen(context = this@MainActivity)
-                            "Info" -> InfoScreen(context = this@MainActivity)
-                            "Debug" -> DebugScreen(context = this@MainActivity, onNavigate = { title -> currentScreen = title })
-                            "Runner" -> RunnerScreen(context = this@MainActivity)
-                            "Login" -> LoginScreen(context = this@MainActivity)
-                        }
-
-
-                        val savedIPTVRedirectTime = preferenceManager.getKey("isFlagSetForIPTVtime")?.toInt() ?: 5000
-                        val countdownTimeF = savedIPTVRedirectTime / 1000
-
-                        // Show the redirect popup
-                        RedirectPopup(
-                            isVisible = showRedirectPopup,
-                            countdownTime = countdownTimeF,
-                            context = this@MainActivity,
-                            onDismiss = {
-                                showRedirectPopup = false
-                                shouldLaunchIPTV = false // Cancel IPTV launch if dismissed
-                            }
-                        )
-
-//                        CustPopup(
-//                            isVisible = showCustUpdatePopup,
-//                            xtitle ="Update Available",
-//                            xsubtitle="A new version of the app is available. Please update to the latest version for improved features and performance.",
-//                            xokbtn="Update!",
-//                            xendbtn="Dismiss",
-//                            onOk = { showCustUpdatePopup = false },
-//                            onDismiss = { showCustUpdatePopup = false }
-//                        )
-
-                        val isUpdate_xtitle = preferenceManager.getKey("isUpdate_xtitle")?.takeIf { it.isNotEmpty() } ?: "WARNING"
-                        val isUpdate_xsubtitle = preferenceManager.getKey("isUpdate_xsubtitle")?.takeIf { it.isNotEmpty() } ?: "If you are seeing this message, it indicates an error has occurred."
-                        val isUpdate_xokbtn = preferenceManager.getKey("isUpdate_xokbtn")?.takeIf { it.isNotEmpty() } ?: "OK"
-
-                        val isEngine_xtitle = preferenceManager.getKey("isEngine_xtitle")?.takeIf { it.isNotEmpty() } ?: "WARNING"
-                        val isEngine_xsubtitle = preferenceManager.getKey("isEngine_xsubtitle")?.takeIf { it.isNotEmpty() } ?: "If you are seeing this message, it indicates an error has occurred."
-                        val isEngine_xokbtn = preferenceManager.getKey("isEngine_xokbtn")?.takeIf { it.isNotEmpty() } ?: "OK"
-
-
-
-                        CustPopup(
-                            isVisible = showCustUpdatePopup,
-                            xtitle = isUpdate_xtitle,
-                            xsubtitle=isUpdate_xsubtitle,
-                            xokbtn=isUpdate_xokbtn,
-                            xendbtn="Dismiss",
-                            onOk = { showCustUpdatePopup = false },
-                            onDismiss = { showCustUpdatePopup = false }
-                        )
-
-                        CustPopup(
-                            isVisible = showCustENDPopup,
-                            xtitle = isEngine_xtitle,
-                            xsubtitle= isEngine_xsubtitle,
-                            xokbtn= isEngine_xokbtn,
-                            xendbtn = "Dismiss",
-                            onOk = {
-                                showCustENDPopup = false
-                                finishAffinity()
-                                return@CustPopup
-                                   },
-                            onDismiss = {
-                                showCustENDPopup = false
-                                finishAffinity()
-                                return@CustPopup
-                            }
-                        )
-
-                        CustPopup(
-                            isVisible = showLoginPopup,
-                            xtitle = "Login Required",
-                            xsubtitle = "Please log in using WebTV, to access the server.",
-                            xokbtn = "Login",
-                            xendbtn = "Cancel",
-                            onOk = {
-                                showLoginPopup = false
-                                val intent = Intent(this@MainActivity, WebPlayerActivity::class.java)
-                                startActivity(intent)
-                                Toast.makeText(this@MainActivity, "Opening WEBTV", Toast.LENGTH_SHORT).show()
-                                Log.d("DIX", "Opening WEBTV")
-                                return@CustPopup
-                            },
-                            onDismiss = {
-                                showLoginPopup = false
-                                return@CustPopup
-                            }
-                        )
-
-
-                        CustPopup(
-                            isVisible = showAutoUpdatePopup,
-                            xtitle = "Binary Update Available",
-                            xsubtitle = "A new version of the Binary is available.",
-                            xokbtn = "Update!",
-                            xendbtn = "Dismiss",
-                            onOk = {
-                                showAutoUpdatePopup = false
-                                preferenceManager.setKey("expectedFileSize", "0")
-                                isOutputShowing = true
-                                RemoteBinaryFetcher.startDownloadAndSave(this@MainActivity
-                                ) { output ->
-                                    runOnUiThread {
-                                            outputText += "\n$output"
-                                    }
-                                }
-                            },
-                            onDismiss = {
-                                showAutoUpdatePopup = false
-                                return@CustPopup
-                            }
-                        )
-
-                        CustPopup(
-                            isVisible = showPARAM,
-                            xtitle = "Request Permission",
-                            xsubtitle= "Draw over other apps permission is required for the app to function properly.",
-                            xokbtn= "Grant",
-                            xendbtn = "Dismiss",
-                            onOk = {
-                                showPARAM = false
-                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                                    val intent = Intent(
-                                        Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
-                                        Uri.parse("package:$packageName")
-                                    )
-                                    overlayPermissionLauncher.launch(intent)
-                                }
-                            },
-                            onDismiss = {
-                                showPARAM = false
-                                Toast.makeText(this@MainActivity, "Permission is required to continue", Toast.LENGTH_SHORT).show()
-                                return@CustPopup
-                            }
-                        )
-
-
-                    }
-                }
-
-//                // Handle delayed IPTV launch
-//                LaunchedEffect(shouldLaunchIPTV) {
-//                    if (shouldLaunchIPTV) {
-//                        val savedIPTVRedirectTime = preferenceManager.getKey("isFlagSetForIPTVtime")?.toInt() ?: 5000
-//                        delay(savedIPTVRedirectTime.toLong())
-//                        startIPTV()
-//                    }
-//                }
-
-            }
-        }
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        backPressedCallback.remove()
-        unregisterReceiver(binaryStoppedReceiver)
-    }
-
-
-
-    override fun onStart() {
-        super.onStart()
-
-        val wifiIpAddress = getWifiIpAddress(this)
-
-        val nekoFirstTime = preferenceManager.getKey("nekoFirstTime")
-
-        if (nekoFirstTime.isNullOrEmpty()) {
-            preferenceManager.setKey("nekoFirstTime", "Done")
-            Log.d("MainActivity", "nekoFirstTime was empty or not available, set to Done.")
-
-            val arch = System.getProperty("os.arch")
-            preferenceManager.setKey("ARCHx", arch)
-
-            // Set default values
-            preferenceManager.setKey("isFlagSetForLOCAL", "Yes") // Reverse
-            preferenceManager.setKey("isFlagSetForAutoStartServer", "No")
-            preferenceManager.setKey("isFlagSetForAutoStartOnBoot", "No")
-            preferenceManager.setKey("isFlagSetForAutoBootIPTV", "Yes")
-            preferenceManager.setKey("app_packagename", "")
-            preferenceManager.setKey("isFlagSetForEPG", "No")
-            preferenceManager.setKey("app_name", "")
-            preferenceManager.setKey("isFlagSetForAutoIPTV", "No")
-            preferenceManager.setKey("app_launch_activity", "")
-            preferenceManager.setKey("isCustomSetForPORT", "5350")
-            preferenceManager.setKey("__Port", " --port 5350")
-            preferenceManager.setKey("__Public", " --public")
-            preferenceManager.setKey("__EPG", " --config configtv.json")
-            preferenceManager.setKey("BinaryFileName", "majorbin")
-            preferenceManager.setKey("isAutoUpdate", "No")
-            preferenceManager.setKey("VersionNumber", "v3.11")
-            preferenceManager.setKey("expectedFileSize", "69")
-            preferenceManager.setKey("isCheckForUpdate", "Yes")
-
-        }
-
-        // Use the utility function to fetch and save config
-        ConfigHandler.fetchAndSaveConfig(this)
-
-        val isUpdate = preferenceManager.getKey("isUpdate")
-        val isEngine = preferenceManager.getKey("isEngine")
-
-
-//        Debug Values
-//        val isUpdate = "Yes"
-//        val isEngine = "2"
-
-
-        if (isUpdate == "Yes") {
-            showCustUpdatePopup = true
-            Toast.makeText(this@MainActivity, "Update Available please update", Toast.LENGTH_SHORT).show()
-        }
-
-        if (isEngine?.toIntOrNull()?.let { it > 1 } == true) {
-            showCustENDPopup = true
-            Toast.makeText(this@MainActivity, "App support period ended.", Toast.LENGTH_SHORT).show()
-        }
-
-
-        fun checkAndRun() {
-            val externalStoragePath = Environment.getExternalStorageDirectory().path
-            val folder = File(externalStoragePath, ".jiotv_go")
-            val jsonFile = File(folder, "jiotv-config.json")
-
-            if (jsonFile.exists()) {
-                Log.d("DIX","Config exist")
-            } else {
-                jsonmaker(this@MainActivity);
-            }
-        }
-
-        checkAndRun()
-
-
-        // Check if server should start automatically
-        val isFlagSetForAutoStartServer = preferenceManager.getKey("isFlagSetForAutoStartServer")
-        if (isFlagSetForAutoStartServer == "Yes") {
-            Log.d("DIX-AutoStartServer", "Starting server automatically")
-
-            val uriToUse = selectedBinaryUri
-                ?: Uri.parse("android.resource://com.skylake.skytv.jgorunner/raw/majorbin")
-            val arguments = emptyArray<String>()
-
-            startServer(uriToUse, arguments)
-        }
-
-        val isFlagSetForAutoIPTV = preferenceManager.getKey("isFlagSetForAutoIPTV")
-
-//        val isServerRunning = checkServerStatus()
-
-        Log.i("DIX::","UP")
-        checkServerStatusInCoroutine()
-        Log.i("DIX::","DOWN")
-
-
-
-
-//        if (isFlagSetForAutoIPTV == "Yes" && isServerLoginRunning) {
-//            showRedirectPopup = true
-//            shouldLaunchIPTV = true
-//
-//            countdownJob?.cancel() // Cancel any existing countdown job
-//            val savedIPTVRedirectTime = preferenceManager.getKey("isFlagSetForIPTVtime")?.toInt() ?: 4000
-//            var countdownTime = savedIPTVRedirectTime / 1000
-//            countdownJob = CoroutineScope(Dispatchers.Main).launch {
-//                while (countdownTime > 0) {
-//                    delay(1000)
-//                    countdownTime--
-//                }
-//                if (shouldLaunchIPTV) {
-//                    startIPTV()
-//                }
-//                showRedirectPopup = false
-//            }
-//        }
-    }
-
-
-    private fun startServer(uri: Uri, arguments: Array<String>) {
-        val intent = Intent(this, BinaryService::class.java).apply {
-            putExtra("binaryUri", uri.toString())
-            putExtra("arguments", arguments)
-        }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            startForegroundService(intent)
-        } else {
-            startService(intent)
-        }
-
-        outputText = "Server is running in the background"
-        isBinaryRunning = true
-
-        BinaryExecutor.executeBinary(this, arguments) { output ->
-            outputText += "\n$output"
-        }
-    }
-
-    private fun checkServerStatusInCoroutine() {
-        CoroutineScope(Dispatchers.IO).launch {
-            val isServerRunning = checkServerStatus()
-            if (isServerRunning) {
-                checkLoginStatusInCoroutine()
-            } else {
-                Log.w("DIXxx", "Server is not expected to be running.")
-            }
-            withContext(Dispatchers.Main) {
-                Log.d("DIXx", "Is server running: $isServerRunning")
-            }
-        }
-    }
-
-    private fun checkLoginStatusInCoroutine() {
-        CoroutineScope(Dispatchers.IO).launch {
-            val statusCode = checkServerLoginStatus()
-            withContext(Dispatchers.Main) {
-                Log.d("DIX", "Server login status code: $statusCode")
-                when (statusCode) {
-                    200 -> {
-                        Log.i("DIX", "Server is online, login successful.")
-                        isGlowBox = false
-                        isServerLoginRunning = true
-                        val isFlagSetForAutoIPTV = preferenceManager.getKey("isFlagSetForAutoIPTV")
-                        if (isFlagSetForAutoIPTV == "Yes" && isServerLoginRunning) {
-                            showRedirectPopup = true
-                            shouldLaunchIPTV = true
-
-                            countdownJob?.cancel() // Cancel any existing countdown job
-                            val savedIPTVRedirectTime = preferenceManager.getKey("isFlagSetForIPTVtime")?.toInt() ?: 4000
-                            var countdownTime = savedIPTVRedirectTime / 1000
-                            countdownJob = CoroutineScope(Dispatchers.Main).launch {
-                                while (countdownTime > 0) {
-                                    delay(1000)
-                                    countdownTime--
-                                }
-                                if (shouldLaunchIPTV) {
-                                    startIPTV()
-                                }
-                                showRedirectPopup = false
-                            }
-                        }
-                    }
-                    500 -> {
-                        Log.e("DIX", "Server returned an internal error (500).")
-                        showLoginPopup = true
-                    }
-                    0 -> {
-                        Log.e("DIX", "Error checking server status or server is down.")
-                    }
-                    else -> {
-                        Log.e("DIX", "Unexpected return value: $statusCode")
-                    }
-                }
-            }
-        }
-    }
-
-    private fun startIPTV() {
-        executor.execute {
-            try {
-                runOnUiThread {
-                        val appPackageName = preferenceManager.getKey("app_packagename")
-                        if (appPackageName.isNotEmpty()) {
-                            Log.d("DIX", appPackageName)
-                            val appName = preferenceManager.getKey("app_name")
-
-                            if (appPackageName == "webtv") {
-                                val intent = Intent(this@MainActivity, WebPlayerActivity::class.java)
-                                startActivity(intent)
-                                Toast.makeText(this@MainActivity, "Opening WEBTV", Toast.LENGTH_SHORT).show()
-                                Log.d("DIX", "Opening WEBTV")
-                            } else if (appPackageName.isNotEmpty() && appName.isNotEmpty()) {
-                                val launchIntent = packageManager.getLaunchIntentForPackage(appPackageName)
-                                launchIntent?.let {
-                                    startActivity(it)
-                                    Toast.makeText(this@MainActivity, "Opening $appName", Toast.LENGTH_SHORT).show()
-                                    Log.d("DIX", "Opening $appName")
-                                } ?: run {
-                                    Toast.makeText(this@MainActivity, "Cannot find the specified application", Toast.LENGTH_SHORT).show()
-                                    Log.d("DIX", "Cannot find the specified application")
-                                }
-                            } else {
-                                Toast.makeText(this@MainActivity, "No application details found", Toast.LENGTH_SHORT).show()
-                                Log.d("DIX", "No application details found")
-                            }
-                        } else {
-                            Toast.makeText(this@MainActivity, "IPTV not set.", Toast.LENGTH_SHORT).show()
-                            Log.d("DIX", "IPTV not set")
-                        }
-                }
-            } catch (e: Exception) {
-                Log.e("DIX", "Error starting IPTV", e)
-                runOnUiThread {
-                    Toast.makeText(this@MainActivity, "Error starting IPTV", Toast.LENGTH_SHORT).show()
-                    Log.d("DIX", "Error starting IPTV: ${e.message}")
-                }
-            }
-        }
-
-    }
-
-
-    private fun getWifiIpAddress(context: Context): String? {
-        val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-
-        // CODE TWISTER XD
-        val isPublic = preferenceManager.getKey("isFlagSetForLOCAL")
-        if (isPublic != "Yes") {
-            val savedPortNumber = preferenceManager.getKey("isCustomSetForPORT")?.toIntOrNull() ?: 5350
-            return "http://localhost:$savedPortNumber/playlist.m3u"
-        }
-
-
-        val activeNetwork = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            connectivityManager.activeNetwork
-        } else {
-            val networks = connectivityManager.allNetworks
-            if (networks.isNotEmpty()) networks[0] else null
-        }
-
-        if (activeNetwork != null) {
-            val networkCapabilities = connectivityManager.getNetworkCapabilities(activeNetwork)
-            if (networkCapabilities != null && networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) {
-                val linkProperties: LinkProperties? = connectivityManager.getLinkProperties(activeNetwork)
-                val ipAddresses = linkProperties?.linkAddresses
-                    ?.filter { it.address is Inet4Address } // Filter for IPv4 addresses
-                    ?.map { it.address.hostAddress }
-                val ipAddress = ipAddresses?.firstOrNull() // Get the first IPv4 address
-
-                if (ipAddress != null) {
-                    val savedPortNumber = preferenceManager.getKey("isCustomSetForPORT")?.toIntOrNull() ?: 5350
-                    return "http://$ipAddress:$savedPortNumber/playlist.m3u"
-                }
-            }
-        }
-        return null // Return null if not connected to Wi-Fi or no valid IP is found
-    }
-
-
-
-
-
-    @Composable
-    fun RedirectPopup(
-        isVisible: Boolean,
-        countdownTime: Int,
-        onDismiss: () -> Unit,
-        context: Context
-    ) {
-        var currentTime by remember { mutableIntStateOf(countdownTime) }
-        val appIPTV = preferenceManager.getKey("app_name") ?: "IPTV app"
-        val appIPTVpkg = preferenceManager.getKey("app_packagename")
-
-        // Retrieve the app icon from the package name
-        val appIcon = remember {
-            try {
-                val pm = context.packageManager
-                pm.getApplicationIcon(appIPTVpkg ?: "")
-            } catch (e: Exception) {
-                null
-            }
-        }
-
-        if (isVisible) {
-            Log.d("RedirectPopup", "Popup is visible.")
-
-            // Countdown logic
-            LaunchedEffect(isVisible) {
-                currentTime = countdownTime
-                while (currentTime > 0) {
-                    delay(1000)
-                    currentTime -= 1
-                }
-                onDismiss()
-            }
-
-            // Log current time
-            Log.d("RedirectPopup", "Current countdown: $currentTime")
-
-            AlertDialog(
-                onDismissRequest = { onDismiss() },
-                text = {
-                    Column(
-                        horizontalAlignment = Alignment.CenterHorizontally,
-                        verticalArrangement = Arrangement.Center,
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(vertical = 16.dp)
-                    ) {
-                        appIcon?.let {
-                            Image(
-                                bitmap = it.toBitmap().asImageBitmap(),
-                                contentDescription = "App Icon",
-                                modifier = Modifier
-                                    .size(48.dp)
-                                    .padding(bottom = 8.dp)
-                            )
-                        }
-
-                        Text(
-                            text = "Redirecting to $appIPTV",
-                            style = MaterialTheme.typography.bodyLarge.copy(
-                                fontSize = 18.sp,
-                                fontWeight = FontWeight.Bold,
-                                color = MaterialTheme.colorScheme.primary
-                            ),
-                            textAlign = TextAlign.Center,
-                            modifier = Modifier.padding(vertical = 8.dp)
-                        )
-
-                        Text(
-                            text = "$currentTime seconds remaining",
-                            style = MaterialTheme.typography.bodyLarge.copy(
-                                fontSize = 16.sp,
-                                fontWeight = FontWeight.Medium,
-                                color = MaterialTheme.colorScheme.secondary
-                            ),
-                            textAlign = TextAlign.Center,
-                            modifier = Modifier
-                                .alpha(if (currentTime % 2 == 0) 1f else 0.7f)
-                                .padding(top = 8.dp)
-                        )
-                    }
-                },
-                confirmButton = {
-                    Button(
-                        onClick = { onDismiss() },
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(horizontal = 16.dp, vertical = 8.dp)
-                    ) {
-                        Text("Dismiss")
-                    }
-                },
-                properties = DialogProperties(dismissOnBackPress = false, dismissOnClickOutside = false)
-            )
-        } else {
-            Log.d("RedirectPopup", "Popup is NOT visible.")
-        }
-    }
-
-
-
-
-
-
-
-    @Composable
-    fun CustPopup(isVisible: Boolean, xtitle: String, xsubtitle: String, xokbtn: String, xendbtn: String, onOk: () -> Unit, onDismiss: () -> Unit) {
-        if (isVisible) {
-            Log.d("CustPopup", "CustPopup [$xtitle] is visible.")
-
-            AlertDialog(
-                onDismissRequest = { onDismiss() },
-                title = { Text(xtitle) },
-                text = { Text(xsubtitle) },
-                confirmButton = {
-                    Button(onClick = { onOk() }) {
-                        Text(xokbtn)
-                    }
-                },
-                dismissButton = {
-                    Button(onClick = { onDismiss() }) {
-                        Text(xendbtn)
-                    }
-                },
-                properties = DialogProperties(dismissOnBackPress = false, dismissOnClickOutside = false)
-            )
-        } else {
-            Log.d("CustPopup", "CustPopup [$xtitle] is NOT visible.")
-        }
-    }
-
-
-
-    private suspend fun checkServerStatus(): Boolean {
-        val savedPortNumber = preferenceManager.getKey("isCustomSetForPORT")?.toIntOrNull() ?: 5350
-        val url = URL("http://localhost:$savedPortNumber")
-        Log.d("ServerStatusChecker", "Constructed URL: $url")
-
-        repeat(5) { attempt ->  // Change from 3 to 5 attempts
-            try {
-                Log.d("ServerStatusChecker", "Attempt ${attempt + 1} to check server status")
-
-                val connection = url.openConnection() as HttpURLConnection
-                connection.requestMethod = "HEAD"
-                connection.connectTimeout = 5000 // 5 seconds timeout
-                connection.readTimeout = 5000 // 5 seconds timeout
-
-                Log.d("ServerStatusChecker", "Connection established. Requesting server headers...")
-
-                val responseCode = connection.responseCode
-                Log.d("ServerStatusChecker", "Received response code: $responseCode")
-
-                connection.disconnect()
-
-                // If we get a successful response, return true
-                if (responseCode == HttpURLConnection.HTTP_OK) {
-                    Log.d("ServerStatusChecker", "Server is up and running (HTTP_OK response).")
-                    return true
-                } else {
-                    Log.d("ServerStatusChecker", "Unexpected response code: $responseCode. Server might be down.")
-                }
-            } catch (e: Exception) {
-                Log.d("ServerStatusChecker", "Error occurred during attempt ${attempt + 1}")
-                Log.e("ServerStatusChecker", "Error checking server status (attempt ${attempt + 1})", e)
-            }
-
-            // Only introduce a delay if an error occurs
-            if (attempt < 4) { // Change to 4 to avoid sleeping after the last attempt
-                Log.d("ServerStatusChecker", "Retrying after 1 second delay (attempt ${attempt + 1})")
-                delay(1000) // Use delay instead of Thread.sleep
-            }
-        }
-
-        // If all attempts fail, return false
-        Log.d("ServerStatusChecker", "All 5 attempts failed. Server is not reachable.")
-        return false
-    }
-
-
-
-
-
-    private suspend fun checkServerLoginStatus(): Int {
-        val savedPortNumber = preferenceManager.getKey("isCustomSetForPORT")?.toIntOrNull() ?: 5350
-        val url = URL("http://localhost:$savedPortNumber/live/144.m3u8")
-        var consecutiveFailures = 0 // Counter for consecutive failures
-        val maxFailures = 5 // Maximum allowed consecutive failures
-
-        repeat(5) { attempt ->
-            try {
-                Log.d("ServerLoginCheck", "Attempt #${attempt + 1}: Checking server status...")
-                val connection = url.openConnection() as HttpURLConnection
-                connection.requestMethod = "HEAD"
-                connection.connectTimeout = 5000 // 5 seconds timeout
-                connection.readTimeout = 5000 // 5 seconds timeout
-                val responseCode = connection.responseCode
-                connection.disconnect()
-
-                return when (responseCode) {
-                    HttpURLConnection.HTTP_OK -> {
-                        Log.d("ServerLoginCheck", "Response Code: $responseCode - Server is up!")
-                        consecutiveFailures = 0 // Reset on success
-                        200
-                    }
-                    HttpURLConnection.HTTP_INTERNAL_ERROR -> {
-                        Log.d("ServerLoginCheck", "Response Code: $responseCode - Server error!")
-                        consecutiveFailures = 0 // Reset on success
-                        500
-                    }
-                    else -> {
-                        consecutiveFailures++ // Increment failure counter
-                        Log.d("ServerLoginCheck", "Unexpected Response Code: $responseCode")
-                        if (consecutiveFailures >= maxFailures) {
-                            Log.d("ServerLoginCheck", "Reached maximum consecutive failures.")
-                            return 0 // Stop checking after 5 failures
-                        }
-                        0
-                    }
-                }
-            } catch (e: Exception) {
-                Log.d("ServerLoginCheck", "Attempt #${attempt + 1}: Error occurred")
-                Log.e("ServerLoginCheck", "Error checking server status (attempt ${attempt + 1})", e)
-                consecutiveFailures++ // Increment failure counter
-                if (consecutiveFailures >= maxFailures) {
-                    Log.d("ServerLoginCheck", "Reached maximum consecutive failures.")
-                    return 0 // Stop checking after 5 failures
-                }
-            }
-
-            // Only introduce a delay if an error occurs
-            if (attempt < 2) { // Avoid sleeping after the last attempt
-                Log.d("ServerLoginCheck", "Delaying before next attempt...")
-                delay(1000) // Use delay instead of Thread.sleep
-            }
-        }
-
-        // If all attempts fail, return 0
-        return 0
-    }
-
-
-
-
-
-    private fun checkStoragePermission() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            val isPermissionGranted = ContextCompat.checkSelfPermission(
-                this, Manifest.permission.WRITE_EXTERNAL_STORAGE
-            ) == PackageManager.PERMISSION_GRANTED
-
-            if (!isPermissionGranted) {
-                storagePermissionLauncher.launch(
-                    arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                )
-            }
-        }
-    }
-
-    @Composable
-    fun BottomNavigationBar(selectBinaryLauncher: ActivityResultLauncher<Intent>) {
-        val items = listOf(
-            BottomNavigationItem(
-                title = "Home",
-                selectedIcon = Icons.Filled.Home,
-                unselectedIcon = Icons.Outlined.Home,
-                hasNews = false,
-            ),
-            BottomNavigationItem(
-                title = "Settings",
-                selectedIcon = Icons.Filled.Settings,
-                unselectedIcon = Icons.Outlined.Settings,
-                hasNews = false,
-            ),
-            BottomNavigationItem(
-                title = "Debug",
-                selectedIcon = Icons.Filled.DeveloperMode,
-                unselectedIcon = Icons.Outlined.DeveloperMode,
-                hasNews = false,
-            ),
-        )
-        var selectedItemIndex by rememberSaveable { mutableStateOf(0) }
-
-        NavigationBar {
-            items.forEachIndexed { index, item ->
-                NavigationBarItem(
-                    selected = selectedItemIndex == index,
-                    onClick = {
-                        selectedItemIndex = index
-                        currentScreen = item.title
-//                        if (index == 1) {
-//                            val intent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
-//                                type = "*/*"
-//                                addCategory(Intent.CATEGORY_OPENABLE)
-//                            }
-//                            selectBinaryLauncher.launch(intent)
-//                        }
-                    },
-                    label = {
-                        Text(text = item.title)
-                    },
-                    icon = {
-                        BadgedBox(
-                            badge = {
-                                if (item.hasNews) {
-                                    Badge()
-                                }
-                            }
-                        ) {
-                            Icon(
-                                imageVector = if (selectedItemIndex == index) {
-                                    item.selectedIcon
-                                } else {
-                                    item.unselectedIcon
-                                },
-                                contentDescription = item.title
-                            )
-                        }
-                    }
-                )
-            }
-        }
-    }
-
-    @Composable
-    fun HomeScreen(
-        selectedBinaryName: String,
-        selectedBinaryUri: Uri?,
-        isBinaryRunning: Boolean,
-        outputText: String,
-        selectBinaryLauncher: ActivityResultLauncher<Intent>,
-        onRunBinary: (Uri, Array<String>) -> Unit,
-        onStopBinary: () -> Unit
-    ) {
-        val scrollState = rememberScrollState()
-
-        Column(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(16.dp)
-                .verticalScroll(scrollState),
-            verticalArrangement = Arrangement.Center,
-            horizontalAlignment = Alignment.CenterHorizontally
-        ) {
-//            Text(
-//                text = selectedBinaryName,
-//                fontSize = 24.sp,
-//                fontFamily = customFontFamily,
-//                color = MaterialTheme.colorScheme.onBackground
-//            )
-            Text(
-                text = selectedBinaryName,
-                fontSize = 24.sp,
-                fontFamily = customFontFamily,
-                color = MaterialTheme.colorScheme.onBackground,
-                style = if (isGlowBox) {
-                    TextStyle.Default
-                } else {
-                    TextStyle(
-                        shadow = Shadow(
-                            color = Color.Green,
-                            blurRadius = 30f,
-                            offset = androidx.compose.ui.geometry.Offset(0f, 0f)
-                        )
-                    )
-                },
-                modifier = Modifier.padding(bottom = 16.dp)
-            )
-
-            Spacer(modifier = Modifier.height(16.dp))
-
-//            Text(text = "✨")
-//
-//            Spacer(modifier = Modifier.height(16.dp))
-
-            Box(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .border(2.dp, Color.Gray, RoundedCornerShape(8.dp))
-                    .background(
-                        if (isGlowBox) MaterialTheme.colorScheme.errorContainer else  Color(0xFFA5D6A7),
-                        RoundedCornerShape(8.dp)
-                    )
-                    .padding(5.dp)
-            ) {
-                val wifiIpAddress = getWifiIpAddress(this@MainActivity) ?: "Not connected to Wi-Fi"
-                val clipboardManager = LocalClipboardManager.current
-
-                Text(
-                    text = wifiIpAddress,
-                    fontSize = 16.sp,
-                    color = if (isGlowBox) MaterialTheme.colorScheme.onSurface else  Color.Black,
-                    modifier = Modifier
-                        .align(Alignment.Center)
-                        .clickable {
-                            clipboardManager.setText(AnnotatedString(wifiIpAddress))
-                        }
-                )
-            }
-
-
-
-            Spacer(modifier = Modifier.height(16.dp))
-
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceEvenly
-            ) {
-                Button1(selectedBinaryUri)
-                Button2()
-            }
-
-            Spacer(modifier = Modifier.height(4.dp)) // Space between rows
-
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceEvenly
-            ) {
-                Button3()
-                Button4()
-                Button5()
-                Button6()
-            }
-
-
-            Spacer(modifier = Modifier.height(16.dp))
-
-
-            Column (
-                modifier = Modifier.alpha(if (isBinaryRunning || isOutputShowing) 1f else 0f)
-            ) {
-                Text(
-                    text = outputText,
-                    color = Color.White,
-                    fontSize = 12.sp,
-                    fontWeight = FontWeight.Normal,
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .height(160.dp)
-                        .background(Color.Black)
-                        .padding(8.dp)
-                        .verticalScroll(rememberScrollState())
-                )
-            }
-        }
-    }
-
-
-    @Composable
-    fun RowScope.Button1(selectedBinaryUri: Uri?) {
-        val colorPRIME = MaterialTheme.colorScheme.primary
-        val colorSECOND = MaterialTheme.colorScheme.secondary
-        val buttonColor = remember { mutableStateOf(colorPRIME) }
-
-        Button(
-            onClick = {
-                val uriToUse = selectedBinaryUri ?: Uri.parse("android.resource://com.skylake.skytv.jgorunner/raw/majorbin")
-                val arguments = emptyArray<String>()
-                onRunBinary(uriToUse, arguments)
-            },
-            modifier = Modifier
-                .weight(1f)
-                .padding(8.dp)
-                .onFocusChanged { focusState ->
-                    buttonColor.value = if (focusState.isFocused) {
-                        colorSECOND
-                    } else {
-                        colorPRIME
-                    }
-                },
-            shape = RoundedCornerShape(8.dp),
-            colors = ButtonDefaults.buttonColors(containerColor = buttonColor.value),
-            contentPadding = PaddingValues(2.dp)
-        ) {
-            ButtonContent("Run Server", Icons.TwoTone.PlayArrow) // Different icon
-        }
-    }
-
-    private fun onRunBinary(uriToUse: Uri?, arguments: Array<String>) {
-        val intent = Intent(this@MainActivity, BinaryService::class.java).apply {
-            putExtra("binaryUri", uriToUse.toString())
-            putExtra("arguments", arguments)
-        }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            startForegroundService(intent)
-        } else {
-            startService(intent)
-        }
-
-        outputText = "Server is running in the background"
-        isBinaryRunning = true
-
-        BinaryExecutor.executeBinary(
-            this@MainActivity,
-            arguments
-        ) { output ->
-            outputText += "\n$output"
-        }
-    }
-
-    private fun onStopBinary() {
-
-        // BinaryExecutor.stopBinary()
-
-        val intent = Intent(this@MainActivity, BinaryService::class.java).apply {
-            action = BinaryService.ACTION_STOP_BINARY
-        }
-
-        startService(intent)
-        outputText = "Server stopped"
-        isBinaryRunning = false
-    }
-
-
-
-
-    @Composable
-    fun RowScope.Button2() {
-        val colorPRIME = MaterialTheme.colorScheme.primary
-        val colorSECOND = MaterialTheme.colorScheme.secondary
-        val buttonColor = remember { mutableStateOf(colorPRIME) }
-        Button(
-            onClick = { onStopBinary() },
-            enabled = isBinaryRunning,
-            modifier = Modifier
-                .weight(1f)
-                .padding(8.dp)
-                .onFocusChanged { focusState ->
-                    buttonColor.value = if (focusState.isFocused) {
-                        colorSECOND
-                    } else {
-                        colorPRIME
-                    }
-                },
-        shape = RoundedCornerShape(8.dp),
-        colors = ButtonDefaults.buttonColors(containerColor = buttonColor.value),
-        contentPadding = PaddingValues(2.dp)
-        ) {
-            ButtonContent("Stop Server", Icons.TwoTone.Stop) // Different icon
-        }
-    }
-
-    @Composable
-    fun RowScope.Button3() {
-        val colorPRIME = MaterialTheme.colorScheme.primary
-        val colorSECOND = MaterialTheme.colorScheme.secondary
-        val buttonColor = remember { mutableStateOf(colorPRIME) }
-        Button(
-            onClick = { iptvRedirectFunc() },
-            modifier = Modifier
-                .weight(1f)
-                .padding(8.dp)
-                .onFocusChanged { focusState ->
-                    buttonColor.value = if (focusState.isFocused) {
-                        colorSECOND
-                    } else {
-                        colorPRIME
-                    }
-                },
-            shape = RoundedCornerShape(8.dp),
-            colors = ButtonDefaults.buttonColors(containerColor = buttonColor.value),
-            contentPadding = PaddingValues(2.dp)
-        ) {
-            ButtonContent("Run IPTV", Icons.TwoTone.ResetTv) // Different icon
-        }
-    }
-
-    @Composable
-    fun RowScope.Button4() {
-        val colorPRIME = MaterialTheme.colorScheme.primary
-        val colorSECOND = MaterialTheme.colorScheme.secondary
-        val buttonColor = remember { mutableStateOf(colorPRIME) }
-        Button(
-            onClick = {  val intent = Intent(this@MainActivity, WebPlayerActivity::class.java)
-                    startActivity(intent) },
-            modifier = Modifier
-                .weight(1f)
-                .padding(8.dp)
-                .onFocusChanged { focusState ->
-                    buttonColor.value = if (focusState.isFocused) {
-                        colorSECOND
-                    } else {
-                        colorPRIME
-                    }
-                },
-            shape = RoundedCornerShape(8.dp),
-            colors = ButtonDefaults.buttonColors(containerColor = buttonColor.value),
-            contentPadding = PaddingValues(2.dp)
-        ) {
-            ButtonContent("Web TV", Icons.TwoTone.LiveTv) // Different icon
-        }
-    }
-
-    @Composable
-    fun RowScope.Button5() {
-        val colorPRIME = MaterialTheme.colorScheme.primary
-        val colorSECOND = MaterialTheme.colorScheme.secondary
-        val buttonColor = remember { mutableStateOf(colorPRIME) }
-        Button(
-            onClick = {
-                currentScreen = "Debug"
-                },
-            modifier = Modifier
-                .weight(1f)
-                .padding(8.dp)
-                .onFocusChanged { focusState ->
-                    buttonColor.value = if (focusState.isFocused) {
-                        colorSECOND
-                    } else {
-                        colorPRIME
-                    }
-                },
-            shape = RoundedCornerShape(8.dp),
-            colors = ButtonDefaults.buttonColors(containerColor = buttonColor.value),
-            contentPadding = PaddingValues(2.dp)
-        ) {
-            ButtonContent("Debug", Icons.TwoTone.Deblur) // Different icon
-        }
-    }
-
-    @Composable
-    fun RowScope.Button6() {
-        val colorPRIME = MaterialTheme.colorScheme.primary
-        val colorSECOND = MaterialTheme.colorScheme.secondary
-        val buttonColor = remember { mutableStateOf(colorPRIME) }
-        Button(
-            onClick = {
-                // Call the function to stop the binary process
-                onStopBinary()
-
-                // Exit the app
-                (this@MainActivity as? Activity)?.finish()
-            },
-            modifier = Modifier
-                .weight(1f)
-                .padding(8.dp)
-                .onFocusChanged { focusState ->
-                    buttonColor.value = if (focusState.isFocused) {
-                        colorSECOND
-                    } else {
-                        colorPRIME
-                    }
-                },
-            shape = RoundedCornerShape(8.dp),
-            colors = ButtonDefaults.buttonColors(containerColor = buttonColor.value),
-            contentPadding = PaddingValues(2.dp)
-        ) {
-            ButtonContent("Exit", Icons.AutoMirrored.TwoTone.ExitToApp) // Different icon
-        }
-    }
-
-    @Composable
-    fun ButtonContent(text: String, icon: ImageVector) {
-        Column(
-            horizontalAlignment = Alignment.CenterHorizontally
-        ) {
-            Icon(
-                imageVector = icon,
-                contentDescription = "Icon",
-                tint = MaterialTheme.colorScheme.onPrimary,
-                modifier = Modifier.size(27.dp)
-            )
-            Spacer(modifier = Modifier.height(4.dp))
-            Text(
-                text = text,
-                fontSize = 12.sp,
-                color = MaterialTheme.colorScheme.onPrimary
-            )
-        }
-    }
-
-
-
-    fun handleButton1Click(context: Context) {
-        Toast.makeText(context, "Debug Mode : ON", Toast.LENGTH_SHORT).show()
-    }
-
-
-    private fun iptvRedirectFunc() {
-        // Retrieve the app package name from shared preferences
-        val appPackageName = preferenceManager.getKey("app_packagename")
-
-        if (appPackageName.isNotEmpty()) {
-            Log.d("DIX",appPackageName)
-            // Retrieve other details
-            val appLaunchActivity = preferenceManager.getKey("app_launch_activity")
-            val appName = preferenceManager.getKey("app_name")
-
-            if (appPackageName=="webtv") {
-                val intent = Intent(this@MainActivity, WebPlayerActivity::class.java)
-                startActivity(intent)
-                Toast.makeText(this@MainActivity, "Starting: $appName", Toast.LENGTH_SHORT).show()
-            } else {
-                if (appLaunchActivity.isNotEmpty()) {
-                    Log.d("DIX",appLaunchActivity)
-                    // Create an intent to launch the app
-                    val launchIntent = Intent().apply {
-                        setClassName(appPackageName, appLaunchActivity)
-                    }
-
-                    // Check if the app can be resolved
-                    val packageManager = this@MainActivity.packageManager
-                    if (launchIntent.resolveActivity(packageManager) != null) {
-                        // Start the activity
-                        startActivity(launchIntent)
-                        Toast.makeText(this@MainActivity, "Starting: $appName", Toast.LENGTH_SHORT).show()
-                    } else {
-                        // Handle the case where the app can't be resolved
-                        Toast.makeText(this@MainActivity, "App not found", Toast.LENGTH_SHORT).show()
-                    }
-                } else {
-                    // Handle the case where app_launch_activity is not found
-                    Toast.makeText(this@MainActivity, "App launch activity not found", Toast.LENGTH_SHORT).show()
-                }
-            }
-        } else {
-            // Handle the case where app_packagename is null
-            Toast.makeText(this@MainActivity, "IPTV app not selected", Toast.LENGTH_SHORT).show()
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    private val overlayPermissionLauncher = registerForActivityResult(
-        ActivityResultContracts.StartActivityForResult()
-    ) { result ->
-        // Handle the result of the permission request
-        if (Settings.canDrawOverlays(this)) {
-            // Permission granted
-            Log.d("KOX","granted")
-        } else {
-            // Permission not granted
-            Log.d("KOX","not granted")
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    private fun requestOverlayPermission() {
-        if (!Settings.canDrawOverlays(this)) {
-//            val intent = Intent(
-//                Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
-//                Uri.parse("package:$packageName")
-//            )
-//            overlayPermissionLauncher.launch(intent)
-            showPARAM = true
-        }
-    }
-}
-
-
-
-
-data class BottomNavigationItem(
-    val title: String,
-    val selectedIcon: ImageVector,
-    val unselectedIcon: ImageVector,
-    val hasNews: Boolean
-)
-
-
-
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/activities/AppListActivity.kt b/app/src/main/java/com/skylake/skytv/jgorunner/activities/AppListActivity.kt
new file mode 100644
index 0000000..b10193e
--- /dev/null
+++ b/app/src/main/java/com/skylake/skytv/jgorunner/activities/AppListActivity.kt
@@ -0,0 +1,42 @@
+package com.skylake.skytv.jgorunner.activities
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Scaffold
+import androidx.compose.ui.Modifier
+import com.skylake.skytv.jgorunner.data.SkySharedPref
+import com.skylake.skytv.jgorunner.ui.screens.AppListScreen
+import com.skylake.skytv.jgorunner.ui.theme.JGOTheme
+
+class AppListActivity : ComponentActivity() {
+    private lateinit var preferenceManager: SkySharedPref
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        preferenceManager = SkySharedPref.getInstance(this)
+        enableEdgeToEdge()
+
+        setContent {
+            JGOTheme {
+                Scaffold(
+                    modifier = Modifier.fillMaxSize(),
+                ) { innerPadding ->
+                    AppListScreen(
+                        modifier = Modifier.padding(innerPadding),
+                        onAppSelected = { selectedApp ->
+                            preferenceManager.myPrefs.iptvAppName = selectedApp.appName
+                            preferenceManager.myPrefs.iptvAppPackageName = selectedApp.packageName
+                            preferenceManager.myPrefs.iptvAppLaunchActivity = selectedApp.launchActivity
+                            preferenceManager.savePreferences()
+                            finish()
+                        }
+                    )
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/activities/MainActivity.kt b/app/src/main/java/com/skylake/skytv/jgorunner/activities/MainActivity.kt
new file mode 100644
index 0000000..42c1c03
--- /dev/null
+++ b/app/src/main/java/com/skylake/skytv/jgorunner/activities/MainActivity.kt
@@ -0,0 +1,839 @@
+package com.skylake.skytv.jgorunner.activities
+
+import android.Manifest
+import android.annotation.SuppressLint
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.net.ConnectivityManager
+import android.net.LinkProperties
+import android.net.NetworkCapabilities
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.provider.Settings
+import android.util.Log
+import android.widget.Toast
+import androidx.activity.ComponentActivity
+import androidx.activity.OnBackPressedCallback
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.annotation.RequiresApi
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Scaffold
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.ketch.DownloadConfig
+import com.ketch.DownloadModel
+import com.ketch.Ketch
+import com.ketch.NotificationConfig
+import com.ketch.Status
+import com.skylake.skytv.jgorunner.BuildConfig
+import com.skylake.skytv.jgorunner.R
+import com.skylake.skytv.jgorunner.core.checkServerStatus
+import com.skylake.skytv.jgorunner.core.data.JTVConfigurationManager
+import com.skylake.skytv.jgorunner.core.execution.runBinary
+import com.skylake.skytv.jgorunner.core.execution.stopBinary
+import com.skylake.skytv.jgorunner.core.update.ApplicationUpdater
+import com.skylake.skytv.jgorunner.core.update.BinaryUpdater
+import com.skylake.skytv.jgorunner.core.update.DownloadProgress
+import com.skylake.skytv.jgorunner.data.SkySharedPref
+import com.skylake.skytv.jgorunner.services.BinaryService
+import com.skylake.skytv.jgorunner.ui.components.BottomNavigationBar
+import com.skylake.skytv.jgorunner.ui.components.CustPopup
+import com.skylake.skytv.jgorunner.ui.components.ProgressPopup
+import com.skylake.skytv.jgorunner.ui.components.RedirectPopup
+import com.skylake.skytv.jgorunner.ui.screens.DebugScreen
+import com.skylake.skytv.jgorunner.ui.screens.HomeScreen
+import com.skylake.skytv.jgorunner.ui.screens.InfoScreen
+import com.skylake.skytv.jgorunner.ui.screens.LoginScreen
+import com.skylake.skytv.jgorunner.ui.screens.RunnerScreen
+import com.skylake.skytv.jgorunner.ui.screens.SettingsScreen
+import com.skylake.skytv.jgorunner.ui.theme.JGOTheme
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.launch
+import okhttp3.OkHttpClient
+import org.cthing.versionparser.semver.SemanticVersion
+import java.net.Inet4Address
+import java.util.concurrent.Executors
+import java.util.concurrent.TimeUnit
+
+
+class MainActivity : ComponentActivity() {
+    companion object {
+        private const val TAG = "JTVGo::MainActivity"
+    }
+
+    private var selectedBinaryName by mutableStateOf("JTV-GO SERVER")
+    private lateinit var preferenceManager: SkySharedPref
+
+    // SharedPreferences for saving binary selection
+    private var outputText by mutableStateOf("ℹ️ Output logs")
+    private var currentScreen by mutableStateOf("Home") // Manage current screen
+
+    private val executor = Executors.newSingleThreadExecutor()
+    private var showBinaryUpdatePopup by mutableStateOf(false)
+    private var showAppUpdatePopup by mutableStateOf(false)
+    private var showLoginPopup by mutableStateOf(false)
+    private var isServerRunning by mutableStateOf(false)
+
+    private var isGlowBox by mutableStateOf(false)
+
+    private var showOverlayPermissionPopup by mutableStateOf(false)
+
+    private var showRedirectPopup by mutableStateOf(false)
+    private var shouldLaunchIPTV by mutableStateOf(false)
+    private var countdownJob: Job? = null
+
+    private var downloadProgress by mutableStateOf<DownloadProgress?>(null)
+    private var isSwitchOnForAutoStartForeground by mutableStateOf(false)
+
+    override fun onStart() {
+        super.onStart()
+        preferenceManager = SkySharedPref.getInstance(this)
+
+        JTVConfigurationManager.getInstance(this).saveJTVConfiguration()
+        isServerRunning = BinaryService.isRunning
+        if (isServerRunning) {
+            BinaryService.instance?.binaryOutput?.observe(this) {
+                outputText = it
+            }
+        }
+
+        // Check if server should start automatically
+        val isFlagSetForAutoStartServer = preferenceManager.myPrefs.autoStartServer
+        if (isFlagSetForAutoStartServer) {
+            Log.d(TAG, "Starting server automatically")
+            val arguments = emptyArray<String>()
+            runBinary(
+                activity = this,
+                arguments = arguments,
+                onRunSuccess = {
+                    onJTVServerRun()
+                },
+                onOutput = { output ->
+                    Log.d(TAG, output)
+                    outputText = output
+                }
+            )
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        if (isServerRunning)
+            onJTVServerRun()
+    }
+
+    @SuppressLint("UnspecifiedRegisterReceiverFlag")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
+        requestNotificationPermissions()
+        preferenceManager = SkySharedPref.getInstance(this)
+        isSwitchOnForAutoStartForeground = preferenceManager.myPrefs.autoStartOnBootForeground
+        if (!checkOverlayPermission() && isSwitchOnForAutoStartForeground) {
+            isSwitchOnForAutoStartForeground = false
+            preferenceManager.myPrefs.autoStartOnBootForeground = false
+            preferenceManager.savePreferences()
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            registerReceiver(
+                binaryStoppedReceiver,
+                IntentFilter(BinaryService.ACTION_BINARY_STOPPED),
+                RECEIVER_NOT_EXPORTED
+            )
+        } else {
+            registerReceiver(
+                binaryStoppedReceiver,
+                IntentFilter(BinaryService.ACTION_BINARY_STOPPED)
+            )
+        }
+
+        // Register the OnBackPressedCallback
+        onBackPressedDispatcher.addCallback(this, backPressedCallback)
+
+        setContent {
+            JGOTheme {
+                Scaffold(
+                    modifier = Modifier.fillMaxSize(),
+                    bottomBar = { BottomNavigationBar(setCurrentScreen = { currentScreen = it }) },
+                ) { innerPadding ->
+                    Column(
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .padding(innerPadding)
+                    ) {
+                        when (currentScreen) {
+                            "Home" -> HomeScreen(
+                                title = selectedBinaryName,
+                                titleShouldGlow = isGlowBox,
+                                isServerRunning = isServerRunning,
+                                publicJTVServerURL = getPublicJTVServerURL(context = this@MainActivity),
+                                outputText = outputText,
+                                onRunServerButtonClick = {
+                                    runBinary(
+                                        activity = this@MainActivity,
+                                        arguments = emptyArray(),
+                                        onRunSuccess = {
+                                            onJTVServerRun()
+                                        },
+                                        onOutput = { output ->
+                                            outputText = output
+                                        }
+                                    )
+                                },
+                                onStopServerButtonClick = {
+                                    stopBinary(
+                                        context = this@MainActivity,
+                                        onBinaryStopped = {
+                                            isGlowBox = false
+                                            isServerRunning = false
+                                            outputText = "Server stopped"
+                                        }
+                                    )
+                                },
+                                onRunIPTVButtonClick = {
+                                    iptvRedirectFunc()
+                                },
+                                onWebTVButtonClick = {
+                                    val intent =
+                                        Intent(this@MainActivity, WebPlayerActivity::class.java)
+                                    startActivity(intent)
+                                },
+                                onDebugButtonClick = {
+                                    currentScreen = "Debug"
+                                },
+                                onExitButtonClick = {
+                                    stopBinary(
+                                        context = this@MainActivity,
+                                        onBinaryStopped = {
+                                            isGlowBox = false
+                                            isServerRunning = false
+                                            outputText = "Server stopped"
+                                            finish()
+                                        }
+                                    )
+                                },
+                            )
+
+                            "Settings" -> SettingsScreen(
+                                activity = this@MainActivity,
+                                checkForUpdates = { checkForUpdates(true) },
+                                isSwitchOnForAutoStartForeground = isSwitchOnForAutoStartForeground,
+                                onAutoStartForegroundSwitch = {
+                                    if (it) {
+                                        requestOverlayPermission()
+                                    } else {
+                                        preferenceManager.myPrefs.autoStartOnBootForeground = false
+                                        preferenceManager.savePreferences()
+                                        isSwitchOnForAutoStartForeground = false
+                                    }
+                                })
+
+                            "Info" -> InfoScreen(context = this@MainActivity)
+                            "Debug" -> DebugScreen(
+                                context = this@MainActivity,
+                                onNavigate = { title -> currentScreen = title })
+
+                            "Runner" -> RunnerScreen(context = this@MainActivity)
+                            "Login" -> LoginScreen(context = this@MainActivity)
+                        }
+
+                        // Show the redirect popup
+                        RedirectPopup(
+                            appIPTV = preferenceManager.myPrefs.iptvAppName,
+                            appIPTVpkg = preferenceManager.myPrefs.iptvAppPackageName,
+                            isVisible = showRedirectPopup,
+                            countdownTime = preferenceManager.myPrefs.iptvLaunchCountdown,
+                            context = this@MainActivity,
+                            onDismiss = {
+                                showRedirectPopup = false
+
+                                // Cancel IPTV launch if dismissed
+                                shouldLaunchIPTV = false
+                            }
+                        )
+
+                        CustPopup(
+                            isVisible = showLoginPopup,
+                            title = "Login Required",
+                            text = "Please log in using WebTV, to access the server.",
+                            confirmButtonText = "Login",
+                            dismissButtonText = "Cancel",
+                            onConfirm = {
+                                showLoginPopup = false
+                                val intent =
+                                    Intent(this@MainActivity, WebPlayerActivity::class.java)
+                                startActivity(intent)
+                                Toast.makeText(
+                                    this@MainActivity,
+                                    "Opening WEBTV",
+                                    Toast.LENGTH_SHORT
+                                ).show()
+                                Log.d("DIX", "Opening WEBTV")
+                                return@CustPopup
+                            },
+                            onDismiss = {
+                                showLoginPopup = false
+                                return@CustPopup
+                            }
+                        )
+
+                        CustPopup(
+                            isVisible = showBinaryUpdatePopup,
+                            title = "Binary Update Available",
+                            text = "A new version of the binary is available. Update now?",
+                            confirmButtonText = "Update",
+                            dismissButtonText = "Later",
+                            onConfirm = {
+                                performBinaryUpdate()
+                                showBinaryUpdatePopup = false
+                            },
+                            onDismiss = {
+                                showBinaryUpdatePopup = false
+                            }
+                        )
+
+                        CustPopup(
+                            isVisible = showAppUpdatePopup,
+                            title = "App Update Available",
+                            text = "A new version of the app is available. Update now?",
+                            confirmButtonText = "Update",
+                            dismissButtonText = "Later",
+                            onConfirm = {
+                                performAppUpdate()
+                                showAppUpdatePopup = false
+                            },
+                            onDismiss = null
+                        )
+
+                        if (downloadProgress != null) {
+                            ProgressPopup(
+                                fileName = downloadProgress!!.fileName,
+                                currentProgress = downloadProgress!!.progress,
+                            )
+                        }
+
+                        CustPopup(
+                            isVisible = showOverlayPermissionPopup,
+                            title = "Request Permission",
+                            text = "Draw over other apps permission is required for the app to function properly.",
+                            confirmButtonText = "Grant",
+                            dismissButtonText = "Dismiss",
+                            onConfirm = {
+                                showOverlayPermissionPopup = false
+                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                                    val intent = Intent(
+                                        Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
+                                        Uri.parse("package:$packageName")
+                                    )
+                                    overlayPermissionLauncher.launch(intent)
+                                }
+                            },
+                            onDismiss = {
+                                isSwitchOnForAutoStartForeground = false
+                                showOverlayPermissionPopup = false
+                                Toast.makeText(
+                                    this@MainActivity,
+                                    "Permission is required to continue",
+                                    Toast.LENGTH_SHORT
+                                ).show()
+                            }
+                        )
+                    }
+                }
+            }
+
+            LaunchedEffect(Unit) {
+                val currentBinaryVersion = preferenceManager.myPrefs.jtvGoBinaryVersion
+                if (currentBinaryVersion == null || preferenceManager.myPrefs.enableAutoUpdate)
+                    checkForUpdates()
+            }
+        }
+    }
+
+    private val backPressedCallback = object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+            when (currentScreen) {
+                "Settings" -> {
+                    currentScreen = "Home"
+                }
+
+                "Debug" -> {
+                    currentScreen = "Home"
+                }
+
+                "Info" -> {
+                    currentScreen = "Debug"
+                }
+
+                "Runner" -> {
+                    currentScreen = "Debug"
+                }
+
+                "Login" -> {
+                    currentScreen = "Debug"
+                }
+
+                else -> {
+                    // Let the system handle the back press
+                    isEnabled = false
+                    onBackPressedDispatcher.onBackPressed()
+                }
+            }
+
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        backPressedCallback.remove()
+        unregisterReceiver(binaryStoppedReceiver)
+    }
+
+    private fun checkForUpdates(forceCheck: Boolean = false) {
+        // Binary update check
+        CoroutineScope(Dispatchers.IO).launch {
+            val currentBinaryVersion = preferenceManager.myPrefs.jtvGoBinaryVersion
+            val currentBinaryName = preferenceManager.myPrefs.jtvGoBinaryName
+            if (currentBinaryName.isNullOrEmpty() || currentBinaryVersion.isNullOrEmpty()) {
+                performBinaryUpdate()
+                return@launch
+            }
+
+            if (!preferenceManager.myPrefs.enableAutoUpdate && !forceCheck)
+                return@launch
+
+            val latestBinaryReleaseInfo = BinaryUpdater.fetchLatestReleaseInfo()
+            Log.d("DIX", "Current binary version: $currentBinaryVersion")
+            Log.d("DIX", "Latest binary version: ${latestBinaryReleaseInfo?.version}")
+
+            if (latestBinaryReleaseInfo?.version?.compareTo(
+                    SemanticVersion.parse(
+                        currentBinaryVersion
+                    )
+                ) == 1
+            ) {
+                showBinaryUpdatePopup = true
+                Log.d("DIX", "Binary update available")
+            } else {
+                if (forceCheck) {
+                    CoroutineScope(Dispatchers.Main).launch {
+                        Toast.makeText(
+                            this@MainActivity,
+                            "No binary updates available",
+                            Toast.LENGTH_SHORT
+                        )
+                            .show()
+                    }
+                }
+            }
+        }
+
+        // App Update check
+        CoroutineScope(Dispatchers.IO).launch {
+            if (!preferenceManager.myPrefs.enableAutoUpdate && !forceCheck)
+                return@launch
+
+            val currentAppVersion = BuildConfig.VERSION_NAME
+            val latestAppVersion = ApplicationUpdater.fetchLatestReleaseInfo()
+            if (latestAppVersion?.version?.compareTo(SemanticVersion.parse(currentAppVersion)) == 1) {
+                showAppUpdatePopup = true
+                Log.d("DIX", "App update available")
+            } else {
+                if (forceCheck) {
+                    CoroutineScope(Dispatchers.Main).launch {
+                        Toast.makeText(
+                            this@MainActivity,
+                            "No app updates available",
+                            Toast.LENGTH_SHORT
+                        )
+                            .show()
+                    }
+                }
+            }
+        }
+    }
+
+    private fun performBinaryUpdate() {
+        CoroutineScope(Dispatchers.IO).launch {
+            val latestBinaryReleaseInfo = BinaryUpdater.fetchLatestReleaseInfo()
+            if (latestBinaryReleaseInfo == null || latestBinaryReleaseInfo.downloadUrl.isEmpty()) {
+                return@launch
+            }
+
+            val previousBinaryName = preferenceManager.myPrefs.jtvGoBinaryName
+            if (!previousBinaryName.isNullOrEmpty()) {
+                val previousBinaryFile = filesDir.resolve(previousBinaryName)
+                if (previousBinaryFile.exists()) {
+                    previousBinaryFile.delete()
+                }
+            }
+            preferenceManager.myPrefs.jtvGoBinaryName = null
+            preferenceManager.myPrefs.jtvGoBinaryVersion = "v0.0.0"
+            preferenceManager.savePreferences()
+
+            downloadFile(
+                activity = this@MainActivity,
+                url = latestBinaryReleaseInfo.downloadUrl,
+                fileName = latestBinaryReleaseInfo.name,
+                path = filesDir.absolutePath,
+                onDownloadStatusUpdate = { downloadModel ->
+                    when (downloadModel.status) {
+                        Status.CANCELLED -> {
+                            this@MainActivity.downloadProgress = null
+                        }
+
+                        Status.FAILED -> {
+                            Log.e("DIX", "Download failed")
+                            Log.e("DIX", downloadModel.failureReason)
+                            this@MainActivity.downloadProgress = null
+                        }
+
+                        Status.SUCCESS -> {
+                            preferenceManager.myPrefs.jtvGoBinaryVersion =
+                                latestBinaryReleaseInfo.version.toString()
+                            preferenceManager.myPrefs.jtvGoBinaryName = latestBinaryReleaseInfo.name
+                            preferenceManager.savePreferences()
+                            Ketch.builder().build(this@MainActivity).clearAllDb(false)
+                            this@MainActivity.downloadProgress = null
+                        }
+
+                        else -> {
+                            this@MainActivity.downloadProgress = DownloadProgress(
+                                fileName = downloadModel.fileName,
+                                progress = downloadModel.progress
+                            )
+                        }
+                    }
+                }
+            )
+        }
+    }
+
+    private fun downloadFile(
+        activity: ComponentActivity,
+        url: String,
+        fileName: String,
+        path: String = activity.filesDir.absolutePath,
+        onDownloadStatusUpdate: (DownloadModel) -> Unit
+    ) {
+        val ketch = Ketch.builder()
+            .setOkHttpClient(
+                okHttpClient = OkHttpClient
+                    .Builder()
+                    .followRedirects(true)
+                    .followSslRedirects(true)
+                    .connectTimeout(10, TimeUnit.SECONDS)
+                    .readTimeout(10, TimeUnit.SECONDS)
+                    .build()
+            ).setDownloadConfig(
+                config = DownloadConfig(
+                    connectTimeOutInMs = 20000L,
+                    readTimeOutInMs = 15000L
+                )
+            ).setNotificationConfig(
+                config = NotificationConfig(
+                    enabled = true, // Default: false
+                    smallIcon = R.drawable.notifications_24px,
+                )
+            ).build(activity)
+        val id = ketch.download(url, path, fileName)
+        activity.lifecycleScope.launch {
+            activity.repeatOnLifecycle(Lifecycle.State.STARTED) {
+                ketch.observeDownloadById(id)
+                    .flowOn(Dispatchers.IO)
+                    .collect { downloadModel ->
+                        onDownloadStatusUpdate(downloadModel)
+                    }
+            }
+        }
+    }
+
+    private fun performAppUpdate() {
+        CoroutineScope(Dispatchers.IO).launch {
+            val latestAppVersion = ApplicationUpdater.fetchLatestReleaseInfo()
+            if (latestAppVersion == null || latestAppVersion.downloadUrl.isEmpty()) {
+                return@launch
+            }
+
+            ApplicationUpdater.downloadAppUpdate(
+                context = this@MainActivity,
+                downloadUrl = latestAppVersion.downloadUrl,
+                fileName = latestAppVersion.name,
+                onProgress = { progress ->
+                    downloadProgress = progress
+                }
+            )
+        }
+    }
+
+    private fun onJTVServerRun() {
+        // Check server status
+        val port = preferenceManager.myPrefs.jtvGoServerPort
+        CoroutineScope(Dispatchers.IO).launch {
+            checkServerStatus(
+                port = port,
+                onLoginSuccess = {
+                    isServerRunning = true
+                    isGlowBox = true
+
+                    if (preferenceManager.myPrefs.autoStartIPTV) {
+                        countdownJob?.cancel() // Cancel any existing countdown job
+
+                        var countdownTime = preferenceManager.myPrefs.iptvLaunchCountdown
+                        countdownJob = CoroutineScope(Dispatchers.Main).launch {
+                            showRedirectPopup = true
+                            shouldLaunchIPTV = true
+
+                            while (countdownTime > 0) {
+                                delay(1000)
+                                countdownTime--
+                            }
+
+                            showRedirectPopup = false
+
+                            if (shouldLaunchIPTV) {
+                                startIPTV()
+                            }
+                        }
+                    }
+                },
+                onLoginFailure = {
+                    isGlowBox = false
+                    isServerRunning = true
+                    showLoginPopup = true
+                },
+                onServerDown = {
+                    CoroutineScope(Dispatchers.Main).launch {
+                        isServerRunning = false
+                        isGlowBox = false
+                        Toast.makeText(this@MainActivity, "Server is down", Toast.LENGTH_SHORT)
+                            .show()
+                    }
+                },
+            )
+        }
+    }
+
+    @RequiresApi(Build.VERSION_CODES.TIRAMISU)
+    private val notificationPermissionLauncher = registerForActivityResult(
+        ActivityResultContracts.RequestMultiplePermissions()
+    ) { permissions ->
+        val notificationGranted = permissions[Manifest.permission.POST_NOTIFICATIONS] ?: false
+
+        if (!notificationGranted) {
+            Toast.makeText(
+                this,
+                "Notification permission is required to show alerts",
+                Toast.LENGTH_SHORT
+            ).show()
+        }
+    }
+
+    // Notification permission request
+    private fun requestNotificationPermissions() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            notificationPermissionLauncher.launch(arrayOf(Manifest.permission.POST_NOTIFICATIONS))
+        }
+    }
+
+    private fun startIPTV() {
+        executor.execute {
+            try {
+                runOnUiThread {
+                    val appPackageName = preferenceManager.myPrefs.iptvAppPackageName
+                    if (!appPackageName.isNullOrEmpty()) {
+                        Log.d("DIX", appPackageName)
+                        val appName = preferenceManager.myPrefs.iptvAppName
+
+                        if (appPackageName == "webtv") {
+                            val intent = Intent(this@MainActivity, WebPlayerActivity::class.java)
+                            Toast.makeText(this@MainActivity, "Opening WEBTV", Toast.LENGTH_SHORT)
+                                .show()
+                            Log.d("DIX", "Opening WEBTV")
+                            startActivity(intent)
+                        } else {
+                            val launchIntent =
+                                packageManager.getLaunchIntentForPackage(appPackageName)
+                            launchIntent?.let {
+                                Toast.makeText(
+                                    this@MainActivity,
+                                    "Opening $appName",
+                                    Toast.LENGTH_SHORT
+                                ).show()
+                                Log.d("DIX", "Opening $appName")
+                                startActivity(it)
+                            } ?: run {
+                                Toast.makeText(
+                                    this@MainActivity,
+                                    "Cannot find the specified application",
+                                    Toast.LENGTH_SHORT
+                                ).show()
+                                Log.d("DIX", "Cannot find the specified application")
+                            }
+                        }
+                    } else {
+                        Toast.makeText(this@MainActivity, "IPTV not set.", Toast.LENGTH_SHORT)
+                            .show()
+                        Log.d("DIX", "IPTV not set")
+                    }
+                }
+            } catch (e: Exception) {
+                Log.e("DIX", "Error starting IPTV", e)
+                runOnUiThread {
+                    Toast.makeText(this@MainActivity, "Error starting IPTV", Toast.LENGTH_SHORT)
+                        .show()
+                }
+                Log.d("DIX", "Error starting IPTV: ${e.message}")
+            }
+        }
+    }
+
+    private fun getPublicJTVServerURL(context: Context): String {
+        val connectivityManager =
+            context.getSystemService(CONNECTIVITY_SERVICE) as ConnectivityManager
+
+        val savedPortNumber = preferenceManager.myPrefs.jtvGoServerPort
+
+        val isPublic = !preferenceManager.myPrefs.serveLocal
+        if (!isPublic)
+            return "http://localhost:$savedPortNumber/playlist.m3u"
+
+        val activeNetwork = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            connectivityManager.activeNetwork
+        } else {
+            @Suppress("deprecation")
+            val networks = connectivityManager.allNetworks
+            if (networks.isNotEmpty()) networks[0] else null
+        }
+
+        if (activeNetwork != null) {
+            val networkCapabilities = connectivityManager.getNetworkCapabilities(activeNetwork)
+            if (networkCapabilities != null && networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) {
+                val linkProperties: LinkProperties? =
+                    connectivityManager.getLinkProperties(activeNetwork)
+                val ipAddresses = linkProperties?.linkAddresses
+                    ?.filter { it.address is Inet4Address } // Filter for IPv4 addresses
+                    ?.map { it.address.hostAddress }
+                val ipAddress = ipAddresses?.firstOrNull() // Get the first IPv4 address
+
+                if (ipAddress != null)
+                    return "http://$ipAddress:$savedPortNumber/playlist.m3u"
+            }
+        }
+
+        // WiFi is not connected or no public IP address found
+        return "Not connected to Wi-Fi"
+    }
+
+    // Receiver to handle binary stop action
+    private val binaryStoppedReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context?, intent: Intent?) {
+            if (intent?.action == BinaryService.ACTION_BINARY_STOPPED) {
+                isServerRunning = false
+                outputText = "Server stopped"
+            }
+        }
+    }
+
+    private fun iptvRedirectFunc() {
+        // Retrieve the app package name from shared preferences
+        val appPackageName = preferenceManager.myPrefs.iptvAppPackageName
+
+        if (!appPackageName.isNullOrEmpty()) {
+            Log.d("DIX", appPackageName)
+            // Retrieve other details
+            val appLaunchActivity = preferenceManager.myPrefs.iptvAppLaunchActivity
+            val appName = preferenceManager.myPrefs.iptvAppName
+
+            if (appPackageName == "webtv") {
+                val intent = Intent(this@MainActivity, WebPlayerActivity::class.java)
+                startActivity(intent)
+                Toast.makeText(this@MainActivity, "Starting: $appName", Toast.LENGTH_SHORT).show()
+            } else {
+                if (!appLaunchActivity.isNullOrEmpty()) {
+                    Log.d("DIX", appLaunchActivity)
+                    // Create an intent to launch the app
+                    val launchIntent = Intent().apply {
+                        setClassName(appPackageName, appLaunchActivity)
+                    }
+
+                    // Check if the app can be resolved
+                    val packageManager = this@MainActivity.packageManager
+                    if (launchIntent.resolveActivity(packageManager) != null) {
+                        // Start the activity
+                        startActivity(launchIntent)
+                        Toast.makeText(this@MainActivity, "Starting: $appName", Toast.LENGTH_SHORT)
+                            .show()
+                    } else {
+                        // Handle the case where the app can't be resolved
+                        Toast.makeText(this@MainActivity, "App not found", Toast.LENGTH_SHORT)
+                            .show()
+                    }
+                } else {
+                    // Handle the case where app_launch_activity is not found
+                    Toast.makeText(
+                        this@MainActivity,
+                        "App launch activity not found",
+                        Toast.LENGTH_SHORT
+                    ).show()
+                }
+            }
+        } else {
+            // Handle the case where app_packagename is null
+            Toast.makeText(this@MainActivity, "IPTV app not selected", Toast.LENGTH_SHORT).show()
+        }
+    }
+
+    @RequiresApi(Build.VERSION_CODES.M)
+    private val overlayPermissionLauncher = registerForActivityResult(
+        ActivityResultContracts.StartActivityForResult()
+    ) { _ ->
+        // Handle the result of the permission request
+        if (!Settings.canDrawOverlays(this)) {
+            isSwitchOnForAutoStartForeground = false
+            Toast.makeText(this, "Overlay permission Denied!", Toast.LENGTH_SHORT)
+                .show()
+        } else {
+            preferenceManager.myPrefs.autoStartOnBootForeground = true
+            preferenceManager.savePreferences()
+            isSwitchOnForAutoStartForeground = true
+        }
+    }
+
+    private fun checkOverlayPermission(): Boolean {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            Settings.canDrawOverlays(this)
+        } else true
+    }
+
+    private fun requestOverlayPermission() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            if (!Settings.canDrawOverlays(this)) {
+                showOverlayPermissionPopup = true
+            } else {
+                preferenceManager.myPrefs.autoStartOnBootForeground = true
+                preferenceManager.savePreferences()
+                isSwitchOnForAutoStartForeground = true
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/activities/WebPlayerActivity.kt b/app/src/main/java/com/skylake/skytv/jgorunner/activities/WebPlayerActivity.kt
new file mode 100644
index 0000000..994d0df
--- /dev/null
+++ b/app/src/main/java/com/skylake/skytv/jgorunner/activities/WebPlayerActivity.kt
@@ -0,0 +1,538 @@
+package com.skylake.skytv.jgorunner.activities
+
+import android.annotation.SuppressLint
+import android.content.res.Configuration
+import android.graphics.Bitmap
+import android.os.Build
+import android.os.Bundle
+import android.util.Log
+import android.view.KeyEvent
+import android.view.View
+import android.view.WindowInsets
+import android.view.WindowInsetsController
+import android.webkit.WebChromeClient
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import android.widget.ProgressBar
+import androidx.activity.ComponentActivity
+import androidx.activity.OnBackPressedCallback
+import com.skylake.skytv.jgorunner.R
+import com.skylake.skytv.jgorunner.data.SkySharedPref
+import org.json.JSONArray
+import org.json.JSONException
+import org.json.JSONObject
+import java.util.Locale
+
+class WebPlayerActivity : ComponentActivity() {
+    companion object {
+        private const val TAG = "WebPlayerActivity"
+        private const val DEFAULT_URL_TEMPLATE = "http://localhost:%d"
+    }
+
+    private var webView: WebView? = null
+    private var loadingSpinner: ProgressBar? = null
+    private var url: String? = null
+
+    private var channelNumbers: List<String>? = null
+    private var initURL: String? = null
+
+    private var currentPlayId: String? = null
+    private var currentLogoUrl: String? = null
+    private var currentChannelName: String? = null
+
+    private val recentChannels: MutableList<Channel> = ArrayList()
+
+    private val prefManager = SkySharedPref.getInstance(this)
+
+    private class Channel(var playId: String?, var logoUrl: String?, var channelName: String?)
+
+
+    @SuppressLint("SetJavaScriptEnabled")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_web_player)
+
+        val savedPortNumber = prefManager.myPrefs.jtvGoServerPort
+        url = String.format(Locale.getDefault(), DEFAULT_URL_TEMPLATE, savedPortNumber)
+
+        Log.d(TAG, "URL: $url")
+
+        setupBackPressedCallback()
+        setupFullScreenMode()
+
+        webView = findViewById(R.id.webview)
+        loadingSpinner = findViewById(R.id.loading_spinner)
+
+        setupWebView()
+        loadUrl()
+    }
+
+    private var playerUrlCount = 0
+
+    private fun setupBackPressedCallback() {
+        val callback: OnBackPressedCallback = object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                if (webView != null) {
+                    val currentUrl = webView!!.url
+
+                    if (currentUrl != null && currentUrl.contains("/player/")) {
+                        playerUrlCount++
+                        if (playerUrlCount >= 3) {
+                            webView!!.loadUrl(initURL!!)
+                        } else {
+                            webView!!.goBack()
+                        }
+                    } else if (webView!!.canGoBack()) {
+                        playerUrlCount++
+                        if (playerUrlCount >= 6) {
+                            finish()
+                        } else {
+                            webView!!.goBack()
+                        }
+                    } else {
+                        finish()
+                    }
+                } else {
+                    finish()
+                }
+            }
+        }
+        onBackPressedDispatcher.addCallback(this, callback)
+    }
+
+
+    private fun setupFullScreenMode() {
+//        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+        updateSystemUiVisibility()
+    }
+
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        updateSystemUiVisibility() // This maintains full-screen mode in both orientations
+    }
+
+
+    private fun updateSystemUiVisibility() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            window.setDecorFitsSystemWindows(false)
+            window.insetsController?.let { controller ->
+                controller.hide(WindowInsets.Type.statusBars() or WindowInsets.Type.navigationBars())
+                controller.systemBarsBehavior = WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+            }
+        } else {
+            @Suppress("deprecation")
+            window.decorView.systemUiVisibility = (View.SYSTEM_UI_FLAG_FULLSCREEN
+                    or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                    or View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY)
+        }
+    }
+
+    @SuppressLint("SetJavaScriptEnabled")
+    private fun setupWebView() {
+        webView!!.webViewClient = CustomWebViewClient()
+        webView!!.webChromeClient = WebChromeClient()
+
+        val webSettings = webView!!.settings
+        webSettings.javaScriptEnabled = true
+        webSettings.domStorageEnabled = true
+        webSettings.loadWithOverviewMode = true
+        webSettings.useWideViewPort = true
+        webSettings.defaultTextEncodingName = "utf-8"
+        webSettings.mediaPlaybackRequiresUserGesture = false // Allow autoplay
+    }
+
+    private fun loadUrl() {
+        if (url != null) {
+            webView!!.loadUrl(url!!)
+        }
+    }
+
+    private fun setDarkTheme() {
+        if (webView != null) {
+            val jsCode =
+                "document.getElementsByTagName('html')[0].setAttribute('data-theme', 'dark');" +
+                        "localStorage.setItem('theme', 'dark');"
+            webView!!.evaluateJavascript(jsCode, null)
+        }
+    }
+
+    override fun onPause() {
+        super.onPause()
+        webView!!.onPause()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        webView!!.onResume()
+    }
+
+    @SuppressLint("RestrictedApi")
+    override fun dispatchKeyEvent(event: KeyEvent): Boolean {
+        if (event.action == KeyEvent.ACTION_DOWN && webView!!.url != null && webView!!.url!!
+                .contains("/player/")
+        ) {
+            when (event.keyCode) {
+                KeyEvent.KEYCODE_DPAD_RIGHT -> {
+                    navigateToNextChannel()
+                    return true
+                }
+
+                KeyEvent.KEYCODE_DPAD_LEFT -> {
+                    navigateToPreviousChannel()
+                    return true
+                }
+            }
+        }
+        return super.dispatchKeyEvent(event)
+    }
+
+    private fun navigateToNextChannel() {
+        navigateChannel(1)
+    }
+
+    private fun navigateToPreviousChannel() {
+        navigateChannel(-1)
+    }
+
+    private fun navigateChannel(direction: Int) {
+        if (channelNumbers == null || channelNumbers!!.isEmpty()) {
+            Log.d(TAG, "No channel numbers available.")
+            return
+        }
+
+        Log.d(TAG, "Total channels available: " + channelNumbers!!.size)
+
+        val currentUrl = checkNotNull(webView!!.url)
+        val queryIndex = currentUrl.indexOf('?')
+
+        val currentNumber = if (queryIndex != -1) {
+            currentUrl.substring(currentUrl.lastIndexOf('/') + 1, queryIndex)
+        } else {
+            currentUrl.substring(currentUrl.lastIndexOf('/') + 1)
+        }
+
+        val index = channelNumbers!!.indexOf(currentNumber)
+
+        if (index >= 0) {
+            val newIndex = (index + direction + channelNumbers!!.size) % channelNumbers!!.size
+            val newNumber = channelNumbers!![newIndex]
+            val newUrl = if (queryIndex != -1) {
+                currentUrl.replace("/$currentNumber?", "/$newNumber?")
+            } else {
+                currentUrl.replace("/$currentNumber", "/$newNumber")
+            }
+
+            Log.d(TAG, "Navigating to Channel: $newUrl")
+            webView!!.loadUrl(newUrl)
+        } else {
+            Log.d(TAG, "Current number not found in channel numbers.")
+        }
+    }
+
+    private inner class CustomWebViewClient : WebViewClient() {
+        @Deprecated("Deprecated in Java")
+        override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean {
+            if (url.contains("/play/")) {
+                initURL = webView!!.url
+                Log.d(TAG, "Saving initURL: $initURL")
+
+                // Extract the play ID from the URL
+                //String playId = url.substring(url.lastIndexOf("/play/") + 6); // Extracting play ID
+                val playId = if (url.matches(".*\\/play\\/([^\\/]+).*".toRegex())) url.replace(
+                    ".*\\/play\\/([^\\/]+).*".toRegex(),
+                    "$1"
+                ) else null
+
+
+                Log.d("WB", playId!!)
+
+                // Use JavaScript to extract the channel logo and name
+                view.evaluateJavascript(
+                    "(function() { " +
+                            "try { " +
+                            "    var channelCard = document.querySelector('a[href*=\"/play/" + playId + "\"]'); " +
+                            "    if (channelCard) { " +
+                            "        var logoElement = channelCard.querySelector('img'); " +
+                            "        var nameElement = channelCard.querySelector('span'); " +
+                            "        var logoUrl = logoElement ? logoElement.getAttribute('src') : null; " +
+                            "        var channelName = nameElement ? nameElement.innerText : null; " +
+                            "        return JSON.stringify({playId: '" + playId + "', logoUrl: logoUrl, channelName: channelName}); " +
+                            "    } else { " +
+                            "        return null; " +
+                            "    } " +
+                            "} catch (error) { " +
+                            "    return null; " +
+                            "} " +
+                            "})();"
+                ) { result: String? ->
+                    if (result != null && result != "null") {
+                        try {
+                            // Remove any extra quotes surrounding the JSON result
+                            val jsonString =
+                                result.replace("^\"|\"$".toRegex(), "").replace("\\\"", "\"")
+                            val jsonResult = JSONObject(jsonString)
+                            currentPlayId = jsonResult.getString("playId")
+                            currentLogoUrl = jsonResult.getString("logoUrl")
+                            currentChannelName = jsonResult.getString("channelName")
+
+                            Log.d(
+                                TAG,
+                                "Channel Clicked: $currentChannelName (Play ID: $currentPlayId)"
+                            )
+                            saveRecentChannel(currentPlayId, currentLogoUrl, currentChannelName)
+                        } catch (e: JSONException) {
+                            Log.d(
+                                TAG,
+                                "JSON parsing error: " + e.message
+                            )
+                        }
+                    } else {
+                        Log.d(
+                            TAG,
+                            "No channel data extracted."
+                        )
+                    }
+                }
+
+
+                val newUrl = url.replace("/play/", "/player/")
+                Log.d(
+                    TAG,
+                    "Loading new player URL: $newUrl"
+                )
+                webView!!.loadUrl(newUrl)
+                return true
+            } else if (!url.contains("/play/") && !url.contains("/player/")) {
+                initURL = url
+                return false
+            }
+            return false
+        }
+
+        override fun onPageStarted(view: WebView, url: String, favicon: Bitmap?) {
+            loadingSpinner!!.visibility = View.VISIBLE
+        }
+
+        override fun onPageFinished(view: WebView, url: String) {
+            loadingSpinner!!.visibility = View.GONE
+            if (url.contains("/player/")) {
+                Log.d(TAG, "Playing: $url")
+                setupFullScreenMode()
+                playVideoInFullScreen(view)
+            } else {
+                moveSearchInput(view)
+                extractChannelNumbers()
+                loadRecentChannels()
+            }
+        }
+
+        fun extractChannelNumbers() {
+            webView!!.evaluateJavascript(
+                "Array.from(document.querySelectorAll('.card')).map(card => card.getAttribute('href').match(/\\/play\\/(\\d+)/)[1])"
+            ) { it: String? ->
+                var result = it
+                if (!result.isNullOrEmpty()) {
+                    result = result.replace("[", "").replace("]", "").replace("\"", "")
+                    channelNumbers = listOf(
+                        *result.split(",".toRegex()).dropLastWhile { it.isEmpty() }
+                            .toTypedArray())
+                    Log.d(
+                        TAG,
+                        "Channel Numbers: $channelNumbers"
+                    )
+                }
+            }
+        }
+
+        fun playVideoInFullScreen(view: WebView) {
+            val width = "100vw"
+            val height = "auto"
+            val objectFit = "contain"
+
+            val script = """
+        javascript:(function() {
+            try {
+                var video = document.getElementsByTagName('video')[0];
+                if (video) {
+                    video.style.width = '$width';
+                    video.style.height = '$height';
+                    video.style.objectFit = '$objectFit';
+                    video.play();
+                } else {
+                    console.error('No video element found');
+                }
+            } catch (e) {
+                console.error('Error in full-screen script:', e);
+            }
+        })()
+    """.trimIndent()
+
+            view.evaluateJavascript(script, null)
+        }
+
+
+
+
+        fun moveSearchInput(view: WebView) {
+            view.loadUrl(
+                "javascript:(function() { " +
+                        "var searchButton = document.getElementById('portexe-search-button'); " +
+                        "var searchInput = document.getElementById('portexe-search-input'); " +
+                        "if (searchButton && searchInput) { " +
+                        "  searchButton.parentNode.insertBefore(searchInput, searchButton.nextSibling); " +
+                        "} " +
+                        "})()"
+            )
+        }
+    }
+
+    private fun injectTVChannel(channelName: String?, playId: String, logoUrl: String?) {
+        val jsCode = "javascript:(function() {" +
+                "console.log('Starting channel injection process...');" +
+                "var channelGrid = document.querySelector('.grid.grid-cols-2');" +
+                "console.log('Attempting to find the channel grid:', channelGrid);" +
+                "if (channelGrid) {" +
+                "  console.log('Channel grid found:', channelGrid);" +
+                "  var existingChannel = document.querySelector('a[href=\"/play/" + playId + "\"]');" +
+                "  console.log('Checking for existing channel with playId:', '" + playId + "');" +
+                "  if (existingChannel) {" +
+                "    console.log('Channel with playId ' + '" + playId + "' + ' already exists, skipping injection.');" +
+                "  } else {" +
+                "    console.log('Channel does not exist. Proceeding with channel injection...');" +
+                "    var newChannel = document.createElement('a');" +
+                "    newChannel.href = '/play/" + playId + "';" +
+                "    newChannel.className = 'card border-2 border-gold shadow-lg hover:shadow-xl hover:bg-base-300 transition-all duration-200 ease-in-out scale-100 hover:scale-105';" +
+                "    var cardContent = `<div class=\"flex flex-col items-center p-2 sm:p-4\">" +
+                "      <img src=\"" + logoUrl + "\" loading=\"lazy\" alt=\"" + channelName + "\" class=\"h-14 w-14 sm:h-16 sm:w-16 md:h-18 md:w-18 lg:h-20 lg:w-20 rounded-full bg-gray-200\" />" +
+                "      <span class=\"text-lg font-bold mt-2\">" + channelName + "</span>" +
+                "      <div class=\"absolute top-2 right-2\">" +
+                "        <svg xmlns=\"http://www.w3.org/2000/svg\" width=\"16\" height=\"16\" fill=\"gold\" viewBox=\"0 -960 960 960\">" +
+                "        <path d=\"M480-269 314-169q-11 7-23 6t-21-8q-9-7-14-17.5t-2-23.5l44-189-147-127q-10-9-12.5-20.5T140-571q4-11 12-18t22-9l194-17 75-178q5-12 15.5-18t21.5-6q11 0 21.5 6t15.5 18l75 178 194 17q14 2 22 9t12 18q4 11 1.5 22.5T809-528L662-401l44 189q3 13-2 23.5T690-171q-9 7-21 8t-23-6L480-269Z\"/>  " +
+                "        </svg>" +
+                "      </div>" +
+                "    </div>`;" +
+                "    newChannel.innerHTML = cardContent;" +
+                "    channelGrid.insertBefore(newChannel, channelGrid.firstChild);" +
+                "    console.log('Successfully injected new channel:', newChannel);" +
+                "  }" +
+                "} else {" +
+                "  console.log('Failed to find the channel grid. Injection skipped.');" +
+                "}" +
+                "})()"
+
+        webView!!.evaluateJavascript(jsCode, null)
+        Log.d("ChannelInjection", "JavaScript code injected into the WebView.")
+    }
+
+
+    private fun saveRecentChannel(playId: String?, logoUrl: String?, channelName: String?) {
+        // Load existing recent channels from preferenceManager
+        val recentChannelsJson = prefManager.myPrefs.recentChannelsJson
+        if (!recentChannelsJson.isNullOrEmpty()) {
+            try {
+                val jsonArray = JSONArray(recentChannelsJson)
+                recentChannels.clear()
+                for (i in 0 until jsonArray.length()) {
+                    val jsonObject = jsonArray.getJSONObject(i)
+                    recentChannels.add(
+                        Channel(
+                            jsonObject.getString("playId"),
+                            jsonObject.getString("logoUrl"),
+                            jsonObject.getString("channelName")
+                        )
+                    )
+                }
+            } catch (e: JSONException) {
+                Log.d(
+                    TAG,
+                    "Error loading recent channels: $e"
+                )
+            }
+        }
+
+        // Check if the channel with the given channelName already exists and remove it if found
+        val iterator = recentChannels.iterator()
+        while (iterator.hasNext()) {
+            val channel = iterator.next()
+            if (channel.channelName == channelName) {
+                iterator.remove()
+            }
+        }
+
+        recentChannels.add(0, Channel(playId, logoUrl, channelName))
+
+        // Keep only the latest 5 channels
+        if (recentChannels.size > 5) {
+            recentChannels.removeAt(recentChannels.size - 1)
+        }
+
+        // Convert updated list to JSON array and save back to preferences
+        val jsonArray = JSONArray()
+        for (channel in recentChannels) {
+            try {
+                val jsonObject = JSONObject()
+                jsonObject.put("playId", channel.playId)
+                jsonObject.put("logoUrl", channel.logoUrl)
+                jsonObject.put("channelName", channel.channelName)
+                jsonArray.put(jsonObject)
+            } catch (e: JSONException) {
+                Log.d(TAG, e.toString())
+            }
+        }
+
+        prefManager.myPrefs.recentChannelsJson = jsonArray.toString()
+        prefManager.savePreferences()
+    }
+
+    private fun loadRecentChannels() {
+        val channelData = prefManager.myPrefs.recentChannelsJson
+
+        Log.d(
+            TAG,
+            "Channel Data from Shared Preferences: $channelData"
+        )
+
+        if (!channelData.isNullOrEmpty()) {
+            recentChannels.clear() // Clear existing list
+            try {
+                val jsonArray = JSONArray(channelData)
+
+                // Iterate in reverse
+                for (i in jsonArray.length() - 1 downTo 0) {
+                    val jsonObject = jsonArray.getJSONObject(i)
+                    val playId = jsonObject.getString("playId")
+                    val logoUrl = jsonObject.getString("logoUrl")
+                    val channelName = jsonObject.getString("channelName")
+
+                    // Log each channel's details to confirm parsing
+                    Log.d(
+                        TAG,
+                        "Parsed Channel - Play ID: $playId, Logo URL: $logoUrl, Name: $channelName"
+                    )
+
+                    recentChannels.add(Channel(playId, logoUrl, channelName))
+                }
+            } catch (e: JSONException) {
+                Log.e(TAG, "JSON parsing error in loadRecentChannels: " + e.message)
+            }
+        }
+
+        for (channel in recentChannels) {
+            val formattedPlayId = if (!channel.playId!!.endsWith("//")) {
+                channel.playId + "//"
+            } else {
+                channel.playId
+            }
+
+            Log.d(
+                TAG,
+                "Injecting Channel into WebView - Name: ${channel.channelName}, Play ID: $formattedPlayId"
+            )
+
+            if (formattedPlayId != null) {
+                injectTVChannel(channel.channelName, formattedPlayId, channel.logoUrl)
+            }
+        }
+
+    }
+}
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/activity/AppListActivity.kt b/app/src/main/java/com/skylake/skytv/jgorunner/activity/AppListActivity.kt
deleted file mode 100644
index c122e41..0000000
--- a/app/src/main/java/com/skylake/skytv/jgorunner/activity/AppListActivity.kt
+++ /dev/null
@@ -1,171 +0,0 @@
-package com.skylake.skytv.jgorunner.activity
-
-import android.R
-import android.content.Context
-import android.content.Intent
-import android.content.pm.ApplicationInfo
-import android.content.pm.PackageManager
-import android.content.pm.ResolveInfo
-import android.graphics.drawable.Drawable
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.asImageBitmap
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.graphics.Color
-import androidx.core.graphics.drawable.toBitmap
-import com.skylake.skytv.jgorunner.data.SkySharedPref
-import kotlinx.coroutines.launch
-
-class AppListActivity : ComponentActivity() {
-
-    private lateinit var preferenceManager: SkySharedPref
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        preferenceManager = SkySharedPref(this)
-
-        setContent {
-            AppListScreen(
-                onAppSelected = { selectedApp ->
-                    preferenceManager.setKey("app_name", selectedApp.appName)
-                    preferenceManager.setKey("app_packagename", selectedApp.packageName)
-                    preferenceManager.setKey("app_launch_activity", selectedApp.launchActivity)
-                    finish()
-                }
-            )
-        }
-    }
-}
-
-@Composable
-fun AppListScreen(onAppSelected: (AppInfo) -> Unit) {
-    val context = LocalContext.current
-    val apps = remember { mutableStateListOf<AppInfo>() }
-    val coroutineScope = rememberCoroutineScope()
-
-    LaunchedEffect(Unit) {
-        coroutineScope.launch {
-            val installedApps = getInstalledApps(context)
-
-            val addedOptions = listOf(
-                AppInfo(
-                    appName = "No IPTV",
-                    icon = context.getDrawable(R.drawable.ic_menu_close_clear_cancel)!!,
-                    packageName = "",
-                    launchActivity = ""
-                ),
-                AppInfo(
-                    appName = "WEB TV",
-                    icon = context.getDrawable(com.skylake.skytv.jgorunner.R.mipmap.ic_launcher_neo)!!,
-                    packageName = "webtv",
-                    launchActivity = ""
-                )
-            )
-
-
-            val sortedInstalledApps = installedApps.sortedBy { it.appName }
-            apps.addAll(addedOptions)
-            apps.addAll(sortedInstalledApps)
-        }
-    }
-
-    LazyColumn(modifier = Modifier.fillMaxSize().padding(16.dp)) {
-        items(apps) { app ->
-            AppListItem(appInfo = app, onAppSelected = onAppSelected)
-            HorizontalDivider(color = Color.Gray, thickness = 1.dp)
-        }
-    }
-}
-
-
-
-@Composable
-fun AppListItem(appInfo: AppInfo, onAppSelected: (AppInfo) -> Unit) {
-    Row(
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(8.dp)
-            .clickable { onAppSelected(appInfo) }
-    ) {
-        val drawable = appInfo.icon
-        val bitmap = drawable.toBitmap().asImageBitmap()
-
-        Image(
-            bitmap = bitmap,
-            contentDescription = "App Icon",
-            modifier = Modifier.size(48.dp),
-            contentScale = ContentScale.Crop
-        )
-
-        Spacer(modifier = Modifier.width(16.dp))
-
-        Box(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(vertical = 8.dp)
-        ) {
-            Text(
-                text = appInfo.appName,
-                style = MaterialTheme.typography.bodyMedium,
-                modifier = Modifier.align(Alignment.CenterStart)
-            )
-        }
-    }
-}
-
-
-data class AppInfo(
-    val appName: String,
-    val icon: Drawable,
-    val packageName: String,
-    val launchActivity: String
-)
-
-fun getInstalledApps(context: Context): List<AppInfo> {
-    val packageManager: PackageManager = context.packageManager
-    val mainIntent = Intent(Intent.ACTION_MAIN, null).apply {
-        addCategory(Intent.CATEGORY_LAUNCHER)
-    }
-
-    val resolveInfos: List<ResolveInfo> = packageManager.queryIntentActivities(mainIntent, 0)
-    val apps = mutableListOf<AppInfo>()
-
-    val noneOption = AppInfo(
-        appName = "No IPTV",
-        icon = context.getDrawable(R.drawable.ic_menu_close_clear_cancel)!!,
-        packageName = "",
-        launchActivity = ""
-    )
-    apps.add(noneOption)
-
-    val webOption = AppInfo(
-        appName = "WEB TV",
-        icon = context.getDrawable(com.skylake.skytv.jgorunner.R.mipmap.ic_launcher_neo)!!,
-        packageName = "webtv",
-        launchActivity = ""
-    )
-    apps.add(webOption)
-
-    for (info in resolveInfos) {
-        val appInfo: ApplicationInfo = info.activityInfo.applicationInfo
-        val appName = appInfo.loadLabel(packageManager).toString()
-        val appIcon = appInfo.loadIcon(packageManager)
-        val packageName = appInfo.packageName
-        val launchActivity = info.activityInfo.name
-
-        apps.add(AppInfo(appName, appIcon, packageName, launchActivity))
-    }
-    return apps
-}
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/activity/WebPlayerActivity.java b/app/src/main/java/com/skylake/skytv/jgorunner/activity/WebPlayerActivity.java
deleted file mode 100644
index 29ad2e6..0000000
--- a/app/src/main/java/com/skylake/skytv/jgorunner/activity/WebPlayerActivity.java
+++ /dev/null
@@ -1,539 +0,0 @@
-package com.skylake.skytv.jgorunner.activity;
-
-import android.annotation.SuppressLint;
-import android.content.pm.ActivityInfo;
-import android.content.res.Configuration;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.View;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.ProgressBar;
-
-import androidx.activity.ComponentActivity;
-import androidx.activity.OnBackPressedCallback;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.skylake.skytv.jgorunner.R;
-import com.skylake.skytv.jgorunner.data.SkySharedPref;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-public class WebPlayerActivity extends ComponentActivity {
-
-    private static final String TAG = "WebPlayerActivity";
-    private static final String PORT_PREF_KEY = "isCustomSetForPORT";
-    private static final String DEFAULT_URL_TEMPLATE = "http://localhost:%d";
-
-    private WebView webView;
-    private ProgressBar loadingSpinner;
-    private String url;
-
-    private List<String> channelNumbers;
-    private String initURL;
-
-    private String currentPlayId;
-    private String currentLogoUrl;
-    private String currentChannelName;
-
-    private static final String RECENT_CHANNELS_KEY = "recent_channels";
-    private final List<Channel> recentChannels = new ArrayList<>();
-
-
-    private static class Channel {
-        String playId;
-        String logoUrl;
-        String channelName;
-
-        Channel(String playId, String logoUrl, String channelName) {
-            this.playId = playId;
-            this.logoUrl = logoUrl;
-            this.channelName = channelName;
-        }
-    }
-
-
-    @SuppressLint("SetJavaScriptEnabled")
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_web_player);
-
-        int savedPortNumber = getSavedPortNumber();
-        url = String.format(DEFAULT_URL_TEMPLATE, savedPortNumber);
-
-        Log.d(TAG, "URL: " + url);
-
-        setupBackPressedCallback();
-        setupFullScreenMode();
-
-        webView = findViewById(R.id.webview);
-        loadingSpinner = findViewById(R.id.loading_spinner);
-
-        setupWebView();
-        loadUrl();
-    }
-
-    private int getSavedPortNumber() {
-        SkySharedPref preferenceManager = new SkySharedPref(this);
-        String portString = preferenceManager.getKey(PORT_PREF_KEY);
-        return portString != null ? Integer.parseInt(portString) : 5350; // Default to 5350 if not set
-    }
-
-    private int playerUrlCount = 0;
-
-    private void setupBackPressedCallback() {
-        OnBackPressedCallback callback = new OnBackPressedCallback(true) {
-            @Override
-            public void handleOnBackPressed() {
-                if (webView != null) {
-                    String currentUrl = webView.getUrl();
-
-                    if (currentUrl != null && currentUrl.contains("/player/")) {
-                        playerUrlCount++;
-                        if (playerUrlCount >= 3) {
-                            webView.loadUrl(initURL);
-                        } else {
-                            webView.goBack();
-                        }
-                    } else if (webView.canGoBack()) {
-                        playerUrlCount++;
-                        if (playerUrlCount >= 6) {
-                            finish();
-                        } else {
-                            webView.goBack();
-                        }
-                    } else {
-                        finish();
-                    }
-                } else {
-                    finish();
-                }
-            }
-        };
-        getOnBackPressedDispatcher().addCallback(this, callback);
-    }
-
-
-    private void setupFullScreenMode() {
-//        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-        updateSystemUiVisibility();
-    }
-
-    @Override
-    public void onConfigurationChanged(@NonNull Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        updateSystemUiVisibility();  // This maintains full-screen mode in both orientations
-    }
-
-
-
-    private void updateSystemUiVisibility() {
-        getWindow().getDecorView().setSystemUiVisibility(
-                View.SYSTEM_UI_FLAG_FULLSCREEN |
-                        View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
-                        View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-        );
-    }
-
-    @SuppressLint("SetJavaScriptEnabled")
-    private void setupWebView() {
-        webView.setWebViewClient(new CustomWebViewClient());
-        webView.setWebChromeClient(new WebChromeClient());
-
-        WebSettings webSettings = webView.getSettings();
-        webSettings.setJavaScriptEnabled(true);
-        webSettings.setDomStorageEnabled(true);
-        webSettings.setLoadWithOverviewMode(true);
-        webSettings.setUseWideViewPort(true);
-        webSettings.setDefaultTextEncodingName("utf-8");
-        webSettings.setMediaPlaybackRequiresUserGesture(false); // Allow autoplay
-    }
-
-    private void loadUrl() {
-        if (url != null) {
-            webView.loadUrl(url);
-        }
-    }
-
-    private void setDarkTheme() {
-        if (webView != null) {
-            String jsCode = "document.getElementsByTagName('html')[0].setAttribute('data-theme', 'dark');" +
-                    "localStorage.setItem('theme', 'dark');";
-            webView.evaluateJavascript(jsCode, null);
-        }
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        webView.onPause();
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        webView.onResume();
-    }
-
-    @SuppressLint("RestrictedApi")
-    @Override
-    public boolean dispatchKeyEvent(KeyEvent event) {
-        if (event.getAction() == KeyEvent.ACTION_DOWN && webView.getUrl() != null && webView.getUrl().contains("/player/")) {
-            switch (event.getKeyCode()) {
-                case KeyEvent.KEYCODE_DPAD_RIGHT:
-                    navigateToNextChannel();
-                    return true;
-                case KeyEvent.KEYCODE_DPAD_LEFT:
-                    navigateToPreviousChannel();
-                    return true;
-            }
-        }
-        return super.dispatchKeyEvent(event);
-    }
-
-    private void navigateToNextChannel() {
-        navigateChannel(1);
-    }
-
-    private void navigateToPreviousChannel() {
-        navigateChannel(-1);
-    }
-
-    private void navigateChannel(int direction) {
-        if (channelNumbers == null || channelNumbers.isEmpty()) {
-            Log.d(TAG, "No channel numbers available.");
-            return;
-        }
-
-        Log.d(TAG, "Total channels available: " + channelNumbers.size());
-
-        String currentUrl = webView.getUrl();
-        assert currentUrl != null;
-
-        int queryIndex = currentUrl.indexOf('?');
-        String currentNumber;
-
-        if (queryIndex != -1) {
-            currentNumber = currentUrl.substring(currentUrl.lastIndexOf('/') + 1, queryIndex);
-        } else {
-            currentNumber = currentUrl.substring(currentUrl.lastIndexOf('/') + 1);
-        }
-
-        int index = channelNumbers.indexOf(currentNumber);
-
-        if (index >= 0) {
-            int newIndex = (index + direction + channelNumbers.size()) % channelNumbers.size();
-            String newNumber = channelNumbers.get(newIndex);
-
-            String newUrl;
-            if (queryIndex != -1) {
-                newUrl = currentUrl.replace("/" + currentNumber + "?", "/" + newNumber + "?");
-            } else {
-                newUrl = currentUrl.replace("/" + currentNumber, "/" + newNumber);
-            }
-
-            Log.d(TAG, "Navigating to Channel: " + newUrl);
-            webView.loadUrl(newUrl);
-        } else {
-            Log.d(TAG, "Current number not found in channel numbers.");
-        }
-    }
-
-    private class CustomWebViewClient extends WebViewClient {
-        @Override
-        public boolean shouldOverrideUrlLoading(WebView view, String url) {
-            if (url.contains("/play/")) {
-                initURL = webView.getUrl();
-                Log.d(TAG, "Saving initURL: " + initURL);
-
-                // Extract the play ID from the URL
-                //String playId = url.substring(url.lastIndexOf("/play/") + 6); // Extracting play ID
-
-                String playId = url.matches(".*\\/play\\/([^\\/]+).*") ? url.replaceAll(".*\\/play\\/([^\\/]+).*", "$1") : null;
-
-
-                Log.d("WB", playId);
-
-                // Use JavaScript to extract the channel logo and name
-                view.evaluateJavascript(
-                        "(function() { " +
-                                "try { " +
-                                "    var channelCard = document.querySelector('a[href*=\"/play/" + playId + "\"]'); " +
-                                "    if (channelCard) { " +
-                                "        var logoElement = channelCard.querySelector('img'); " +
-                                "        var nameElement = channelCard.querySelector('span'); " +
-                                "        var logoUrl = logoElement ? logoElement.getAttribute('src') : null; " +
-                                "        var channelName = nameElement ? nameElement.innerText : null; " +
-                                "        return JSON.stringify({playId: '" + playId + "', logoUrl: logoUrl, channelName: channelName}); " +
-                                "    } else { " +
-                                "        return null; " +
-                                "    } " +
-                                "} catch (error) { " +
-                                "    return null; " +
-                                "} " +
-                                "})();", result -> {
-                            if (result != null && !result.equals("null")) {
-                                try {
-                                    // Remove any extra quotes surrounding the JSON result
-                                    String jsonString = result.replaceAll("^\"|\"$", "").replace("\\\"", "\"");
-                                    JSONObject jsonResult = new JSONObject(jsonString);
-                                    currentPlayId = jsonResult.getString("playId");
-                                    currentLogoUrl = jsonResult.getString("logoUrl");
-                                    currentChannelName = jsonResult.getString("channelName");
-
-                                    Log.d(TAG, "Channel Clicked: " + currentChannelName + " (Play ID: " + currentPlayId + ")");
-                                    saveRecentChannel(currentPlayId, currentLogoUrl, currentChannelName);
-                                } catch (JSONException e) {
-                                    Log.d(TAG, "JSON parsing error: " + e.getMessage());
-                                }
-                            } else {
-                                Log.d(TAG, "No channel data extracted.");
-                            }
-                        });
-
-
-                String newUrl = url.replace("/play/", "/player/");
-                Log.d(TAG, "Loading new player URL: " + newUrl);
-                webView.loadUrl(newUrl);
-                return true;
-            } else if (!url.contains("/play/") && !url.contains("/player/")) {
-                initURL = url;
-                return false;
-            }
-            return false;
-        }
-
-            @Override
-        public void onPageStarted(WebView view, String url, android.graphics.Bitmap favicon) {
-            loadingSpinner.setVisibility(View.VISIBLE);
-        }
-
-        @Override
-        public void onPageFinished(WebView view, String url) {
-            loadingSpinner.setVisibility(View.GONE);
-            if (url.contains("/player/")) {
-                Log.d(TAG, "Playing: " + url);
-                setupFullScreenMode();
-                playVideoInFullScreen(view);
-            } else{
-                moveSearchInput(view);
-                extractChannelNumbers();
-                loadRecentChannels();
-            }
-        }
-
-        private void extractChannelNumbers() {
-            webView.evaluateJavascript("Array.from(document.querySelectorAll('.card')).map(card => card.getAttribute('href').match(/\\/play\\/(\\d+)/)[1])", result -> {
-                if (result != null && !result.isEmpty()) {
-                    result = result.replace("[", "").replace("]", "").replace("\"", "");
-                    channelNumbers = Arrays.asList(result.split(","));
-                    Log.d(TAG, "Channel Numbers: " + channelNumbers);
-                }
-            });
-        }
-
-        private void playVideoInFullScreen(WebView view) {
-            int orientation = getResources().getConfiguration().orientation;
-
-            if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
-                view.loadUrl("javascript:(function() { " +
-                        "var video = document.getElementsByTagName('video')[0]; " +
-                        "if (video) { " +
-                        "  video.style.width = '100vw'; " +  // Use full viewport width
-                        "  video.style.height = '100vh'; " + // Use full viewport height
-                        "  video.style.objectFit = 'contain'; " + // Maintain aspect ratio, contain in view
-                        "  video.play(); " +
-                        "} " +
-                        "})()");
-            } else if (orientation == Configuration.ORIENTATION_PORTRAIT) {
-                view.loadUrl("javascript:(function() { " +
-                        "var video = document.getElementsByTagName('video')[0]; " +
-                        "if (video) { " +
-                        "  video.style.width = '100vw'; " +  // Use full viewport width
-                        "  video.style.height = 'auto'; " +  // Automatically adjust height based on width
-                        "  video.style.objectFit = 'contain'; " + // Maintain aspect ratio
-                        "  video.play(); " +
-                        "} " +
-                        "})()");
-            }
-        }
-
-
-        private void moveSearchInput(WebView view) {
-            view.loadUrl("javascript:(function() { " +
-                    "var searchButton = document.getElementById('portexe-search-button'); " +
-                    "var searchInput = document.getElementById('portexe-search-input'); " +
-                    "if (searchButton && searchInput) { " +
-                    "  searchButton.parentNode.insertBefore(searchInput, searchButton.nextSibling); " +
-                    "} " +
-                    "})()");
-        }
-    }
-
-    private void injectTVChannel(String channelName, String playId, String logoUrl) {
-
-        String jsCode = "javascript:(function() {" +
-                "console.log('Starting channel injection process...');" +
-
-                "var channelGrid = document.querySelector('.grid.grid-cols-2');" +
-                "console.log('Attempting to find the channel grid:', channelGrid);" +
-
-                "if (channelGrid) {" +
-                "  console.log('Channel grid found:', channelGrid);" +
-                "  var existingChannel = document.querySelector('a[href=\"/play/" + playId + "\"]');" +
-                "  console.log('Checking for existing channel with playId:', '" + playId + "');" +
-
-                "  if (existingChannel) {" +
-                "    console.log('Channel with playId ' + '" + playId + "' + ' already exists, skipping injection.');" +
-                "  } else {" +
-                "    console.log('Channel does not exist. Proceeding with channel injection...');" +
-                "    var newChannel = document.createElement('a');" +
-                "    newChannel.href = '/play/" + playId + "';" +
-                "    newChannel.className = 'card border-2 border-gold shadow-lg hover:shadow-xl hover:bg-base-300 transition-all duration-200 ease-in-out scale-100 hover:scale-105';" +
-                "    var cardContent = `<div class=\"flex flex-col items-center p-2 sm:p-4\">" +
-                "      <img src=\"" + logoUrl + "\" loading=\"lazy\" alt=\"" + channelName + "\" class=\"h-14 w-14 sm:h-16 sm:w-16 md:h-18 md:w-18 lg:h-20 lg:w-20 rounded-full bg-gray-200\" />" +
-                "      <span class=\"text-lg font-bold mt-2\">" + channelName + "</span>" +
-                "      <div class=\"absolute top-2 right-2\">" +
-                "        <svg xmlns=\"http://www.w3.org/2000/svg\" width=\"16\" height=\"16\" fill=\"gold\" viewBox=\"0 -960 960 960\">" +
-                "        <path d=\"m480-120-58-52q-101-91-167-157T150-447.5Q111-500 95.5-544T80-634q0-94 63-157t157-63q52 0 99 22t81 62q34-40 81-62t99-22q94 0 157 63t63 157q0 46-15.5 90T810-447.5Q771-395 705-329T538-172l-58 52Z\"/>  " +
-                "        </svg>" +
-                "      </div>" +
-                "    </div>`;" +
-
-                "    newChannel.innerHTML = cardContent;" +
-                "    channelGrid.insertBefore(newChannel, channelGrid.firstChild);" +
-                "    console.log('Successfully injected new channel:', newChannel);" +
-                "  }" +
-                "} else {" +
-                "  console.log('Failed to find the channel grid. Injection skipped.');" +
-                "}" +
-                "})()";
-
-        webView.evaluateJavascript(jsCode, null);
-        Log.d("ChannelInjection", "JavaScript code injected into the WebView.");
-    }
-
-
-
-
-
-
-
-
-
-    private void saveRecentChannel(String playId, String logoUrl, String channelName) {
-        SkySharedPref preferenceManager = new SkySharedPref(this);
-
-        // Load existing recent channels from preferenceManager
-        String recentChannelsJson = preferenceManager.getKey(RECENT_CHANNELS_KEY);
-        if (recentChannelsJson != null && !recentChannelsJson.isEmpty()) {
-            try {
-                JSONArray jsonArray = new JSONArray(recentChannelsJson);
-                recentChannels.clear();
-                for (int i = 0; i < jsonArray.length(); i++) {
-                    JSONObject jsonObject = jsonArray.getJSONObject(i);
-                    recentChannels.add(new Channel(
-                            jsonObject.getString("playId"),
-                            jsonObject.getString("logoUrl"),
-                            jsonObject.getString("channelName")
-                    ));
-                }
-            } catch (JSONException e) {
-                Log.d(TAG, "Error loading recent channels: " + e);
-            }
-        }
-
-        // Check if the channel with the given playId already exists and remove it if found
-        for (Iterator<Channel> iterator = recentChannels.iterator(); iterator.hasNext(); ) {
-            Channel channel = iterator.next();
-            if (channel.playId.equals(playId)) {
-                iterator.remove();
-            }
-        }
-
-        recentChannels.add(0, new Channel(playId, logoUrl, channelName));
-
-        // Keep only the latest 5 channels
-        if (recentChannels.size() > 5) {
-            recentChannels.remove(recentChannels.size() - 1);
-        }
-
-        // Convert updated list to JSON array and save back to preferences
-        JSONArray jsonArray = new JSONArray();
-        for (Channel channel : recentChannels) {
-            try {
-                JSONObject jsonObject = new JSONObject();
-                jsonObject.put("playId", channel.playId);
-                jsonObject.put("logoUrl", channel.logoUrl);
-                jsonObject.put("channelName", channel.channelName);
-                jsonArray.put(jsonObject);
-            } catch (JSONException e) {
-                Log.d(TAG, String.valueOf(e));
-            }
-        }
-
-        preferenceManager.setKey(RECENT_CHANNELS_KEY, jsonArray.toString());
-    }
-
-
-    private void loadRecentChannels() {
-        SkySharedPref preferenceManager = new SkySharedPref(this);
-        String channelData = preferenceManager.getKey(RECENT_CHANNELS_KEY);
-
-        Log.d(TAG, "Channel Data from Shared Preferences: " + channelData);
-
-        if (channelData != null && !channelData.isEmpty()) {
-
-            recentChannels.clear(); // Clear existing list
-            Log.d("RIX", "I WAS HERE");
-            try {
-                JSONArray jsonArray = new JSONArray(channelData);
-
-//                // Start iterating
-//                for (int i = 0; i < jsonArray.length(); i++) {
-
-                // Iterate in reverse
-                for (int i = jsonArray.length() - 1; i >= 0; i--) {
-                    JSONObject jsonObject = jsonArray.getJSONObject(i);
-                    String playId = jsonObject.getString("playId");
-                    String logoUrl = jsonObject.getString("logoUrl");
-                    String channelName = jsonObject.getString("channelName");
-
-                    // Log each channel's details to confirm parsing
-                    Log.d(TAG, "Parsed Channel - Play ID: " + playId + ", Logo URL: " + logoUrl + ", Name: " + channelName);
-
-                    recentChannels.add(new Channel(playId, logoUrl, channelName));
-                }
-            } catch (JSONException e) {
-                Log.e(TAG, "JSON parsing error in loadRecentChannels: " + e.getMessage());
-            }
-        }
-
-        for (Channel channel : recentChannels) {
-            String formattedPlayId = channel.playId.contains("?")
-                    ? channel.playId.indexOf('?') == 0
-                    ? "??" + channel.playId.substring(1)
-                    : channel.playId.replaceFirst("\\?", "??")
-                    : channel.playId + "??";
-
-            Log.d(TAG, "Injecting Channel into WebView - Name: " + channel.channelName + ", Play ID: " + formattedPlayId);
-
-            injectTVChannel(channel.channelName, formattedPlayId, channel.logoUrl);
-        }
-
-    }
-
-
-}
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/core/ServerUtils.kt b/app/src/main/java/com/skylake/skytv/jgorunner/core/ServerUtils.kt
new file mode 100644
index 0000000..86c0089
--- /dev/null
+++ b/app/src/main/java/com/skylake/skytv/jgorunner/core/ServerUtils.kt
@@ -0,0 +1,58 @@
+package com.skylake.skytv.jgorunner.core
+
+import android.util.Log
+import kotlinx.coroutines.delay
+import java.net.HttpURLConnection
+import java.net.URL
+
+suspend fun checkServerStatus(
+    port: Int = 5350,
+    onLoginSuccess: () -> Unit,
+    onLoginFailure: () -> Unit,
+    onServerDown: () -> Unit,
+) {
+    val url = URL("http://localhost:$port/live/144.m3u8")
+
+    repeat(5) { attempt ->
+        try {
+            Log.d("ServerLoginCheck", "Attempt #${attempt + 1}: Checking server status...")
+            val connection = url.openConnection() as HttpURLConnection
+            connection.requestMethod = "HEAD"
+            connection.connectTimeout = 5000 // 5 seconds timeout
+            connection.readTimeout = 5000 // 5 seconds timeout
+            val responseCode = connection.responseCode
+            connection.disconnect()
+
+            when (responseCode) {
+                HttpURLConnection.HTTP_OK -> {
+                    Log.d("ServerLoginCheck", "Response Code: $responseCode - Server is up!")
+                    onLoginSuccess()
+                    return
+                }
+
+                HttpURLConnection.HTTP_INTERNAL_ERROR -> {
+                    Log.d("ServerLoginCheck", "Response Code: $responseCode - Server error!")
+                    onLoginFailure()
+                    return
+                }
+                else -> {
+                    Log.d("ServerLoginCheck", "Unexpected Response Code: $responseCode")
+                }
+            }
+        } catch (ex: Exception) {
+            Log.d("ServerLoginCheck", "Attempt #${attempt + 1}: Error occurred")
+            Log.e(
+                "ServerLoginCheck",
+                "Error checking server status (attempt ${attempt + 1})",
+                ex
+            )
+        }
+
+        if (attempt < 2) {
+            Log.d("ServerLoginCheck", "Delaying before next attempt...")
+            delay(1000)
+        }
+    }
+    Log.d("ServerLoginCheck", "Reached maximum consecutive failures.")
+    onServerDown()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/core/data/JTVConfiguration.kt b/app/src/main/java/com/skylake/skytv/jgorunner/core/data/JTVConfiguration.kt
new file mode 100644
index 0000000..eccf1d0
--- /dev/null
+++ b/app/src/main/java/com/skylake/skytv/jgorunner/core/data/JTVConfiguration.kt
@@ -0,0 +1,32 @@
+package com.skylake.skytv.jgorunner.core.data
+
+import com.google.gson.annotations.SerializedName
+
+data class JTVConfiguration(
+    @SerializedName("epg")
+    var epg: Boolean = false,
+
+    @SerializedName("debug")
+    var debug: Boolean = false,
+
+    @SerializedName("disable_ts_handler")
+    var disableTsHandler: Boolean = false,
+
+    @SerializedName("disable_logout")
+    var disableLogout: Boolean = false,
+
+    @SerializedName("drm")
+    var drm: Boolean = false,
+
+    @SerializedName("title")
+    var title: String = "JTV-GO",
+
+    @SerializedName("disable_url_encryption")
+    var disableUrlEncryption: Boolean = false,
+
+    @SerializedName("path_prefix")
+    var pathPrefix: String = "",
+
+    @SerializedName("proxy")
+    var proxy: String = ""
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/core/data/JTVConfigurationManager.kt b/app/src/main/java/com/skylake/skytv/jgorunner/core/data/JTVConfigurationManager.kt
new file mode 100644
index 0000000..3bfe105
--- /dev/null
+++ b/app/src/main/java/com/skylake/skytv/jgorunner/core/data/JTVConfigurationManager.kt
@@ -0,0 +1,69 @@
+package com.skylake.skytv.jgorunner.core.data
+
+import android.content.Context
+import com.google.gson.Gson
+import com.skylake.skytv.jgorunner.data.SkySharedPref
+import java.io.File
+
+class JTVConfigurationManager private constructor(context: Context) {
+    companion object {
+        @Volatile
+        private var instance: JTVConfigurationManager? = null
+
+        // Singleton
+        fun getInstance(context: Context): JTVConfigurationManager {
+            return instance ?: synchronized(this) {
+                instance
+                    ?: JTVConfigurationManager(context.applicationContext).also { instance = it }
+            }
+        }
+    }
+
+    // Configuration
+    private val preferenceManager = SkySharedPref.getInstance(context.applicationContext)
+    private val filesDir = context.filesDir
+    var jtvConfiguration = readFromJTVConfiguration()
+        private set
+
+    private fun readFromJTVConfiguration(): JTVConfiguration {
+        val jtvConfigLocation = preferenceManager.myPrefs.jtvConfigLocation ?: return JTVConfiguration()
+        val jtvConfigFile = File(jtvConfigLocation)
+        if (!jtvConfigFile.exists())
+            return JTVConfiguration()
+
+        return try {
+            Gson().fromJson(jtvConfigFile.readText(), JTVConfiguration::class.java)
+        } catch (e: Exception){
+            JTVConfiguration()
+        }
+    }
+
+    fun saveJTVConfiguration() {
+        var jtvConfigLocation = preferenceManager.myPrefs.jtvConfigLocation
+
+        if (jtvConfigLocation == null) {
+            val parentDir = File(filesDir, "jiotv_go")
+            jtvConfigLocation = File(parentDir, "jtv_config.json").absolutePath
+            jtvConfiguration.pathPrefix = parentDir.absolutePath
+
+            preferenceManager.myPrefs.jtvConfigLocation = jtvConfigLocation
+            preferenceManager.savePreferences()
+        }
+
+        val jtvConfigFile = File(jtvConfigLocation!!)
+        if (!jtvConfigFile.exists()) {
+            jtvConfigFile.parentFile?.mkdirs()
+            jtvConfigFile.createNewFile()
+        }
+
+        jtvConfigFile.writeText(Gson().toJson(jtvConfiguration))
+    }
+
+    fun deleteJTVConfiguration() {
+        val jtvConfigLocation = preferenceManager.myPrefs.jtvConfigLocation ?: return
+        val jtvConfigFile = File(jtvConfigLocation)
+        if (jtvConfigFile.exists())
+            jtvConfigFile.delete()
+        jtvConfiguration = JTVConfiguration()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/core/execution/BinaryExecutor.kt b/app/src/main/java/com/skylake/skytv/jgorunner/core/execution/BinaryExecutor.kt
new file mode 100644
index 0000000..78f1970
--- /dev/null
+++ b/app/src/main/java/com/skylake/skytv/jgorunner/core/execution/BinaryExecutor.kt
@@ -0,0 +1,224 @@
+package com.skylake.skytv.jgorunner.core.execution
+
+import android.content.Context
+import android.os.Build
+import android.util.Log
+import com.skylake.skytv.jgorunner.data.SkySharedPref
+import java.io.File
+import java.io.InputStream
+
+object BinaryExecutor {
+    private var binaryProcess: Process? = null
+    private val outputBuilder = StringBuilder()
+    private const val TAG = "BinaryExecutor"
+
+    fun executeBinary(
+        context: Context,
+        binaryFile: File,
+        arguments: Array<String>?,
+        onOutput: (String) -> Unit,
+        onError: (ExecutionError) -> Unit
+    ) {
+        Thread {
+            try {
+                if (!binaryFile.exists()) {
+                    onError(
+                        ExecutionError(
+                            ExecutionError.ExecutionErrorType.BINARY_NOT_FOUND,
+                            "Binary file not found"
+                        )
+                    )
+                    return@Thread
+                }
+
+                setBinaryExecutable(binaryFile)
+                val args = buildArgsList(context, arguments)
+                Log.d(TAG, "Executing binary: $args")
+                binaryProcess = Runtime.getRuntime().exec(
+                    arrayOf(
+                        "sh",
+                        "-c",
+                        arrayOf(
+                            binaryFile.absolutePath,
+                            *args.toTypedArray()
+                        ).joinToString(" ")
+                    ),
+                    null, // Environment variables (null means inherit from parent process)
+                    binaryFile.parentFile // Set the working directory
+                )
+
+                Thread(
+                    StreamGobbler(
+                        binaryProcess!!.inputStream,
+                        onOutput
+                    )
+                ).start()
+                Thread(
+                    ErrorStreamGobbler(
+                        binaryProcess!!.errorStream,
+                        onOutput
+                    )
+                ).start()
+
+                Log.d(TAG, "Binary started successfully with PID: ${getProcessId(binaryProcess!!)}")
+                binaryProcess!!.waitFor()
+            } catch (e: Exception) {
+                Log.e(TAG, "Error executing binary: ", e)
+                onError(
+                    ExecutionError(
+                        ExecutionError.ExecutionErrorType.BINARY_UNKNOWN_ERROR,
+                        e.message ?: "Unknown error",
+                        e
+                    )
+                )
+            }
+        }.start()
+    }
+
+    private fun setBinaryExecutable(binaryFile: File) {
+        if (binaryFile.exists()) {
+            val success = binaryFile.setExecutable(true, false)
+            // Intentionally ignore the result without further action
+            Log.d(TAG, "binaryPermissions: $success")
+        }
+    }
+
+    private fun buildArgsList(
+        context: Context,
+        arguments: Array<String>?
+    ): List<String> {
+        if (!arguments.isNullOrEmpty()) {
+            return arguments.toList()
+        }
+
+        val port = SkySharedPref.getInstance(context).myPrefs.jtvGoServerPort
+        val jtvConfigLocation = SkySharedPref.getInstance(context).myPrefs.jtvConfigLocation
+
+        val command = mutableListOf(
+            "run",
+        )
+        if (port in 1..65535) {
+            command.add("--port")
+            command.add(port.toString())
+        }
+        if (!SkySharedPref.getInstance(context).myPrefs.serveLocal)
+            command.add("--public")
+
+        command.add("--config")
+        command.add("\"${jtvConfigLocation}\"")
+
+        return command
+    }
+
+    fun stopBinary() {
+        if (binaryProcess != null) {
+            try {
+                // Close all streams before killing the process
+                closeProcessStreams(binaryProcess!!)
+
+                // Retrieve the process ID (PID)
+                val pid = getProcessId(binaryProcess!!)
+                if (pid != null) {
+                    Log.i(TAG, "Killing process tree for PID: $pid")
+
+                    // Execute shell command to kill the entire process tree
+                    killProcessTree(pid)
+                }
+
+                // First attempt to stop the process gracefully
+                binaryProcess!!.destroy()
+                Log.i(TAG + "DIX", "Process destroyed.")
+
+                // If needed, escalate to forcibly destroying it
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    binaryProcess!!.destroyForcibly()
+                }
+                Log.i(TAG, "Process forcibly destroyed.")
+            } catch (e: Exception) {
+                Log.e(TAG, "Error while stopping binary process: ", e)
+            } finally {
+                binaryProcess = null // Reset the process variable
+            }
+        }
+    }
+
+    // Helper method to retrieve the process ID (PID) via reflection
+    private fun getProcessId(process: Process): String? {
+        try {
+            // Use reflection to access the PID field in the Process class
+            val pidField = process.javaClass.getDeclaredField("pid")
+            pidField.isAccessible = true
+            return pidField.getInt(process).toString()
+        } catch (e: Exception) {
+            Log.e(TAG, "Error getting process ID: ", e)
+            return null
+        }
+    }
+
+    // Helper method to kill the process tree using a shell command
+    private fun killProcessTree(pid: String) {
+        try {
+            // Execute shell command to kill the process tree (including subprocesses)
+            val cmd = arrayOf(
+                "sh", "-c",
+                "pkill -P $pid"
+            )
+            val killProcess = Runtime.getRuntime().exec(cmd)
+            killProcess.waitFor() // Wait for the kill command to finish
+            Log.i(TAG, "Successfully killed process tree for PID: $pid")
+        } catch (e: Exception) {
+            Log.e(TAG, "Error killing process tree: ", e)
+        }
+    }
+
+    // Helper method to close process streams
+    private fun closeProcessStreams(process: Process) {
+        try {
+            process.inputStream.close()
+            process.outputStream.close()
+            process.errorStream.close()
+        } catch (e: Exception) {
+            Log.e(TAG, "Error closing process streams: ", e)
+        }
+    }
+
+    private class StreamGobbler(
+        private val inputStream: InputStream,
+        private val onOutput: (String) -> Unit
+    ) : Runnable {
+        override fun run() {
+            try {
+                val buffer = ByteArray(1024)
+                var bytesRead: Int
+                while ((inputStream.read(buffer).also { bytesRead = it }) != -1) {
+                    val output = String(buffer, 0, bytesRead)
+                    outputBuilder.append(output).append("\n")
+                    Log.d(TAG, "Process output: $output")
+                    onOutput(output)
+                }
+            } catch (e: Exception) {
+                Log.e(TAG, "Error reading binary output: ", e)
+            }
+        }
+    }
+
+    private class ErrorStreamGobbler(
+        private val errorStream: InputStream,
+        private val onError: (String) -> Unit
+    ) : Runnable {
+        override fun run() {
+            try {
+                val buffer = ByteArray(1024)
+                var bytesRead: Int
+                while ((errorStream.read(buffer).also { bytesRead = it }) != -1) {
+                    val output = String(buffer, 0, bytesRead)
+                    Log.e(TAG, "Process error: $output")
+                    onError(output)
+                }
+            } catch (e: Exception) {
+                Log.e(TAG, "Error reading binary error output: ", e)
+            }
+        }
+    }
+}
+
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/core/execution/ExecutionError.kt b/app/src/main/java/com/skylake/skytv/jgorunner/core/execution/ExecutionError.kt
new file mode 100644
index 0000000..d29a087
--- /dev/null
+++ b/app/src/main/java/com/skylake/skytv/jgorunner/core/execution/ExecutionError.kt
@@ -0,0 +1,17 @@
+package com.skylake.skytv.jgorunner.core.execution
+
+class ExecutionError : Exception {
+    val errorType: ExecutionErrorType
+
+    constructor(errorType: ExecutionErrorType, message: String) : super(message){
+        this.errorType = errorType
+    }
+    constructor(errorType: ExecutionErrorType, message: String, cause: Throwable) : super(message, cause) {
+        this.errorType = errorType
+    }
+
+    enum class ExecutionErrorType {
+        BINARY_NOT_FOUND,
+        BINARY_UNKNOWN_ERROR
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/core/execution/ExecutionManager.kt b/app/src/main/java/com/skylake/skytv/jgorunner/core/execution/ExecutionManager.kt
new file mode 100644
index 0000000..a41b71f
--- /dev/null
+++ b/app/src/main/java/com/skylake/skytv/jgorunner/core/execution/ExecutionManager.kt
@@ -0,0 +1,64 @@
+package com.skylake.skytv.jgorunner.core.execution
+
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import androidx.activity.ComponentActivity
+import com.skylake.skytv.jgorunner.data.SkySharedPref
+import com.skylake.skytv.jgorunner.services.BinaryService
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.io.File
+
+fun runBinary(
+    activity: ComponentActivity,
+    arguments: Array<String>,
+    onRunSuccess: () -> Unit,
+    onOutput: (String) -> Unit
+) {
+    val preferenceManager = SkySharedPref.getInstance(activity)
+    val intent = Intent(activity, BinaryService::class.java).apply {
+        putExtra(
+            "binaryFileLocation",
+            preferenceManager.myPrefs.jtvGoBinaryName?.let {
+                File(
+                    activity.filesDir,
+                    it
+                ).absolutePath
+            })
+        putExtra("arguments", arguments)
+    }
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        activity.startForegroundService(intent)
+    } else {
+        activity.startService(intent)
+    }
+
+    CoroutineScope(Dispatchers.IO).launch {
+        // Wait until the binary service is running
+        while (!BinaryService.isRunning) delay(100)
+
+        onRunSuccess()
+        withContext(Dispatchers.Main) {
+            BinaryService.instance?.binaryOutput?.observe(activity) { output ->
+                onOutput(output)
+            }
+        }
+    }
+}
+
+fun stopBinary(
+    context: Context,
+    onBinaryStopped: () -> Unit
+) {
+    val intent = Intent(context, BinaryService::class.java).apply {
+        action = BinaryService.ACTION_STOP_BINARY
+    }
+
+    context.startService(intent)
+    onBinaryStopped()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/core/update/ApplicationUpdater.kt b/app/src/main/java/com/skylake/skytv/jgorunner/core/update/ApplicationUpdater.kt
new file mode 100644
index 0000000..dbdf873
--- /dev/null
+++ b/app/src/main/java/com/skylake/skytv/jgorunner/core/update/ApplicationUpdater.kt
@@ -0,0 +1,157 @@
+package com.skylake.skytv.jgorunner.core.update
+
+import android.annotation.SuppressLint
+import android.app.DownloadManager
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.net.Uri
+import android.os.Build
+import android.os.Environment
+import android.util.Log
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.cthing.versionparser.semver.SemanticVersion
+import org.json.JSONObject
+import java.net.URL
+
+object ApplicationUpdater {
+    private const val TAG = "JTVGo::AppUpdater"
+
+    private const val LATEST_RELEASE_INFO_URL =
+        "https://api.github.com/repos/JioTV-Go/jiotv_go_app/releases/latest"
+
+    suspend fun fetchLatestReleaseInfo() =
+        withContext(Dispatchers.IO) {
+            try {
+                val response = URL(LATEST_RELEASE_INFO_URL).readText()
+                val json = JSONObject(response)
+                val tagName = json.getString("tag_name")
+                val assets = json.getJSONArray("assets")
+
+                val releaseTargetDetails: JSONObject? = try {
+                    assets.getJSONObject(0)
+                } catch (e: Exception) {
+                    null
+                }
+
+                if (releaseTargetDetails == null) {
+                    Log.e(TAG, "No release found!")
+                    return@withContext null
+                }
+
+                val assetName = releaseTargetDetails.getString("name")
+                val downloadUrl = releaseTargetDetails.getString("browser_download_url")
+                val downloadSize = releaseTargetDetails.getLong("size")
+                val version = SemanticVersion.parse(tagName)
+                return@withContext DownloadAsset(assetName, version, downloadUrl, downloadSize)
+            } catch (e: Exception) {
+                Log.e(TAG, "Error fetching latest release info: ${e.message}")
+                return@withContext null
+            }
+        }
+
+    @SuppressLint("UnspecifiedRegisterReceiverFlag")
+    fun downloadAppUpdate(
+        context: Context,
+        downloadUrl: String,
+        fileName: String,
+        onProgress: (DownloadProgress) -> Unit
+    ) {
+        val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
+
+        // Configure the request
+        val request = DownloadManager.Request(Uri.parse(downloadUrl)).apply {
+            setTitle("Downloading Update")
+            setDescription("Your app update is being downloaded...")
+            setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, fileName)
+            setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
+            setAllowedOverMetered(true) // Allow on metered networks
+            setAllowedOverRoaming(true) // Allow on roaming
+        }
+
+        // Enqueue the download
+        val downloadId = downloadManager.enqueue(request)
+
+        CoroutineScope(Dispatchers.Main).launch {
+            var isDownloading = true
+            while (isDownloading) {
+                val query = DownloadManager.Query().setFilterById(downloadId)
+                val cursor = downloadManager.query(query)
+
+                if (cursor != null && cursor.moveToFirst()) {
+                    val bytesDownloaded =
+                        cursor.getInt(cursor.getColumnIndexOrThrow(DownloadManager.COLUMN_BYTES_DOWNLOADED_SO_FAR))
+                    val totalBytes =
+                        cursor.getInt(cursor.getColumnIndexOrThrow(DownloadManager.COLUMN_TOTAL_SIZE_BYTES))
+
+                    if (totalBytes > 0) {
+                        val progress = (bytesDownloaded * 100L / totalBytes).toInt()
+                        onProgress(DownloadProgress(fileName, progress))
+                    }
+
+                    val status =
+                        cursor.getInt(cursor.getColumnIndexOrThrow(DownloadManager.COLUMN_STATUS))
+
+                    if (status == DownloadManager.STATUS_SUCCESSFUL) {
+                        isDownloading = false
+                    } else if (status == DownloadManager.STATUS_FAILED) {
+                        isDownloading = false
+                        Log.e("DownloadManager", "Download failed.")
+                    }
+
+                    cursor.close()
+                }
+                delay(500) // Poll every 500ms
+            }
+        }
+
+        val onCompleteReceiver = object : BroadcastReceiver() {
+            override fun onReceive(context: Context, intent: Intent) {
+                val id = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1)
+
+                // Check if this is the download we're waiting for
+                if (id == downloadId) {
+                    val fileUri = downloadManager.getUriForDownloadedFile(downloadId)
+                    launchInstaller(context, fileUri)
+                    context.unregisterReceiver(this) // Unregister receiver after completion
+                }
+            }
+        }
+
+        // Register the receiver
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            context.registerReceiver(
+                onCompleteReceiver, IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE),
+                Context.RECEIVER_EXPORTED
+            )
+        } else {
+            context.registerReceiver(
+                onCompleteReceiver,
+                IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)
+            )
+        }
+    }
+
+    private fun launchInstaller(context: Context, fileUri: Uri?) {
+        if (fileUri == null) {
+            Log.e("AppUpdate", "File URI is null. Cannot launch installer.")
+            return
+        }
+
+        val intent = Intent(Intent.ACTION_VIEW).apply {
+            setDataAndType(fileUri, "application/vnd.android.package-archive")
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_GRANT_READ_URI_PERMISSION
+        }
+
+        try {
+            context.startActivity(intent)
+        } catch (e: Exception) {
+            Log.e("AppUpdate", "Error launching installer: ${e.message}")
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/core/update/BinaryUpdater.kt b/app/src/main/java/com/skylake/skytv/jgorunner/core/update/BinaryUpdater.kt
new file mode 100644
index 0000000..76c959f
--- /dev/null
+++ b/app/src/main/java/com/skylake/skytv/jgorunner/core/update/BinaryUpdater.kt
@@ -0,0 +1,61 @@
+package com.skylake.skytv.jgorunner.core.update
+
+import android.os.Build
+import android.util.Log
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import org.cthing.versionparser.semver.SemanticVersion
+import org.json.JSONObject
+import java.net.URL
+
+object BinaryUpdater {
+    private const val TAG = "JTVGo::BinaryUpdater"
+
+    private const val LATEST_RELEASE_INFO_URL =
+        "https://api.github.com/repos/JioTV-Go/jiotv_go/releases/latest"
+    private const val RELEASE_NAME_PREFIX = "jiotv_go-android"
+
+    suspend fun fetchLatestReleaseInfo() =
+        withContext(Dispatchers.IO) {
+            try {
+                val response = URL(LATEST_RELEASE_INFO_URL).readText()
+                val json = JSONObject(response)
+                val tagName = json.getString("tag_name")
+                val assets = json.getJSONArray("assets")
+                var releaseTargetDetails: JSONObject? = null
+                for (i in 0 until assets.length()) {
+                    val asset = assets.getJSONObject(i)
+
+                    // Get system arch (amd64 or arm or arm64 or armv7)
+                    val supportedABIs = Build.SUPPORTED_ABIS
+                    val releaseNameSuffix = when {
+                        supportedABIs.contains("arm64-v8a") -> "-arm64"
+                        supportedABIs.contains("armeabi-v7a") -> "5-armv7"
+                        supportedABIs.contains("armeabi") -> "-arm"
+                        supportedABIs.contains("x86_64") -> "-amd64"
+                        else -> "-arm"
+                    }
+
+                    if (asset.getString("name").contains(RELEASE_NAME_PREFIX + releaseNameSuffix)) {
+                        releaseTargetDetails = asset
+                        break
+                    }
+                }
+
+                if (releaseTargetDetails == null) {
+                    Log.e(TAG, "No release found for the current system architecture")
+                    return@withContext null
+                }
+                val assetName = releaseTargetDetails.getString("name")
+                val downloadUrl = releaseTargetDetails.getString("browser_download_url")
+                val downloadSize = releaseTargetDetails.getLong("size")
+                val version = SemanticVersion.parse(tagName)
+                Log.d(TAG, "Latest release info: $version, $assetName, $downloadUrl, $downloadSize")
+                return@withContext DownloadAsset(assetName, version, downloadUrl, downloadSize)
+            } catch (e: Exception) {
+                Log.e(TAG, "Error fetching latest release info: ${e.message}")
+                return@withContext null
+            }
+        }
+}
+
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/core/update/DownloadAsset.kt b/app/src/main/java/com/skylake/skytv/jgorunner/core/update/DownloadAsset.kt
new file mode 100644
index 0000000..208a456
--- /dev/null
+++ b/app/src/main/java/com/skylake/skytv/jgorunner/core/update/DownloadAsset.kt
@@ -0,0 +1,10 @@
+package com.skylake.skytv.jgorunner.core.update
+
+import org.cthing.versionparser.semver.SemanticVersion
+
+data class DownloadAsset(
+    val name: String,
+    val version: SemanticVersion,
+    val downloadUrl: String,
+    val downloadSize: Long
+)
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/core/update/DownloadProgress.kt b/app/src/main/java/com/skylake/skytv/jgorunner/core/update/DownloadProgress.kt
new file mode 100644
index 0000000..8393cf1
--- /dev/null
+++ b/app/src/main/java/com/skylake/skytv/jgorunner/core/update/DownloadProgress.kt
@@ -0,0 +1,6 @@
+package com.skylake.skytv.jgorunner.core.update
+
+data class DownloadProgress(
+    val fileName: String,
+    val progress: Int,
+)
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/data/SkySharedPref.java b/app/src/main/java/com/skylake/skytv/jgorunner/data/SkySharedPref.java
deleted file mode 100644
index 86e8670..0000000
--- a/app/src/main/java/com/skylake/skytv/jgorunner/data/SkySharedPref.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.skylake.skytv.jgorunner.data;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-
-import java.util.Map;
-
-public class SkySharedPref {
-
-    private static final String PREF_NAME = "SkySharedPref";
-    private final SharedPreferences sharedPreferences;
-    private final SharedPreferences.Editor editor;
-
-    public SkySharedPref(Context context) {
-        sharedPreferences = context.getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE);
-        editor = sharedPreferences.edit();
-    }
-
-    // Method to save key-value pairs
-    public void setKey(String key, String value) {
-        editor.putString(key, value);
-        editor.apply();
-    }
-
-    // Overloaded method to retrieve String by key with a default value
-    public String getKey(String key) {
-        return sharedPreferences.getString(key, null); // Default to null if no value exists
-    }
-
-    public String getKey(String key, String defaultValue) {
-        return sharedPreferences.getString(key, defaultValue); // Use provided default value
-    }
-
-    // Save int key-value pair
-    public void setInt(String key, int value) {
-        editor.putInt(key, value);
-        editor.apply();
-    }
-
-    // Overloaded method to retrieve int by key with a default value
-    public int getInt(String key) {
-        return sharedPreferences.getInt(key, 0); // Default to 0 if no value exists
-    }
-
-    public int getInt(String key, int defaultValue) {
-        return sharedPreferences.getInt(key, defaultValue); // Use provided default value
-    }
-
-    // Save boolean key-value pair
-    public void setBoolean(String key, boolean value) {
-        editor.putBoolean(key, value);
-        editor.apply();
-    }
-
-    // Overloaded method to retrieve boolean by key with a default value
-    public boolean getBoolean(String key) {
-        return sharedPreferences.getBoolean(key, false); // Default to false if no value exists
-    }
-
-    public boolean getBoolean(String key, boolean defaultValue) {
-        return sharedPreferences.getBoolean(key, defaultValue); // Use provided default value
-    }
-
-    // Remove a specific key
-    public void removeKey(String key) {
-        editor.remove(key);
-        editor.apply();
-    }
-
-    // Clear all preferences
-    public void clearAll() {
-        editor.clear();
-        editor.apply();
-    }
-
-    // Check if a key exists
-    public boolean containsKey(String key) {
-        return sharedPreferences.contains(key);
-    }
-
-    // Retrieve all stored preferences (key-value pairs)
-    public Map<String, ?> getAll() {
-        return sharedPreferences.getAll();
-    }
-}
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/data/SkySharedPref.kt b/app/src/main/java/com/skylake/skytv/jgorunner/data/SkySharedPref.kt
new file mode 100644
index 0000000..0c40b35
--- /dev/null
+++ b/app/src/main/java/com/skylake/skytv/jgorunner/data/SkySharedPref.kt
@@ -0,0 +1,157 @@
+package com.skylake.skytv.jgorunner.data
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.util.Log
+import kotlin.reflect.KMutableProperty
+import kotlin.reflect.full.findAnnotation
+import kotlin.reflect.full.memberProperties
+import kotlin.reflect.jvm.isAccessible
+
+class SkySharedPref private constructor(context: Context) {
+    companion object {
+        private const val PREF_NAME = "SkySharedPref"
+
+        @Volatile
+        private var instance: SkySharedPref? = null
+
+        // Singleton
+        fun getInstance(context: Context): SkySharedPref {
+            return instance ?: synchronized(this) {
+                instance ?: SkySharedPref(context.applicationContext).also { instance = it }
+            }
+        }
+    }
+
+    private val sharedPreferences: SharedPreferences =
+        context.getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE)
+    private val editor: SharedPreferences.Editor = sharedPreferences.edit()
+    var myPrefs = readFromSharedPreferences()
+    private set
+
+    fun savePreferences() {
+        SharedPrefStructure::class.memberProperties.forEach { property ->
+            // Access the annotation
+            val annotation = property.findAnnotation<SharedPrefKey>()
+
+            // If annotation exists, save the value in SharedPreferences
+            annotation?.let { ann ->
+                // Make the property accessible (in case it's private)
+                property.isAccessible = true
+
+                // Get the value of the property
+                // Use the annotated key to save the value
+                val value = myPrefs.let {
+                    property.get(it)
+                }
+                if (value == null) {
+                    return@let
+                }
+                when (value) {
+                    is String -> editor.putString(ann.key, value)
+                    is Boolean -> editor.putBoolean(ann.key, value)
+                    is Int -> editor.putInt(ann.key, value)
+                    is Float -> editor.putFloat(ann.key, value)
+                    is Long -> editor.putLong(ann.key, value)
+                    else -> {
+                        Log.e("SkySharedPref", "Unsupported type")
+                        Log.e("SkySharedPref", "Type: ${value.javaClass}")
+                        throw IllegalArgumentException("Unsupported type")
+                    }
+                }
+            }
+        }
+        editor.apply()
+    }
+
+    // Function to read data from SharedPreferences using annotated keys
+    private fun readFromSharedPreferences(): SharedPrefStructure {
+        val instance = SharedPrefStructure()
+
+        SharedPrefStructure::class.memberProperties.forEach { property ->
+            val annotation = property.findAnnotation<SharedPrefKey>()
+            annotation?.let {
+                property.isAccessible = true
+
+                // Check if the key exists in SharedPreferences
+                // If not, skip the property
+                if (sharedPreferences.contains(it.key).not()) {
+                    return@let
+                }
+
+                // Retrieve the value from SharedPreferences using the annotated key
+                val value = when (property.returnType.classifier) {
+                    String::class -> sharedPreferences.getString(it.key, null) as Any
+                    Boolean::class -> sharedPreferences.getBoolean(it.key, false)
+                    Int::class -> sharedPreferences.getInt(it.key, 0)
+                    Float::class -> sharedPreferences.getFloat(it.key, 0f)
+                    Long::class -> sharedPreferences.getLong(it.key, 0L)
+                    else -> throw IllegalArgumentException("Unsupported type")
+                }
+
+                // Set the value to the property
+                if (property is KMutableProperty<*>) {
+                    property.setter.call(instance, value)
+                }
+            }
+        }
+        return instance
+    }
+
+    fun clearPreferences() {
+        editor.clear().apply()
+        myPrefs = SharedPrefStructure()
+    }
+
+    data class SharedPrefStructure(
+        @SharedPrefKey("serve_local")
+        var serveLocal: Boolean = false,
+
+        @SharedPrefKey("auto_start_server")
+        var autoStartServer: Boolean = false,
+
+        @SharedPrefKey("auto_start_on_boot")
+        var autoStartOnBoot: Boolean = false,
+
+        @SharedPrefKey("auto_start_on_boot_foreground")
+        var autoStartOnBootForeground: Boolean = false,
+
+        @SharedPrefKey("auto_start_iptv")
+        var autoStartIPTV: Boolean = false,
+
+        @SharedPrefKey("enable_auto_update")
+        var enableAutoUpdate: Boolean = true,
+
+        @SharedPrefKey("jtv_go_port")
+        var jtvGoServerPort: Int = 5350,
+
+        @SharedPrefKey("jtv_go_binary_name")
+        var jtvGoBinaryName: String? = null,
+
+        @SharedPrefKey("jtv_binary_version")
+        var jtvGoBinaryVersion: String? = "v0.0.0",
+
+        @SharedPrefKey("jtv_config_location")
+        var jtvConfigLocation: String? = null,
+
+        @SharedPrefKey("iptv_app_name")
+        var iptvAppName: String? = null,
+
+        @SharedPrefKey("iptv_app_package_name")
+        var iptvAppPackageName: String? = null,
+
+        @SharedPrefKey("iptv_app_launch_activity")
+        var iptvAppLaunchActivity: String? = null,
+
+        @SharedPrefKey("iptv_launch_countdown")
+        var iptvLaunchCountdown: Int = 4,
+
+        @SharedPrefKey("recent_channels_json")
+        var recentChannelsJson: String? = null
+    )
+
+    // Annotation class to define the key for SharedPreferences
+    @Target(AnnotationTarget.PROPERTY)
+    @Retention(AnnotationRetention.RUNTIME)
+    annotation class SharedPrefKey(val key: String)
+}
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/data/UserConfigHandler.kt b/app/src/main/java/com/skylake/skytv/jgorunner/data/UserConfigHandler.kt
deleted file mode 100644
index 51138f6..0000000
--- a/app/src/main/java/com/skylake/skytv/jgorunner/data/UserConfigHandler.kt
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.skylake.skytv.jgorunner.data
-
-import android.content.Context
-import android.util.Log
-import com.skylake.skytv.jgorunner.utils.createJsonFile
-
-fun applyConfigurations(context: Context, preferenceManager: SkySharedPref) {
-    val isFlagSetForLOCAL = preferenceManager.getKey("isFlagSetForLOCAL")
-    if (isFlagSetForLOCAL == "No") {
-        preferenceManager.setKey("__Public", "")
-        Log.d("DIX-isFlagSetForLOCAL", isFlagSetForLOCAL)
-    } else {
-        preferenceManager.setKey("__Public", " --public")
-        Log.d("DIX-isFlagSetForLOCAL", "Public")
-    }
-
-    val isCustomSetForPORT = preferenceManager.getKey("isCustomSetForPORT")
-    if (isCustomSetForPORT == "5350") {
-        preferenceManager.setKey("__Port", " --port 5350")
-        Log.d("DIX-isCustomSetForPORT", isCustomSetForPORT)
-    } else {
-        preferenceManager.setKey("__Port", " --port $isCustomSetForPORT")
-        Log.d("DIX-isCustomSetForPORT", "Custom Port $isCustomSetForPORT")
-    }
-
-    val isFlagSetForAutoStartOnBoot = preferenceManager.getKey("isFlagSetForAutoStartOnBoot")
-    if (isFlagSetForAutoStartOnBoot == "Yes") {
-        Log.d("DIX-isAutoStartOnBoot", " $isFlagSetForAutoStartOnBoot")
-    } else {
-        Log.d("DIX-isAutoStartOnBoot", " $isFlagSetForAutoStartOnBoot")
-    }
-
-    val isFlagSetForAutoBootIPTV = preferenceManager.getKey("isFlagSetForAutoBootIPTV")
-    if (isFlagSetForAutoBootIPTV == "Yes") {
-        Log.d("DIX-isAutoBootIPTV", " $isFlagSetForAutoBootIPTV")
-    } else {
-        Log.d("DIX-isAutoBootIPTV", " $isFlagSetForAutoBootIPTV")
-    }
-
-    val isFlagSetForEPG = preferenceManager.getKey("isFlagSetForEPG")
-    if (isFlagSetForEPG == "Yes") {
-
-        jsonmaker(context);
-
-        preferenceManager.setKey("__EPG", " --config 'configtv.json'")
-
-        Log.d("DIX-isFlagSetForEPG", isFlagSetForEPG)
-    } else {
-        preferenceManager.setKey("__EPG", " ")
-        Log.d("DIX-isFlagSetForEPG", "No EPG")
-    }
-
-    val isFlagSetForAutoStartServer = preferenceManager.getKey("isFlagSetForAutoStartServer")
-    if (isFlagSetForAutoStartServer == "Yes") {
-        Log.d("DIX-AutoStartServer", isFlagSetForAutoStartServer)
-
-        val isFlagSetForAutoIPTV = preferenceManager.getKey("isFlagSetForAutoIPTV")
-        if (isFlagSetForAutoIPTV == "No") {
-            Log.d("DIX-ForAutoIPTV", isFlagSetForAutoIPTV)
-        }
-    }
-
-
-    val __Port = preferenceManager.getKey("__Port")
-    val __Public = preferenceManager.getKey("__Public")
-    val __EPG = preferenceManager.getKey("__EPG")
-
-    preferenceManager.setKey("__MasterArgs_temp", " run$__Port$__Public$__EPG")
-}
-
-fun jsonmaker(context: Context)  {
-    val jsonData = """
-                    {
-            "debug": false,
-            "disable_ts_handler": false,
-            "disable_logout": false,
-            "drm": false,
-            "title": "JTV-GO",
-            "disable_url_encryption": false,
-            "path_prefix": "",
-            "proxy": ""
-        }
-        """.trimIndent()
-
-    createJsonFile(context, "jiotv-config.json", jsonData,true)
-
-
-}
-
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/receivers/BootReceiver.java b/app/src/main/java/com/skylake/skytv/jgorunner/receivers/BootReceiver.java
deleted file mode 100644
index be10b5b..0000000
--- a/app/src/main/java/com/skylake/skytv/jgorunner/receivers/BootReceiver.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.skylake.skytv.jgorunner.receivers;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.os.Build;
-import android.util.Log;
-import android.widget.Toast;
-
-import com.skylake.skytv.jgorunner.services.BinaryService;
-import com.skylake.skytv.jgorunner.data.SkySharedPref;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public class BootReceiver extends BroadcastReceiver {
-
-    private static final String TAG = "BootReceiver";
-    private static final String AUTO_BOOT_PREF_KEY = "isFlagSetForAutoStartOnBoot";
-    private static final String AUTO_BOOT_ENABLED = "Yes";
-    private static final String AUTO_BOOT_STATE_PREF_KEY = "isFlagSetForAutoBootIPTV";
-    private static final String AUTO_BOOT_STATE = "Yes";
-
-    private final ExecutorService executor = Executors.newSingleThreadExecutor();
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        if (Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
-            handleBootCompleted(context);
-        }
-    }
-
-    private void handleBootCompleted(Context context) {
-        SkySharedPref preferenceManager = new SkySharedPref(context);
-        String isAutoboot = preferenceManager.getKey(AUTO_BOOT_PREF_KEY);
-        String stateBG = preferenceManager.getKey(AUTO_BOOT_STATE_PREF_KEY);
-
-        if (AUTO_BOOT_ENABLED.equals(isAutoboot)) {
-            if (AUTO_BOOT_STATE.equals(stateBG)) {
-                startBinaryService(context);
-            } else {
-                preferenceManager.setKey("isFlagSetForAutoStartServer","Yes");
-                startBinaryServiceFG(context);
-            }
-        }
-    }
-
-    private void startBinaryService(Context context) {
-        Toast.makeText(context, "[JGO] Running Server in Background", Toast.LENGTH_SHORT).show();
-        Intent serviceIntent = new Intent(context, BinaryService.class);
-        serviceIntent.putExtra("binaryUri", "android.resource://com.skylake.skytv.jgorunner/raw/majorbin");
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            context.startForegroundService(serviceIntent);
-        } else {
-            context.startService(serviceIntent);
-        }
-        Log.d(TAG, "BinaryService started in the background.");
-    }
-
-    private void startBinaryServiceFG(Context context) {
-        Toast.makeText(context, "[JGO] Running Server in Foreground", Toast.LENGTH_SHORT).show();
-        Log.d(TAG, "BinaryService started in the foreground.");
-        launchMainActivity(context);
-    }
-
-    private void launchMainActivity(Context context) {
-        PackageManager pm = context.getPackageManager();
-        Intent launchIntent = pm.getLaunchIntentForPackage(context.getPackageName());
-
-        if (launchIntent != null) {
-            launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(launchIntent);
-            Toast.makeText(context, "[JGO] App launched in the foreground.", Toast.LENGTH_SHORT).show();
-            Log.d(TAG, "App launched in the foreground.");
-        } else {
-            Toast.makeText(context, "[JGO] Unable to launch app: Launch intent is null.", Toast.LENGTH_SHORT).show();
-            Log.e(TAG, "Unable to launch app: Launch intent is null.");
-        }
-    }
-}
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/receivers/BootReceiver.kt b/app/src/main/java/com/skylake/skytv/jgorunner/receivers/BootReceiver.kt
new file mode 100644
index 0000000..6592d86
--- /dev/null
+++ b/app/src/main/java/com/skylake/skytv/jgorunner/receivers/BootReceiver.kt
@@ -0,0 +1,76 @@
+package com.skylake.skytv.jgorunner.receivers
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.util.Log
+import android.widget.Toast
+import com.skylake.skytv.jgorunner.data.SkySharedPref
+import com.skylake.skytv.jgorunner.services.BinaryService
+
+class BootReceiver : BroadcastReceiver() {
+    companion object {
+        private const val TAG = "BootReceiver"
+    }
+
+    override fun onReceive(context: Context, intent: Intent) {
+        if (Intent.ACTION_BOOT_COMPLETED == intent.action) {
+            handleBootCompleted(context)
+        }
+    }
+
+    private fun handleBootCompleted(context: Context) {
+        val preferenceManager = SkySharedPref.getInstance(context)
+        val isAutoStartOnBootEnabled = preferenceManager.myPrefs.autoStartOnBoot
+        val autoStartOnBootForeground = preferenceManager.myPrefs.autoStartOnBootForeground
+
+        if (isAutoStartOnBootEnabled) {
+            if (autoStartOnBootForeground) {
+                preferenceManager.myPrefs.autoStartServer = true
+                preferenceManager.savePreferences()
+                startBinaryServiceFG(context)
+            } else {
+                startBinaryService(context)
+            }
+        }
+    }
+
+    private fun startBinaryService(context: Context) {
+        Toast.makeText(context, "[JGO] Running Server in Background", Toast.LENGTH_SHORT).show()
+        val serviceIntent = Intent(context, BinaryService::class.java)
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            context.startForegroundService(serviceIntent)
+        } else {
+            context.startService(serviceIntent)
+        }
+        Log.d(TAG, "BinaryService started in the background.")
+    }
+
+    private fun startBinaryServiceFG(context: Context) {
+        Toast.makeText(context, "[JGO] Running Server in Foreground", Toast.LENGTH_SHORT).show()
+        Log.d(TAG, "BinaryService started in the foreground.")
+        launchMainActivity(context)
+    }
+
+    private fun launchMainActivity(context: Context) {
+        val pm = context.packageManager
+        val launchIntent = pm.getLaunchIntentForPackage(context.packageName)
+
+        if (launchIntent != null) {
+            launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            context.startActivity(launchIntent)
+            Toast.makeText(context, "[JGO] App launched in the foreground.", Toast.LENGTH_SHORT)
+                .show()
+            Log.d(TAG, "App launched in the foreground.")
+        } else {
+            Toast.makeText(
+                context,
+                "[JGO] Unable to launch app: Launch intent is null.",
+                Toast.LENGTH_SHORT
+            ).show()
+            Log.e(TAG, "Unable to launch app: Launch intent is null.")
+        }
+    }
+}
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/services/BinaryExecutor.java b/app/src/main/java/com/skylake/skytv/jgorunner/services/BinaryExecutor.java
deleted file mode 100644
index 011b551..0000000
--- a/app/src/main/java/com/skylake/skytv/jgorunner/services/BinaryExecutor.java
+++ /dev/null
@@ -1,287 +0,0 @@
-package com.skylake.skytv.jgorunner.services;
-
-import android.content.Context;
-import android.os.Build;
-import android.os.Environment;
-import android.util.Log;
-import android.widget.Toast;
-
-import com.skylake.skytv.jgorunner.R;
-import com.skylake.skytv.jgorunner.data.SkySharedPref;
-import com.skylake.skytv.jgorunner.utils.RemoteBinaryFetcher;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.lang.reflect.Field;
-
-public class BinaryExecutor {
-
-    private static Process binaryProcess = null;
-    private static StringBuilder outputBuilder = new StringBuilder();
-    private static final String TAG = "BinaryExecutor";
-
-    public interface OutputCallback {
-        void onOutput(String output);
-    }
-
-    public static void executeBinary(final Context context, final String[] arguments, final OutputCallback callback) {
-        new Thread(() -> {
-            SkySharedPref preferenceManager = new SkySharedPref(context);
-            File binaryFile = new File(context.getFilesDir(), "majorbin");
-
-            try {
-
-                String arch =  preferenceManager.getKey("ARCHx");
-                Log.d(TAG, "Device architecture: " + arch);
-
-                assert arch != null;
-                if (!arch.toLowerCase().contains("arm") && !arch.toLowerCase().contains("aarch")) {
-                    Toast.makeText(context, "The device architecture["+arch+"] is not supported.", Toast.LENGTH_SHORT).show();
-                }
-
-                handleBinaryFile(preferenceManager, binaryFile, context, callback);
-                setBinaryExecutable(binaryFile);
-                String command = buildCommand(preferenceManager, arguments, binaryFile,context);
-
-                String command_log = preferenceManager.getKey("__MasterArgs_final");
-                Log.d("DIX.Runner",command_log);
-
-                binaryProcess = Runtime.getRuntime().exec(new String[]{"sh", "-c", command});
-                new Thread(new StreamGobbler(binaryProcess.getInputStream(), callback)).start();
-
-                binaryProcess.waitFor();
-            } catch (Exception e) {
-                Log.e(TAG, "Error executing binary: ", e);
-                callback.onOutput("Exception occurred: " + e.getMessage());
-            }
-        }).start();
-    }
-
-    private static void handleBinaryFile(SkySharedPref preferenceManager, File binaryFile, Context context, OutputCallback callback) {
-        if (shouldResetBinary(preferenceManager, binaryFile)) {
-            deleteBinaryFile(binaryFile, preferenceManager);
-        }
-
-        if (!binaryFile.exists()) {
-            RemoteBinaryFetcher.INSTANCE.startDownloadAndSave(context, callback);
-            /* DEBUG CASE */
-            boolean skipper = false;
-            if (skipper) {
-                copyBinaryFromResources(binaryFile, context);
-            } else {
-                /* 未来 USE CASE */
-            }
-        }
-    }
-
-
-    private static boolean shouldResetBinary(SkySharedPref preferenceManager, File binaryFile) {
-        String resetBinaryCheck = preferenceManager.getKey("ResetBinaryCheck");
-        return "Yes".equals(resetBinaryCheck) && binaryFile.exists();
-    }
-
-    private static void deleteBinaryFile(File binaryFile, SkySharedPref preferenceManager) {
-        if (binaryFile.delete()) {
-            Log.e(TAG, "Binary file deleted successfully.");
-            preferenceManager.setKey("ResetBinaryCheck", "No");
-        } else {
-            Log.e(TAG, "Failed to delete binary file.");
-        }
-    }
-
-    private static void copyBinaryFromResources(File binaryFile, Context context) {
-        try (InputStream in = context.getResources().openRawResource(R.raw.majorbin);
-             FileOutputStream out = new FileOutputStream(binaryFile)) {
-
-            byte[] buffer = new byte[1024];
-            int bytesRead;
-            while ((bytesRead = in.read(buffer)) != -1) {
-                out.write(buffer, 0, bytesRead);
-            }
-        } catch (Exception e) {
-            Log.e(TAG, "Error copying binary from resources: ", e);
-        }
-    }
-
-    private static void setBinaryExecutable(File binaryFile) {
-        if (binaryFile.exists()) {
-            boolean success = binaryFile.setExecutable(true, false);
-            // Intentionally ignore the result without further action
-            Log.d(TAG,"binaryPermissions: " + success);
-        }
-    }
-
-    private static String buildCommand(SkySharedPref preferenceManager, String[] arguments, File binaryFile, Context context) {
-        StringBuilder commandBuilder = new StringBuilder(binaryFile.getAbsolutePath());
-        String __Port = preferenceManager.getKey("__Port");
-        String __Public = preferenceManager.getKey("__Public");
-
-        /* DEBUG CASE */
-//        commandBuilder.append(" run").append(__Port).append(__Public).append(" --config \"jiotv-config.json\"");
-
-        // Internal storage
-        if (false) {
-            commandBuilder.append(" run")
-                    .append(__Port)
-                    .append(__Public)
-                    .append(" --config \"")
-                    .append(context.getFilesDir().getAbsolutePath())
-                    .append("/jiotv-config.json\"");
-        }
-
-        // External storage
-        if (true) {
-            String externalStoragePath = Environment.getExternalStorageDirectory().getPath();
-            File folder = new File(externalStoragePath, ".jiotv_go");
-            File jsonFile = new File(folder, "jiotv-config.json");
-            File keyFile = new File(folder, "key.pem");
-            File certFile = new File(folder, "cert.pem");
-
-            commandBuilder.append(" run")
-                    .append(__Port)
-                    .append(__Public)
-                    .append(" --config \"")
-                    .append(jsonFile.getAbsolutePath())
-                    .append("\"");
-
-            /* DEBUG CASE: DRM */
-            if (false){
-                commandBuilder.append(" run")
-                        .append(__Port)
-                        .append(__Public)
-                        .append(" --tls")
-                        .append(" --tls-key \"")
-                        .append(keyFile.getAbsolutePath())
-                        .append("\"")
-                        .append(" --tls-cert \"")
-                        .append(certFile.getAbsolutePath())
-                        .append("\"")
-                        .append(" --config \"")
-                        .append(jsonFile.getAbsolutePath())
-                        .append("\"");
-            }
-        }
-
-
-
-        preferenceManager.setKey("__MasterArgs_final",commandBuilder.toString());
-
-//        for (String arg : arguments) {
-//            commandBuilder.append(" ").append(arg);
-//        }
-
-        return commandBuilder.toString();
-    }
-//
-//    public static void stopBinary() {
-//        if (binaryProcess != null) {
-//            binaryProcess.destroy();
-//            binaryProcess = null;
-//        }
-//    }
-
-    public static void stopBinary() {
-        if (binaryProcess != null) {
-            try {
-                // Close all streams before killing the process
-                closeProcessStreams(binaryProcess);
-
-                // Retrieve the process ID (PID)
-                String pid = getProcessId(binaryProcess);
-                if (pid != null) {
-                    Log.i(TAG, "Killing process tree for PID: " + pid);
-
-                    // Execute shell command to kill the entire process tree
-                    killProcessTree(pid);
-                }
-
-                // First attempt to stop the process gracefully
-                binaryProcess.destroy();
-                Log.i(TAG+"DIX", "Process destroyed.");
-
-                // If needed, escalate to forcibly destroying it
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    binaryProcess.destroyForcibly();
-                }
-                Log.i(TAG, "Process forcibly destroyed.");
-
-            } catch (Exception e) {
-                Log.e(TAG, "Error while stopping binary process: ", e);
-            } finally {
-                binaryProcess = null;  // Reset the process variable
-            }
-        }
-    }
-
-    // Helper method to retrieve the process ID (PID) via reflection
-    private static String getProcessId(Process process) {
-        try {
-            // Use reflection to access the PID field in the Process class
-            Field pidField = process.getClass().getDeclaredField("pid");
-            pidField.setAccessible(true);
-            Log.e(TAG, "String.valueOf(pidField.getInt(process)");
-            return String.valueOf(pidField.getInt(process));
-        } catch (Exception e) {
-            Log.e(TAG, "Error getting process ID: ", e);
-            return null;
-        }
-    }
-
-    // Helper method to kill the process tree using a shell command
-    private static void killProcessTree(String pid) {
-        try {
-            // Execute shell command to kill the process tree (including subprocesses)
-            String[] cmd = { "sh", "-c", "kill -9 " + pid };
-            Process killProcess = Runtime.getRuntime().exec(cmd);
-            killProcess.waitFor();  // Wait for the kill command to finish
-            Log.i(TAG, "Successfully killed process tree for PID: " + pid);
-        } catch (Exception e) {
-            Log.e(TAG, "Error killing process tree: ", e);
-        }
-    }
-
-    // Helper method to close process streams
-    private static void closeProcessStreams(Process process) {
-        try {
-            process.getInputStream().close();
-            process.getOutputStream().close();
-            process.getErrorStream().close();
-        } catch (Exception e) {
-            Log.e(TAG, "Error closing process streams: ", e);
-        }
-    }
-
-
-
-    public static boolean isBinaryRunning() {
-        return binaryProcess != null;
-    }
-
-    private static class StreamGobbler implements Runnable {
-        private final InputStream inputStream;
-        private final OutputCallback callback;
-
-        public StreamGobbler(InputStream inputStream, OutputCallback callback) {
-            this.inputStream = inputStream;
-            this.callback = callback;
-        }
-
-        @Override
-        public void run() {
-            try {
-                byte[] buffer = new byte[1024];
-                int bytesRead;
-                while ((bytesRead = inputStream.read(buffer)) != -1) {
-                    String output = new String(buffer, 0, bytesRead);
-                    outputBuilder.append(output).append("\n");
-                    Log.d(TAG, "Process output: " + output);
-                    callback.onOutput(output);
-                }
-            } catch (Exception e) {
-                Log.e(TAG, "Error reading binary output: ", e);
-            }
-        }
-    }
-}
-
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/services/BinaryService.java b/app/src/main/java/com/skylake/skytv/jgorunner/services/BinaryService.java
deleted file mode 100644
index 6bfa85e..0000000
--- a/app/src/main/java/com/skylake/skytv/jgorunner/services/BinaryService.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package com.skylake.skytv.jgorunner.services;
-
-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.app.Service;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Build;
-import android.os.IBinder;
-import android.util.Log;
-
-import androidx.core.app.NotificationCompat;
-
-import com.skylake.skytv.jgorunner.R;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.util.Arrays;
-
-public class BinaryService extends Service {
-
-    private static final String CHANNEL_ID = "BinaryServiceChannel";
-    private static final int NOTIFICATION_ID = 1;
-    public static final String ACTION_STOP_BINARY = "com.skylake.skytv.jgorunner.action.STOP_BINARY";
-    public static final String ACTION_BINARY_STOPPED = "com.skylake.skytv.jgorunner.action.BINARY_STOPPED";
-
-    private Uri binaryUri;
-    private String[] arguments;
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        createNotificationChannel();
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        if (ACTION_STOP_BINARY.equals(intent.getAction())) {
-            BinaryExecutor.stopBinary();
-            Log.d("BinaryService", "Binary stopped by user.");
-
-            Intent broadcastIntent = new Intent(ACTION_BINARY_STOPPED);
-            broadcastIntent.setPackage(getPackageName()); // Ensure the broadcast is internal-only
-            sendBroadcast(broadcastIntent);
-
-
-            stopForeground(true);
-            stopSelf();
-            return START_NOT_STICKY;
-        }
-
-        binaryUri = Uri.parse(intent.getStringExtra("binaryUri"));
-        arguments = intent.getStringArrayExtra("arguments");
-
-        if (binaryUri == null) {
-            binaryUri = Uri.parse("android.resource://com.skylake.skytv.jgorunner/raw/majorbin");
-        }
-
-        if (arguments == null) {
-            arguments = new String[]{"Boot Start"};
-        }
-
-        if (binaryUri != null) {
-            if (binaryUri.toString().startsWith("android.resource://")) {
-                Log.d("BinaryService1", "BinaryService started in the background. ? "+ Arrays.toString(arguments));
-                BinaryExecutor.executeBinary(this, arguments, output -> {
-                    Log.d("BinaryOutput", output);
-                });
-            } else {
-                Log.d("BinaryService2", "BinaryService started in the background. ? "+ Arrays.toString(arguments));
-                BinaryExecutor.executeBinary(this, arguments, output -> {
-                    Log.d("BinaryOutput", output);
-                });
-            }
-        } else {
-            Log.e("BinaryService", "No binary selected");
-        }
-
-        Notification notification = createNotification();
-        startForeground(NOTIFICATION_ID, notification);
-
-        return START_STICKY;
-    }
-
-    private void handleDefaultBinary() {
-        File binaryFile = new File(getFilesDir(), "defaultBinary"); // Changed file name to defaultBinary
-        if (!binaryFile.exists()) {
-            try (InputStream in = getResources().openRawResource(R.raw.majorbin);
-                 FileOutputStream out = new FileOutputStream(binaryFile)) {
-
-                byte[] buffer = new byte[1024];
-                int bytesRead;
-                while ((bytesRead = in.read(buffer)) != -1) {
-                    out.write(buffer, 0, bytesRead);
-                }
-
-                binaryFile.setExecutable(true, false);
-
-            } catch (Exception e) {
-                Log.e("BinaryService", "Failed to handle default binary", e);
-            }
-        }
-
-        BinaryExecutor.executeBinary(this, arguments, output -> {
-            Log.d("BinaryOutput", output);
-        });
-    }
-
-
-
-
-    private Notification createNotification() {
-        // Create the Stop Binary intent and PendingIntent
-        Intent stopIntent = new Intent(this, BinaryService.class);
-        stopIntent.setAction(ACTION_STOP_BINARY);
-
-        PendingIntent stopPendingIntent = PendingIntent.getService(
-                this, 0, stopIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
-
-        Notification notification;
-
-        // Check for Android O and above for notification channel
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            Notification.Builder notificationBuilder = new Notification.Builder(this, CHANNEL_ID)
-                    .setContentTitle("JTV-GO Service Running")
-                    .setContentText("The server is running in the background.")
-                    .setSmallIcon(R.drawable.notifications_24px)
-                    .setOngoing(true)
-                    .addAction(R.drawable.cancel_24px, "Stop Server", stopPendingIntent);
-            notification = notificationBuilder.build();
-        } else {
-            NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this)
-                    .setContentTitle("JTV-GO Service Running")
-                    .setContentText("The server is running in the background.")
-                    .setSmallIcon(R.drawable.notifications_24px)
-                    .setOngoing(true)
-                    .addAction(R.drawable.cancel_24px, "Stop Server", stopPendingIntent);
-            notification = notificationBuilder.build();
-        }
-
-        return notification;
-    }
-
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-    }
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-
-    private void createNotificationChannel() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            NotificationManager manager = getSystemService(NotificationManager.class);
-            if (manager.getNotificationChannel(CHANNEL_ID) == null) {
-                NotificationChannel serviceChannel = new NotificationChannel(
-                        CHANNEL_ID,
-                        "Binary Service Channel",
-                        NotificationManager.IMPORTANCE_DEFAULT
-                );
-                manager.createNotificationChannel(serviceChannel);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/services/BinaryService.kt b/app/src/main/java/com/skylake/skytv/jgorunner/services/BinaryService.kt
new file mode 100644
index 0000000..8db6482
--- /dev/null
+++ b/app/src/main/java/com/skylake/skytv/jgorunner/services/BinaryService.kt
@@ -0,0 +1,208 @@
+package com.skylake.skytv.jgorunner.services
+
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.app.Service
+import android.content.Intent
+import android.graphics.drawable.Icon
+import android.os.Build
+import android.os.IBinder
+import android.util.Log
+import androidx.core.app.NotificationCompat
+import androidx.lifecycle.MutableLiveData
+import com.skylake.skytv.jgorunner.BuildConfig
+import com.skylake.skytv.jgorunner.R
+import com.skylake.skytv.jgorunner.core.execution.BinaryExecutor
+import com.skylake.skytv.jgorunner.core.execution.ExecutionError
+import com.skylake.skytv.jgorunner.data.SkySharedPref
+import java.io.File
+
+class BinaryService : Service() {
+    companion object {
+        // Constants
+        private const val CHANNEL_ID = "BinaryServiceChannel"
+        private const val NOTIFICATION_ID = 1
+        const val ACTION_STOP_BINARY: String =
+            "${BuildConfig.APPLICATION_ID}.action.STOP_BINARY"
+        const val ACTION_BINARY_STOPPED: String =
+            "${BuildConfig.APPLICATION_ID}.action.BINARY_STOPPED"
+
+        // Singleton instance of the BinaryService
+        var instance: BinaryService? = null
+            private set
+
+        val isRunning: Boolean
+            get() = instance != null
+
+    }
+
+    // LiveData to observe the output of the ran binary
+    val binaryOutput: MutableLiveData<String> = MutableLiveData("")
+
+    override fun onCreate() {
+        super.onCreate()
+        createNotificationChannel()
+    }
+
+    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+        // Create the notification for the service
+        val notification = createNotification()
+        startForeground(NOTIFICATION_ID, notification)
+
+        if (intent.action == ACTION_STOP_BINARY) {
+            stopService()
+            return START_NOT_STICKY
+        }
+
+        // Prevents the service from being running again if it's already running
+        if (isRunning) return START_STICKY
+
+        // Set the singleton instance to this
+        instance = this
+
+        // Get the arguments from the intent
+        var binaryFileLocation = intent.getStringExtra("binaryFileLocation")
+        val arguments = intent.getStringArrayExtra("arguments")
+
+        // Default binary file location
+        if (binaryFileLocation == null) {
+            val binaryFileName = SkySharedPref.getInstance(this).myPrefs.jtvGoBinaryName
+            if (binaryFileName.isNullOrEmpty()) {
+                Log.e("BinaryService", "Binary file location not provided.")
+                stopService()
+                return START_NOT_STICKY
+            }
+            binaryFileLocation =
+                File(filesDir, binaryFileName).absolutePath
+        }
+
+        val binaryFile = File(binaryFileLocation!!)
+
+        // Execute the binary
+        BinaryExecutor.executeBinary(
+            this, binaryFile, arguments,
+            onOutput = { output ->
+                var temp = binaryOutput.value
+                if (temp == null) {
+                    binaryOutput.postValue(output)
+                    return@executeBinary
+                }
+                temp += output
+                if (temp.length > 5000)
+                    temp = temp.substring(5000)
+                binaryOutput.postValue(temp.toString())
+            },
+            onError = {
+                Log.e("BinaryService", "Error executing binary: ${it.errorType.name}", it)
+                when (it.errorType) {
+                    ExecutionError.ExecutionErrorType.BINARY_NOT_FOUND -> {
+                        val preferenceManager = SkySharedPref.getInstance(this)
+                        preferenceManager.myPrefs.jtvGoBinaryName = null
+                        preferenceManager.myPrefs.jtvGoBinaryVersion = "v0.0.0"
+                        preferenceManager.savePreferences()
+                    }
+                    ExecutionError.ExecutionErrorType.BINARY_UNKNOWN_ERROR -> {
+                        Log.e("BinaryService", "Unknown error occurred while executing binary.")
+                    }
+                }
+                stopService()
+            }
+        )
+
+        Log.d(
+            "BinaryService",
+            "BinaryService started in the background. ? " + arguments.contentToString()
+        )
+
+        return START_STICKY
+    }
+
+    private fun stopService() {
+        // Stop the binary
+        BinaryExecutor.stopBinary()
+        Log.d("BinaryService", "Binary stopping...")
+
+        // Broadcast that the binary has stopped
+        val broadcastIntent = Intent(ACTION_BINARY_STOPPED)
+
+        // Ensure the broadcast is internal-only
+        broadcastIntent.setPackage(packageName)
+
+        // Send the broadcast
+        sendBroadcast(broadcastIntent)
+
+        // Set the singleton instance to null
+        instance = null
+
+        @Suppress("deprecation")
+        stopForeground(true)
+        stopSelf()
+    }
+
+    private fun createNotification(): Notification {
+        // Create the Stop Binary intent and PendingIntent
+        val stopIntent = Intent(this, BinaryService::class.java)
+        stopIntent.setAction(ACTION_STOP_BINARY)
+
+        val stopPendingIntent = PendingIntent.getService(
+            this, 0, stopIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        )
+
+        val notification: Notification
+
+        // Check for Android O and above for notification channel
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val notificationBuilder = Notification.Builder(this, CHANNEL_ID)
+                .setContentTitle("JTV-GO Service Running")
+                .setContentText("The server is running in the background.")
+                .setSmallIcon(R.drawable.notifications_24px)
+                .setOngoing(true)
+                .addAction(
+                    Notification.Action.Builder(
+                        Icon.createWithResource(this, R.drawable.cancel_24px),
+                        "Stop Server",
+                        stopPendingIntent
+                    ).build()
+                )
+            notification = notificationBuilder.build()
+        } else {
+            val notificationBuilder = NotificationCompat.Builder(this, CHANNEL_ID)
+                .setContentTitle("JTV-GO Service Running")
+                .setContentText("The server is running in the background.")
+                .setSmallIcon(R.drawable.notifications_24px)
+                .setOngoing(true)
+                .addAction(R.drawable.cancel_24px, "Stop Server", stopPendingIntent)
+            notification = notificationBuilder.build()
+        }
+
+        return notification
+    }
+
+
+    override fun onDestroy() {
+        super.onDestroy()
+        instance = null
+    }
+
+    override fun onBind(intent: Intent): IBinder? {
+        return null
+    }
+
+    private fun createNotificationChannel() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val manager = getSystemService(
+                NotificationManager::class.java
+            )
+            if (manager.getNotificationChannel(CHANNEL_ID) == null) {
+                val serviceChannel = NotificationChannel(
+                    CHANNEL_ID,
+                    "Binary Service Channel",
+                    NotificationManager.IMPORTANCE_DEFAULT
+                )
+                manager.createNotificationChannel(serviceChannel)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/ui/components/BottomNavigationBar.kt b/app/src/main/java/com/skylake/skytv/jgorunner/ui/components/BottomNavigationBar.kt
new file mode 100644
index 0000000..e06bc0a
--- /dev/null
+++ b/app/src/main/java/com/skylake/skytv/jgorunner/ui/components/BottomNavigationBar.kt
@@ -0,0 +1,88 @@
+package com.skylake.skytv.jgorunner.ui.components
+
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.DeveloperMode
+import androidx.compose.material.icons.filled.Home
+import androidx.compose.material.icons.filled.Settings
+import androidx.compose.material.icons.outlined.DeveloperMode
+import androidx.compose.material.icons.outlined.Home
+import androidx.compose.material.icons.outlined.Settings
+import androidx.compose.material3.Badge
+import androidx.compose.material3.BadgedBox
+import androidx.compose.material3.Icon
+import androidx.compose.material3.NavigationBar
+import androidx.compose.material3.NavigationBarItem
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.graphics.vector.ImageVector
+
+@Composable
+fun BottomNavigationBar(
+    setCurrentScreen: (String) -> Unit
+) {
+    val items = listOf(
+        BottomNavigationItem(
+            title = "Home",
+            selectedIcon = Icons.Filled.Home,
+            unselectedIcon = Icons.Outlined.Home,
+            hasNews = false,
+        ),
+        BottomNavigationItem(
+            title = "Settings",
+            selectedIcon = Icons.Filled.Settings,
+            unselectedIcon = Icons.Outlined.Settings,
+            hasNews = false,
+        ),
+        BottomNavigationItem(
+            title = "Debug",
+            selectedIcon = Icons.Filled.DeveloperMode,
+            unselectedIcon = Icons.Outlined.DeveloperMode,
+            hasNews = false,
+        ),
+    )
+    var selectedItemIndex by rememberSaveable { mutableIntStateOf(0) }
+
+    NavigationBar {
+        items.forEachIndexed { index, item ->
+            NavigationBarItem(
+                selected = selectedItemIndex == index,
+                onClick = {
+                    selectedItemIndex = index
+                    setCurrentScreen(item.title)
+                },
+                label = {
+                    Text(text = item.title)
+                },
+                icon = {
+                    BadgedBox(
+                        badge = {
+                            if (item.hasNews) {
+                                Badge()
+                            }
+                        }
+                    ) {
+                        Icon(
+                            imageVector = if (selectedItemIndex == index) {
+                                item.selectedIcon
+                            } else {
+                                item.unselectedIcon
+                            },
+                            contentDescription = item.title
+                        )
+                    }
+                }
+            )
+        }
+    }
+}
+
+data class BottomNavigationItem(
+    val title: String,
+    val selectedIcon: ImageVector,
+    val unselectedIcon: ImageVector,
+    val hasNews: Boolean
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/ui/components/ButtonContent.kt b/app/src/main/java/com/skylake/skytv/jgorunner/ui/components/ButtonContent.kt
new file mode 100644
index 0000000..3bbb359
--- /dev/null
+++ b/app/src/main/java/com/skylake/skytv/jgorunner/ui/components/ButtonContent.kt
@@ -0,0 +1,35 @@
+package com.skylake.skytv.jgorunner.ui.components
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+
+@Composable
+fun ButtonContent(text: String, icon: ImageVector) {
+    Column(
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        Icon(
+            imageVector = icon,
+            contentDescription = "Icon",
+            tint = MaterialTheme.colorScheme.onPrimary,
+            modifier = Modifier.size(27.dp)
+        )
+        Spacer(modifier = Modifier.height(4.dp))
+        Text(
+            text = text,
+            fontSize = 12.sp,
+            color = MaterialTheme.colorScheme.onPrimary
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/ui/components/CustPopup.kt b/app/src/main/java/com/skylake/skytv/jgorunner/ui/components/CustPopup.kt
new file mode 100644
index 0000000..511143a
--- /dev/null
+++ b/app/src/main/java/com/skylake/skytv/jgorunner/ui/components/CustPopup.kt
@@ -0,0 +1,41 @@
+package com.skylake.skytv.jgorunner.ui.components
+
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Button
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.window.DialogProperties
+
+@Composable
+fun CustPopup(
+    isVisible: Boolean,
+    title: String,
+    text: String,
+    confirmButtonText: String,
+    dismissButtonText: String,
+    onConfirm: () -> Unit,
+    onDismiss: (() -> Unit)?
+) {
+    if (isVisible) {
+        AlertDialog(
+            onDismissRequest = { if (onDismiss != null) onDismiss() },
+            title = { Text(title) },
+            text = { Text(text) },
+            confirmButton = {
+                Button(onClick = { onConfirm() }) {
+                    Text(confirmButtonText)
+                }
+            },
+            dismissButton = {
+                if (onDismiss != null)
+                    Button(onClick = { onDismiss() }) {
+                        Text(dismissButtonText)
+                    }
+            },
+            properties = DialogProperties(
+                dismissOnBackPress = false,
+                dismissOnClickOutside = false
+            )
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/ui/components/ProgressPopup.kt b/app/src/main/java/com/skylake/skytv/jgorunner/ui/components/ProgressPopup.kt
new file mode 100644
index 0000000..5490e03
--- /dev/null
+++ b/app/src/main/java/com/skylake/skytv/jgorunner/ui/components/ProgressPopup.kt
@@ -0,0 +1,95 @@
+package com.skylake.skytv.jgorunner.ui.components
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.DialogProperties
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.width
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.LinearProgressIndicator
+
+@Composable
+fun ProgressPopup(
+    fileName: String,
+    currentProgress: Int,
+) {
+    AlertDialog(
+        onDismissRequest = { },
+        text = {
+            Column(
+                horizontalAlignment = Alignment.CenterHorizontally,
+                verticalArrangement = Arrangement.spacedBy(16.dp),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(16.dp)
+            ) {
+                Text(
+                    text = "Downloading $fileName",
+                    style = MaterialTheme.typography.bodyLarge.copy(
+                        fontSize = 18.sp,
+                        fontWeight = FontWeight.Bold,
+                        color = MaterialTheme.colorScheme.primary
+                    ),
+                    textAlign = TextAlign.Center,
+                    modifier = Modifier.padding(bottom = 8.dp)
+                )
+
+                if (currentProgress == 0) {
+                    BufferBar()
+                } else {
+                    ProgressBar(currentProgress)
+                }
+
+                Text(
+                    text = "Progress: $currentProgress%",
+                    style = MaterialTheme.typography.bodyLarge.copy(
+                        fontSize = 16.sp,
+                        fontWeight = FontWeight.Medium,
+                        color = MaterialTheme.colorScheme.secondary
+                    ),
+                    textAlign = TextAlign.Center,
+                )
+            }
+        },
+        confirmButton = { },
+        properties = DialogProperties(
+            dismissOnBackPress = false,
+            dismissOnClickOutside = false
+        )
+    )
+}
+
+@Composable
+fun ProgressBar(currentProgress : Int) {
+    LinearProgressIndicator(
+        progress = { currentProgress.coerceIn(0, 100) / 100f },
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(6.dp),
+        color = MaterialTheme.colorScheme.secondary,
+        trackColor = MaterialTheme.colorScheme.surfaceVariant,
+    )
+}
+
+@Composable
+fun BufferBar() {
+    LinearProgressIndicator(
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(6.dp),
+        color = MaterialTheme.colorScheme.secondary,
+        trackColor = MaterialTheme.colorScheme.surfaceVariant
+    )
+}
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/ui/components/RedirectPopup.kt b/app/src/main/java/com/skylake/skytv/jgorunner/ui/components/RedirectPopup.kt
new file mode 100644
index 0000000..fb08f71
--- /dev/null
+++ b/app/src/main/java/com/skylake/skytv/jgorunner/ui/components/RedirectPopup.kt
@@ -0,0 +1,140 @@
+package com.skylake.skytv.jgorunner.ui.components
+
+import android.content.Context
+import android.util.Log
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Button
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.DialogProperties
+import androidx.core.graphics.drawable.toBitmap
+import kotlinx.coroutines.delay
+
+@Composable
+fun RedirectPopup(
+    appIPTV: String?,
+    appIPTVpkg: String?,
+    isVisible: Boolean,
+    countdownTime: Int,
+    onDismiss: () -> Unit,
+    context: Context
+) {
+    if (appIPTV == null || appIPTVpkg == null) {
+        return
+    }
+
+    var currentTime by remember { mutableIntStateOf(countdownTime) }
+
+    // Retrieve the app icon from the package name
+    val appIcon = remember {
+        try {
+            val pm = context.packageManager
+            pm.getApplicationIcon(appIPTVpkg)
+        } catch (e: Exception) {
+            null
+        }
+    }
+
+    if (isVisible) {
+        Log.d("RedirectPopup", "Popup is visible.")
+
+        // Countdown logic
+        LaunchedEffect(Unit) {
+            currentTime = countdownTime
+            while (currentTime > 0) {
+                delay(1000)
+                currentTime -= 1
+            }
+            onDismiss()
+        }
+
+        // Log current time
+        Log.d("RedirectPopup", "Current countdown: $currentTime")
+
+        AlertDialog(
+            onDismissRequest = { onDismiss() },
+            text = {
+                Column(
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    verticalArrangement = Arrangement.Center,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(vertical = 16.dp)
+                ) {
+                    appIcon?.let {
+                        Image(
+                            bitmap = it.toBitmap().asImageBitmap(),
+                            contentDescription = "App Icon",
+                            modifier = Modifier
+                                .size(48.dp)
+                                .padding(bottom = 8.dp)
+                        )
+                    }
+
+                    Text(
+                        text = if (appIPTV == "No IPTV")
+                            "No IPTV selected."
+                        else
+                            "Redirecting to $appIPTV",
+                        style = MaterialTheme.typography.bodyLarge.copy(
+                            fontSize = 18.sp,
+                            fontWeight = FontWeight.Bold,
+                            color = MaterialTheme.colorScheme.primary
+                        ),
+                        textAlign = TextAlign.Center,
+                        modifier = Modifier.padding(vertical = 8.dp)
+                    )
+
+                    Text(
+                        text = "$currentTime seconds remaining",
+                        style = MaterialTheme.typography.bodyLarge.copy(
+                            fontSize = 16.sp,
+                            fontWeight = FontWeight.Medium,
+                            color = MaterialTheme.colorScheme.secondary
+                        ),
+                        textAlign = TextAlign.Center,
+                        modifier = Modifier
+                            .alpha(if (currentTime % 2 == 0) 1f else 0.7f)
+                            .padding(top = 8.dp)
+                    )
+                }
+            },
+            confirmButton = {
+                Button(
+                    onClick = { onDismiss() },
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = 16.dp, vertical = 8.dp)
+                ) {
+                    Text("Dismiss")
+                }
+            },
+            properties = DialogProperties(
+                dismissOnBackPress = false,
+                dismissOnClickOutside = false
+            )
+        )
+    } else {
+        Log.d("RedirectPopup", "Popup is NOT visible.")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/ui/screens/AppListScreen.kt b/app/src/main/java/com/skylake/skytv/jgorunner/ui/screens/AppListScreen.kt
new file mode 100644
index 0000000..84210a1
--- /dev/null
+++ b/app/src/main/java/com/skylake/skytv/jgorunner/ui/screens/AppListScreen.kt
@@ -0,0 +1,151 @@
+package com.skylake.skytv.jgorunner.ui.screens
+
+import android.content.Context
+import android.content.pm.ApplicationInfo
+import android.content.pm.PackageManager
+import android.graphics.drawable.Drawable
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.unit.dp
+import androidx.core.graphics.drawable.toBitmap
+import com.skylake.skytv.jgorunner.R
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.launch
+
+
+@Composable
+fun AppListScreen(modifier: Modifier = Modifier, onAppSelected: (AppInfo) -> Unit) {
+    val context = LocalContext.current
+    val apps = remember { mutableStateListOf<AppInfo>() }
+    val coroutineScope = rememberCoroutineScope()
+
+    LaunchedEffect(Unit) {
+        coroutineScope.launch {
+            getInstalledApps(context).collect {
+                apps.add(it)
+            }
+        }
+    }
+
+    LazyColumn(
+        modifier = modifier
+            .fillMaxSize()
+    ) {
+        items(apps) { app ->
+            AppListItem(appInfo = app, onAppSelected = onAppSelected)
+            HorizontalDivider(color = Color.Gray, thickness = 1.dp)
+        }
+    }
+}
+
+@Composable
+fun AppListItem(appInfo: AppInfo, onAppSelected: (AppInfo) -> Unit) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(8.dp)
+            .clickable { onAppSelected(appInfo) }
+    ) {
+        val drawable = appInfo.icon
+        val bitmap = drawable.toBitmap().asImageBitmap()
+
+        Image(
+            bitmap = bitmap,
+            contentDescription = "App Icon",
+            modifier = Modifier.size(48.dp),
+            contentScale = ContentScale.Crop
+        )
+
+        Spacer(modifier = Modifier.width(16.dp))
+
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(vertical = 8.dp)
+        ) {
+            Text(
+                text = appInfo.appName,
+                style = MaterialTheme.typography.bodyMedium,
+                modifier = Modifier.align(Alignment.CenterStart)
+            )
+        }
+    }
+}
+
+
+data class AppInfo(
+    val appName: String,
+    val icon: Drawable,
+    val packageName: String,
+    val launchActivity: String
+)
+
+fun getInstalledApps(context: Context): Flow<AppInfo> = flow {
+    val packageManager: PackageManager = context.packageManager
+
+    // Get installed applications
+    val apps = packageManager.getInstalledApplications(PackageManager.GET_META_DATA)
+        .filter { appInfo ->
+            // Filter out system apps
+            appInfo.flags and ApplicationInfo.FLAG_SYSTEM == 0
+        }
+        .sortedBy { appInfo ->
+            // Sort by app name
+            packageManager.getApplicationLabel(appInfo).toString().lowercase()
+        }
+
+    // Add a none action
+    val noneOption = AppInfo(
+        appName = "No IPTV",
+        icon = context.getDrawable(R.drawable.cancel_24px)!!,
+        packageName = "",
+        launchActivity = ""
+    )
+    emit(noneOption)
+
+    // Add WebTV action
+    val webOption = AppInfo(
+        appName = "WEB TV",
+        icon = context.getDrawable(R.mipmap.ic_launcher_neo)!!,
+        packageName = "webtv",
+        launchActivity = ""
+    )
+    emit(webOption)
+
+    for (appInfo in apps) {
+        val appName = packageManager.getApplicationLabel(appInfo).toString()
+        val appIcon = packageManager.getApplicationIcon(appInfo)
+        val packageName = appInfo.packageName
+        val launchActivity =
+            packageManager.getLaunchIntentForPackage(packageName)?.component?.className
+                ?: ""
+        emit(AppInfo(appName, appIcon, packageName, launchActivity))
+    }
+}.flowOn(Dispatchers.IO)
\ No newline at end of file
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/activity/DebugScreen.kt b/app/src/main/java/com/skylake/skytv/jgorunner/ui/screens/DebugScreen.kt
similarity index 91%
rename from app/src/main/java/com/skylake/skytv/jgorunner/activity/DebugScreen.kt
rename to app/src/main/java/com/skylake/skytv/jgorunner/ui/screens/DebugScreen.kt
index 83c8a8d..50a2370 100644
--- a/app/src/main/java/com/skylake/skytv/jgorunner/activity/DebugScreen.kt
+++ b/app/src/main/java/com/skylake/skytv/jgorunner/ui/screens/DebugScreen.kt
@@ -1,4 +1,4 @@
-package com.skylake.skytv.jgorunner.activity
+package com.skylake.skytv.jgorunner.ui.screens
 
 import android.content.Context
 import android.content.Intent
@@ -17,7 +17,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.unit.dp
@@ -43,6 +42,7 @@ import androidx.compose.material.icons.sharp.Info
 import androidx.compose.material.icons.sharp.Support
 import androidx.compose.runtime.*
 import com.skylake.skytv.jgorunner.data.SkySharedPref
+import com.skylake.skytv.jgorunner.ui.components.ButtonContent
 
 @Composable
 fun DebugScreen(context: Context, onNavigate: (String) -> Unit) {
@@ -57,14 +57,14 @@ fun DebugScreen(context: Context, onNavigate: (String) -> Unit) {
         Color.Magenta
     )
     val glowColor = remember { Animatable(glowColors.first()) }
-    val preferenceManager = remember { SkySharedPref(context) }
+    val preferenceManager = SkySharedPref.getInstance(context)
 
     LaunchedEffect(Unit) {
         launch(Dispatchers.IO) {
             repeat(3) {
-                val savedSwitchState = preferenceManager.getKey("isFlagSetForLOCAL")
+                val savedSwitchState = preferenceManager.myPrefs.serveLocal
                 Log.d("PreferenceCheck", "isFlagSetForLOCAL: $savedSwitchState")
-                isGlowing = savedSwitchState == "Yes"
+                isGlowing = savedSwitchState
                 delay(3000)
             }
         }
@@ -244,26 +244,6 @@ fun RowScope.Button4(context: Context) {
     }
 }
 
-@Composable
-fun ButtonContent(text: String, icon: ImageVector) {
-    Column(
-        horizontalAlignment = Alignment.CenterHorizontally
-    ) {
-        Icon(
-            imageVector = icon,
-            contentDescription = "Icon",
-            tint = MaterialTheme.colorScheme.onPrimary,
-            modifier = Modifier.size(32.dp)
-        )
-        Spacer(modifier = Modifier.height(4.dp))
-        Text(
-            text = text,
-            fontSize = 12.sp,
-            color = MaterialTheme.colorScheme.onPrimary
-        )
-    }
-}
-
 fun handleButton1Click(context: Context) {
     Toast.makeText(context, "Caution: Experimental!\n May be unstable.", Toast.LENGTH_SHORT).show()
 }
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/ui/screens/HomeScreen.kt b/app/src/main/java/com/skylake/skytv/jgorunner/ui/screens/HomeScreen.kt
new file mode 100644
index 0000000..e42fb0a
--- /dev/null
+++ b/app/src/main/java/com/skylake/skytv/jgorunner/ui/screens/HomeScreen.kt
@@ -0,0 +1,375 @@
+package com.skylake.skytv.jgorunner.ui.screens
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.twotone.ExitToApp
+import androidx.compose.material.icons.twotone.Deblur
+import androidx.compose.material.icons.twotone.LiveTv
+import androidx.compose.material.icons.twotone.PlayArrow
+import androidx.compose.material.icons.twotone.ResetTv
+import androidx.compose.material.icons.twotone.Stop
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Shadow
+import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.skylake.skytv.jgorunner.R
+import com.skylake.skytv.jgorunner.ui.components.ButtonContent
+
+private val customFontFamily = FontFamily(
+    Font(R.font.chakrapetch_bold)
+)
+
+@Composable
+fun HomeScreen(
+    title: String,
+    titleShouldGlow: Boolean,
+    isServerRunning: Boolean,
+    publicJTVServerURL: String,
+    outputText: String,
+    onRunServerButtonClick: () -> Unit,
+    onStopServerButtonClick: () -> Unit,
+    onRunIPTVButtonClick: () -> Unit,
+    onWebTVButtonClick: () -> Unit,
+    onDebugButtonClick: () -> Unit,
+    onExitButtonClick: () -> Unit
+) {
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(16.dp)
+            .verticalScroll(rememberScrollState()),
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        Image(
+            painter = painterResource(id = R.mipmap.ic_launcher_neo_foreground),
+            contentDescription = "App Icon",
+            modifier = Modifier.size(200.dp)
+        )
+        Text(
+            text = title,
+            fontSize = 24.sp,
+            fontFamily = customFontFamily,
+            color = MaterialTheme.colorScheme.onBackground,
+            style = if (titleShouldGlow) {
+                TextStyle(
+                    shadow = Shadow(
+                        color = Color.Green,
+                        blurRadius = 30f,
+                        offset = androidx.compose.ui.geometry.Offset(0f, 0f)
+                    )
+                )
+
+            } else {
+                TextStyle.Default
+            },
+            modifier = Modifier.padding(bottom = 16.dp)
+        )
+
+        Spacer(modifier = Modifier.height(16.dp))
+
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .border(2.dp, Color.Gray, RoundedCornerShape(8.dp))
+                .background(
+                    if (titleShouldGlow) Color(
+                        0xFFA5D6A7
+                    ) else MaterialTheme.colorScheme.errorContainer,
+                    RoundedCornerShape(8.dp)
+                )
+                .padding(5.dp)
+        ) {
+            val clipboardManager = LocalClipboardManager.current
+
+            Text(
+                text = publicJTVServerURL,
+                fontSize = 16.sp,
+                color = if (titleShouldGlow) Color.Black else MaterialTheme.colorScheme.onSurface,
+                modifier = Modifier
+                    .align(Alignment.Center)
+                    .clickable {
+                        clipboardManager.setText(AnnotatedString(publicJTVServerURL))
+                    }
+            )
+        }
+
+        Spacer(modifier = Modifier.height(16.dp))
+
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.SpaceEvenly
+        ) {
+            RunServerButton(enabled = isServerRunning.not()) {
+                onRunServerButtonClick()
+            }
+            StopServerButton(isServerRunning = isServerRunning) {
+                onStopServerButtonClick()
+            }
+        }
+
+        Spacer(modifier = Modifier.height(4.dp))
+
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.SpaceEvenly
+        ) {
+            RunIPTVButton {
+                onRunIPTVButtonClick()
+            }
+            WebTVButton(
+                enabled = isServerRunning
+            ) {
+                onWebTVButtonClick()
+            }
+            DebugButton {
+                onDebugButtonClick()
+            }
+            ExitButton {
+                onExitButtonClick()
+            }
+        }
+
+        Spacer(modifier = Modifier.height(16.dp))
+
+        Column(
+            modifier = Modifier.alpha(if (isServerRunning) 1f else 0f)
+        ) {
+            val outputScrollState = rememberScrollState()
+
+            // Scroll to the bottom whenever the text changes (recomposition)
+            LaunchedEffect(outputText) {
+                outputScrollState.animateScrollTo(outputScrollState.maxValue)
+            }
+
+            Text(
+                text = outputText,
+                color = Color.White,
+                fontSize = 12.sp,
+                fontWeight = FontWeight.Normal,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(160.dp)
+                    .background(Color.Black)
+                    .padding(8.dp)
+                    .verticalScroll(outputScrollState)
+            )
+        }
+    }
+}
+
+@Composable
+fun RowScope.RunServerButton(
+    enabled: Boolean = true,
+    onClick: () -> Unit
+) {
+    val colorPRIME = MaterialTheme.colorScheme.primary
+    val colorSECOND = MaterialTheme.colorScheme.secondary
+    val buttonColor = remember { mutableStateOf(colorPRIME) }
+
+    Button(
+        onClick = {
+            onClick()
+        },
+        modifier = Modifier
+            .weight(1f)
+            .padding(8.dp)
+            .onFocusChanged { focusState ->
+                buttonColor.value = if (focusState.isFocused) {
+                    colorSECOND
+                } else {
+                    colorPRIME
+                }
+            },
+        shape = RoundedCornerShape(8.dp),
+        colors = ButtonDefaults.buttonColors(containerColor = buttonColor.value),
+        contentPadding = PaddingValues(2.dp),
+        enabled = enabled
+    ) {
+        ButtonContent("Run Server", Icons.TwoTone.PlayArrow) // Different icon
+    }
+}
+
+@Composable
+fun RowScope.StopServerButton(
+    isServerRunning: Boolean,
+    onClick: () -> Unit
+) {
+    val colorPRIME = MaterialTheme.colorScheme.primary
+    val colorSECOND = MaterialTheme.colorScheme.secondary
+    val buttonColor = remember { mutableStateOf(colorPRIME) }
+    Button(
+        onClick = {
+            onClick()
+        },
+        enabled = isServerRunning,
+        modifier = Modifier
+            .weight(1f)
+            .padding(8.dp)
+            .onFocusChanged { focusState ->
+                buttonColor.value = if (focusState.isFocused) {
+                    colorSECOND
+                } else {
+                    colorPRIME
+                }
+            },
+        shape = RoundedCornerShape(8.dp),
+        colors = ButtonDefaults.buttonColors(containerColor = buttonColor.value),
+        contentPadding = PaddingValues(2.dp)
+    ) {
+        ButtonContent("Stop Server", Icons.TwoTone.Stop) // Different icon
+    }
+}
+
+@Composable
+fun RowScope.RunIPTVButton(
+    onClick: () -> Unit
+) {
+    val colorPRIME = MaterialTheme.colorScheme.primary
+    val colorSECOND = MaterialTheme.colorScheme.secondary
+    val buttonColor = remember { mutableStateOf(colorPRIME) }
+    Button(
+        onClick = { onClick() },
+        modifier = Modifier
+            .weight(1f)
+            .padding(8.dp)
+            .onFocusChanged { focusState ->
+                buttonColor.value = if (focusState.isFocused) {
+                    colorSECOND
+                } else {
+                    colorPRIME
+                }
+            },
+        shape = RoundedCornerShape(8.dp),
+        colors = ButtonDefaults.buttonColors(containerColor = buttonColor.value),
+        contentPadding = PaddingValues(2.dp)
+    ) {
+        ButtonContent("Run IPTV", Icons.TwoTone.ResetTv)
+    }
+}
+
+@Composable
+fun RowScope.WebTVButton(
+    enabled: Boolean = true,
+    onClick: () -> Unit
+) {
+    val colorPRIME = MaterialTheme.colorScheme.primary
+    val colorSECOND = MaterialTheme.colorScheme.secondary
+    val buttonColor = remember { mutableStateOf(colorPRIME) }
+    Button(
+        onClick = {
+            onClick()
+        },
+        modifier = Modifier
+            .weight(1f)
+            .padding(8.dp)
+            .onFocusChanged { focusState ->
+                buttonColor.value = if (focusState.isFocused) {
+                    colorSECOND
+                } else {
+                    colorPRIME
+                }
+            },
+        shape = RoundedCornerShape(8.dp),
+        colors = ButtonDefaults.buttonColors(containerColor = buttonColor.value),
+        contentPadding = PaddingValues(2.dp),
+        enabled = enabled
+    ) {
+        ButtonContent("Web TV", Icons.TwoTone.LiveTv)
+    }
+}
+
+@Composable
+fun RowScope.DebugButton(
+    onClick: () -> Unit
+) {
+    val colorPRIME = MaterialTheme.colorScheme.primary
+    val colorSECOND = MaterialTheme.colorScheme.secondary
+    val buttonColor = remember { mutableStateOf(colorPRIME) }
+    Button(
+        onClick = {
+            onClick()
+        },
+        modifier = Modifier
+            .weight(1f)
+            .padding(8.dp)
+            .onFocusChanged { focusState ->
+                buttonColor.value = if (focusState.isFocused) {
+                    colorSECOND
+                } else {
+                    colorPRIME
+                }
+            },
+        shape = RoundedCornerShape(8.dp),
+        colors = ButtonDefaults.buttonColors(containerColor = buttonColor.value),
+        contentPadding = PaddingValues(2.dp)
+    ) {
+        ButtonContent("Debug", Icons.TwoTone.Deblur)
+    }
+}
+
+@Composable
+fun RowScope.ExitButton(
+    onClick: () -> Unit
+) {
+    val colorPRIME = MaterialTheme.colorScheme.primary
+    val colorSECOND = MaterialTheme.colorScheme.secondary
+    val buttonColor = remember { mutableStateOf(colorPRIME) }
+    Button(
+        onClick = {
+            onClick()
+        },
+        modifier = Modifier
+            .weight(1f)
+            .padding(8.dp)
+            .onFocusChanged { focusState ->
+                buttonColor.value = if (focusState.isFocused) {
+                    colorSECOND
+                } else {
+                    colorPRIME
+                }
+            },
+        shape = RoundedCornerShape(8.dp),
+        colors = ButtonDefaults.buttonColors(containerColor = buttonColor.value),
+        contentPadding = PaddingValues(2.dp)
+    ) {
+        ButtonContent("Exit", Icons.AutoMirrored.TwoTone.ExitToApp)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/activity/InfoScreen.kt b/app/src/main/java/com/skylake/skytv/jgorunner/ui/screens/InfoScreen.kt
similarity index 68%
rename from app/src/main/java/com/skylake/skytv/jgorunner/activity/InfoScreen.kt
rename to app/src/main/java/com/skylake/skytv/jgorunner/ui/screens/InfoScreen.kt
index f03065c..deb7ae3 100644
--- a/app/src/main/java/com/skylake/skytv/jgorunner/activity/InfoScreen.kt
+++ b/app/src/main/java/com/skylake/skytv/jgorunner/ui/screens/InfoScreen.kt
@@ -1,4 +1,4 @@
-package com.skylake.skytv.jgorunner.activity
+package com.skylake.skytv.jgorunner.ui.screens
 
 import android.content.ClipData
 import android.content.ClipboardManager
@@ -17,29 +17,27 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.core.content.ContextCompat
 import com.skylake.skytv.jgorunner.data.SkySharedPref
+import java.io.File
 import java.net.InetAddress
 import java.text.SimpleDateFormat
 import java.util.*
+import java.io.FileOutputStream
+
 
 @Composable
 fun InfoScreen(context: Context) {
-    val preferenceManager = remember { SkySharedPref(context) }
+    val preferenceManager = SkySharedPref.getInstance(context)
     val wifiManager = context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
     val ipAddress = getIpAddress(wifiManager)
     val appVersion = getAppVersion(context)
-    val binVersion = preferenceManager.getKey("releaseName")
+    val binVersion = preferenceManager.myPrefs.jtvGoBinaryVersion
     val androidVersion = Build.VERSION.RELEASE
     val sdkVersion = Build.VERSION.SDK_INT
-    val countryCode = Locale.getDefault().country
     val architecture = System.getProperty("os.arch") ?: "Unknown"
     val totalStorage = getTotalStorageSpace(context)
     val dateTime = getCurrentDateTime()
 
-    // Checking permissions
-    val permissionsStatus = checkPermissions(context)
-
     // Creating a formatted device information string
     val deviceInfo = """
         JTV-GO Version: $appVersion
@@ -52,11 +50,12 @@ fun InfoScreen(context: Context) {
         Date and Time: $dateTime
     """.trimIndent()
 
+
     Column(
         modifier = Modifier
-            . fillMaxSize()
+            .fillMaxSize()
             .padding(16.dp)
-            .verticalScroll(rememberScrollState()), // Make it scrollable
+            .verticalScroll(rememberScrollState()),
         verticalArrangement = Arrangement.Center,
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
@@ -78,40 +77,20 @@ fun InfoScreen(context: Context) {
 
         Spacer(modifier = Modifier.height(16.dp))
 
-        // Divider for permissions section
+        // Divider
         HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
 
-        // Permissions Status Section
-        Text(
-            text = "Permissions Status:",
-            fontSize = 16.sp,
-            fontWeight = FontWeight.Bold,
-            modifier = Modifier.padding(vertical = 8.dp)
-        )
-        Column {
-            permissionsStatus.forEach { status ->
-                Text(
-                    text = status,
-                    fontSize = 12.sp,
-                    modifier = Modifier.padding(vertical = 2.dp)
-                )
-            }
-        }
-
-        Spacer(modifier = Modifier.height(32.dp))
+//        Spacer(modifier = Modifier.height(32.dp))
 
         Button(
             onClick = {
                 val allInfo = buildString {
                     append(deviceInfo)
-                    append("\n\nPermissions Status:\n")
-                    permissionsStatus.forEach { status ->
-                        append("$status\n")
-                    }
                 }
 
                 copyToClipboard(context, allInfo)
-                Toast.makeText(context, "Information copied to clipboard", Toast.LENGTH_SHORT).show()
+                Toast.makeText(context, "Information copied to clipboard", Toast.LENGTH_SHORT)
+                    .show()
             },
             modifier = Modifier.align(Alignment.CenterHorizontally)
         ) {
@@ -120,8 +99,6 @@ fun InfoScreen(context: Context) {
     }
 }
 
-
-
 // Function to get the app version
 fun getAppVersion(context: Context): String {
     return try {
@@ -134,6 +111,7 @@ fun getAppVersion(context: Context): String {
 
 // Helper function to get the IP address from WifiManager
 fun getIpAddress(wifiManager: WifiManager): String {
+    @Suppress("deprecation")
     val ip = wifiManager.connectionInfo.ipAddress
     return if (ip != 0) {
         InetAddress.getByAddress(
@@ -168,23 +146,3 @@ fun copyToClipboard(context: Context, text: String) {
     val clip = ClipData.newPlainText("Device Info", text)
     clipboard.setPrimaryClip(clip)
 }
-
-// Function to check permissions
-fun checkPermissions(context: Context): List<String> {
-    val requiredPermissions = listOf(
-        android.Manifest.permission.READ_EXTERNAL_STORAGE,
-        android.Manifest.permission.WRITE_EXTERNAL_STORAGE,
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {android.Manifest.permission.POST_NOTIFICATIONS} else {
-            TODO("VERSION.SDK_INT < TIRAMISU") },
-        android.Manifest.permission.SYSTEM_ALERT_WINDOW,
-    )
-
-    return requiredPermissions.map { permission ->
-        val permissionName = permission.substringAfterLast(".")
-        if (ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED) {
-            "$permissionName: Granted"
-        } else {
-            "$permissionName: Denied"
-        }
-    }
-}
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/activity/LoginScreen.kt b/app/src/main/java/com/skylake/skytv/jgorunner/ui/screens/LoginScreen.kt
similarity index 89%
rename from app/src/main/java/com/skylake/skytv/jgorunner/activity/LoginScreen.kt
rename to app/src/main/java/com/skylake/skytv/jgorunner/ui/screens/LoginScreen.kt
index a0113f4..9597f9b 100644
--- a/app/src/main/java/com/skylake/skytv/jgorunner/activity/LoginScreen.kt
+++ b/app/src/main/java/com/skylake/skytv/jgorunner/ui/screens/LoginScreen.kt
@@ -1,18 +1,44 @@
-package com.skylake.skytv.jgorunner.activity
+package com.skylake.skytv.jgorunner.ui.screens
 
 import android.content.Context
 import android.util.Log
-import androidx.compose.foundation.layout.*
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
+import android.widget.Toast
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material3.Button
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Tab
+import androidx.compose.material3.TabRow
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shadow
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.unit.dp
@@ -20,20 +46,12 @@ import androidx.compose.ui.unit.sp
 import com.skylake.skytv.jgorunner.R
 import com.skylake.skytv.jgorunner.data.SkySharedPref
 import kotlinx.coroutines.delay
-import android.widget.Toast
-import androidx.compose.foundation.text.KeyboardActions
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.ui.draw.alpha
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.graphics.graphicsLayer
-import androidx.compose.ui.text.input.ImeAction
 
 @Composable
 fun LoginScreen(context: Context) {
     val customFontFamily = FontFamily(Font(R.font.chakrapetch_bold))
     val glowColor = Color.Green
-    val preferenceManager = remember { SkySharedPref(context) }
+    val preferenceManager = SkySharedPref.getInstance(context)
 
     var isUsingOtp by remember { mutableStateOf(true) }
 
@@ -42,7 +60,7 @@ fun LoginScreen(context: Context) {
     var password by remember { mutableStateOf("") }
 
     val isGlowing by rememberUpdatedState(newValue = run {
-        preferenceManager.getKey("isFlagSetForLOCAL") == "Yes"
+        preferenceManager.myPrefs.serveLocal
     })
 
     // Focus requesters for managing focus on fields
@@ -105,7 +123,7 @@ fun LoginScreen(context: Context) {
             )
 
             // Tab layout to switch between OTP and Password
-            var selectedTabIndex by remember { mutableStateOf(0) }
+            var selectedTabIndex by remember { mutableIntStateOf(0) }
             TabRow(selectedTabIndex = selectedTabIndex) {
                 Tab(
                     selected = selectedTabIndex == 0,
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/activity/RunnerScreen.kt b/app/src/main/java/com/skylake/skytv/jgorunner/ui/screens/RunnerScreen.kt
similarity index 80%
rename from app/src/main/java/com/skylake/skytv/jgorunner/activity/RunnerScreen.kt
rename to app/src/main/java/com/skylake/skytv/jgorunner/ui/screens/RunnerScreen.kt
index cbe117f..bb8e6bc 100644
--- a/app/src/main/java/com/skylake/skytv/jgorunner/activity/RunnerScreen.kt
+++ b/app/src/main/java/com/skylake/skytv/jgorunner/ui/screens/RunnerScreen.kt
@@ -1,24 +1,37 @@
-package com.skylake.skytv.jgorunner.activity
+package com.skylake.skytv.jgorunner.ui.screens
 import android.content.Context
 import android.net.Uri
 import android.util.Log
 import android.widget.Toast
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.foundation.layout.*
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Button
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.skylake.skytv.jgorunner.data.SkySharedPref
-import java.io.*
+import com.skylake.skytv.jgorunner.core.execution.BinaryExecutor
+import java.io.File
+import java.io.FileOutputStream
 
 @Composable
 fun RunnerScreen(context: Context) {
-    val preferenceManager = remember { SkySharedPref(context) }
     var logOutput by remember { mutableStateOf("") }
     var showDialog by remember { mutableStateOf(false) }
     var commandInput by remember { mutableStateOf("") }
@@ -102,8 +115,13 @@ fun RunnerScreen(context: Context) {
                 onDismiss = { showDialog = false },
                 onRunCommand = { command ->
                     val binaryFile = File(context.filesDir, "majorbin")
-                    val output = runBinaryCommand(binaryFile.absolutePath, command, context)
-                    logOutput += output + "\n"
+                    BinaryExecutor.executeBinary(
+                        context,
+                        binaryFile,
+                        command.split(" ").toTypedArray(),
+                        { output -> logOutput += output + "\n" },
+                        { error -> logOutput += "Error: ${error.message}\n" }
+                    )
                     showDialog = false
                 },
                 commandInput = commandInput,
@@ -161,27 +179,4 @@ fun copyFileToInternalStorage(context: Context, uri: Uri, destFile: File): Boole
         Log.e("FileCopy", "Error copying file: ${e.message}")
         false // Failed to copy
     }
-}
-
-// Function to run a binary command with arguments
-fun runBinaryCommand(binaryPath: String, commandArgs: String, context: Context): String {
-    return try {
-        val command = "$binaryPath $commandArgs"
-        val process = Runtime.getRuntime().exec(arrayOf("sh", "-c", command))
-        val reader = BufferedReader(InputStreamReader(process.inputStream))
-        val output = StringBuilder()
-        var line: String?
-
-        while (reader.readLine().also { line = it } != null) {
-            output.append(line).append("\n")
-        }
-
-        reader.close()
-        process.waitFor()
-        Log.d("BinaryCommand", output.toString())
-        output.toString()
-    } catch (e: Exception) {
-        Log.e("BinaryCommand", "Error executing command: ${e.message}")
-        "Error: ${e.message}"
-    }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/activity/SettingsScreen.kt b/app/src/main/java/com/skylake/skytv/jgorunner/ui/screens/SettingsScreen.kt
similarity index 51%
rename from app/src/main/java/com/skylake/skytv/jgorunner/activity/SettingsScreen.kt
rename to app/src/main/java/com/skylake/skytv/jgorunner/ui/screens/SettingsScreen.kt
index 3fe7697..a0f8ea9 100644
--- a/app/src/main/java/com/skylake/skytv/jgorunner/activity/SettingsScreen.kt
+++ b/app/src/main/java/com/skylake/skytv/jgorunner/ui/screens/SettingsScreen.kt
@@ -1,94 +1,123 @@
-package com.skylake.skytv.jgorunner.activity
+package com.skylake.skytv.jgorunner.ui.screens
 
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
-import android.os.Environment
-import android.os.Handler
-import android.os.Looper
 import android.widget.Toast
+import androidx.activity.ComponentActivity
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.focusable
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.*
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
+import androidx.compose.material.icons.filled.ArrowCircleUp
+import androidx.compose.material.icons.filled.Attribution
+import androidx.compose.material.icons.filled.BrowserUpdated
+import androidx.compose.material.icons.filled.CenterFocusStrong
+import androidx.compose.material.icons.filled.LiveTv
+import androidx.compose.material.icons.filled.Pix
+import androidx.compose.material.icons.filled.Public
+import androidx.compose.material.icons.filled.ResetTv
+import androidx.compose.material.icons.filled.RestartAlt
+import androidx.compose.material.icons.filled.SoupKitchen
+import androidx.compose.material.icons.filled.Stream
+import androidx.compose.material.icons.filled.Timelapse
+import androidx.compose.material3.Button
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Slider
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.material3.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.Text
+import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.input.key.Key
 import androidx.compose.ui.input.key.nativeKeyCode
 import androidx.compose.ui.input.key.onKeyEvent
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
-import com.skylake.skytv.jgorunner.data.SkySharedPref
-import com.skylake.skytv.jgorunner.data.applyConfigurations
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
-import com.skylake.skytv.jgorunner.MainActivity
 import com.skylake.skytv.jgorunner.R
-import com.skylake.skytv.jgorunner.utils.RemoteBinaryFetcher
-import java.io.File
+import com.skylake.skytv.jgorunner.activities.AppListActivity
+import com.skylake.skytv.jgorunner.activities.MainActivity
+import com.skylake.skytv.jgorunner.core.data.JTVConfigurationManager
+import com.skylake.skytv.jgorunner.data.SkySharedPref
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun SettingsScreen(context: Context) {
+fun SettingsScreen(
+    activity: ComponentActivity,
+    checkForUpdates: () -> Unit,
+    isSwitchOnForAutoStartForeground: Boolean,
+    onAutoStartForegroundSwitch: (Boolean) -> Unit,
+) {
     // Initialize SkySharedPref
-    val preferenceManager = remember { SkySharedPref(context) }
-
+    val jtvConfigurationManager = JTVConfigurationManager.getInstance(activity)
+    val preferenceManager = SkySharedPref.getInstance(activity)
     val focusRequester = remember { FocusRequester() }
-
     val customFontFamily = FontFamily(Font(R.font.chakrapetch_bold))
 
+    fun applySettings() {
+        preferenceManager.savePreferences()
+    }
     // Retrieve saved switch states
-    val savedSwitchStateForLOCAL = preferenceManager.getKey("isFlagSetForLOCAL") == "Yes"
-    var isSwitchOnForLOCAL by remember { mutableStateOf(savedSwitchStateForLOCAL) }
-
-    val savedSwitchStateForEPG = preferenceManager.getKey("isFlagSetForEPG") == "Yes"
-    var isSwitchOnForEPG by remember { mutableStateOf(savedSwitchStateForEPG) }
-
-    val savedSwitchStateForAutoUpdate = preferenceManager.getKey("isAutoUpdate") == "Yes"
-    var isSwitchOnForAutoUpdate by remember { mutableStateOf(savedSwitchStateForAutoUpdate) }
-
-    val savedSwitchStateForAutoStartServer = preferenceManager.getKey("isFlagSetForAutoStartServer") == "Yes"
-    var isSwitchOnForAutoStartServer by remember { mutableStateOf(savedSwitchStateForAutoStartServer) }
-
-    val savedSwitchStateForAutoStartOnBoot = preferenceManager.getKey("isFlagSetForAutoStartOnBoot") == "Yes"
-    var isSwitchOnForAutoStartOnBoot by remember { mutableStateOf(savedSwitchStateForAutoStartOnBoot) }
-
-    val savedSwitchStateForAutoIPTV = preferenceManager.getKey("isFlagSetForAutoIPTV") == "Yes"
-    var isSwitchOnForAutoIPTV by remember { mutableStateOf(savedSwitchStateForAutoIPTV) }
-
-    val savedisCheckForUpdate = preferenceManager.getKey("isCheckForUpdate") == "Yes"
-    var isSwitchOnCheckForUpdate by remember { mutableStateOf(savedisCheckForUpdate) }
-
-    val savedSwitchStateForAutoStartIPTVOnBoot = preferenceManager.getKey("isFlagSetForAutoBootIPTV") == "Yes"
-    var isSwitchOnForisFlagSetForAutoBootIPTV by remember { mutableStateOf(savedSwitchStateForAutoStartIPTVOnBoot) }
-
-    val savedIPTVRedirectTime = preferenceManager.getKey("isFlagSetForIPTVtime")?.toInt() ?: 5000
-    var selectedIPTVTime by remember { mutableStateOf(savedIPTVRedirectTime) }
-
-    // Retrieve saved port number
-    val savedPortNumber = preferenceManager.getKey("isCustomSetForPORT")?.toIntOrNull() ?: 5350
-    var portNumber by remember { mutableStateOf(savedPortNumber.toString()) }
+    var isSwitchOnForLOCAL by remember {
+        mutableStateOf(preferenceManager.myPrefs.serveLocal)
+    }
+    var isSwitchOnForEPG by remember {
+        mutableStateOf(jtvConfigurationManager.jtvConfiguration.epg)
+    }
+    var isSwitchOnForAutoStartServer by remember {
+        mutableStateOf(preferenceManager.myPrefs.autoStartServer)
+    }
 
-    // Retrieve saved version number
-    val savedVersionNumber = preferenceManager.getKey("releaseName")?: "Not Installed"
-    var releaseName by remember { mutableStateOf(savedVersionNumber) }
+    var isSwitchOnForAutoStartOnBoot by remember {
+        mutableStateOf(preferenceManager.myPrefs.autoStartOnBoot)
+    }
+    var isSwitchOnForAutoIPTV by remember {
+        mutableStateOf(preferenceManager.myPrefs.autoStartIPTV)
+    }
+    var isSwitchOnCheckForUpdate by remember {
+        mutableStateOf(preferenceManager.myPrefs.enableAutoUpdate)
+    }
+    var selectedIPTVTime by remember {
+        mutableIntStateOf(preferenceManager.myPrefs.iptvLaunchCountdown)
+    }
+    var portNumber by remember {
+        mutableIntStateOf(preferenceManager.myPrefs.jtvGoServerPort)
+    }
 
     var showPortDialog by remember { mutableStateOf(false) }
     var showRestartDialog by remember { mutableStateOf(false) }
@@ -96,51 +125,47 @@ fun SettingsScreen(context: Context) {
 
     // Update shared preference when switch states change
     LaunchedEffect(isSwitchOnForLOCAL) {
-        preferenceManager.setKey("isFlagSetForLOCAL", if (isSwitchOnForLOCAL) "Yes" else "No")
-        applyConfigurations(context, preferenceManager)
+        preferenceManager.myPrefs.serveLocal = isSwitchOnForLOCAL
+        applySettings()
     }
 
     LaunchedEffect(isSwitchOnForAutoStartServer) {
-        preferenceManager.setKey("isFlagSetForAutoStartServer", if (isSwitchOnForAutoStartServer) "Yes" else "No")
-        applyConfigurations(context, preferenceManager)
+        preferenceManager.myPrefs.autoStartServer = isSwitchOnForAutoStartServer
+        applySettings()
     }
 
     LaunchedEffect(isSwitchOnForAutoStartOnBoot) {
-        preferenceManager.setKey("isFlagSetForAutoStartOnBoot", if (isSwitchOnForAutoStartOnBoot) "Yes" else "No")
-        applyConfigurations(context, preferenceManager)
+        preferenceManager.myPrefs.autoStartOnBoot = isSwitchOnForAutoStartOnBoot
+        applySettings()
     }
 
     LaunchedEffect(isSwitchOnForAutoIPTV) {
-        preferenceManager.setKey("isFlagSetForAutoIPTV", if (isSwitchOnForAutoIPTV) "Yes" else "No")
-        applyConfigurations(context, preferenceManager)
-    }
-
-    LaunchedEffect(isSwitchOnForAutoUpdate) {
-        preferenceManager.setKey("isAutoUpdate", if (isSwitchOnForAutoUpdate) "Yes" else "No")
-        applyConfigurations(context, preferenceManager)
-    }
-
-    LaunchedEffect(isSwitchOnForisFlagSetForAutoBootIPTV) {
-        preferenceManager.setKey("isFlagSetForAutoBootIPTV", if (isSwitchOnForisFlagSetForAutoBootIPTV) "Yes" else "No")
-        applyConfigurations(context, preferenceManager)
+        preferenceManager.myPrefs.autoStartIPTV = isSwitchOnForAutoIPTV
+        applySettings()
     }
 
     LaunchedEffect(selectedIPTVTime) {
-        preferenceManager.setKey("isFlagSetForIPTVtime", selectedIPTVTime.toString())
+        preferenceManager.myPrefs.iptvLaunchCountdown = selectedIPTVTime
+        applySettings()
     }
 
     // Update port number when changed
     LaunchedEffect(portNumber) {
-        val validPort = portNumber.toIntOrNull()
-        if (validPort != null && validPort in 1000..9999) {
-            preferenceManager.setKey("isCustomSetForPORT", validPort.toString())
-            applyConfigurations(context, preferenceManager)
+        if (portNumber !in 1000..9999) {
+            portNumber = 5350
         }
+        preferenceManager.myPrefs.jtvGoServerPort = portNumber
+        applySettings()
     }
 
     LaunchedEffect(isSwitchOnCheckForUpdate) {
-        preferenceManager.setKey("isCheckForUpdate", if (isSwitchOnCheckForUpdate) "Yes" else "No")
-        applyConfigurations(context, preferenceManager)
+        preferenceManager.myPrefs.enableAutoUpdate = isSwitchOnCheckForUpdate
+        applySettings()
+    }
+
+    LaunchedEffect(isSwitchOnForEPG) {
+        jtvConfigurationManager.jtvConfiguration.epg = isSwitchOnForEPG
+        jtvConfigurationManager.saveJTVConfiguration()
     }
 
     Column(
@@ -150,7 +175,7 @@ fun SettingsScreen(context: Context) {
     ) {
         // TopAppBar
         TopAppBar(
-            title = { Text(text = "Settings", fontSize = 30.sp,fontFamily = customFontFamily) },
+            title = { Text(text = "Settings", fontSize = 30.sp, fontFamily = customFontFamily) },
         )
 
         // Content
@@ -158,83 +183,57 @@ fun SettingsScreen(context: Context) {
             modifier = Modifier.padding(top = 0.dp)
         ) {
             item {
-                SettingSwitchItem(
-                    icon = Icons.Filled.Pix,
+                SettingSwitchItem(icon = Icons.Filled.Pix,
                     title = "Auto Start Server",
                     subtitle = "Automatically start server on app start",
                     isChecked = isSwitchOnForAutoStartServer,
-                    onCheckedChange = { isChecked -> isSwitchOnForAutoStartServer = isChecked }
-                )
+                    onCheckedChange = { isChecked -> isSwitchOnForAutoStartServer = isChecked })
             }
-
             item {
-                SettingSwitchItem(
-                    icon = Icons.Filled.Stream,
+                SettingSwitchItem(icon = Icons.Filled.Stream,
                     title = "Auto Start on Boot",
                     subtitle = "Automatically start server on boot",
                     isChecked = isSwitchOnForAutoStartOnBoot,
-                    onCheckedChange = { isChecked -> isSwitchOnForAutoStartOnBoot = isChecked }
-                )
+                    onCheckedChange = { isChecked -> isSwitchOnForAutoStartOnBoot = isChecked })
             }
 
-
-
             // Conditionally render the Boot switch
             if (isSwitchOnForAutoStartOnBoot) {
                 item {
-                    val stateBG = if (isSwitchOnForisFlagSetForAutoBootIPTV) "background" else "foreground"
-                    SettingSwitchItem(
-                        icon = Icons.Filled.CenterFocusStrong,
+                    val stateBG =
+                        if (isSwitchOnForAutoStartForeground) "foreground" else "background"
+                    SettingSwitchItem(icon = Icons.Filled.CenterFocusStrong,
                         title = "Server Start Mode",
-                        subtitle =  "The server will start in $stateBG mode",
-                        isChecked = isSwitchOnForisFlagSetForAutoBootIPTV,
-                        onCheckedChange = {
-                            isChecked -> isSwitchOnForisFlagSetForAutoBootIPTV = isChecked
-                        }
-                    )
+                        subtitle = "The server will start in $stateBG mode",
+                        isChecked = isSwitchOnForAutoStartForeground,
+                        onCheckedChange = { isChecked ->
+                            onAutoStartForegroundSwitch(isChecked)
+                        })
                 }
             }
-
             item {
-                SettingSwitchItem(
-                    icon = Icons.Filled.Public,
+                SettingSwitchItem(icon = Icons.Filled.Public,
                     title = "Use Server Publicly",
                     subtitle = "Allow access to server from other devices",
-                    isChecked = isSwitchOnForLOCAL,
-                    onCheckedChange = { isChecked -> isSwitchOnForLOCAL = isChecked }
-                )
+                    isChecked = !isSwitchOnForLOCAL,
+                    onCheckedChange = { isChecked -> isSwitchOnForLOCAL = !isChecked })
             }
-
             // Port Number Setting
             item {
-                SettingItem(
-                    icon = Icons.Filled.Settings,
+                SettingItem(icon = Icons.Filled.Attribution,
                     title = "Server Port",
                     subtitle = "Current Port: $portNumber",
-                    onClick = { showPortDialog = true }
-                )
+                    onClick = { showPortDialog = true })
             }
-
-//            item {
-//                HorizontalDivider(
-//                    modifier = Modifier.padding(horizontal = 16.dp),
-//                    thickness = 1.dp,
-//                    color = MaterialTheme.colorScheme.surface
-//                )
-//            }
-
-            if (false) {
-                item {
-                    SettingSwitchItem(
-                        icon = Icons.Filled.Info,
-                        title = "Enable EPG",
-                        subtitle = "Electronic program guide generation",
-                        isChecked = isSwitchOnForEPG,
-                        onCheckedChange = { isChecked -> isSwitchOnForEPG = isChecked }
-                    )
-                }
+            item {
+                SettingSwitchItem(
+                    icon = Icons.Filled.BrowserUpdated,
+                    title = "Enable EPG",
+                    subtitle = "Electronic program guide generation",
+                    isChecked = isSwitchOnForEPG,
+                    onCheckedChange = { isChecked -> isSwitchOnForEPG = isChecked },
+                )
             }
-
             item {
                 SettingSwitchItem(
                     icon = Icons.Filled.LiveTv,
@@ -244,16 +243,20 @@ fun SettingsScreen(context: Context) {
                     onCheckedChange = { isChecked -> isSwitchOnForAutoIPTV = isChecked }
                 )
             }
-
+            val iptvNameSaved = preferenceManager.myPrefs.iptvAppName
             item {
                 Spacer(modifier = Modifier.height(12.dp))
                 SettingItem(
                     icon = Icons.Filled.ResetTv,
                     title = "Select Start IPTV",
-                    subtitle = "Choose your preferred IPTV to start",
+                    subtitle = if (iptvNameSaved.isNullOrEmpty() || iptvNameSaved == "No IPTV") {
+                        "Choose your preferred IPTV to start"
+                    } else {
+                        "Selected IPTV: $iptvNameSaved"
+                    },
                     onClick = {
-                        val intent = Intent(context, AppListActivity::class.java)
-                        context.startActivity(intent)
+                        val intent = Intent(activity, AppListActivity::class.java)
+                        activity.startActivity(intent)
                     }
                 )
             }
@@ -264,15 +267,21 @@ fun SettingsScreen(context: Context) {
                     verticalAlignment = Alignment.CenterVertically,
                     modifier = Modifier.padding(bottom = 8.dp)
                 ) {
-                    Icon(imageVector = Icons.Filled.Timelapse, contentDescription = null, modifier = Modifier.size(24.dp))
+                    Icon(
+                        imageVector = Icons.Filled.Timelapse,
+                        contentDescription = null,
+                        modifier = Modifier.size(24.dp)
+                    )
                     Spacer(modifier = Modifier.width(16.dp))
-                    Text(text = "IPTV Redirect Time: ${selectedIPTVTime / 1000} sec", fontWeight = FontWeight.Bold)
+                    Text(
+                        text = "IPTV Redirect Time: $selectedIPTVTime sec",
+                        fontWeight = FontWeight.Bold
+                    )
                 }
-                Slider(
-                    value = selectedIPTVTime.toFloat(),
+                Slider(value = selectedIPTVTime.toFloat(),
                     onValueChange = { selectedIPTVTime = it.toInt() },
-                    valueRange = 2000f..10000f,
-                    steps = 5, // for 2, 4, 6, 8, 10 seconds
+                    valueRange = 2f..10f,
+                    steps = 3, // for 2, 4, 6, 8, 10 seconds
                     modifier = Modifier
                         .padding(horizontal = 16.dp)
                         .focusRequester(focusRequester) // Focus for keyboard handling
@@ -280,88 +289,43 @@ fun SettingsScreen(context: Context) {
                         .onKeyEvent { event ->
                             when (event.nativeKeyEvent.keyCode) {
                                 Key.DirectionRight.nativeKeyCode -> {
-                                    selectedIPTVTime = (selectedIPTVTime + 1000).coerceAtMost(10000)
+                                    selectedIPTVTime = (selectedIPTVTime + 1).coerceAtMost(10)
                                     true
                                 }
+
                                 Key.DirectionLeft.nativeKeyCode -> {
-                                    selectedIPTVTime = (selectedIPTVTime - 1000).coerceAtLeast(2000)
+                                    selectedIPTVTime = (selectedIPTVTime - 1).coerceAtLeast(2)
                                     true
                                 }
+
                                 else -> false
                             }
-                        }
-                )
+                        })
 
             }
-
-//            item {
-//                HorizontalDivider(
-//                    modifier = Modifier.padding(horizontal = 16.dp),
-//                    thickness = 1.dp,
-//                    color = Color.Gray
-//                )
-//            }
-
-
             item {
-                SettingSwitchItem(
-                    icon = Icons.Filled.SoupKitchen,
-                    title = "Check for updates",
+                SettingSwitchItem(icon = Icons.Filled.SoupKitchen,
+                    title = "Check for updates automatically",
                     subtitle = "Check for updates when the app starts",
                     isChecked = isSwitchOnCheckForUpdate,
-                    onCheckedChange = { isChecked -> isSwitchOnCheckForUpdate = isChecked }
-                )
+                    onCheckedChange = { isChecked -> isSwitchOnCheckForUpdate = isChecked })
             }
-
             item {
-                SettingItem(
-                    icon = Icons.Filled.ArrowCircleUp,
-                    title = "Update Binary",
-                    subtitle = "Update to the latest binary version.",
+                SettingItem(icon = Icons.Filled.ArrowCircleUp,
+                    title = "Check for Updates Now",
+                    subtitle = "Update to the latest binary and application version.",
                     onClick = {
-                        preferenceManager.setKey("expectedFileSize", "0")
-                        RemoteBinaryFetcher.startDownloadAndSave(context) { output ->
-                            Handler(Looper.getMainLooper()).post {
-                                Toast.makeText(context, output, Toast.LENGTH_LONG).show()
-                            }
-                        }
-                    }
-                )
+                        checkForUpdates()
+                    })
             }
-
             item {
-                SettingItem(
-                    icon = Icons.Filled.RestartAlt,
+                SettingItem(icon = Icons.Filled.RestartAlt,
                     title = "Reset All Settings",
                     subtitle = "Useful for troubleshooting and resolving issues.",
                     onClick = {
-                        resetFunc(context) {
-                            showRestartAppDialog = true
-                        }
-
-                    }
-                )
-            }
-
-
-            item {
-                HorizontalDivider(
-                    modifier = Modifier.padding(vertical = 8.dp, horizontal = 16.dp),
-                    thickness = 1.dp,
-                )
-            }
-
-            item {
-                Text(
-                    text = "Note: EPG is not supported.",
-                    fontSize = 14.sp,
-                    color = Color.Gray,
-                    modifier = Modifier.padding(horizontal = 16.dp)
-                )
+                        showRestartAppDialog = true
+                    })
             }
-
-
-
         }
     }
 
@@ -372,8 +336,7 @@ fun SettingsScreen(context: Context) {
             properties = DialogProperties(dismissOnBackPress = true, dismissOnClickOutside = true)
         ) {
             Surface(
-                shape = MaterialTheme.shapes.medium,
-                color = MaterialTheme.colorScheme.surface
+                shape = MaterialTheme.shapes.medium, color = MaterialTheme.colorScheme.surface
             ) {
                 Column(
                     modifier = Modifier
@@ -383,23 +346,22 @@ fun SettingsScreen(context: Context) {
                 ) {
                     Text(text = "Set Server Port", fontSize = 20.sp, fontWeight = FontWeight.Bold)
                     Spacer(modifier = Modifier.height(16.dp))
-
+                    var currentPort by remember { mutableStateOf(portNumber.toString()) }
                     TextField(
-                        value = portNumber,
-                        onValueChange = { portNumber = it.take(4) },
+                        value = currentPort,
+                        onValueChange = { currentPort = it },
                         label = { Text(text = "Port Number") },
                         singleLine = true,
-                        keyboardOptions = KeyboardOptions.Default.copy(keyboardType = KeyboardType.Number, imeAction = ImeAction.Done), // Numeric keyboard + Done action
-                        keyboardActions = KeyboardActions(
-                            onDone = {
-                                val validPort = portNumber.toIntOrNull()
-                                if (validPort != null && validPort in 1000..9999) {
-                                    preferenceManager.setKey("isCustomSetForPORT", validPort.toString())
-                                    showPortDialog = false
-                                    showRestartDialog = true // Show restart dialog
-                                }
+                        keyboardOptions = KeyboardOptions.Default.copy(
+                            keyboardType = KeyboardType.Number, imeAction = ImeAction.Done
+                        ), // Numeric keyboard + Done action
+                        keyboardActions = KeyboardActions(onDone = {
+                            if (currentPort.toIntOrNull() != null && currentPort.toIntOrNull() in 1000..9999) {
+                                portNumber = currentPort.toInt()
+                                showPortDialog = false
+                                showRestartDialog = true
                             }
-                        ),
+                        }),
                         modifier = Modifier.fillMaxWidth()
                     )
 
@@ -413,9 +375,8 @@ fun SettingsScreen(context: Context) {
                             Text("Cancel")
                         }
                         Button(onClick = {
-                            val validPort = portNumber.toIntOrNull()
-                            if (validPort != null && validPort in 1000..9999) {
-                                preferenceManager.setKey("isCustomSetForPORT", validPort.toString())
+                            if (currentPort.toIntOrNull() != null && currentPort.toIntOrNull() in 1000..9999) {
+                                portNumber = currentPort.toInt()
                                 showPortDialog = false
                                 showRestartDialog = true
                             }
@@ -436,8 +397,7 @@ fun SettingsScreen(context: Context) {
             properties = DialogProperties(dismissOnBackPress = true, dismissOnClickOutside = true)
         ) {
             Surface(
-                shape = MaterialTheme.shapes.medium,
-                color = MaterialTheme.colorScheme.surface
+                shape = MaterialTheme.shapes.medium, color = MaterialTheme.colorScheme.surface
             ) {
                 Column(
                     modifier = Modifier
@@ -447,7 +407,10 @@ fun SettingsScreen(context: Context) {
                 ) {
                     Text(text = "Restart Required", fontSize = 20.sp, fontWeight = FontWeight.Bold)
                     Spacer(modifier = Modifier.height(16.dp))
-                    Text(text = "The server port has been changed. Please restart the device for the changes to take effect.", fontSize = 16.sp)
+                    Text(
+                        text = "The server port has been changed. Please restart the device for the changes to take effect.",
+                        fontSize = 16.sp
+                    )
                     Spacer(modifier = Modifier.height(16.dp))
                     Row(
                         horizontalArrangement = Arrangement.SpaceEvenly,
@@ -469,8 +432,7 @@ fun SettingsScreen(context: Context) {
             properties = DialogProperties(dismissOnBackPress = true, dismissOnClickOutside = true)
         ) {
             Surface(
-                shape = MaterialTheme.shapes.medium,
-                color = MaterialTheme.colorScheme.surface
+                shape = MaterialTheme.shapes.medium, color = MaterialTheme.colorScheme.surface
             ) {
                 Column(
                     modifier = Modifier
@@ -480,7 +442,10 @@ fun SettingsScreen(context: Context) {
                 ) {
                     Text(text = "Restart Required", fontSize = 20.sp, fontWeight = FontWeight.Bold)
                     Spacer(modifier = Modifier.height(16.dp))
-                    Text(text = "The app needs to be restarted for the changes to take effect. Please restart the app.", fontSize = 16.sp)
+                    Text(
+                        text = "The app needs to be restarted to reset all app settings. Please restart the app.",
+                        fontSize = 16.sp
+                    )
                     Spacer(modifier = Modifier.height(16.dp))
                     Row(
                         horizontalArrangement = Arrangement.SpaceEvenly,
@@ -488,7 +453,8 @@ fun SettingsScreen(context: Context) {
                     ) {
                         Button(onClick = {
                             showRestartAppDialog = false
-                            restartApp(context)
+                            resetFunc(activity)
+                            restartApp(activity)
                         }) {
                             Text("Restart")
                         }
@@ -497,8 +463,6 @@ fun SettingsScreen(context: Context) {
             }
         }
     }
-
-
 }
 
 fun restartApp(context: Context) {
@@ -509,46 +473,31 @@ fun restartApp(context: Context) {
 }
 
 
-fun resetFunc(context: Context, onComplete: () -> Unit) {
+fun resetFunc(context: Context) {
     Toast.makeText(context, "[#] Clearing files.", Toast.LENGTH_LONG).show()
-
-    // Delete folder in external storage
-    val externalStoragePath = Environment.getExternalStorageDirectory().path
-    val folder = File("$externalStoragePath/.jiotv_go")
-
-    if (folder.exists() && folder.isDirectory) {
-        folder.deleteRecursively()
-    } else {
-    }
-
-    // Delete binary file in internal storage
-    val binaryFile = File(context.filesDir, "majorbin")
-    if (binaryFile.exists()) {
-        binaryFile.delete()
-    } else {
-        Toast.makeText(context, "Reset successfully.", Toast.LENGTH_SHORT).show();
-    }
-    onComplete()
+    JTVConfigurationManager.getInstance(context).deleteJTVConfiguration()
+    SkySharedPref.getInstance(context).clearPreferences()
+    context.filesDir.deleteRecursively()
 }
 
 
-
-
-
 @Composable
 fun SettingSwitchItem(
     icon: ImageVector,
     title: String,
     subtitle: String,
     isChecked: Boolean,
+    enabled: Boolean = true,
     onCheckedChange: (Boolean) -> Unit
 ) {
     Row(
         modifier = Modifier
             .fillMaxWidth()
             .padding(vertical = 8.dp)
-            .clickable { onCheckedChange(!isChecked) },
-        verticalAlignment = Alignment.CenterVertically
+            .alpha(if (enabled) 1f else 0.25f)
+            .clickable {
+                if (enabled) onCheckedChange(!isChecked)
+            }, verticalAlignment = Alignment.CenterVertically
     ) {
         Icon(imageVector = icon, contentDescription = null, modifier = Modifier.size(24.dp))
         Spacer(modifier = Modifier.width(16.dp))
@@ -557,16 +506,13 @@ fun SettingSwitchItem(
             Text(text = subtitle, fontSize = 12.sp, color = Color.Gray)
         }
         Spacer(modifier = Modifier.weight(1f))
-        Switch(checked = isChecked, onCheckedChange = { onCheckedChange(it) })
+        Switch(checked = isChecked, onCheckedChange = { onCheckedChange(it) }, enabled = enabled)
     }
 }
 
 @Composable
 fun SettingItem(
-    icon: ImageVector,
-    title: String,
-    subtitle: String,
-    onClick: () -> Unit
+    icon: ImageVector, title: String, subtitle: String, onClick: () -> Unit
 ) {
     Row(
         modifier = Modifier
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/utils/ConfigHandler.kt b/app/src/main/java/com/skylake/skytv/jgorunner/utils/ConfigHandler.kt
deleted file mode 100644
index 5a26d96..0000000
--- a/app/src/main/java/com/skylake/skytv/jgorunner/utils/ConfigHandler.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.skylake.skytv.jgorunner.utils
-
-import android.content.Context
-import android.util.Log
-import com.skylake.skytv.jgorunner.data.SkySharedPref
-import kotlinx.coroutines.*
-import java.net.HttpURLConnection
-import java.net.URL
-
-object ConfigHandler {
-
-    private const val TAG = "ConfigUtils"
-
-    fun fetchAndSaveConfig(context: Context) {
-        val preferenceManager = SkySharedPref(context)
-
-        // Launch coroutine to handle background network operations
-        CoroutineScope(Dispatchers.IO).launch {
-            try {
-                val configUrl = "https://raw.githubusercontent.com/siddharthsky/Extrix/main/JGO/syncrunner1.cfg"
-                val configData = downloadFile(configUrl)
-
-                if (configData != null) {
-                    // Parse and save the config data into preferences
-                    parseAndSaveConfigData(configData, preferenceManager)
-                }
-            } catch (e: Exception) {
-                Log.e(TAG, "Error fetching or parsing config: ${e.message}")
-            }
-        }
-    }
-
-    // Download the configuration file
-    private suspend fun downloadFile(fileUrl: String): String? {
-        return withContext(Dispatchers.IO) {
-            try {
-                val url = URL(fileUrl)
-                val urlConnection = url.openConnection() as HttpURLConnection
-                urlConnection.requestMethod = "GET"
-
-                val inputStream = urlConnection.inputStream
-                val content = inputStream.bufferedReader().use { it.readText() }
-                inputStream.close()
-
-                content
-            } catch (e: Exception) {
-                Log.e(TAG, "Error downloading file: ${e.message}")
-                null
-            }
-        }
-    }
-
-    // Parse the file contents and save each key-value pair to preferences
-    private fun parseAndSaveConfigData(configData: String, preferenceManager: SkySharedPref) {
-        val lines = configData.split("\n")
-        for (line in lines) {
-            if (line.contains("=")) {
-                val parts = line.split("=")
-                if (parts.size == 2) {
-                    val key = parts[0].trim()
-                    val value = parts[1].replace("\"", "").trim() // Remove any quotes
-                    preferenceManager.setKey(key, value)
-                    if (false) Log.d(TAG, "Saved Key: $key with Value: $value")
-                }
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/utils/ConfigSyncHandler.kt b/app/src/main/java/com/skylake/skytv/jgorunner/utils/ConfigSyncHandler.kt
deleted file mode 100644
index 66b052e..0000000
--- a/app/src/main/java/com/skylake/skytv/jgorunner/utils/ConfigSyncHandler.kt
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.skylake.skytv.jgorunner.utils
-
-import android.os.Bundle
-import android.util.Log
-import androidx.activity.ComponentActivity
-import com.skylake.skytv.jgorunner.data.SkySharedPref
-import kotlinx.coroutines.*
-import java.net.HttpURLConnection
-import java.net.URL
-
-class ConfigSyncHandler : ComponentActivity() {
-
-    private lateinit var preferenceManager: SkySharedPref
-    private val TAG = "ConfigDownloader"
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        preferenceManager = SkySharedPref(this)
-
-        // Fetch and parse the config file
-        fetchAndParseConfig()
-    }
-
-    private fun fetchAndParseConfig() {
-        // Use a coroutine to perform network requests on a background thread
-        CoroutineScope(Dispatchers.IO).launch {
-            try {
-                val configUrl = "https://raw.githubusercontent.com/siddharthsky/Extrix/main/JGO/syncrunner1.cfg"
-                val configData = downloadFile(configUrl)
-
-                if (configData != null) {
-                    // Parse the file contents and save to preferences
-                    parseConfigData(configData)
-                }
-            } catch (e: Exception) {
-                Log.e(TAG, "Error fetching or parsing config: ${e.message}")
-            }
-        }
-    }
-
-    private suspend fun downloadFile(fileUrl: String): String? {
-        return withContext(Dispatchers.IO) {
-            try {
-                val url = URL(fileUrl)
-                val urlConnection = url.openConnection() as HttpURLConnection
-                urlConnection.requestMethod = "GET"
-
-                val inputStream = urlConnection.inputStream
-                val content = inputStream.bufferedReader().use { it.readText() }
-                inputStream.close()
-
-                content
-            } catch (e: Exception) {
-                Log.e(TAG, "Error downloading file: ${e.message}")
-                null
-            }
-        }
-    }
-
-    private fun parseConfigData(configData: String) {
-        // Split the content into lines
-        val lines = configData.split("\n")
-
-        // Loop through each line and extract key-value pairs
-        for (line in lines) {
-            if (line.contains("=")) {
-                val parts = line.split("=")
-                if (parts.size == 2) {
-                    val key = parts[0].trim()
-                    val value = parts[1].replace("\"", "").trim() // Remove quotes if present
-                    saveToPreferences(key, value)
-                }
-            }
-        }
-    }
-
-    private fun saveToPreferences(key: String, value: String) {
-        // Log the key-value pair before saving it
-        //Log.d(TAG, "Saving to preferences: Key = $key, Value = $value")
-
-        // Store the key-value pair in SkySharedPref
-        preferenceManager.setKey(key, value)
-
-        // Log confirmation after saving
-        Log.d(TAG, "Saved Key: $key with Value: $value")
-    }
-}
diff --git a/app/src/main/java/com/skylake/skytv/jgorunner/utils/RemoteBinaryFetcher.kt b/app/src/main/java/com/skylake/skytv/jgorunner/utils/RemoteBinaryFetcher.kt
deleted file mode 100644
index decbe91..0000000
--- a/app/src/main/java/com/skylake/skytv/jgorunner/utils/RemoteBinaryFetcher.kt
+++ /dev/null
@@ -1,257 +0,0 @@
-package com.skylake.skytv.jgorunner.utils
-
-import android.content.Context
-import android.util.Base64
-import android.util.Log
-import com.skylake.skytv.jgorunner.data.SkySharedPref
-import com.skylake.skytv.jgorunner.services.BinaryExecutor
-import kotlinx.coroutines.*
-import org.json.JSONObject
-import java.io.File
-import java.io.FileOutputStream
-import java.net.HttpURLConnection
-import java.net.URL
-
-object RemoteBinaryFetcher {
-
-    private const val TAG = "Config2DL"
-    private const val FILE_NAME = "majorbin"
-    private val coroutineScope = CoroutineScope(Dispatchers.IO)
-
-    fun startDownloadAndSave(context: Context, callback: BinaryExecutor.OutputCallback?) {
-
-        val preferenceManager = SkySharedPref(context)
-
-        CoroutineScope(Dispatchers.IO).launch {
-            try {
-                var expectedFileSize = preferenceManager.getKey("expectedFileSize")?.toIntOrNull()
-                if (expectedFileSize == null || expectedFileSize == 0 || expectedFileSize == 69) {
-                    expectedFileSize = fetchExpectedFileSize(context, callback)
-                }
-
-                val xCRL = String(Base64.decode("aHR0cHM6Ly9iaXQubHkvbWFqb3JiaW4=", Base64.DEFAULT))
-                val saved = downloadLatestRelease(xCRL, context, expectedFileSize, callback)
-
-                if (saved) {
-                    Log.d(TAG, "File downloaded and saved as $FILE_NAME")
-                    callback?.onOutput("[#] Installed Binary Successfully")
-                } else {
-                    Log.e(TAG, "Failed to download or save the binary")
-                    callback?.onOutput("[#] Failed to download or save the binary")
-                }
-            } catch (e: Exception) {
-                Log.e(TAG, "Error downloading or saving binary: ${e.message}")
-                callback?.onOutput("[#] Error downloading or saving binary.")
-            }
-        }
-    }
-
-
-    private suspend fun fetchExpectedFileSize(context: Context, callback: BinaryExecutor.OutputCallback?): Int? {
-        return withContext(Dispatchers.IO) {
-            val preferenceManager = SkySharedPref(context)
-            try {
-                val APXCRL = String(Base64.decode("aHR0cHM6Ly9iaXQubHkvbWFqb3JiaW5hcGk=", Base64.DEFAULT))
-                val url = URL(APXCRL)
-                val urlConnection = url.openConnection() as HttpURLConnection
-                urlConnection.requestMethod = "GET"
-                urlConnection.connect()
-
-                if (urlConnection.responseCode == HttpURLConnection.HTTP_OK) {
-                    val response = urlConnection.inputStream.bufferedReader().use { it.readText() }
-                    val jsonObject = JSONObject(response)
-                    val assets = jsonObject.getJSONArray("assets")
-                    val releaseName = jsonObject.getString("tag_name")
-                    val decodedName = String(Base64.decode("amlvdHZfZ28tYW5kcm9pZDUtYXJtdjc=", Base64.DEFAULT))
-
-                    for (i in 0 until assets.length()) {
-                        val asset = assets.getJSONObject(i)
-                        if (asset.getString("name") == decodedName) {
-                            val size = asset.getInt("size") // Get expected file size
-                            preferenceManager.setKey("releaseName", releaseName) // Get expected file size
-                            preferenceManager.setKey("expectedFileSize", size.toString())
-                            Log.d(TAG, "Expected file size: $size bytes, "+"Downloading: ${size / (1024 * 1024)} MB")
-//                            callback?.onOutput("[#] Downloading: ${size / (1024 * 1024)} MB")
-//                            callback?.onOutput("[#] Downloading Binary: ${size / (1024 * 1024)} MB")
-                            callback?.onOutput("[#] Downloading: Binary $releaseName [${size / (1024 * 1024)} MB]")
-                            return@withContext size
-                        }
-                    }
-                } else {
-                    Log.e(TAG, "Failed to fetch release information: HTTP ${urlConnection.responseCode}")
-                    callback?.onOutput("[#] Failed to fetch release information: HTTP ${urlConnection.responseCode}")
-                }
-            } catch (e: Exception) {
-                Log.e(TAG, "Error fetching expected file size: ${e.message}")
-                callback?.onOutput("[#] Error fetching expected file size: ${e.message}")
-            }
-            return@withContext null
-        }
-    }
-
-    private suspend fun downloadLatestRelease(fileUrl: String, context: Context, expectedFileSize: Int?, callback: BinaryExecutor.OutputCallback?): Boolean {
-        return withContext(Dispatchers.IO) {
-            val fileDir = context.filesDir
-            val file = File(fileDir, FILE_NAME)
-
-            // Check if the file already exists
-            if (file.exists()) {
-                if (isFileCorrupt(file, expectedFileSize)) {
-                    Log.d(TAG, "Downloading updated binary.")
-                    callback?.onOutput("[#] Downloading updated binary.")
-                } else {
-                    Log.d(TAG, "Binary is up-to-date.")
-                    callback?.onOutput("[#] Binary is up-to-date.")
-                    return@withContext true
-                }
-            }
-
-            return@withContext try {
-                val url = URL(fileUrl)
-                val urlConnection = url.openConnection() as HttpURLConnection
-                urlConnection.requestMethod = "GET"
-                urlConnection.connect()
-
-                if (urlConnection.responseCode != HttpURLConnection.HTTP_OK) {
-                    Log.e(TAG, "Server returned HTTP ${urlConnection.responseCode}")
-                    callback?.onOutput("[#] Server returned HTTP ${urlConnection.responseCode}")
-                    return@withContext false
-                }
-
-                urlConnection.inputStream.use { inputStream ->
-                    FileOutputStream(file).use { outputStream ->
-                        val buffer = ByteArray(1024 * 1024) // 1 MB buffer
-                        var bytesRead: Int
-                        var totalBytesRead = 0
-                        val fileSize = urlConnection.contentLength
-                        val halfwayMark = fileSize / 2
-                        val seventyFivePercentMark = (fileSize * 3) / 4
-                        var halfwayMessageShown = false
-                        var seventyFiveMessageShown = false
-                        var completedMessageShown = false
-
-                        while (inputStream.read(buffer).also { bytesRead = it } != -1) {
-                            outputStream.write(buffer, 0, bytesRead)
-                            totalBytesRead += bytesRead
-
-                            // Output message when 50% of the download is done
-                            if (!halfwayMessageShown && totalBytesRead >= halfwayMark) {
-                                val message = "[#] Downloaded 50%"
-                                Log.d(TAG, message)
-                                callback?.onOutput(message)
-                                halfwayMessageShown = true
-                            }
-
-                            // Output message when 75% of the download is done
-                            if (!seventyFiveMessageShown && totalBytesRead >= seventyFivePercentMark) {
-                                val message = "[#] Downloaded 75%"
-                                Log.d(TAG, message)
-                                callback?.onOutput(message)
-                                seventyFiveMessageShown = true
-                            }
-
-//                            // Output message when the download is complete
-//                            if (!completedMessageShown && totalBytesRead == fileSize) {
-//                                val message = "[#] Download completed"
-//                                Log.d(TAG, message)
-//                                callback?.onOutput(message)
-//                                completedMessageShown = true
-//                            }
-                        }
-                    }
-                }
-
-
-
-                if (isFileCorrupt(file, expectedFileSize)) {
-                    Log.e(TAG, "Downloaded file is corrupt or incomplete.")
-                    callback?.onOutput("[#] Downloaded file is corrupt or incomplete.")
-                    return@withContext false
-                }
-
-                Log.d(TAG, "File saved to: ${file.absolutePath}")
-                callback?.onOutput("[#] Binary Downloaded Successfully")
-                return@withContext true
-            } catch (e: Exception) {
-                Log.e(TAG, "Error downloading or saving the file: ${e.message}")
-                callback?.onOutput("[#] Error downloading or saving the file: ${e.message}")
-                return@withContext false
-            }
-        }
-    }
-
-
-    private fun isFileCorrupt(file: File, expectedFileSize: Int?): Boolean {
-        return expectedFileSize == null || !file.exists() || file.length() != expectedFileSize.toLong()
-    }
-
-    fun isFileSizeSame(Xsize: Int?, callback: (Boolean) -> Unit) {
-        val url = String(Base64.decode("aHR0cHM6Ly9iaXQubHkvbWFqb3JiaW5hcGk=", Base64.DEFAULT))
-
-        CoroutineScope(Dispatchers.IO).launch {
-            var result = true // Default to true, meaning no error
-
-            var connection: HttpURLConnection? = null
-
-            try {
-                val urlConnection = URL(url).openConnection() as HttpURLConnection
-                urlConnection.requestMethod = "GET"
-                urlConnection.connect()
-
-                if (urlConnection.responseCode == HttpURLConnection.HTTP_OK) {
-                    val inputStream = urlConnection.inputStream
-                    val responseData = inputStream.bufferedReader().use { it.readText() }
-                    val jsonObject = JSONObject(responseData)
-                    val assetsArray = jsonObject.getJSONArray("assets")
-
-                    var fileSize: Long? = null
-                    for (i in 0 until assetsArray.length()) {
-                        val asset = assetsArray.getJSONObject(i)
-                        if (asset.getString("name").contains(String(Base64.decode("amlvdHZfZ28tYW5kcm9pZDUtYXJtdjc=", Base64.DEFAULT)))) {
-                            fileSize = asset.getLong("size")
-                            break
-                        }
-                    }
-
-                    if (fileSize != null) {
-                        result = logFileSizeComparison(Xsize, fileSize)
-                    } else {
-                        log("File not found in the latest release.")
-                        result = false // Set to false if file not found
-                    }
-                } else {
-                    log("Failed to retrieve data: ${urlConnection.responseMessage}")
-                    result = false // Set to false if there is an error retrieving data
-                }
-            } catch (e: Exception) {
-                log("Error occurred: ${e.message}")
-                result = false // Set to false if there is an exception
-            } finally {
-                connection?.disconnect()
-            }
-
-            // Call the callback with the result
-            callback(result)
-        }
-    }
-
-    private fun logFileSizeComparison(Xsize: Int?, fileSize: Long): Boolean {
-        return if (Xsize?.toLong() == fileSize) {
-            log("File sizes are the same: $Xsize , $fileSize bytes")
-            false // Sizes match
-        } else {
-            log("File sizes are different: Xsize = $Xsize bytes, API size = $fileSize bytes")
-            true // Sizes do not match
-        }
-    }
-
-    private fun log(message: String) {
-        // Replace with your preferred logging method, e.g., Log.d(TAG, message)
-        Log.d(TAG + "FIX", message)
-    }
-
-
-
-
-
-}
diff --git a/app/src/main/res/drawable/cancel_24px.xml b/app/src/main/res/drawable/cancel_24px.xml
index 0325f58..24e6f78 100644
--- a/app/src/main/res/drawable/cancel_24px.xml
+++ b/app/src/main/res/drawable/cancel_24px.xml
@@ -2,9 +2,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="#003f3f">
+    android:viewportHeight="960">
   <path
-      android:fillColor="@android:color/white"
-      android:pathData="M336,680L480,536L624,680L680,624L536,480L680,336L624,280L480,424L336,280L280,336L424,480L280,624L336,680ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
+      android:pathData="m480,536 l116,116q11,11 28,11t28,-11q11,-11 11,-28t-11,-28L536,480l116,-116q11,-11 11,-28t-11,-28q-11,-11 -28,-11t-28,11L480,424 364,308q-11,-11 -28,-11t-28,11q-11,11 -11,28t11,28l116,116 -116,116q-11,11 -11,28t11,28q11,11 28,11t28,-11l116,-116ZM480,880q-83,0 -156,-31.5T197,763q-54,-54 -85.5,-127T80,480q0,-83 31.5,-156T197,197q54,-54 127,-85.5T480,80q83,0 156,31.5T763,197q54,54 85.5,127T880,480q0,83 -31.5,156T763,763q-54,54 -127,85.5T480,880ZM480,800q134,0 227,-93t93,-227q0,-134 -93,-227t-227,-93q-134,0 -227,93t-93,227q0,134 93,227t227,93ZM480,480Z"
+      android:fillColor="#e8eaed"/>
 </vector>
diff --git a/app/src/main/res/drawable/notifications_24px.xml b/app/src/main/res/drawable/notifications_24px.xml
index ae0fb11..d007dd3 100644
--- a/app/src/main/res/drawable/notifications_24px.xml
+++ b/app/src/main/res/drawable/notifications_24px.xml
@@ -1,10 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="#003f3f">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M160,760L160,680L240,680L240,400Q240,317 290,252.5Q340,188 420,168L420,140Q420,115 437.5,97.5Q455,80 480,80Q505,80 522.5,97.5Q540,115 540,140L540,168Q620,188 670,252.5Q720,317 720,400L720,680L800,680L800,760L160,760ZM480,460L480,460L480,460L480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460ZM480,880Q447,880 423.5,856.5Q400,833 400,800L560,800Q560,833 536.5,856.5Q513,880 480,880ZM320,680L640,680L640,400Q640,334 593,287Q546,240 480,240Q414,240 367,287Q320,334 320,400L320,680Z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
+      
+    <path android:fillColor="#e8eaed" android:pathData="M200,760q-17,0 -28.5,-11.5T160,720q0,-17 11.5,-28.5T200,680h40v-280q0,-83 50,-147.5T420,168v-28q0,-25 17.5,-42.5T480,80q25,0 42.5,17.5T540,140v28q80,20 130,84.5T720,400v280h40q17,0 28.5,11.5T800,720q0,17 -11.5,28.5T760,760L200,760ZM480,460ZM480,880q-33,0 -56.5,-23.5T400,800h160q0,33 -23.5,56.5T480,880ZM320,680h320v-280q0,-66 -47,-113t-113,-47q-66,0 -113,47t-47,113v280Z"/>
+    
 </vector>
diff --git a/app/src/main/res/raw/majorbin b/app/src/main/res/raw/majorbin
deleted file mode 100644
index c5d581f..0000000
--- a/app/src/main/res/raw/majorbin
+++ /dev/null
@@ -1 +0,0 @@
-自分に勝てれば、明日勝てると思う
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 315b6e2..871e89c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,22 +1,24 @@
 [versions]
-agp = "8.5.1"
-coreSplashscreen = "1.2.0-alpha02"
+agp = "8.7.2"
 customview = "1.1.0"
 customviewPoolingcontainer = "1.0.0"
 kotlin = "1.9.0"
+kotlinReflect = "1.9.25"
 coreKtx = "1.13.1"
 junit = "4.13.2"
 junitVersion = "1.2.1"
 espressoCore = "3.6.1"
-lifecycleRuntimeKtx = "2.8.6"
-activityCompose = "1.9.2"
-composeBom = "2024.09.02"
-lottieCompose = "5.0.3"
+lifecycleRuntimeKtx = "2.8.7"
+activityCompose = "1.9.3"
+composeBom = "2024.11.00"
+versionParser = "5.0.0"
+okhttp = "4.12.0"
+ketch = "2.0.2"
+gson = "2.11.0"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
-androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "coreSplashscreen" }
-androidx-customview = { module = "androidx.customview:customview", version.ref = "customview" }
+androidx-customview = { group = "androidx.customview", name = "customview", version.ref = "customview" }
 androidx-customview-poolingcontainer = { module = "androidx.customview:customview-poolingcontainer", version.ref = "customviewPoolingcontainer" }
 androidx-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
@@ -32,7 +34,11 @@ androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-toolin
 androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
 androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
 androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
-lottie-compose = { module = "com.airbnb.android:lottie-compose", version.ref = "lottieCompose" }
+kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlinReflect"}
+version-parser = { group = "org.cthing", name = "versionparser", version.ref = "versionParser" }
+okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
+ketch = { group = "com.github.khushpanchal", name = "ketch", version.ref = "ketch" }
+gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 43805b8..cb48b4d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sat Aug 24 21:59:25 IST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
index 0087239..8729596 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -16,6 +16,7 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
+        maven { url 'https://jitpack.io' }
     }
 }