diff --git a/universal7885-common/apps/FMRadio/Android.bp b/universal7885-common/apps/FMRadio/Android.bp
index 4eb94c2..bf319ab 100644
--- a/universal7885-common/apps/FMRadio/Android.bp
+++ b/universal7885-common/apps/FMRadio/Android.bp
@@ -10,15 +10,12 @@ android_app {
     static_libs: [
     	"androidx.core_core",
     	"androidx.appcompat_appcompat",
-    	"de.yanndroid.oneui",
+    	"com.google.android.material_material",
     ],
     required: [
     	"privapp_whitelist_com.eurekateam.fmradio.xml",
     	"vendor.eureka.hardware.fmradio@1.2-service",
     ],
-    optimize: {
-        proguard_flags_files: ["rules.pro"],
-    },
 }
 
 prebuilt_etc {
diff --git a/universal7885-common/apps/FMRadio/AndroidManifest.xml b/universal7885-common/apps/FMRadio/AndroidManifest.xml
index e7337e2..3c9c98b 100644
--- a/universal7885-common/apps/FMRadio/AndroidManifest.xml
+++ b/universal7885-common/apps/FMRadio/AndroidManifest.xml
@@ -1,26 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.eurekateam.fmradio"
-    android:sharedUserId="android.uid.system">
-
+    android:sharedUserId="android.uid.system"
+    package="com.eurekateam.fmradio">
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
     <application
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/OneUI4Theme">
-        <activity
-            android:name=".ErrorHandler"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="android.intent.action.HEADSET_PLUG"/>
-                <action android:name="com.eurekateam.fmradio.RADIO.IO" />
-                <action android:name="com.eurekateam.fmradio.TRACKS" />
-                <action android:name="com.eurekateam.fmradio.NO_HEADPHONE" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
+        android:theme="@style/Theme.Material3.DayNight.NoActionBar">
         <activity
             android:name=".MainActivity"
             android:exported="true">
@@ -39,7 +26,6 @@
                 <action android:name="com.eurekateam.fmradio.NEXT"/>
                 <action android:name="com.eurekateam.fmradio.BEFORE"/>
                 <action android:name="com.eurekateam.fmradio.QUIT"/>
-                <action android:name="com.eurekateam.fmradio.STOPBG"/>
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </service>
diff --git a/universal7885-common/apps/FMRadio/jni/fm_ioctl.cpp b/universal7885-common/apps/FMRadio/jni/fm_ioctl.cpp
index fc94e04..3e0b70d 100644
--- a/universal7885-common/apps/FMRadio/jni/fm_ioctl.cpp
+++ b/universal7885-common/apps/FMRadio/jni/fm_ioctl.cpp
@@ -8,7 +8,7 @@
 #include <cerrno>
 #include <iostream>
 #include "s610_radio.h"
-#include "kernel_internal.h"
+#include "v4l2_api.h"
 #include <algorithm>
 #include <jni.h>
 #include <hardware/hardware.h>
@@ -452,7 +452,8 @@ extern "C"
 JNIEXPORT jint JNICALL
 Java_com_eurekateam_fmradio_NativeFMInterface_getBeforeChannel
 (__unused JNIEnv *env, __unused jobject thiz, jint fd) {
-    long ret;sp<IFMRadio> service = IFMRadio::getService();
+    long ret;
+    sp<IFMRadio> service = IFMRadio::getService();
     bool mSysfs = service->isAvailable() == Status::YES; 
     if (!mSysfs){
     	fm_radio_channel_searching(fd, 0, 0, FM_CHANNEL_SPACING_100KHZ, &ret);
@@ -492,3 +493,10 @@ Java_com_eurekateam_fmradio_NativeFMInterface_closeFMDevice
 (__unused JNIEnv *env, __unused jobject thiz, jint fd) {
     close(fd);
 }
+extern "C"
+JNIEXPORT jboolean JNICALL
+Java_com_eurekateam_fmradio_NativeFMInterface_getSysfsSupport
+(__unused JNIEnv *env, __unused jobject thiz) {
+    sp<IFMRadio> service = IFMRadio::getService();
+    return service->isAvailable() == Status::YES;
+}
diff --git a/universal7885-common/apps/FMRadio/jni/kernel_internal.h b/universal7885-common/apps/FMRadio/jni/v4l2_api.h
similarity index 100%
rename from universal7885-common/apps/FMRadio/jni/kernel_internal.h
rename to universal7885-common/apps/FMRadio/jni/v4l2_api.h
diff --git a/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_close.png b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_close.png
new file mode 100644
index 0000000..6a4814b
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_close.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_error.png b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_error.png
new file mode 100644
index 0000000..f305259
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_error.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_first.png b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_first.png
new file mode 100644
index 0000000..7ea4bbd
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_first.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_forward.png b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_forward.png
new file mode 100644
index 0000000..8e31602
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_forward.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_headphones.png b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_headphones.png
new file mode 100644
index 0000000..de99f8b
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_headphones.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_last.png b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_last.png
new file mode 100644
index 0000000..fcf082b
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_last.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_list.png b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_list.png
new file mode 100644
index 0000000..27783be
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_list.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_no_image.png b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_no_image.png
new file mode 100644
index 0000000..701c865
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_no_image.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_pause.png b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_pause.png
new file mode 100644
index 0000000..6c2d2ca
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_pause.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_play.png b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_play.png
new file mode 100644
index 0000000..8d1fca0
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_play.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_power.png b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_power.png
new file mode 100644
index 0000000..6482494
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_power.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_radio.png b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_radio.png
new file mode 100644
index 0000000..a0cb119
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_radio.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_refresh.png b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_refresh.png
new file mode 100644
index 0000000..a917b82
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_refresh.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_rewind.png b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_rewind.png
new file mode 100644
index 0000000..7af0c22
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_rewind.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_star.png b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_star.png
new file mode 100644
index 0000000..90354e0
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_star.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_star_filled.png b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_star_filled.png
new file mode 100644
index 0000000..4a3cc9d
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_star_filled.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_volume_down.png b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_volume_down.png
new file mode 100644
index 0000000..a046615
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_volume_down.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_volume_up.png b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_volume_up.png
new file mode 100644
index 0000000..3730624
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-hdpi/ic_volume_up.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_close.png b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_close.png
new file mode 100644
index 0000000..cc49537
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_close.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_error.png b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_error.png
new file mode 100644
index 0000000..f59c748
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_error.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_first.png b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_first.png
new file mode 100644
index 0000000..9d1ed85
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_first.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_forward.png b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_forward.png
new file mode 100644
index 0000000..070fcb5
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_forward.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_headphones.png b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_headphones.png
new file mode 100644
index 0000000..38aa7d5
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_headphones.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_last.png b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_last.png
new file mode 100644
index 0000000..7b2623e
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_last.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_list.png b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_list.png
new file mode 100644
index 0000000..d1b42e8
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_list.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_no_image.png b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_no_image.png
new file mode 100644
index 0000000..45ad809
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_no_image.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_pause.png b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_pause.png
new file mode 100644
index 0000000..1630f4f
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_pause.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_play.png b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_play.png
new file mode 100644
index 0000000..fa2bb89
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_play.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_power.png b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_power.png
new file mode 100644
index 0000000..719838c
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_power.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_radio.png b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_radio.png
new file mode 100644
index 0000000..6514b77
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_radio.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_refresh.png b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_refresh.png
new file mode 100644
index 0000000..88454f7
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_refresh.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_rewind.png b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_rewind.png
new file mode 100644
index 0000000..0798f8b
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_rewind.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_star.png b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_star.png
new file mode 100644
index 0000000..547c93b
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_star.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_star_filled.png b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_star_filled.png
new file mode 100644
index 0000000..bac8b50
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_star_filled.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_volume_down.png b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_volume_down.png
new file mode 100644
index 0000000..26d11fe
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_volume_down.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_volume_up.png b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_volume_up.png
new file mode 100644
index 0000000..e822bc3
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-mdpi/ic_volume_up.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_close.png b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_close.png
new file mode 100644
index 0000000..f4f9445
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_close.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_error.png b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_error.png
new file mode 100644
index 0000000..720d17c
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_error.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_first.png b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_first.png
new file mode 100644
index 0000000..317ed52
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_first.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_forward.png b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_forward.png
new file mode 100644
index 0000000..c8a3e7f
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_forward.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_headphones.png b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_headphones.png
new file mode 100644
index 0000000..d70491b
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_headphones.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_last.png b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_last.png
new file mode 100644
index 0000000..fa179dd
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_last.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_list.png b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_list.png
new file mode 100644
index 0000000..d94b45a
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_list.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_no_image.png b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_no_image.png
new file mode 100644
index 0000000..02617ff
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_no_image.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_pause.png b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_pause.png
new file mode 100644
index 0000000..bb707ea
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_pause.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_play.png b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_play.png
new file mode 100644
index 0000000..b41105f
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_play.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_power.png b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_power.png
new file mode 100644
index 0000000..9f4042d
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_power.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_radio.png b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_radio.png
new file mode 100644
index 0000000..98530fd
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_radio.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_refresh.png b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_refresh.png
new file mode 100644
index 0000000..22fec5e
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_refresh.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_rewind.png b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_rewind.png
new file mode 100644
index 0000000..7821c6c
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_rewind.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_star.png b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_star.png
new file mode 100644
index 0000000..957ce0d
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_star.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_star_filled.png b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_star_filled.png
new file mode 100644
index 0000000..6bce0e1
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_star_filled.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_volume_down.png b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_volume_down.png
new file mode 100644
index 0000000..f016945
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_volume_down.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_volume_up.png b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_volume_up.png
new file mode 100644
index 0000000..6da6c1a
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xhdpi/ic_volume_up.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_close.png b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_close.png
new file mode 100644
index 0000000..cdd306b
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_close.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_error.png b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_error.png
new file mode 100644
index 0000000..082598b
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_error.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_first.png b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_first.png
new file mode 100644
index 0000000..633f606
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_first.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_forward.png b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_forward.png
new file mode 100644
index 0000000..bd8059c
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_forward.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_headphones.png b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_headphones.png
new file mode 100644
index 0000000..1c540cc
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_headphones.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_last.png b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_last.png
new file mode 100644
index 0000000..d93050c
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_last.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_list.png b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_list.png
new file mode 100644
index 0000000..20909eb
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_list.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_no_image.png b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_no_image.png
new file mode 100644
index 0000000..50d1adf
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_no_image.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_pause.png b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_pause.png
new file mode 100644
index 0000000..d169f23
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_pause.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_play.png b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_play.png
new file mode 100644
index 0000000..d926c13
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_play.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_power.png b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_power.png
new file mode 100644
index 0000000..2430124
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_power.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_radio.png b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_radio.png
new file mode 100644
index 0000000..ce10f35
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_radio.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_refresh.png b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_refresh.png
new file mode 100644
index 0000000..884fcd1
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_refresh.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_rewind.png b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_rewind.png
new file mode 100644
index 0000000..8662446
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_rewind.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_star.png b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_star.png
new file mode 100644
index 0000000..0cd4248
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_star.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_star_filled.png b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_star_filled.png
new file mode 100644
index 0000000..179f934
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_star_filled.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_volume_down.png b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_volume_down.png
new file mode 100644
index 0000000..c6c138a
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_volume_down.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_volume_up.png b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_volume_up.png
new file mode 100644
index 0000000..c4facef
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxhdpi/ic_volume_up.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_close.png b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_close.png
new file mode 100644
index 0000000..8d88f15
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_close.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_error.png b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_error.png
new file mode 100644
index 0000000..772590a
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_error.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_first.png b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_first.png
new file mode 100644
index 0000000..f2c26a0
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_first.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_forward.png b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_forward.png
new file mode 100644
index 0000000..72c39b7
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_forward.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_headphones.png b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_headphones.png
new file mode 100644
index 0000000..3b12f14
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_headphones.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_last.png b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_last.png
new file mode 100644
index 0000000..98b0a2a
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_last.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_list.png b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_list.png
new file mode 100644
index 0000000..7ddaf52
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_list.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_no_image.png b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_no_image.png
new file mode 100644
index 0000000..2136e9b
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_no_image.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_pause.png b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_pause.png
new file mode 100644
index 0000000..dc63538
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_pause.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_play.png b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_play.png
new file mode 100644
index 0000000..fc02009
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_play.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_power.png b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_power.png
new file mode 100644
index 0000000..63cf05b
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_power.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_radio.png b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_radio.png
new file mode 100644
index 0000000..5946b64
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_radio.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_refresh.png b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_refresh.png
new file mode 100644
index 0000000..cd1bbdd
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_refresh.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_rewind.png b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_rewind.png
new file mode 100644
index 0000000..4b5395d
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_rewind.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_star.png b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_star.png
new file mode 100644
index 0000000..2c67ccd
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_star.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_star_filled.png b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_star_filled.png
new file mode 100644
index 0000000..bf4fe37
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_star_filled.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_volume_down.png b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_volume_down.png
new file mode 100644
index 0000000..fafc1e9
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_volume_down.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_volume_up.png b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_volume_up.png
new file mode 100644
index 0000000..11cac5b
Binary files /dev/null and b/universal7885-common/apps/FMRadio/res/drawable-xxxhdpi/ic_volume_up.png differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable/ic_launcher.xml b/universal7885-common/apps/FMRadio/res/drawable/ic_launcher.xml
new file mode 100644
index 0000000..74ef657
--- /dev/null
+++ b/universal7885-common/apps/FMRadio/res/drawable/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@android:color/system_accent1_200"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/universal7885-common/apps/FMRadio/res/drawable/ic_launcher_foreground.xml b/universal7885-common/apps/FMRadio/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 0000000..a3e1a5f
--- /dev/null
+++ b/universal7885-common/apps/FMRadio/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108"
+    android:tint="#FFFFFF">
+  <group android:scaleX="2.1924"
+      android:scaleY="2.1924"
+      android:translateX="27.6912"
+      android:translateY="27.6912">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M3.24,6.15C2.51,6.43 2,7.17 2,8v12c0,1.1 0.89,2 2,2h16c1.11,0 2,-0.9 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2L8.3,6l8.26,-3.34L15.88,1 3.24,6.15zM7,20c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM20,12h-2v-2h-2v2L4,12L4,8h16v4z"/>
+  </group>
+</vector>
diff --git a/universal7885-common/apps/FMRadio/res/drawable/ic_seekbar.xml b/universal7885-common/apps/FMRadio/res/drawable/ic_seekbar.xml
new file mode 100644
index 0000000..c4f1d8c
--- /dev/null
+++ b/universal7885-common/apps/FMRadio/res/drawable/ic_seekbar.xml
@@ -0,0 +1,32 @@
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
+        <shape
+            android:shape="line">
+            <stroke
+                android:color="@android:color/system_accent1_500"
+                android:width="@dimen/seek_bar_thickness"/>
+        </shape>
+    </item>
+    <item android:id="@android:id/secondaryProgress">
+        <clip>
+            <shape
+                android:shape="line">
+                <stroke
+                    android:color="@android:color/system_accent1_200"
+                    android:width="@dimen/seek_bar_thickness"/>
+            </shape>
+        </clip>
+    </item>
+
+    <item android:id="@android:id/progress">
+        <clip>
+            <shape
+                android:shape="line">
+                <stroke
+                    android:color="@android:color/system_accent1_300"
+                    android:width="@dimen/seek_bar_thickness"/>
+            </shape>
+        </clip>
+    </item>
+
+</layer-list>
diff --git a/universal7885-common/apps/FMRadio/res/drawable/ic_seekbar_thumb.xml b/universal7885-common/apps/FMRadio/res/drawable/ic_seekbar_thumb.xml
new file mode 100644
index 0000000..54a76ee
--- /dev/null
+++ b/universal7885-common/apps/FMRadio/res/drawable/ic_seekbar_thumb.xml
@@ -0,0 +1,8 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size
+        android:height="@dimen/seek_bar_thumb_size"
+        android:width="@dimen/seek_bar_thumb_size"
+        />
+    <solid android:color="@android:color/system_accent2_500"/>
+</shape>
\ No newline at end of file
diff --git a/universal7885-common/apps/FMRadio/res/drawable/left.png b/universal7885-common/apps/FMRadio/res/drawable/left.png
deleted file mode 100644
index 73bd50a..0000000
Binary files a/universal7885-common/apps/FMRadio/res/drawable/left.png and /dev/null differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable/power.xml b/universal7885-common/apps/FMRadio/res/drawable/power.xml
deleted file mode 100644
index d816c7d..0000000
--- a/universal7885-common/apps/FMRadio/res/drawable/power.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.0dp"
-    android:height="24.0dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M11,2h2v10h-2z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M18.37,5.64l-1.41,1.41c2.73,2.73 2.72,7.16 -0.01,9.89c-2.73,2.73 -7.17,2.73 -9.89,0.01c-2.73,-2.73 -2.74,-7.18 -0.01,-9.91L5.64,5.64c-3.51,3.51 -3.51,9.21 0.01,12.73c3.51,3.51 9.21,3.51 12.72,-0.01C21.88,14.85 21.88,9.16 18.37,5.64z"/>
-</vector>
\ No newline at end of file
diff --git a/universal7885-common/apps/FMRadio/res/drawable/radio.png b/universal7885-common/apps/FMRadio/res/drawable/radio.png
deleted file mode 100644
index 3d087e5..0000000
Binary files a/universal7885-common/apps/FMRadio/res/drawable/radio.png and /dev/null differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable/radio_text.png b/universal7885-common/apps/FMRadio/res/drawable/radio_text.png
deleted file mode 100644
index 762332f..0000000
Binary files a/universal7885-common/apps/FMRadio/res/drawable/radio_text.png and /dev/null differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable/right.png b/universal7885-common/apps/FMRadio/res/drawable/right.png
deleted file mode 100644
index 9108c07..0000000
Binary files a/universal7885-common/apps/FMRadio/res/drawable/right.png and /dev/null differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable/start.png b/universal7885-common/apps/FMRadio/res/drawable/start.png
deleted file mode 100644
index b737620..0000000
Binary files a/universal7885-common/apps/FMRadio/res/drawable/start.png and /dev/null differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable/stop.png b/universal7885-common/apps/FMRadio/res/drawable/stop.png
deleted file mode 100644
index 3c7de6a..0000000
Binary files a/universal7885-common/apps/FMRadio/res/drawable/stop.png and /dev/null differ
diff --git a/universal7885-common/apps/FMRadio/res/drawable/warning.jpg b/universal7885-common/apps/FMRadio/res/drawable/warning.jpg
deleted file mode 100644
index bff3977..0000000
Binary files a/universal7885-common/apps/FMRadio/res/drawable/warning.jpg and /dev/null differ
diff --git a/universal7885-common/apps/FMRadio/res/layout/activity_channel_list.xml b/universal7885-common/apps/FMRadio/res/layout/activity_channel_list.xml
new file mode 100644
index 0000000..f020094
--- /dev/null
+++ b/universal7885-common/apps/FMRadio/res/layout/activity_channel_list.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginBottom="50dp"
+    android:background="@android:color/system_accent1_100"
+    android:id="@+id/channel_list_layout">
+
+    <ListView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/listview"/>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:id="@+id/refresh_channel_list"
+        android:src="@drawable/ic_refresh"
+        android:layout_marginEnd="25dp"
+        android:layout_marginBottom="25dp"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/universal7885-common/apps/FMRadio/res/layout/activity_main.xml b/universal7885-common/apps/FMRadio/res/layout/activity_main.xml
deleted file mode 100644
index 98440d3..0000000
--- a/universal7885-common/apps/FMRadio/res/layout/activity_main.xml
+++ /dev/null
@@ -1,310 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="top|center"
-    android:fitsSystemWindows="true"
-    tools:context=".MainActivity">
-
-    <TextView
-        android:id="@+id/debug_info"
-        android:layout_width="190dp"
-        android:layout_height="30dp"
-        android:gravity="center" />
-
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="10dp" />
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@color/primary_color"
-        android:gravity="center">
-
-        <Space
-            android:layout_width="10dp"
-            android:layout_height="match_parent"/>
-
-        <ImageView
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            android:src="@drawable/radio"/>
-        <TextView
-            android:id="@+id/fm_radio_title"
-            android:layout_width="240dp"
-            android:layout_height="120dp"
-
-            android:gravity="center"
-            android:text="@string/fm_radio"
-            android:textColor="#263238"
-            android:textSize="48sp"
-            android:textStyle="bold" />
-
-        <Space
-            android:layout_width="10dp"
-            android:layout_height="match_parent" />
-
-    </LinearLayout>
-
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="15dp" />
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="140dp"
-            android:orientation="vertical"
-            android:background="@color/primary_color"
-            android:gravity="center|top">
-
-            <TextView
-                android:id="@+id/output_modes"
-                android:layout_width="185dp"
-                android:layout_height="70dp"
-                android:gravity="center"
-                android:text="@string/output_modes"
-                android:textColor="#263238"
-                android:textSize="25sp"
-                android:textStyle="bold" />
-
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="10dp"/>
-
-            <Button
-                android:id="@+id/fm_output"
-                android:layout_width="175dp"
-                android:layout_height="50dp"
-                android:text="@string/wired_earphones"
-                android:textColor="#263238"
-                android:theme="@style/ButtonStyle.Colored"
-                android:textSize="18sp" />
-
-        </LinearLayout>
-
-        <Space
-            android:layout_width="10dp"
-            android:layout_height="match_parent"/>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="140dp"
-            android:orientation="vertical"
-            android:background="@color/primary_color"
-            android:gravity="center|top">
-
-            <TextView
-                android:id="@+id/enable_fm"
-                android:layout_width="185dp"
-                android:layout_height="70dp"
-                android:gravity="center"
-                android:text="@string/turn_on_fm"
-                android:textColor="#263238"
-                android:textSize="25sp"
-                android:textStyle="bold" />
-
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="10dp"/>
-
-            <Button
-                android:id="@+id/fmswitch"
-                android:layout_width="175dp"
-                android:layout_height="50dp"
-                android:text="@string/disabled"
-                android:textColor="#263238"
-                android:textSize="18sp"
-                android:theme="@style/ButtonStyle.Colored" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="20dp" />
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="230dp"
-        android:background="@color/primary_color"
-        android:orientation="vertical"
-        android:gravity="center|top">
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="20dp"/>
-
-        <TextView
-            android:id="@+id/freq_title"
-            android:layout_width="375dp"
-            android:layout_height="50dp"
-            android:text="@string/fm_radio_frequency"
-            android:textColor="#263238"
-            android:textSize="35sp"
-            android:textStyle="bold"
-            android:gravity="center"/>
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="10dp"/>
-
-        <TextView
-            android:id="@+id/band_select"
-            android:layout_width="375dp"
-            android:layout_height="50dp"
-            android:text="@string/select_channel"
-            android:textColor="#263238"
-            android:textSize="25sp"
-            android:gravity="center"/>
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="20dp"/>
-
-        <FrameLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@color/secondary_color">
-
-            <SeekBar
-                android:id="@+id/fm_freq_seekbar"
-                android:layout_width="325dp"
-                android:layout_height="50dp"
-                android:progressBackgroundTint="@color/white"
-                android:thumbTint="#263238"
-                android:progressTint="#263238"/>
-        </FrameLayout>
-
-    </LinearLayout>
-
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="20dp" />
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top|center"
-        android:orientation="vertical"
-        android:background="@color/primary_color">
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="15dp" />
-
-        <TextView
-            android:id="@+id/radio_ctrl"
-            android:layout_width="375dp"
-            android:layout_height="50dp"
-            android:text="@string/radio_controls"
-            android:textColor="#263238"
-            android:textSize="35sp"
-            android:textStyle="bold"
-            android:gravity="center"/>
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="15dp" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center">
-
-            <Space
-                android:layout_width="15dp"
-                android:layout_height="match_parent" />
-
-            <Button
-                android:id="@+id/scan_through"
-                android:layout_width="wrap_content"
-                android:layout_height="50dp"
-                android:text="@string/scan"
-                android:textColor="#263238"
-                android:theme="@style/ButtonStyle.Colored"/>
-
-            <Space
-                android:layout_width="15dp"
-                android:layout_height="match_parent" />
-
-            <Button
-                android:id="@+id/stop_scan"
-                android:layout_width="wrap_content"
-                android:layout_height="50dp"
-                android:text="@string/stop"
-                android:textColor="#263238"
-                android:theme="@style/ButtonStyle.Colored" />
-
-            <Space
-                android:layout_width="15dp"
-                android:layout_height="match_parent" />
-
-        </LinearLayout>
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="15dp" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="top|center">
-
-            <Space
-                android:layout_width="15dp"
-                android:layout_height="match_parent" />
-
-            <Button
-                android:id="@+id/seek_down"
-                android:layout_width="wrap_content"
-                android:layout_height="50dp"
-                android:text="@string/seek_down"
-                android:textColor="#263238"
-                android:theme="@style/ButtonStyle.Colored"/>
-
-            <Space
-                android:layout_width="15dp"
-                android:layout_height="match_parent" />
-
-            <Button
-                android:id="@+id/quit_fm"
-                android:layout_width="wrap_content"
-                android:layout_height="50dp"
-                android:text="@string/quit"
-                android:textColor="#263238"
-                android:theme="@style/ButtonStyle.Colored"/>
-
-            <Space
-                android:layout_width="15dp"
-                android:layout_height="match_parent" />
-
-            <Button
-                android:id="@+id/seek_up"
-                android:layout_width="wrap_content"
-                android:layout_height="50dp"
-                android:text="@string/seek_up"
-                android:textColor="#263238"
-                android:theme="@style/ButtonStyle.Colored" />
-
-            <Space
-                android:layout_width="15dp"
-                android:layout_height="match_parent" />
-
-        </LinearLayout>
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="15dp" />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/universal7885-common/apps/FMRadio/res/layout/activity_navigation.xml b/universal7885-common/apps/FMRadio/res/layout/activity_navigation.xml
new file mode 100644
index 0000000..99a3b55
--- /dev/null
+++ b/universal7885-common/apps/FMRadio/res/layout/activity_navigation.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/container_view"/>
+
+    <com.google.android.material.bottomnavigation.BottomNavigationView
+        android:layout_width="match_parent"
+        android:layout_gravity="bottom"
+        android:layout_height="wrap_content"
+        android:background="@android:color/system_accent1_300"
+        style="@style/Widget.MaterialComponents.BottomNavigationView.Colored"
+        app:menu="@menu/bottom_navigation_menu"
+        android:id="@+id/bottom_nav_bar"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/universal7885-common/apps/FMRadio/res/layout/alertdialog.xml b/universal7885-common/apps/FMRadio/res/layout/alertdialog.xml
new file mode 100644
index 0000000..8e00db1
--- /dev/null
+++ b/universal7885-common/apps/FMRadio/res/layout/alertdialog.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:theme="@style/Theme.Material3.DayNight.Dialog.Alert">
+    <com.google.android.material.textview.MaterialTextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/warning"
+        android:textSize="50sp"
+        android:textAllCaps="true"
+        android:textStyle="bold"
+        android:gravity="center"
+        android:paddingBottom="15dp"/>
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/alert_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="25sp"
+        android:textStyle="bold"
+        android:gravity="center"
+        android:paddingBottom="15dp"/>
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:layout_width="200dp"
+        android:layout_height="200dp"
+        android:id="@+id/alert_image"
+        android:background="@android:color/system_accent1_400"/>
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/alert_desc"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="25sp"
+        android:gravity="center"
+        android:paddingTop="20dp"
+        android:paddingBottom="10dp"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/universal7885-common/apps/FMRadio/res/layout/channel_list_items.xml b/universal7885-common/apps/FMRadio/res/layout/channel_list_items.xml
new file mode 100644
index 0000000..25da954
--- /dev/null
+++ b/universal7885-common/apps/FMRadio/res/layout/channel_list_items.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:layout_gravity="start|center_vertical"
+        android:id="@+id/star_button_list"
+        android:src="@drawable/ic_star"/>
+
+    <com.google.android.material.textview.MaterialTextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:paddingStart="25dp"
+        android:id="@+id/channel_list_title"
+        android:paddingEnd="25dp"
+        android:textColor="@android:color/system_accent2_700"
+        android:textStyle="bold"
+        android:letterSpacing="0.15"
+        android:paddingTop="15dp"
+        android:paddingBottom="15dp"
+        android:textSize="25sp"
+        android:text="@string/fm_radio_freq"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/universal7885-common/apps/FMRadio/res/layout/error_screen.xml b/universal7885-common/apps/FMRadio/res/layout/error_screen.xml
deleted file mode 100644
index a8ad5da..0000000
--- a/universal7885-common/apps/FMRadio/res/layout/error_screen.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@drawable/warning">
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_gravity="center">
-
-        <ImageView
-            android:id="@+id/error_img"
-            android:layout_width="75dp"
-            android:layout_height="75dp"
-            android:layout_gravity="start|center_vertical"
-            android:background="@drawable/ic_samsung_error"
-            android:translationZ="0dp" />
-
-        <Space
-            android:layout_width="25dp"
-            android:layout_height="match_parent"/>
-
-        <TextView
-            android:id="@+id/error_simple"
-            android:layout_width="300dp"
-            android:layout_height="75dp"
-            android:gravity="center"
-            android:textColor="#00838F"
-            android:textSize="18sp"/>
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/error_detailed"
-        android:layout_width="match_parent"
-        android:layout_height="202dp"
-        android:textColor="#00838F"
-        android:textSize="16sp"
-        android:gravity="center"/>
-
-
-</LinearLayout>
\ No newline at end of file
diff --git a/universal7885-common/apps/FMRadio/res/layout/favorite_channel_items.xml b/universal7885-common/apps/FMRadio/res/layout/favorite_channel_items.xml
new file mode 100644
index 0000000..11a2359
--- /dev/null
+++ b/universal7885-common/apps/FMRadio/res/layout/favorite_channel_items.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="start|top"
+    android:id="@+id/pebble_layout">
+
+    <com.eurekateam.fmradio.PebbleTextView
+        android:id="@+id/pebble_textview"
+        android:layout_width="210dp"
+        android:layout_height="175dp" />
+</FrameLayout>
\ No newline at end of file
diff --git a/universal7885-common/apps/FMRadio/res/layout/fragment_fav_list.xml b/universal7885-common/apps/FMRadio/res/layout/fragment_fav_list.xml
new file mode 100644
index 0000000..50b6be2
--- /dev/null
+++ b/universal7885-common/apps/FMRadio/res/layout/fragment_fav_list.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<GridView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"
+    android:id="@+id/fav_list_grid">
+</GridView>
\ No newline at end of file
diff --git a/universal7885-common/apps/FMRadio/res/layout/fragment_main.xml b/universal7885-common/apps/FMRadio/res/layout/fragment_main.xml
new file mode 100644
index 0000000..3d24af7
--- /dev/null
+++ b/universal7885-common/apps/FMRadio/res/layout/fragment_main.xml
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:fitsSystemWindows="true"
+    android:id="@+id/main_fragment"
+    android:background="@android:color/system_accent1_100">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="65dp"
+        android:paddingStart="30dp"
+        android:paddingEnd="30dp"
+        android:orientation="vertical"
+        android:layout_gravity="top|center">
+
+        <com.google.android.material.textview.MaterialTextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/app_banner"
+            android:textColor="@android:color/system_accent1_500"
+            android:textSize="65sp"
+            android:textStyle="bold"
+            android:text="@string/app_name"/>
+
+        <Space
+            android:layout_width="5dp"
+            android:layout_height="match_parent"/>
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="end">
+
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:layout_gravity="start|center_vertical"
+                android:layout_marginStart="30dp"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:id="@+id/fav_button"
+                app:elevation="0dp"
+                android:backgroundTint="@android:color/system_accent1_400"
+                android:src="@drawable/ic_star"/>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end">
+                <com.google.android.material.textview.MaterialTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:id="@+id/fm_freq"
+                    android:text="@string/inital_freq"
+                    android:textStyle="bold"
+                    android:textColor="@android:color/system_accent1_500"
+                    android:textSize="65sp"/>
+                <com.google.android.material.textview.MaterialTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="bottom"
+                    android:paddingBottom="20dp"
+                    android:id="@+id/freq_misc"
+                    android:textSize="25sp"
+                    android:textColor="@android:color/system_accent1_500"
+                    android:text="@string/mhz"
+                    android:textStyle="bold"/>
+            </LinearLayout>
+
+        </FrameLayout>
+
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|center_horizontal"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        android:paddingBottom="100dp">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="30dp"
+            android:layout_marginBottom="50dp"
+            android:gravity="center">
+
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:backgroundTint="@android:color/system_accent1_400"
+                android:id="@+id/volume_down"
+                app:elevation="0dp"
+                android:src="@drawable/ic_volume_down" />
+
+            <androidx.appcompat.widget.AppCompatSeekBar
+                android:layout_width="175dp"
+                android:id="@+id/volume_seekbar"
+                android:progressDrawable="@drawable/ic_seekbar"
+                android:thumb="@drawable/ic_seekbar_thumb"
+                android:layout_height="match_parent"/>
+
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:backgroundTint="@android:color/system_accent1_400"
+                android:id="@+id/volume_up"
+                app:elevation="0dp"
+                android:src="@drawable/ic_volume_up"/>
+
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center">
+
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:id="@+id/before_channel"
+                android:layout_width="wrap_content"
+                android:backgroundTint="@android:color/system_accent1_400"
+                android:layout_height="wrap_content"
+                app:elevation="0dp"
+                android:src="@drawable/ic_rewind" />
+
+            <Space
+                android:layout_width="50dp"
+                android:layout_height="match_parent" />
+
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:id="@+id/fm_power"
+                android:layout_width="wrap_content"
+                android:backgroundTint="@android:color/system_accent1_400"
+                android:layout_height="wrap_content"
+                app:elevation="0dp"
+                android:src="@drawable/ic_power" />
+
+            <Space
+                android:layout_width="50dp"
+                android:layout_height="match_parent" />
+
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:id="@+id/next_channel"
+                android:layout_width="wrap_content"
+                android:backgroundTint="@android:color/system_accent1_400"
+                android:layout_height="wrap_content"
+                app:elevation="0dp"
+                android:src="@drawable/ic_forward" />
+        </LinearLayout>
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="30dp" />
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/fm_output_btn"
+            android:layout_width="wrap_content"
+            android:backgroundTint="@android:color/system_accent1_400"
+            android:layout_height="wrap_content"
+            app:elevation="0dp"
+            app:srcCompat="@drawable/ic_volume_up" />
+    </LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/universal7885-common/apps/FMRadio/res/layout/notification.xml b/universal7885-common/apps/FMRadio/res/layout/notification.xml
deleted file mode 100644
index cce8f6d..0000000
--- a/universal7885-common/apps/FMRadio/res/layout/notification.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="64dp"
-    android:gravity="center_vertical"
-    android:orientation="horizontal">
-
-    <TextView
-        android:id="@+id/txt_title"
-        android:layout_width="0dp"
-        android:layout_height="50dp"
-        android:layout_marginStart="5dp"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:background="@android:color/white"
-        android:textColor="@android:color/black"
-        android:textSize="20sp"/>
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@android:color/white">
-
-        <ImageButton
-            android:id="@+id/btn_rewind"
-            android:layout_width="wrap_content"
-            android:layout_height="50dp"
-            android:background="@null"
-            android:contentDescription="@string/previous_radio_channel"
-            android:src="@drawable/left"/>
-
-        <ImageButton
-            android:id="@+id/btn_play_pause"
-            android:layout_width="wrap_content"
-            android:layout_height="48dp"
-            android:background="@null"
-            android:contentDescription="@string/play_pause"
-            android:src="@drawable/stop" />
-
-        <ImageButton
-            android:id="@+id/btn_forward"
-            android:layout_width="wrap_content"
-            android:layout_height="50dp"
-            android:background="@null"
-            android:contentDescription="@string/next_radio_channel"
-            android:src="@drawable/right"/>
-
-    </LinearLayout>
-
-    <ImageButton
-        android:id="@+id/btn_close"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@android:color/white"
-        android:contentDescription="@string/close_radio"
-        android:minWidth="32dp"
-        android:minHeight="48dp"
-        android:src="@drawable/power" />
-</LinearLayout>
diff --git a/universal7885-common/apps/FMRadio/res/menu/bottom_navigation_menu.xml b/universal7885-common/apps/FMRadio/res/menu/bottom_navigation_menu.xml
new file mode 100644
index 0000000..591c350
--- /dev/null
+++ b/universal7885-common/apps/FMRadio/res/menu/bottom_navigation_menu.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/radio_main"
+        android:enabled="true"
+        android:icon="@drawable/ic_radio"
+        android:title="@string/app_name"/>
+    <item
+        android:id="@+id/channel_list"
+        android:enabled="true"
+        android:icon="@drawable/ic_list"
+        android:title="@string/channel_list"/>
+    <item
+        android:id="@+id/fav_list"
+        android:enabled="true"
+        android:icon="@drawable/ic_star_filled"
+        android:title="@string/favorites"/>
+</menu>
\ No newline at end of file
diff --git a/universal7885-common/apps/FMRadio/res/mipmap-hdpi/ic_launcher.png b/universal7885-common/apps/FMRadio/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 80aeee0..0000000
Binary files a/universal7885-common/apps/FMRadio/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/universal7885-common/apps/FMRadio/res/mipmap-hdpi/ic_launcher_foreground.png b/universal7885-common/apps/FMRadio/res/mipmap-hdpi/ic_launcher_foreground.png
deleted file mode 100644
index 64b2197..0000000
Binary files a/universal7885-common/apps/FMRadio/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/universal7885-common/apps/FMRadio/res/mipmap-hdpi/ic_launcher_round.png b/universal7885-common/apps/FMRadio/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index ebd5cf6..0000000
Binary files a/universal7885-common/apps/FMRadio/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ
diff --git a/universal7885-common/apps/FMRadio/res/mipmap-mdpi/ic_launcher.png b/universal7885-common/apps/FMRadio/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 9a96488..0000000
Binary files a/universal7885-common/apps/FMRadio/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/universal7885-common/apps/FMRadio/res/mipmap-mdpi/ic_launcher_foreground.png b/universal7885-common/apps/FMRadio/res/mipmap-mdpi/ic_launcher_foreground.png
deleted file mode 100644
index 8c1591b..0000000
Binary files a/universal7885-common/apps/FMRadio/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/universal7885-common/apps/FMRadio/res/mipmap-mdpi/ic_launcher_round.png b/universal7885-common/apps/FMRadio/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index cb4ce45..0000000
Binary files a/universal7885-common/apps/FMRadio/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ
diff --git a/universal7885-common/apps/FMRadio/res/mipmap-xhdpi/ic_launcher.png b/universal7885-common/apps/FMRadio/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index 17cbab8..0000000
Binary files a/universal7885-common/apps/FMRadio/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/universal7885-common/apps/FMRadio/res/mipmap-xhdpi/ic_launcher_foreground.png b/universal7885-common/apps/FMRadio/res/mipmap-xhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 515a0ca..0000000
Binary files a/universal7885-common/apps/FMRadio/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/universal7885-common/apps/FMRadio/res/mipmap-xhdpi/ic_launcher_round.png b/universal7885-common/apps/FMRadio/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index 0e4a85c..0000000
Binary files a/universal7885-common/apps/FMRadio/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/universal7885-common/apps/FMRadio/res/mipmap-xxhdpi/ic_launcher.png b/universal7885-common/apps/FMRadio/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 7248392..0000000
Binary files a/universal7885-common/apps/FMRadio/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/universal7885-common/apps/FMRadio/res/mipmap-xxhdpi/ic_launcher_foreground.png b/universal7885-common/apps/FMRadio/res/mipmap-xxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index fa4eba1..0000000
Binary files a/universal7885-common/apps/FMRadio/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/universal7885-common/apps/FMRadio/res/mipmap-xxhdpi/ic_launcher_round.png b/universal7885-common/apps/FMRadio/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index 86edfe3..0000000
Binary files a/universal7885-common/apps/FMRadio/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/universal7885-common/apps/FMRadio/res/mipmap-xxxhdpi/ic_launcher.png b/universal7885-common/apps/FMRadio/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index e112f21..0000000
Binary files a/universal7885-common/apps/FMRadio/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/universal7885-common/apps/FMRadio/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/universal7885-common/apps/FMRadio/res/mipmap-xxxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 22b5954..0000000
Binary files a/universal7885-common/apps/FMRadio/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/universal7885-common/apps/FMRadio/res/mipmap-xxxhdpi/ic_launcher_round.png b/universal7885-common/apps/FMRadio/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index 8601bfa..0000000
Binary files a/universal7885-common/apps/FMRadio/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/universal7885-common/apps/FMRadio/res/values/dimens.xml b/universal7885-common/apps/FMRadio/res/values/dimens.xml
new file mode 100644
index 0000000..0651471
--- /dev/null
+++ b/universal7885-common/apps/FMRadio/res/values/dimens.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="seek_bar_thickness">10dp</dimen>
+    <dimen name="seek_bar_thumb_size">20dp</dimen>
+    <dimen name="noti_btn_default_size">25dp</dimen>
+    <dimen name="power_btn_default_size">35dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/universal7885-common/apps/FMRadio/res/values/strings.xml b/universal7885-common/apps/FMRadio/res/values/strings.xml
index 3f90bb5..ad8b800 100644
--- a/universal7885-common/apps/FMRadio/res/values/strings.xml
+++ b/universal7885-common/apps/FMRadio/res/values/strings.xml
@@ -1,6 +1,7 @@
 <resources>
     <string name="app_name">FM Radio</string>
     <string name="fm_radio">FM Radio</string>
+    <string name="ok">OK</string>
     <string name="output_modes">Output Modes</string>
     <string name="turn_on_fm">FM Power</string>
     <string name="disabled">Disabled</string>
@@ -13,7 +14,7 @@
     <string name="seek_up">Seek Up</string>
     <string name="scan">Scan</string>
     <string name="stop">Stop</string>
-    <string name="mhz">%s Mhz</string>
+    <string name="mhz">Mhz</string>
     <string name="quit">Quit</string>
     <string name="album_art">Album Art</string>
     <string name="previous_radio_channel">Previous Radio Channel</string>
@@ -31,4 +32,12 @@
     <string name="no_headphones_error_desc">Insert Headphones and try again</string>
     <string name="radio_controls">Radio Controls</string>
     <string name="fm_radio_frequency">FM Radio Station</string>
+    <string name="fm">FM</string>
+    <string name="inital_freq">000.0</string>
+    <string name="channel_list">Channel List</string>
+    <string name="favorites">Favorites</string>
+    <string name="warning">Warning!</string>
+    <string name="retry">Retry</string>
+    <string name="exit_app">Exit App</string>
+    <string name="fm_radio_freq">FM %s Mhz</string>
 </resources>
\ No newline at end of file
diff --git a/universal7885-common/apps/FMRadio/rules.pro b/universal7885-common/apps/FMRadio/rules.pro
deleted file mode 100644
index 3175cca..0000000
--- a/universal7885-common/apps/FMRadio/rules.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-
--keepattributes Signature,*Annotation*
-
--keep class de.dlyt.yanndroid.oneui.** { *; }
diff --git a/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/ErrorHandler.kt b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/ErrorHandler.kt
deleted file mode 100644
index b5b3c34..0000000
--- a/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/ErrorHandler.kt
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.eurekateam.fmradio
-
-import android.app.Activity
-import android.app.Service
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.media.AudioDeviceInfo
-import android.media.AudioManager
-import android.os.Bundle
-import android.widget.TextView
-import android.widget.Toast
-
-class ErrorHandler: Activity() {
-    private lateinit var mErrorSimple: TextView
-    private lateinit var mErrorDetail: TextView
-    private var mHeadPhonesPresent = false
-    private var mRegistered  = false
-    private var fd = 0
-    private lateinit var mContext: Context
-    private lateinit var mAudioManager : AudioManager
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.error_screen)
-        mContext = this
-        fd = intent.getIntExtra("fd", -1)
-        mAudioManager = getSystemService(Service.AUDIO_SERVICE) as AudioManager
-        mErrorDetail = findViewById(R.id.error_detailed)
-        mErrorSimple = findViewById(R.id.error_simple)
-        val mAudioDeviceInfo = mAudioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS)
-        for (i in mAudioDeviceInfo.indices){
-            if (mAudioDeviceInfo[i].type == AudioDeviceInfo.TYPE_WIRED_HEADSET ||
-                mAudioDeviceInfo[i].type == AudioDeviceInfo.TYPE_WIRED_HEADPHONES){
-                mHeadPhonesPresent = true
-            }
-        }
-        when (intent?.action){
-
-            RADIO_DEVICE_IO_FAIL -> {
-                mErrorSimple.text = getString(R.string.radio_io_error)
-                mErrorDetail.text = getString(R.string.radio_io_error_desc)
-            }
-            TRACKS_EMPTY -> {
-                mErrorSimple.text = getString(R.string.tracks_empty_error)
-                mErrorDetail.text = getString(R.string.tracks_empty_error_desc)
-            }
-            NO_WIRED_HEADPHONES -> {
-                mErrorSimple.text = getString(R.string.no_headphones_error)
-                mErrorDetail.text = getString(R.string.no_headphones_error_desc)
-                mHeadPhonesPresent = false
-                val receiverFilter = IntentFilter(Intent.ACTION_HEADSET_PLUG)
-                val receiver = mWiredHeadsetReceiver
-                mHeadPhonesPresent = false
-                registerReceiver(receiver, receiverFilter)
-                mRegistered = true
-            }
-        }
-    }
-    private val mWiredHeadsetReceiver: BroadcastReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context, intent: Intent) {
-            if (intent.action == AudioManager.ACTION_HEADSET_PLUG) {
-                mHeadPhonesPresent = false
-                val mAudioDeviceInfo = mAudioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS)
-                for (i in mAudioDeviceInfo.indices){
-                    if (mAudioDeviceInfo[i].type == AudioDeviceInfo.TYPE_WIRED_HEADSET ||
-                        mAudioDeviceInfo[i].type == AudioDeviceInfo.TYPE_WIRED_HEADPHONES){
-                        mHeadPhonesPresent = true
-                    }
-                }
-                if (mHeadPhonesPresent){
-                    Toast.makeText(mContext, "Wired headphones inserted", Toast.LENGTH_SHORT).show()
-                    startActivity(Intent(mContext, MainActivity::class.java))
-                }
-            }
-        }
-    }
-
-    override fun onPause() {
-        super.onPause()
-        if (mRegistered)
-            unregisterReceiver(mWiredHeadsetReceiver)
-    }
-
-    companion object {
-        private const val PACKAGENAME = "com.eurekateam.fmradio"
-        // Failures
-        private const val RADIO_DEVICE_IO_FAIL = "${PACKAGENAME}.RADIO.IO"
-        private const val TRACKS_EMPTY = "${PACKAGENAME}.TRACKS"
-        private const val NO_WIRED_HEADPHONES = "${PACKAGENAME}.NO_HEADPHONE"
-
-    }
-}
\ No newline at end of file
diff --git a/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/FMRadioService.kt b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/FMRadioService.kt
index 2597668..40242df 100644
--- a/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/FMRadioService.kt
+++ b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/FMRadioService.kt
@@ -3,193 +3,166 @@ package com.eurekateam.fmradio
 import android.app.*
 import android.content.Context
 import android.content.Intent
+import android.graphics.drawable.Icon
 import android.media.AudioManager
+import android.media.MediaMetadata
+import android.media.session.MediaSession
+import android.media.session.PlaybackState
 import android.os.IBinder
 import android.util.Log
-import android.widget.RemoteViews
-import androidx.core.app.NotificationCompat
+import androidx.core.content.res.ResourcesCompat
+import androidx.core.graphics.drawable.toBitmap
+import com.eurekateam.fmradio.fragments.MainFragment
 import java.io.File
-import java.io.FileOutputStream
-import java.io.IOException
-import java.io.OutputStream
 
 
 class FMRadioService : Service() {
     private lateinit var mContext: Context
     private lateinit var mAudioManager: AudioManager
-    private var mIsPlaying = true
     private lateinit var mTracks : LongArray
     private var mTitle : String = ""
     private var fd : Int = -1
     private var mIndex = -1
     private lateinit var mNativeFMInterface: NativeFMInterface
-    private lateinit var pendingIntent: PendingIntent
-    private lateinit var contentView : RemoteViews
     private lateinit var mFilePath : File
     override fun onBind(intent: Intent?): IBinder? {
         return null
     }
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        fd = MainFragment.fd
+        mAudioManager = getSystemService(AUDIO_SERVICE) as AudioManager
+        mTracks = MainFragment.mTracks
+        mIndex = MainFragment.getIndex()
+        if (mTracks.isEmpty() || mIndex == -1)
+        {
+            return super.onStartCommand(intent, flags, startId)
+        }
         if (intent != null) {
-            var mShutDown = false
-            Log.i(TAG, "onStartCommand: Received ${intent.action}")
+            intent.action?.let { Log.i(TAG, it) }
             when (intent.action) {
                 BEGIN_BG_SERVICE -> {
                     mContext = this
                     mFilePath = mContext.filesDir
-                    contentView = RemoteViews(mContext.packageName, R.layout.notification)
                     mNativeFMInterface = NativeFMInterface()
-                    fd = intent.getIntExtra("fd", -1)
-                    mTracks = intent.getLongArrayExtra("tracks")!!
-                    mIndex = intent.getIntExtra("CurrentIndex", -1)
                     mTitle = "FM ${mTracks[mIndex].toFloat() / 1000} Mhz"
-                    contentView.setImageViewResource(
-                        R.id.btn_play_pause,
-                        R.drawable.stop
-                    )
                     mAudioManager = getSystemService(AUDIO_SERVICE) as AudioManager
-                    setupRemoteView()
-                    // Create an explicit intent for an Activity in your app
-                    val onClickIntent = Intent(this, FMRadioService::class.java).apply {
-                        Intent.FLAG_ACTIVITY_NEW_TASK
-                    }
-                    pendingIntent = PendingIntent.getActivity(
-                        this,
-                        0,
-                        onClickIntent,
-                        PendingIntent.FLAG_IMMUTABLE
-                    )
                     mIsPlaying = true
-                    startForeground(51, pushNotification())
                 }
                 ACTION_PLAY -> {
                     mIsPlaying = !mIsPlaying
-                    mTitle =
-                        if (mIsPlaying) {
-                            "FM ${mTracks[mIndex].toFloat() / 1000}Mhz"
-                        } else {
-                            "FM ${mTracks[mIndex].toFloat() / 1000}Mhz - Stopped"
-                        }
+                    mTitle = "FM ${mTracks[mIndex].toFloat() / 1000}Mhz"
                     if (mIsPlaying) {
-                        contentView.setImageViewResource(
-                            R.id.btn_play_pause,
-                            R.drawable.stop
-                        )
-                        writeToFile("fm_radio_state", "1")
                         mAudioManager.setParameters(FM_RADIO_ON)
-
                     } else {
                         mAudioManager.setParameters(FM_RADIO_OFF)
-                        contentView.setImageViewResource(
-                            R.id.btn_play_pause,
-                            R.drawable.start
-                        )
-                        writeToFile("fm_radio_state", "0")
                     }
                 }
                 ACTION_BEFORE -> {
                     mIsPlaying = true
-                    contentView.setImageViewResource(
-                        R.id.btn_play_pause,
-                        R.drawable.stop
-                    )
                     Log.i(TAG, "onStartCommand: mCurrentIndex $mIndex")
                     if (mIndex > 0)
                         mIndex -= 1
                     if (mIndex >= 1)
                         mNativeFMInterface.setFMFreq(fd, mTracks[mIndex].toInt())
-                    mTitle = if (mIsPlaying) {
-                        "FM ${mTracks[mIndex].toFloat() / 1000}Mhz"
-                    } else {
-                        "FM ${mTracks[mIndex].toFloat() / 1000}Mhz - Stopped"
-                    }
+                    mTitle = "FM ${mTracks[mIndex].toFloat() / 1000}Mhz"
                 }
                 ACTION_NEXT -> {
                     mIsPlaying = true
-                    contentView.setImageViewResource(
-                        R.id.btn_play_pause,
-                        R.drawable.stop
-                    )
                     Log.i(TAG, "onStartCommand: mCurrentIndex $mIndex")
                     if (mIndex < mTracks.size - 1)
                         mIndex += 1
                     if (mIndex < mTracks.size - 1)
                         mNativeFMInterface.setFMFreq(fd, mTracks[mIndex].toInt())
-                    mTitle = if (mIsPlaying) {
-                        "FM ${mTracks[mIndex].toFloat() / 1000}Mhz"
-                    } else {
-                        "FM ${mTracks[mIndex].toFloat() / 1000}Mhz - Stopped"
-                    }
+                    mTitle = "FM ${mTracks[mIndex].toFloat() / 1000}Mhz"
                 }
                 ACTION_QUIT -> {
                     mAudioManager = getSystemService(AUDIO_SERVICE) as AudioManager
                     mAudioManager.setParameters(FM_RADIO_OFF)
                     stopForeground(true)
-                    mShutDown = true
-                }
-                STOP_BG_SERVICE -> {
-                    val mFreqToWrite = mTracks[mIndex].toString()
-                    writeToFile(
-                        "fm_radio_freq_current",
-                        mFreqToWrite
-                    )
+                    mMediaSession.release()
                 }
                 else -> {
                     throw IllegalAccessException("Unexpected Intent!")
                 }
             }
-            Log.i(TAG, "onStartCommand: mTitle=$mTitle")
-            if (!mShutDown) {
-                contentView.setTextViewText(R.id.txt_title, mTitle)
-                startForeground(51,pushNotification())
-            }
         }
+        mContext = this
+        mFilePath = mContext.filesDir
+        mNativeFMInterface = NativeFMInterface()
+        mTitle = "FM ${mTracks[mIndex].toFloat() / 1000} Mhz"
+        Log.i(TAG, "onStartCommand: mTitle=$mTitle")
+        mMediaSession = MediaSession(this, "FMRadio")
+        setPlaybackState()
+        sendMetaData("FM ${mTracks[mIndex].toFloat() / 1000}Mhz")
+        mMediaSession.isActive = true
+        startForeground(51,pushNotification())
         return START_STICKY
     }
-    private fun writeToFile(fileName : String, data: String){
-        var os: OutputStream? = null
-        val mData = data.padStart(6,'0')
-        try {
-            os = FileOutputStream(File(mFilePath.absolutePath + "/" + fileName))
-            os.write(mData.toByteArray(), 0, mData.length)
-        } catch (e: IOException) {
-            e.printStackTrace()
-        } finally {
-            try {
-                os?.close()
-            } catch (e: IOException) {
-                e.printStackTrace()
-            }
-        }
+    private fun setPlaybackState() {
+        val state = PlaybackState.Builder()
+            .setActions(
+                PlaybackState.ACTION_PLAY or PlaybackState.ACTION_SKIP_TO_NEXT
+                        or PlaybackState.ACTION_PAUSE or PlaybackState.ACTION_SKIP_TO_PREVIOUS
+                        or PlaybackState.ACTION_STOP or PlaybackState.ACTION_PLAY_PAUSE
+            )
+            .build()
+        mMediaSession.setPlaybackState(state)
     }
-    private fun setupRemoteView() {
-        val actionTogglePlay = Intent(ACTION_PLAY)
-        val actionForward = Intent(ACTION_NEXT)
-        val actionRewind = Intent(ACTION_BEFORE)
-        val actionClose = Intent(ACTION_QUIT)
-        val togglePlay = PendingIntent.getService(mContext, 0, actionTogglePlay, PendingIntent.FLAG_IMMUTABLE)
-        val forward = PendingIntent.getService(mContext, 0, actionForward, PendingIntent.FLAG_IMMUTABLE)
-        val rewind = PendingIntent.getService(mContext, 0, actionRewind, PendingIntent.FLAG_IMMUTABLE)
-        val close = PendingIntent.getService(mContext, 0, actionClose, PendingIntent.FLAG_IMMUTABLE)
-        contentView.setOnClickPendingIntent(R.id.btn_play_pause, togglePlay)
-        contentView.setOnClickPendingIntent(R.id.btn_forward, forward)
-        contentView.setOnClickPendingIntent(R.id.btn_rewind, rewind)
-        contentView.setOnClickPendingIntent(R.id.btn_close, close)
+    private fun sendMetaData(mTitle: String) {
+        val metadata = MediaMetadata.Builder()
+            .putString(MediaMetadata.METADATA_KEY_TITLE, mTitle)
+            .putString(MediaMetadata.METADATA_KEY_ARTIST, resources.getString(R.string.app_name))
+            .putBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART,
+                ResourcesCompat.getDrawable(resources, R.drawable.ic_radio, theme)!!
+                    .toBitmap(150, 150))
+            .build()
+        mMediaSession.setMetadata(metadata)
     }
 
     private fun pushNotification(): Notification {
         val nm = mContext.getSystemService(NOTIFICATION_SERVICE) as NotificationManager
         val channel = NotificationChannel(
             mContext.packageName, "FM Radio Playing",
-            NotificationManager.IMPORTANCE_NONE
+            NotificationManager.IMPORTANCE_HIGH
         )
         nm.createNotificationChannel(channel)
-        val builder = NotificationCompat.Builder(mContext, mContext.packageName)
-        builder.setSmallIcon(R.drawable.radio_text)
+        val builder = Notification.Builder(mContext, mContext.packageName)
+        // Create a MediaStyle object and supply your media session token to it.
+        val mediaStyle = Notification.MediaStyle().setMediaSession(mMediaSession.sessionToken)
+        builder.setSmallIcon(R.drawable.ic_radio)
         builder.setOngoing(true)
-        builder.setCustomBigContentView(contentView)
-        builder.setContentIntent(pendingIntent)
+        builder.setColor(resources.getColor(android.R.color.system_accent1_200, mContext.theme))
+        builder.setColorized(true)
+        builder.style = mediaStyle
         builder.setChannelId(mContext.packageName)
+        val togglePlay = PendingIntent.getService(mContext, 0, Intent(ACTION_PLAY), PendingIntent.FLAG_IMMUTABLE)
+        val forward = PendingIntent.getService(mContext, 0, Intent(ACTION_NEXT), PendingIntent.FLAG_IMMUTABLE)
+        val rewind = PendingIntent.getService(mContext, 0, Intent(ACTION_BEFORE), PendingIntent.FLAG_IMMUTABLE)
+        val close = PendingIntent.getService(mContext, 0, Intent(ACTION_QUIT), PendingIntent.FLAG_IMMUTABLE)
+        val mPausePlayAction: Notification.Action = Notification.Action.Builder(
+            if (mIsPlaying) {
+                Icon.createWithResource(this, R.drawable.ic_pause)
+            }else{
+                Icon.createWithResource(this, R.drawable.ic_play)
+            }, "Start/Stop", togglePlay
+
+        ).build()
+        val mRewindAction: Notification.Action = Notification.Action.Builder(
+            Icon.createWithResource(this, R.drawable.ic_rewind),
+            "Rewind", rewind
+        ).build()
+        val mForwardAction: Notification.Action = Notification.Action.Builder(
+            Icon.createWithResource(this, R.drawable.ic_forward),
+            "Forward", forward
+        ).build()
+        val mCloseAction: Notification.Action = Notification.Action.Builder(
+            Icon.createWithResource(this, R.drawable.ic_close),
+            "Close", close
+        ).build()
+        builder.addAction(mRewindAction)
+        builder.addAction(mPausePlayAction)
+        builder.addAction(mForwardAction)
+        builder.addAction(mCloseAction)
         return builder.build()
     }
     companion object {
@@ -197,11 +170,12 @@ class FMRadioService : Service() {
         private const val BEGIN_BG_SERVICE = "$PACKAGENAME.STARTBG"
         private const val ACTION_PLAY = "$PACKAGENAME.PLAY_FM"
         private const val ACTION_NEXT = "$PACKAGENAME.NEXT"
+        private var mIsPlaying = true
         private const val ACTION_BEFORE = "$PACKAGENAME.BEFORE"
         private const val ACTION_QUIT = "$PACKAGENAME.QUIT"
         private const val FM_RADIO_ON = "l_fmradio_mode=on"
         private const val FM_RADIO_OFF = "l_fmradio_mode=off"
         private const val TAG = "FMRadioService"
-        private const val STOP_BG_SERVICE = "${PACKAGENAME}.STOPBG"
+        lateinit var mMediaSession : MediaSession
     }
-}
\ No newline at end of file
+}
diff --git a/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/MainActivity.kt b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/MainActivity.kt
index ac8bc39..718bcac 100644
--- a/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/MainActivity.kt
+++ b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/MainActivity.kt
@@ -1,610 +1,171 @@
 package com.eurekateam.fmradio
 
-import android.bluetooth.BluetoothAdapter
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.media.AudioAttributes
+import android.content.*
+import android.graphics.drawable.Icon
 import android.media.AudioDeviceInfo
-import android.media.AudioFocusRequest
 import android.media.AudioManager
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
-import android.os.SystemClock
-import android.util.Log
-import android.view.KeyEvent
+import android.view.LayoutInflater
 import android.view.View
-import android.widget.Button
-import android.widget.TextView
-import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
-import android.widget.SeekBar
-import java.io.*
-import java.text.DecimalFormat
+import androidx.appcompat.widget.AppCompatImageView
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import com.eurekateam.fmradio.fragments.ChannelListFragment
+import com.eurekateam.fmradio.fragments.FavouriteFragment
+import com.eurekateam.fmradio.fragments.MainFragment
+import com.eurekateam.fmradio.utils.Log
+import com.google.android.material.bottomnavigation.BottomNavigationView
+import com.google.android.material.color.DynamicColors
+import com.google.android.material.textview.MaterialTextView
 
-class MainActivity : AppCompatActivity(),
-    View.OnClickListener, SeekBar.OnSeekBarChangeListener, AudioManager.OnAudioFocusChangeListener {
-    private lateinit var mAudioManager: AudioManager
-    private lateinit var mStreamSwitch : Button
-    private lateinit var mFMSwitch : Button
-    private lateinit var mSeekUpBtn: Button
-    private lateinit var mSeekDownBtn : Button
-    private lateinit var mBandSelect : TextView
-    private var mFMThread: Thread? = null
-    private var fd = -1
-    private var mCurrentFreq = 0
-    private lateinit var mNativeFMInterface: NativeFMInterface
-    private lateinit var  tracks : LongArray
-    private lateinit var mContext : Context
-    private lateinit var mTitle : TextView
-    private lateinit var mScanBtn : Button
-    private lateinit var mScanStopBtn : Button
-    private lateinit var mSeekBar: SeekBar
-    private var mCurrentIndex = 0
-    private val format: DecimalFormat = DecimalFormat("0.#")
-    private var mVolume : Int = 0
-    private lateinit var scanThread: Thread
-    private var mScanThread: Thread? = null
-    private lateinit var mIntent: Intent
-    private var mServiceRegistered = false
-    private lateinit var mFilePath : File
-    private var mLastBackPress: Long = 0L
-    private var mScanning = false
-    private lateinit var mErrorIntent : Intent
-    private var mFreqInitialized = false
-    private lateinit var mDebugStringThread: Thread
-    private lateinit var mDebugInfo : TextView
-    private var mDebugThread : Thread? = null
-    private lateinit var mQuitButton: Button
-    private var mQuit = false
-    private var mHeadSetPlugged : Boolean = false
-    private val mMainHandler : Handler = Handler(Looper.getMainLooper())
+
+class MainActivity : AppCompatActivity() {
+    private lateinit var mIntent : Intent
+    private fun changeFragment(fragment: Fragment?, tagFragmentName: String) {
+        supportFragmentManager.beginTransaction().apply {
+            replace(R.id.container_view, fragment!!, tagFragmentName)
+            setPrimaryNavigationFragment(fragment)
+            setReorderingAllowed(true)
+            commitNow()
+        }
+    }
+    private val mFMInterface = NativeFMInterface()
+    private lateinit var mAlertView: View
+    private lateinit var mAlertTitle : MaterialTextView
+    private lateinit var mAlertDesc : MaterialTextView
+    private lateinit var mAlertImage : AppCompatImageView
+    private lateinit var mAudioManager : AudioManager
     override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
         System.loadLibrary("fmioctl_jni")
-        setContentView(R.layout.activity_main)
-        mContext = this
-        mFilePath = mContext.filesDir
-        mNativeFMInterface = NativeFMInterface()
-        mIntent = Intent(mContext, FMRadioService::class.java)
-        mErrorIntent = Intent(mContext, ErrorHandler::class.java)
-        mErrorIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-        mCurrentFreq = mNativeFMInterface.getFMLower(fd)
-        mTitle = findViewById(R.id.fm_radio_title)
-        mStreamSwitch = findViewById(R.id.fm_output)
-        mFMSwitch = findViewById(R.id.fmswitch)
-        mSeekBar = findViewById(R.id.fm_freq_seekbar)
-        mSeekDownBtn = findViewById(R.id.seek_down)
-        mSeekUpBtn = findViewById(R.id.seek_up)
-        mBandSelect = findViewById(R.id.band_select)
-        mScanBtn = findViewById(R.id.scan_through)
-        mScanStopBtn = findViewById(R.id.stop_scan)
-        mDebugInfo = findViewById(R.id.debug_info)
-        mQuitButton = findViewById(R.id.quit_fm)
+        MainFragment.fd = mFMInterface.openFMDevice()
+        mAlertView = (getSystemService(LAYOUT_INFLATER_SERVICE) as LayoutInflater)
+            .inflate(R.layout.alertdialog, null)
+        mAlertTitle = mAlertView.findViewById(R.id.alert_title)
+        mAlertImage = mAlertView.findViewById(R.id.alert_image)
+        mAlertDesc = mAlertView.findViewById(R.id.alert_desc)
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_navigation)
+        if (MainFragment.fd == -1){
+            Log.e("CANNOT OPEN /dev/radio0!!!")
+            mAlertTitle.text = getString(R.string.radio_io_error)
+            mAlertDesc.text = getString(R.string.radio_io_error_desc)
+            mAlertImage.setImageIcon(Icon.createWithResource(this, R.drawable.ic_error))
+            val mAlertDialog = AlertDialog.Builder(this)
+            mAlertDialog
+                .setCancelable(false)
+                .setView(mAlertView)
+                .setNegativeButton(R.string.ok) { _: DialogInterface, _: Int ->
+                    finish()
+                }
+                .show()
+        }
+        DynamicColors.applyToActivitiesIfAvailable(application)
         mAudioManager = getSystemService(AUDIO_SERVICE) as AudioManager
-        mStreamSwitch.setOnClickListener(this)
-        mFMSwitch.setOnClickListener(this)
-        mSeekDownBtn.setOnClickListener(this)
-        mSeekUpBtn.setOnClickListener(this)
-        mQuitButton.setOnClickListener(this)
-        mScanBtn.setOnClickListener(this)
-        mScanStopBtn.isEnabled = false
-        mStreamSwitch.text = if(!mAudioManager.isSpeakerphoneOn)
-            getString(R.string.wired_earphones) else getString(R.string.phone_speaker)
-        val receiverFilter = IntentFilter(Intent.ACTION_HEADSET_PLUG)
-        val mBtFilter = IntentFilter(BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED)
-        registerReceiver(mBtHeadsetReceiver, mBtFilter)
-        registerReceiver(mWiredHeadsetReceiver, receiverFilter)
         val mAudioDeviceInfo = mAudioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS)
         for (i in mAudioDeviceInfo.indices){
             if (mAudioDeviceInfo[i].type == AudioDeviceInfo.TYPE_WIRED_HEADSET ||
                 mAudioDeviceInfo[i].type == AudioDeviceInfo.TYPE_WIRED_HEADPHONES) {
-                mHeadSetPlugged = true
-                Log.i(TAG, "onCreate: Wired Headphones detected")
+                MainFragment.mHeadSetPlugged = true
+                Log.i("Wired Headphones detected")
             }
         }
-        fd = mNativeFMInterface.openFMDevice()
-        if (fd == -1){
-            Log.e(TAG, "onCreate: CANNOT OPEN /dev/radio0!!!")
-            mErrorIntent.action = RADIO_DEVICE_IO_FAIL
-            startActivity(mErrorIntent)
-            finish()
-        }
-        mErrorIntent.putExtra("fd", fd)
-        if (!mHeadSetPlugged){
-            Toast.makeText(mContext, "Wired Headphones not detected", Toast.LENGTH_SHORT).show()
-            Thread{
-                Thread.sleep(1500)
-                mainExecutor.execute {
-                    mErrorIntent.action = NO_WIRED_HEADPHONES
-                    mNativeFMInterface.setFMMute(fd, true)
-                    startActivity(mErrorIntent)
-                    finish()
-                }
-            }.start()
-        }
-        mScanStopBtn.setOnClickListener(this)
-        if (File(mFilePath.absolutePath + "/fm_radio_volume").exists()) {
-            mVolume = if (readFromFile("fm_radio_volume").isEmpty()){
-                10
-            }else{
-                readFromFile("fm_radio_volume").toInt()
-            }
-        }
-        Thread{
-            tracks = mNativeFMInterface.getFMTracks(fd)
-            tracks = removeZeros(tracks)
-            val mPreFreq = if (File(mFilePath.absolutePath + "/fm_radio_freq_current").exists()){
-                readFromFile("fm_radio_freq_current")
-            }else{
-                tracks[0].toString()
-            }
-            if (DEBUG) Log.i(TAG, "onCreate: file value = $mPreFreq")
-            for (i in tracks.indices){
-                if (tracks[i] == mPreFreq.toLong()){
-                    mNativeFMInterface.setFMFreq(fd,mPreFreq.toInt())
-                    mBandSelect.text = String.format(getString(R.string.mhz), mPreFreq.toFloat() / 1000)
-                    mCurrentFreq = mPreFreq.toInt()
-                    mCurrentIndex = i
-                    break
-                }
-            }
-            if (File(mFilePath.absolutePath + "/fm_radio_state").exists()){
-                if(readFromFile("fm_radio_state") == "1"){
-                    mainExecutor.execute {
-                        mFMSwitch.text = getString(R.string.enabled)
-                    }
-                    mAudioManager.setParameters(FM_RADIO_ON)
-                    mNativeFMInterface.setFMBoot(fd)
-                    mNativeFMInterface.setFMFreq(fd, mCurrentFreq)
-                    mFMThread = Thread {
-                        mNativeFMInterface.setFMThread(fd,true)
-                    }
-                    mFMThread!!.start()
-                    mDebugThread = Thread(mDebugStringThread)
-                    mDebugThread!!.start()
-                }else{
-                    mainExecutor.execute {
-                        mFMSwitch.text = getString(R.string.disabled)
-                    }
-                    mFMThread = null
-                    mDebugThread = null
+        if (!MainFragment.mHeadSetPlugged){
+            mAlertTitle.text = getString(R.string.no_headphones_error)
+            mAlertDesc.text = getString(R.string.no_headphones_error_desc)
+            mAlertImage.setImageIcon(Icon.createWithResource(mAlertView.context,
+                R.drawable.ic_headphones
+            ))
+            AlertDialog.Builder(mAlertView.context)
+                .setCancelable(false)
+                .setView(mAlertView)
+                .setNegativeButton(R.string.ok) { v: DialogInterface, _: Int ->
                     mAudioManager.setParameters(FM_RADIO_OFF)
-                    mNativeFMInterface.setFMThread(fd,false)
+                    v.dismiss()
+                    Handler(Looper.getMainLooper()).postDelayed({
+                        finish()
+                    },500)
                 }
-            }
-            mSeekBar.max = tracks.size - 1
-            mSeekBar.min = 0
-            mSeekBar.progress = mCurrentIndex
-            mSeekBar.setOnSeekBarChangeListener(this)
-            mAudioManager.mode = AudioManager.MODE_IN_COMMUNICATION
-            if (DEBUG)
-                Log.d(TAG, "onCreate: reading $mFilePath/headphones")
-            if (File("$mFilePath/headphones").exists()){
-                mAudioManager.isSpeakerphoneOn = false
-                mStreamSwitch.text = getString(R.string.wired_earphones)
-            }else{
-                mAudioManager.isSpeakerphoneOn = true
-                mStreamSwitch.text = getString(R.string.phone_speaker)
-            }
-            mFreqInitialized = true
-        }.start()
-        mFMThread = Thread {
-            mNativeFMInterface.setFMThread(fd,true)
+                .show()
         }
-        scanThread = Thread {
-            mFreqInitialized = false
-            val mOriginalIndex = mCurrentIndex
-            mainExecutor.execute {
-                mScanStopBtn.isEnabled = true
-                mSeekBar.isEnabled = false
+        val receiverFilter = IntentFilter(Intent.ACTION_HEADSET_PLUG)
+        registerReceiver(mWiredHeadsetReceiver, receiverFilter)
+        val mRadioMainFragment = MainFragment()
+        val mRadioChannelListFragment = ChannelListFragment()
+        val mFavouriteFragment = FavouriteFragment()
+        changeFragment(mRadioMainFragment, MainFragment::class.java.name)
+        mIntent = Intent(this, FMRadioService::class.java)
+        mIntent.action = BEGIN_BG_SERVICE
+        startService(mIntent)
+        findViewById<BottomNavigationView>(R.id.bottom_nav_bar).setOnItemSelectedListener {
+            when (it.itemId){
+                R.id.radio_main -> changeFragment(mRadioMainFragment, MainFragment::class.java.name)
+                R.id.channel_list -> changeFragment(mRadioChannelListFragment, ChannelListFragment::class.java.name)
+                R.id.fav_list -> changeFragment(mFavouriteFragment, FavouriteFragment::class.java.name)
             }
-            var count = 0
-            mNativeFMInterface.setFMMute(fd, false)
-            while (count < tracks.size && mScanning) {
-                mNativeFMInterface.setFMFreq(fd, tracks[count].toInt())
-                mainExecutor.execute {
-                    mBandSelect.text = String.format(getString(R.string.mhz), format.format(tracks[count].toFloat() / 1000))
-                    mSeekBar.progress = mCurrentIndex
-                }
-                mCurrentFreq = tracks[count].toInt()
-                mCurrentIndex = count
-                Thread.sleep(1500)
-                count++
-            }
-            mainExecutor.execute {
-                mScanBtn.isEnabled = true
-                mScanStopBtn.isEnabled = false
-                mSeekBar.isEnabled = true
-            }
-            if (mScanning)
-                mCurrentIndex = mOriginalIndex
-
-            mNativeFMInterface.setFMFreq(fd, tracks[mCurrentIndex].toInt())
-            mBandSelect.text = String.format(getString(R.string.mhz), format.format(tracks[mCurrentIndex].toFloat() / 1000))
-            mCurrentFreq = tracks[mCurrentIndex].toInt()
-            mSeekBar.progress = mCurrentIndex
-            mScanning = false
-            mFreqInitialized = true
+            true
         }
-        mAudioManager.requestAudioFocus(mFocusRequest)
-        mNativeFMInterface.setFMVolume(fd, mVolume)
-        mDebugStringThread = Thread{
-            while (true){
-                mainExecutor.execute {
-                    mDebugInfo.text = String.format(DEBUG_STRING, fd, mNativeFMInterface.getRMSSI(fd))
-                }
-                Thread.sleep(1000)
-            }
-        }
-
     }
+
     private val mWiredHeadsetReceiver: BroadcastReceiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context, intent: Intent) {
             if (intent.action == AudioManager.ACTION_HEADSET_PLUG) {
-                mHeadSetPlugged = false
+                MainFragment.mHeadSetPlugged = false
                 val mAudioDeviceInfo = mAudioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS)
                 for (i in mAudioDeviceInfo.indices){
                     if (mAudioDeviceInfo[i].type == AudioDeviceInfo.TYPE_WIRED_HEADSET ||
                         mAudioDeviceInfo[i].type == AudioDeviceInfo.TYPE_WIRED_HEADPHONES){
-                        mHeadSetPlugged = true
+                        MainFragment.mHeadSetPlugged = true
                     }
                 }
-                if (!mHeadSetPlugged){
-                    Log.w(TAG, "onReceive: Headset Unplugged")
-                    Toast.makeText(mContext, "HeadSet disconnected", Toast.LENGTH_SHORT).show()
-                    mErrorIntent.action = NO_WIRED_HEADPHONES
-                    unregisterReceiver(this)
-                    mNativeFMInterface.setFMMute(fd, true)
-                    startActivity(mErrorIntent)
-                    finish()
+                if (!MainFragment.mHeadSetPlugged){
+                    Log.w("onReceive: Headset Unplugged")
+                    mAlertTitle.text = getString(R.string.no_headphones_error)
+                    mAlertDesc.text = getString(R.string.no_headphones_error_desc)
+                    mAlertImage.setImageIcon(Icon.createWithResource(mAlertView.context,
+                        R.drawable.ic_headphones
+                    ))
+                    val mAlertDialog = AlertDialog.Builder(mAlertView.context)
+                    mAlertDialog
+                        .setCancelable(false)
+                        .setView(mAlertView)
+                        .setNegativeButton(R.string.ok) { v: DialogInterface, _: Int ->
+                            v.dismiss()
+                            mAudioManager.setParameters(FM_RADIO_OFF)
+                            Handler(Looper.getMainLooper()).postDelayed({
+                                finish()
+                            },500)
+                        }
+                        .show()
                 }
             }
         }
     }
-    private val mBtHeadsetReceiver: BroadcastReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context, intent: Intent) {
-            if (intent.action == BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED) {
-                when (intent.getIntExtra(BluetoothAdapter.EXTRA_CONNECTION_STATE, BluetoothAdapter.ERROR)){
-                    BluetoothAdapter.STATE_CONNECTED -> {
-                        Log.i(TAG, "onReceive: BT Connected, SCO ${mAudioManager.isBluetoothScoOn}")
-                        Toast.makeText(mContext, "Warning: FM via BT not supported", Toast.LENGTH_SHORT).show()
-                    }
-                    BluetoothAdapter.STATE_DISCONNECTED -> {
-                        Log.i(TAG, "onReceive: BT Disconnected SCO ${mAudioManager.isBluetoothScoOn}")
-                    }
-                }
-            }
-        }
-    }
-    override fun dispatchKeyEvent(event: KeyEvent): Boolean {
-        val action = event.action
-        val mHandler = Handler(Looper.getMainLooper())
-        return when (event.keyCode) {
-            KeyEvent.KEYCODE_VOLUME_UP -> {
-                if (action == KeyEvent.ACTION_UP) {
-                    if (mVolume < 15)
-                        mVolume += 1
-                    mAudioManager.adjustStreamVolume(AudioManager.STREAM_MUSIC, AudioManager.ADJUST_RAISE, AudioManager.FLAG_SHOW_UI)
-                    mNativeFMInterface.setFMVolume(fd, mVolume)
-                    mTitle.text = String.format("Volume %d", mVolume)
-                    mHandler.postDelayed({
-                        mTitle.text = getString(R.string.fm_radio)
-                    },4000)
-                }
-                true
-            }
-            KeyEvent.KEYCODE_VOLUME_DOWN -> {
-                if (action == KeyEvent.ACTION_UP) {
-                    if (mVolume > 0)
-                        mVolume -= 1
-                    mAudioManager.adjustStreamVolume(AudioManager.STREAM_MUSIC, AudioManager.ADJUST_LOWER, AudioManager.FLAG_SHOW_UI)
-                    mNativeFMInterface.setFMVolume(fd, mVolume)
-                    mTitle.text = String.format("Volume %d", mVolume)
-                    mHandler.postDelayed({
-                        mTitle.text = getString(R.string.fm_radio)
-                    },4000)
-                }
-                true
-            }
-            else -> super.dispatchKeyEvent(event)
-        }
-    }
-    override fun onClick(v: View) {
-        if (v.id == R.id.fmswitch){
-            if(mDebugThread == null){
-                mAudioManager.setParameters(FM_RADIO_ON)
-                mNativeFMInterface.setFMBoot(fd)
-                mNativeFMInterface.setFMFreq(fd, mCurrentFreq)
-                mFMSwitch.text = getString(R.string.enabled)
-                writeToFile("fm_radio_state", "1")
-                mFMThread = Thread {
-                    mNativeFMInterface.setFMThread(fd,true)
-                }
-                mFMThread!!.start()
-                mDebugThread = Thread(mDebugStringThread)
-                mDebugThread!!.start()
-            }else{
-                mFMThread = null
-                mDebugThread = null
-                mAudioManager.setParameters(FM_RADIO_OFF)
-                mNativeFMInterface.setFMThread(fd,false)
-                writeToFile("fm_radio_state", "0")
-                mFMSwitch.text = getString(R.string.disabled)
-            }
-        }else if (v.id == R.id.fm_output) {
-            /***
-             * Some Notes about ABOX
-             * service call media.audio_policy 5 i32 <mode> i32 2
-             * when mode 1 -> normal
-             * mode 2 -> telephony mode
-             * mode 3 -> terminate telephony mode
-             * mode 4 -> nothing
-             * from 5 -> doesn't exist
-             */
-            mAudioManager.mode = AudioManager.MODE_IN_COMMUNICATION
-            if (mStreamSwitch.text == getString(R.string.wired_earphones)) {
-                Log.i(TAG, "New Output: Speaker")
-                mAudioManager.isSpeakerphoneOn = true
-                File("$mFilePath/headphones").delete()
-                mStreamSwitch.text = getString(R.string.phone_speaker)
-            } else {
-                Log.i(TAG, "New Output: Headset")
-                mAudioManager.isSpeakerphoneOn = false
-                File("$mFilePath/headphones").createNewFile()
-                mStreamSwitch.text = getString(R.string.wired_earphones)
-            }
-            mAudioManager.setParameters(FM_RADIO_OFF)
-            mAudioManager.setParameters(FM_RADIO_ON)
-            mAudioManager.mode = AudioManager.MODE_NORMAL
-        }else {
-            var mExit = false
-            if (!mFreqInitialized && v.id != R.id.stop_scan) {
-                Toast.makeText(mContext, "FM Radio is still scanning...", Toast.LENGTH_SHORT).show()
-            } else {
-                if (tracks.isEmpty()) {
-                    Log.e(TAG, "onClick: tracks is empty!!!")
-                    mErrorIntent.action = TRACKS_EMPTY
-                    startActivity(mErrorIntent)
-                }
-                mNativeFMInterface.setFMMute(fd, true)
-                when (v.id) {
-                    R.id.seek_up -> mCurrentIndex += 1
-                    R.id.seek_down -> mCurrentIndex -= 1
-                    R.id.scan_through -> {
-                        mScanning = true
-                        mScanBtn.isEnabled = false
-                        mScanThread = null
-                        mScanThread = Thread(scanThread)
-                        mScanThread!!.start()
-                        mExit = true
-                    }
-                    R.id.stop_scan -> {
-                        mScanning = false
-                        mNativeFMInterface.setFMMute(fd, false)
-                        mExit = true
-                    }
-                    R.id.quit_fm -> {
-                        mQuit = true
-                        finish()
-                    }
-                    else -> throw IllegalArgumentException("Unexpected Onclick Event!!")
-                }
-                if (!mExit)
-                    updateFreq()
-            }
-        }
+    fun getMySupportFragmentManager(): FragmentManager {
+        return supportFragmentManager
     }
 
-
-    private fun updateFreq(){
-        if (mCurrentIndex < 0 || mCurrentIndex >= tracks.size) mCurrentIndex = 0
-        mCurrentFreq = tracks[mCurrentIndex].toInt()
-        writeToFile("fm_radio_freq_current", mCurrentFreq.toString())
-        mNativeFMInterface.setFMFreq(fd, mCurrentFreq)
-        mainExecutor.execute {
-            mBandSelect.text = String.format("%s Mhz", format.format(mCurrentFreq.toFloat() / 1000))
-            mSeekBar.progress = mCurrentIndex
-        }
-        mNativeFMInterface.setFMMute(fd, false)
-    }
-    companion object {
-        // Abox flags
-        private const val FM_RADIO_ON = "l_fmradio_mode=on"
-        private const val FM_RADIO_OFF = "l_fmradio_mode=off"
-        private const val TAG = "FMRadio"
-
-        private const val DEBUG = true
-
-        // Backgroud service intents
-        private const val PACKAGENAME = "com.eurekateam.fmradio"
-        private const val BEGIN_BG_SERVICE = "$PACKAGENAME.STARTBG"
-        private const val STOP_BG_SERVICE = "$PACKAGENAME.STOPBG"
-        private const val QUIT = "$PACKAGENAME.QUIT"
-
-        // Failures
-        private const val RADIO_DEVICE_IO_FAIL = "$PACKAGENAME.RADIO.IO"
-        private const val TRACKS_EMPTY = "$PACKAGENAME.TRACKS"
-        private const val NO_WIRED_HEADPHONES = "$PACKAGENAME.NO_HEADPHONE"
-        private const val DEBUG_STRING = "fd = %d, rssi = %d"
-    }
-
-    private fun removeZeros(array : LongArray): LongArray{
-        var count = 0
-        if (DEBUG) Log.d(TAG, "removeZeros: Got array")
-        for (i in array.indices){
-            if(array[i] != 0L){
-                count++
-            }
-        }
-        if (DEBUG) Log.d(TAG, "removeZeros: Removed ${array.size - count} of zeros")
-        return array.sliceArray(0 until count)
-    }
-
-    override fun onBackPressed() {
-        if (SystemClock.uptimeMillis() - mLastBackPress in 0..1500){
-            super.onBackPressed()
-        }else{
-            Toast.makeText(mContext, "Press back again to quit", Toast.LENGTH_SHORT).show()
-        }
-        mLastBackPress = SystemClock.uptimeMillis()
-    }
     override fun onPause() {
         super.onPause()
-        if (mQuit){
-            mNativeFMInterface.closeFMDevice(fd)
-            mIntent.action = QUIT
-            startService(mIntent)
-            mAudioManager.abandonAudioFocusRequest(mFocusRequest)
-            writeToFile("fm_radio_state","0")
-        }else {
-            if (readFromFile("fm_radio_state") == "1" && mFreqInitialized) {
-                Log.i(TAG, "onPause: Starting background service")
-                for (i in tracks.indices){
-                    if (tracks[i] == mCurrentFreq.toLong()){
-                        mCurrentIndex = i
-                    }
-                }
-                Log.d(TAG, "onPause: params: fd=$fd, " +
-                        "tracks.size=${tracks.size}, mCurrentIndex: $mCurrentIndex")
-                mIntent.action = BEGIN_BG_SERVICE
-                mIntent.putExtra("fd", fd)
-                mIntent.putExtra("tracks", tracks)
-                mIntent.putExtra("freq",  mCurrentFreq )
-                mIntent.putExtra("CurrentIndex",  mCurrentIndex )
-                startService(mIntent)
-                mServiceRegistered = true
-            }
-        }
-        writeToFile("fm_radio_volume", mVolume.toString())
+        mIntent.action = BEGIN_BG_SERVICE
+        startService(mIntent)
     }
 
-    private val mFocusRequest: AudioFocusRequest = AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN).run {
-        setAudioAttributes(AudioAttributes.Builder().run {
-            setUsage(AudioAttributes.USAGE_MEDIA)
-            setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
-            build()
-        })
-        setAcceptsDelayedFocusGain(true)
-        setOnAudioFocusChangeListener(this@MainActivity, mMainHandler)
-        build()
-    }
-    // implementing OnAudioFocusChangeListener to react to focus changes
-    override fun onAudioFocusChange(focusChange: Int) {
-        when (focusChange) {
-            AudioManager.AUDIOFOCUS_GAIN -> {
-                if (DEBUG)
-                    Log.i(TAG, "onAudioFocusChange: AudioFocus Gain")
-                mNativeFMInterface.setFMVolume(fd, mVolume)
-                mAudioManager.setParameters(FM_RADIO_ON)
-                mNativeFMInterface.setFMFreq(fd, mCurrentFreq)
-                mFMSwitch.text = getString(R.string.enabled)
-                writeToFile("fm_radio_state", "1")
-                mFMThread = Thread {
-                    mNativeFMInterface.setFMThread(fd,true)
-                }
-                mFMThread!!.start()
-                mDebugThread = Thread(mDebugStringThread)
-                mDebugThread!!.start()
-            }
-            AudioManager.AUDIOFOCUS_LOSS -> {
-                if (DEBUG)
-                    Log.i(TAG, "onAudioFocusChange: AudioFocus Loss")
-            }
-            AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK -> {
-                if (DEBUG)
-                    Log.i(TAG, "onAudioFocusChange: AudioFocus Loss (Can Duck)")
-                mNativeFMInterface.setFMVolume(fd, 2)
-            }
-        }
-    }
     override fun onRestart() {
         super.onRestart()
-        if (mServiceRegistered) {
-            mAudioManager.requestAudioFocus(mFocusRequest)
-            Log.i(TAG, "onRestart: Stopping service")
-            mIntent.action = STOP_BG_SERVICE
-            startService(mIntent)
-            mCurrentFreq = readFromFile("fm_radio_freq_current").toInt()
-            if(readFromFile("fm_radio_state") == "1"){
-                mFMThread = Thread {
-                    mNativeFMInterface.setFMThread(fd,true)
-                }
-                mFMThread!!.start()
-                mDebugThread = null
-                mDebugThread = Thread(mDebugStringThread)
-                mDebugThread!!.start()
-                mFMSwitch.text = getString(R.string.enabled)
-            }else{
-                mFMThread = null
-                mDebugThread = null
-                mNativeFMInterface.setFMThread(fd,false)
-                mFMSwitch.text = getString(R.string.disabled)
-            }
-            mServiceRegistered = false
-        }
+        stopService(mIntent)
     }
 
-    private fun writeToFile(fileName : String, data: String){
-        var os: OutputStream? = null
-        val mData = data.padStart(6,'0')
-        try {
-            os = FileOutputStream(File(mFilePath.absolutePath + "/" + fileName))
-            if (DEBUG) Log.i(TAG, "writeToFile: Writing $mData to $fileName")
-            os.write(mData.toByteArray(), 0, mData.length)
-        } catch (e: IOException) {
-            e.printStackTrace()
-        } finally {
-            try {
-                os?.close()
-            } catch (e: IOException) {
-                e.printStackTrace()
-            }
-        }
+    override fun onDestroy() {
+        super.onDestroy()
+        (getSystemService(Context.AUDIO_SERVICE) as AudioManager).setParameters(FM_RADIO_OFF)
     }
-    private fun readFromFile(fileName: String): String{
-        var os: InputStream? = null
-        val mByteArray = ByteArray(6)
-        try {
-            os = FileInputStream(File(mFilePath.absolutePath + "/" + fileName))
-            if (DEBUG) Log.i(TAG, "readFromFile: Reading from $fileName")
-            os.read(mByteArray)
-        } catch (e: IOException) {
-            e.printStackTrace()
-        } finally {
-            try {
-                os?.close()
-            } catch (e: IOException) {
-                e.printStackTrace()
-            }
-        }
-        return String(mByteArray).trimStart('0')
+    companion object {
+        private const val PACKAGENAME = "com.eurekateam.fmradio"
+        private const val BEGIN_BG_SERVICE = "$PACKAGENAME.STARTBG"
+        private const val FM_RADIO_OFF = "l_fmradio_mode=off"
     }
-
-    override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
-        if (DEBUG)
-            Log.i(TAG, "onProgressChanged: Value changed to $progress, matching FM freq is ${tracks[progress]}")
-        mBandSelect.text = String.format(getString(R.string.mhz),
-            format.format(tracks[seekBar.progress].toFloat()/1000))
-    }
-
-    override fun onStartTrackingTouch(seekBar: SeekBar) {
-        mNativeFMInterface.setFMMute(fd, true)
-        if (DEBUG)
-            Log.i(TAG, "onStartTrackingTouch: user touched.")
-
-    }
-
-    override fun onStopTrackingTouch(seekBar: SeekBar) {
-        mCurrentIndex = seekBar.progress
-        mCurrentFreq = tracks[seekBar.progress].toInt()
-        Log.d(TAG, "onStopTrackingTouch: user stopped touching")
-        writeToFile("fm_radio_freq_current", mCurrentFreq.toString())
-        mNativeFMInterface.setFMFreq(fd, mCurrentFreq)
-        mBandSelect.text = String.format("%s Mhz", format.format(mCurrentFreq.toFloat() / 1000))
-        mNativeFMInterface.setFMMute(fd, false)
-    }
-
 }
diff --git a/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/NativeFMInterface.kt b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/NativeFMInterface.kt
index 78bccce..2d405f5 100644
--- a/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/NativeFMInterface.kt
+++ b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/NativeFMInterface.kt
@@ -20,4 +20,5 @@ class NativeFMInterface {
     external fun stopSearching(fd: Int)
     external fun setFMRSSI(fd: Int, rssi: Long): Int
     external fun closeFMDevice(fd: Int)
+    external fun getSysfsSupport(): Boolean
 }
\ No newline at end of file
diff --git a/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/PebbleTextView.kt b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/PebbleTextView.kt
new file mode 100644
index 0000000..0257256
--- /dev/null
+++ b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/PebbleTextView.kt
@@ -0,0 +1,66 @@
+package com.eurekateam.fmradio
+
+import android.content.Context
+import android.graphics.*
+import android.util.AttributeSet
+import android.view.View
+
+
+class PebbleTextView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : View(context, attrs, defStyleAttr) {
+    constructor (context: Context) : this(context, null)
+    constructor (context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
+
+    var mText : String = "102.7"
+    var mColor : Int = Color.GREEN
+
+    private val mPaint = Paint()
+    private val mRectf = RectF(25F, 25F, 350F, 270F)
+    private val mRectfAnother = RectF(10F, 25F, 250F, 235F)
+    override fun onDraw(canvas: Canvas) {
+        super.onDraw(canvas)
+        mPaint.color = mColor
+        mPaint.style = Paint.Style.FILL
+        canvas.drawCircle(175F, 175F, 140F, mPaint)
+        canvas.drawArc(mRectf, -120F, 180F, true, mPaint)
+        canvas.drawArc(mRectfAnother, -240F, 180F, true, mPaint)
+        mPaint.color = Color.BLACK
+        setTextSizeForWidth(mPaint, 200F, mText)
+        canvas.drawText(mText, 75F, 175F, mPaint)
+        setTextSizeForWidth(mPaint, 75F, "Mhz")
+        canvas.drawText("Mhz", 155F, 235F, mPaint)
+    }
+
+    /**
+     * Sets the text size for a Paint object so a given string of text will be a
+     * given width.
+     *
+     * @param paint
+     * the Paint to set the text size for
+     * @param desiredWidth
+     * the desired width
+     * @param text
+     * the text that should be that width
+     */
+    private fun setTextSizeForWidth(
+        paint: Paint, desiredWidth: Float,
+        text: String
+    ) {
+
+        // Pick a reasonably large value for the test. Larger values produce
+        // more accurate results, but may cause problems with hardware
+        // acceleration. But there are workarounds for that, too; refer to
+        // http://stackoverflow.com/questions/6253528/font-size-too-large-to-fit-in-cache
+        val testTextSize = 48f
+
+        // Get the bounds of the text, using our testTextSize.
+        paint.textSize = testTextSize
+        val bounds = Rect()
+        paint.getTextBounds(text, 0, text.length, bounds)
+
+        // Calculate the desired size as a proportion of our testTextSize.
+        val desiredTextSize: Float = testTextSize * desiredWidth / bounds.width()
+
+        // Set the paint for that size.
+        paint.textSize = desiredTextSize
+    }
+}
diff --git a/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/adapters/ListViewAdapter.kt b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/adapters/ListViewAdapter.kt
new file mode 100644
index 0000000..7f54913
--- /dev/null
+++ b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/adapters/ListViewAdapter.kt
@@ -0,0 +1,78 @@
+package com.eurekateam.fmradio.adapters
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.BaseAdapter
+import androidx.appcompat.widget.AppCompatImageView
+import androidx.core.content.res.ResourcesCompat
+import com.eurekateam.fmradio.*
+import com.eurekateam.fmradio.fragments.MainFragment
+import com.eurekateam.fmradio.utils.FileUtilities
+import com.eurekateam.fmradio.utils.Log
+import com.eurekateam.fmradio.NativeFMInterface
+import com.google.android.material.textview.MaterialTextView
+
+class ListViewAdapter (private val mContext: Context) : BaseAdapter() {
+    private val mFMInterface = NativeFMInterface()
+    private var mListofViews = HashMap<Int, View>(30)
+    override fun getCount(): Int {
+        return MainFragment.mTracks.size
+    }
+
+    override fun getItem(p0: Int): Any {
+        return MainFragment.mTracks[p0]
+    }
+
+    override fun getItemId(p0: Int): Long {
+        return p0.toLong()
+    }
+
+    override fun getView(id: Int, mConvertView: View?, parent: ViewGroup?): View {
+        val mAnotherConvertView = mConvertView
+            ?: (mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater).inflate(
+                R.layout.channel_list_items, parent, false)
+        mAnotherConvertView.findViewById<MaterialTextView>(R.id.channel_list_title).text =
+            String.format(mContext.getString(R.string.fm_radio_freq),
+                MainFragment.mTracks[id].toFloat() / 1000)
+        mAnotherConvertView.findViewById<MaterialTextView>(R.id.channel_list_title).setOnClickListener {
+            mFMInterface.setFMFreq(MainFragment.fd, MainFragment.mTracks[id].toInt())
+            MainFragment.mFreqCurrent = MainFragment.mTracks[id].toInt()
+            FileUtilities.writeToFile(
+                FileUtilities.mFMFreqFileName,
+                MainFragment.mFreqCurrent.toString(), mContext
+            )
+            setCurrentFMChannel(id)
+        }
+        mAnotherConvertView.findViewById<AppCompatImageView>(R.id.star_button_list).let {
+            val mStar = ResourcesCompat.getDrawable(mContext.resources, R.drawable.ic_star, mContext.theme)
+            val mStarFilled = ResourcesCompat.getDrawable(mContext.resources,
+                R.drawable.ic_star_filled, mContext.theme)
+            val mIndex = MainFragment.mTracks[id].toInt()
+            if (MainFragment.mFavStats[mIndex] == null){
+                MainFragment.mFavStats.putIfAbsent(mIndex, false)
+            }
+            if (MainFragment.mFavStats[mIndex]!!){
+                it.setImageDrawable(mStarFilled)
+            }else {
+                it.setImageDrawable(mStar)
+            }
+        }
+        if (MainFragment.mFreqCurrent == MainFragment.mTracks[id].toInt()){
+            setCurrentFMChannel(id)
+        }
+        mListofViews[id] = mAnotherConvertView!!
+        return mAnotherConvertView
+    }
+
+    private fun setCurrentFMChannel(mPosition: Int) {
+        Log.i("Position: $mPosition")
+        for (mItem in mListofViews){
+            mItem.value.setBackgroundColor(ResourcesCompat.getColor(mContext.resources,
+                android.R.color.system_accent2_100, mContext.theme))
+        }
+        mListofViews[mPosition]?.setBackgroundColor(ResourcesCompat.getColor(mContext.resources,
+            android.R.color.system_accent3_400, mContext.theme))
+    }
+}
\ No newline at end of file
diff --git a/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/adapters/PebbleLayoutAdapter.kt b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/adapters/PebbleLayoutAdapter.kt
new file mode 100644
index 0000000..d033531
--- /dev/null
+++ b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/adapters/PebbleLayoutAdapter.kt
@@ -0,0 +1,54 @@
+package com.eurekateam.fmradio.adapters
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.BaseAdapter
+import androidx.core.content.res.ResourcesCompat
+import com.eurekateam.fmradio.NativeFMInterface
+import com.eurekateam.fmradio.PebbleTextView
+import com.eurekateam.fmradio.R
+import com.eurekateam.fmradio.fragments.MainFragment
+
+
+class PebbleLayoutAdapter (private val mContext: Context) : BaseAdapter() {
+    private val mFavoriteList : MutableList<Int> = emptyList<Int>().toMutableList()
+    init {
+        for (mItem in MainFragment.mFavStats){
+            if (mItem.value){
+                mFavoriteList.add(mItem.key)
+            }
+        }
+        mFavoriteList.sort()
+    }
+    override fun getCount(): Int {
+        return mFavoriteList.size
+    }
+
+    override fun getItem(p0: Int): Any {
+        return mFavoriteList[p0]
+    }
+
+    private val mFMInterface = NativeFMInterface()
+    override fun getItemId(p0: Int): Long {
+        return p0.toLong()
+    }
+
+    override fun getView(id: Int, mConvertView: View?, parent: ViewGroup?): View {
+        val mAnotherConvertView = mConvertView
+            ?: (mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater).inflate(
+                R.layout.favorite_channel_items, parent, false
+            )
+        mAnotherConvertView.findViewById<PebbleTextView>(R.id.pebble_textview).apply {
+            mText = (mFavoriteList[id].toFloat() / 1000).toString()
+            mColor = ResourcesCompat.getColor(mContext.resources, android.R.color.system_accent1_400,
+                mContext.theme)
+            setOnClickListener {
+                mFMInterface.setFMFreq(MainFragment.fd, mFavoriteList[id])
+                MainFragment.mFreqCurrent = mFavoriteList[id]
+            }
+        }
+        return mAnotherConvertView
+    }
+}
\ No newline at end of file
diff --git a/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/fragments/ChannelListFragment.kt b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/fragments/ChannelListFragment.kt
new file mode 100644
index 0000000..a095eca
--- /dev/null
+++ b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/fragments/ChannelListFragment.kt
@@ -0,0 +1,55 @@
+package com.eurekateam.fmradio.fragments
+
+import android.content.res.Configuration
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.ListView
+import androidx.fragment.app.Fragment
+import com.eurekateam.fmradio.MainActivity
+import com.eurekateam.fmradio.R
+import com.eurekateam.fmradio.adapters.ListViewAdapter
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+
+class ChannelListFragment : Fragment(R.layout.activity_channel_list),
+    View.OnClickListener {
+    private lateinit var mListView : ListView
+    private lateinit var mFloatingActionButton: FloatingActionButton
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val mRootView = inflater.inflate(R.layout.activity_channel_list, container, false)
+        mListView = mRootView.findViewById(R.id.listview)
+        mFloatingActionButton = mRootView.findViewById(R.id.refresh_channel_list)
+        mFloatingActionButton.setOnClickListener(this)
+        mListView.adapter = ListViewAdapter(requireContext())
+        var mIsLight = true
+        val nightModeFlags = requireContext().resources.configuration.uiMode and
+                Configuration.UI_MODE_NIGHT_MASK
+        when (nightModeFlags) {
+            Configuration.UI_MODE_NIGHT_YES -> mIsLight = false
+            Configuration.UI_MODE_NIGHT_NO -> mIsLight = true
+            Configuration.UI_MODE_NIGHT_UNDEFINED -> mIsLight = true
+        }
+        mRootView.findViewById<FrameLayout>(R.id.channel_list_layout).apply {
+            if (mIsLight)
+                setBackgroundColor(resources.getColor(android.R.color.system_accent1_50, requireContext().theme))
+            else
+                setBackgroundColor(resources.getColor(android.R.color.system_accent1_100, requireContext().theme))
+        }
+        return mRootView
+    }
+
+    override fun onClick(v: View?) {
+        MainFragment.mRefreshTracks()
+        (requireActivity() as MainActivity).getMySupportFragmentManager().apply {
+            beginTransaction().remove(this@ChannelListFragment).commit()
+            executePendingTransactions()
+            beginTransaction().add(R.id.container_view, this@ChannelListFragment).commit()
+        }
+    }
+}
\ No newline at end of file
diff --git a/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/fragments/FavouriteFragment.kt b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/fragments/FavouriteFragment.kt
new file mode 100644
index 0000000..0ca0baa
--- /dev/null
+++ b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/fragments/FavouriteFragment.kt
@@ -0,0 +1,39 @@
+package com.eurekateam.fmradio.fragments
+
+import android.content.res.Configuration
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.GridView
+import android.widget.ListView
+import androidx.fragment.app.Fragment
+import com.eurekateam.fmradio.R
+import com.eurekateam.fmradio.adapters.PebbleLayoutAdapter
+
+class FavouriteFragment : Fragment(R.layout.fragment_fav_list) {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val mRootView = inflater.inflate(R.layout.fragment_fav_list, container, false)
+        val mGridView = mRootView.findViewById<GridView>(R.id.fav_list_grid)
+        mGridView.adapter = PebbleLayoutAdapter(requireContext())
+        var mIsLight = true
+        val nightModeFlags = requireContext().resources.configuration.uiMode and
+                Configuration.UI_MODE_NIGHT_MASK
+        when (nightModeFlags) {
+            Configuration.UI_MODE_NIGHT_YES -> mIsLight = false
+            Configuration.UI_MODE_NIGHT_NO -> mIsLight = true
+            Configuration.UI_MODE_NIGHT_UNDEFINED -> mIsLight = true
+        }
+        mRootView.findViewById<GridView>(R.id.fav_list_grid).apply {
+            if (mIsLight)
+                setBackgroundColor(resources.getColor(android.R.color.system_accent1_50, requireContext().theme))
+            else
+                setBackgroundColor(resources.getColor(android.R.color.system_accent1_100, requireContext().theme))
+        }
+        return mRootView
+    }
+}
\ No newline at end of file
diff --git a/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/fragments/MainFragment.kt b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/fragments/MainFragment.kt
new file mode 100644
index 0000000..aacbf9f
--- /dev/null
+++ b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/fragments/MainFragment.kt
@@ -0,0 +1,385 @@
+package com.eurekateam.fmradio.fragments
+
+import android.content.res.Configuration
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.Icon
+import android.media.AudioManager
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.SeekBar
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.AppCompatSeekBar
+import androidx.core.content.res.ResourcesCompat
+import androidx.fragment.app.Fragment
+import com.eurekateam.fmradio.utils.FileUtilities
+import com.eurekateam.fmradio.utils.Log
+import com.eurekateam.fmradio.NativeFMInterface
+import com.eurekateam.fmradio.R
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+import com.google.android.material.textview.MaterialTextView
+import java.text.DecimalFormat
+
+
+class MainFragment : Fragment(R.layout.fragment_main), View.OnClickListener,
+    SeekBar.OnSeekBarChangeListener {
+    private val mFMInterface = NativeFMInterface()
+    private lateinit var mVolumeUp : FloatingActionButton
+    private lateinit var mVolumeDown : FloatingActionButton
+    private lateinit var mSeekBar: AppCompatSeekBar
+    private lateinit var mFavButton : FloatingActionButton
+    private lateinit var mFMFreq : MaterialTextView
+    private val mCleanFormat: DecimalFormat = DecimalFormat("0.#")
+    private lateinit var mOutputSwitch : FloatingActionButton
+    private lateinit var mBeforeChannelBtn : FloatingActionButton
+    private lateinit var mNextChannelBtn : FloatingActionButton
+    private lateinit var mPowerBtn : FloatingActionButton
+    private lateinit var mAudioManager: AudioManager
+    private lateinit var mStar : Drawable
+    private lateinit var mStarFilled : Drawable
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val mRootView = inflater.inflate(R.layout.fragment_main, container, false)
+        super.onCreate(savedInstanceState)
+        mStar = ResourcesCompat.getDrawable(requireContext().resources,
+            R.drawable.ic_star, requireContext().theme)!!
+        mStarFilled = ResourcesCompat.getDrawable(requireContext().resources,
+            R.drawable.ic_star_filled, requireContext().theme)!!
+        mAudioManager = requireContext().getSystemService(AppCompatActivity.AUDIO_SERVICE) as AudioManager
+        mVolumeUp = mRootView.findViewById(R.id.volume_up)
+        mVolumeDown = mRootView.findViewById(R.id.volume_down)
+        mSeekBar = mRootView.findViewById(R.id.volume_seekbar)
+        mFMFreq = mRootView.findViewById(R.id.fm_freq)
+        mBeforeChannelBtn = mRootView.findViewById(R.id.before_channel)
+        mPowerBtn = mRootView.findViewById(R.id.fm_power)
+        mFavButton = mRootView.findViewById(R.id.fav_button)
+        mNextChannelBtn = mRootView.findViewById(R.id.next_channel)
+        mOutputSwitch = mRootView.findViewById(R.id.fm_output_btn)
+        mVolumeUp.setOnClickListener(this)
+        mVolumeDown.setOnClickListener(this)
+        mSeekBar.setOnSeekBarChangeListener(this)
+        mBeforeChannelBtn.setOnClickListener(this)
+        mPowerBtn.setOnClickListener(this)
+        mNextChannelBtn.setOnClickListener(this)
+        mOutputSwitch.setOnClickListener(this)
+        mFavButton.setOnClickListener(this)
+        var mIsLight = true
+        val nightModeFlags = requireContext().resources.configuration.uiMode and
+                Configuration.UI_MODE_NIGHT_MASK
+        when (nightModeFlags) {
+            Configuration.UI_MODE_NIGHT_YES -> mIsLight = false
+            Configuration.UI_MODE_NIGHT_NO -> mIsLight = true
+            Configuration.UI_MODE_NIGHT_UNDEFINED -> mIsLight = true
+        }
+        val mTextViewList = listOf(R.id.app_banner, R.id.fm_freq, R.id.freq_misc)
+        for (mResID in mTextViewList){
+            mRootView.findViewById<MaterialTextView>(mResID).apply {
+                if (mIsLight)
+                    setTextColor(resources.getColor(android.R.color.system_accent2_500, requireContext().theme))
+                else
+                    setTextColor(resources.getColor(android.R.color.system_accent2_100, requireContext().theme))
+            }
+        }
+        mRootView.findViewById<FrameLayout>(R.id.main_fragment).apply {
+            if (mIsLight)
+                setBackgroundColor(resources.getColor(android.R.color.system_accent1_100, requireContext().theme))
+            else
+                setBackgroundColor(resources.getColor(android.R.color.system_accent1_700, requireContext().theme))
+        }
+        var mFMInit = false
+        if (mFreqCurrent == -1) {
+            mAudioManager.setParameters(FM_RADIO_OFF)
+            mUpdateEnableDisable(false, mRootView)
+            mFMInit = true
+        }
+        if (FileUtilities.checkIfExistFile(FileUtilities.mFMFreqFileName, requireContext())){
+            mFreqCurrent = FileUtilities.readFromFile(
+                FileUtilities.mFMFreqFileName,
+                requireContext()
+            ).toInt()
+            mFMInterface.setFMFreq(fd, mFreqCurrent)
+            requireActivity().runOnUiThread {
+                mFMFreq.text = mCleanFormat.format(mFreqCurrent.toFloat() / 1000)
+            }
+        }
+        if (FileUtilities.checkIfExistFile(FileUtilities.mFMVolumeFileName, requireContext())){
+            mVolume = FileUtilities.readFromFile(
+                FileUtilities.mFMVolumeFileName,
+                requireContext()
+            ).toInt()
+            mFMInterface.setFMVolume(fd, mVolume)
+            requireActivity().runOnUiThread {
+                mSeekBar.progress = mVolume
+            }
+        }
+        mSeekBar.min = 1
+        mSeekBar.max = 15
+        if (mVolume == -1) {
+            mVolume = 8
+            mFMInterface.setFMVolume(fd, mVolume)
+            requireActivity().runOnUiThread {
+                mSeekBar.progress = mVolume
+            }
+        }
+        if (FileUtilities.checkIfExistFile(FileUtilities.mHeadsetFileName, requireContext())){
+            mHeadset = true
+            mAudioManager.mode = AudioManager.MODE_IN_COMMUNICATION
+            mAudioManager.isSpeakerphoneOn = mHeadset
+            mAudioManager.setParameters(FM_RADIO_OFF)
+            mAudioManager.setParameters(FM_RADIO_ON)
+            mAudioManager.mode = AudioManager.MODE_NORMAL
+            if (mHeadset) {
+                mOutputSwitch.setImageIcon(
+                    Icon.createWithResource(
+                        requireContext(),
+                        R.drawable.ic_volume_up
+                    )
+                )
+                FileUtilities.createFile(FileUtilities.mHeadsetFileName, requireContext())
+            }
+        }
+        mFMInterface.setFMFreq(fd, mFMInterface.getFMLower(fd))
+        mRefreshTracks()
+        if (mFreqCurrent != -1){
+            mFMInterface.setFMFreq(fd, mFreqCurrent)
+        } else {
+            mFreqCurrent = mFMInterface.getFMLower(fd)
+        }
+        Thread {
+            mFMInterface.setFMBoot(fd)
+            if (!mFMInit && isAdded) {
+                mFreqCurrent = mFMInterface.getFMFreq(fd).toInt()
+                mFMInterface.setFMFreq(fd, mFreqCurrent)
+                requireActivity().mainExecutor.execute {
+                    mFMFreq.text = mCleanFormat.format( mFreqCurrent.toFloat() / 1000)
+                }
+            }
+            if (mTracks.isEmpty()) return@Thread
+            if (mFreqCurrent == -1)
+                mFMInterface.setFMThread(fd, true)
+        }.start()
+        mFavButton.let {
+            if (mFavStats[mFreqCurrent] == null){
+                mFavStats.putIfAbsent(mFreqCurrent, false)
+            }
+            if (mFavStats[mFreqCurrent]!!){
+                it.setImageDrawable(mStarFilled)
+            }else {
+                it.setImageDrawable(mStar)
+            }
+        }
+        return mRootView
+    }
+    private fun View.disable(mTextView : Boolean = false) {
+        alpha = .7f
+        if(!mTextView) isEnabled = false
+    }
+    private fun View.enable(mTextView : Boolean = false) {
+        alpha = 1.0f
+        if(!mTextView) isEnabled = true
+    }
+    private fun mUpdateEnableDisable(mEnabled: Boolean, mView: View = requireView()){
+        val mTextViewList = listOf(R.id.fm_freq, R.id.freq_misc)
+        val mFloatButtonList = listOf(
+            R.id.volume_down, R.id.volume_up,
+            R.id.before_channel, R.id.next_channel, R.id.fm_output_btn
+        )
+        for (i in mTextViewList){
+            if (mEnabled)
+                mView.findViewById<View>(i).enable(true)
+            else
+                mView.findViewById<View>(i).disable(true)
+        }
+        for (i in mFloatButtonList){
+            if (mEnabled)
+                mView.findViewById<View>(i).enable()
+            else
+                mView.findViewById<View>(i).disable()
+        }
+    }
+
+    override fun onClick(v: View) {
+        when (v.id) {
+            mOutputSwitch.id -> {
+                mAudioManager.mode = AudioManager.MODE_IN_COMMUNICATION
+                mAudioManager.isSpeakerphoneOn = mHeadset
+                mAudioManager.setParameters(FM_RADIO_OFF)
+                mAudioManager.setParameters(FM_RADIO_ON)
+                mAudioManager.mode = AudioManager.MODE_NORMAL
+                if (mHeadset) {
+                    mOutputSwitch.setImageIcon(
+                        Icon.createWithResource(
+                            requireContext(),
+                            R.drawable.ic_volume_up
+                        )
+                    )
+                    FileUtilities.createFile(FileUtilities.mHeadsetFileName, requireContext())
+                }else{
+                    mOutputSwitch.setImageIcon(
+                        Icon.createWithResource(
+                            requireContext(),
+                            R.drawable.ic_headphones
+                        )
+                    )
+                    FileUtilities.removeFile(FileUtilities.mHeadsetFileName, requireContext())
+                }
+                mHeadset = !mHeadset
+            }
+            mVolumeUp.id -> {
+                if (mVolume < 15)
+                    mVolume += 1
+                mFMInterface.setFMVolume(fd, mVolume)
+                mSeekBar.progress = mVolume
+                Toast.makeText(requireContext(), "Volume set to $mVolume", Toast.LENGTH_SHORT).show()
+                FileUtilities.writeToFile(
+                    FileUtilities.mFMVolumeFileName,
+                    mVolume.toString(), requireContext()
+                )
+            }
+            mVolumeDown.id -> {
+                if (mVolume > 0)
+                    mVolume -= 1
+                mFMInterface.setFMVolume(fd, mVolume)
+                mSeekBar.progress = mVolume
+                Toast.makeText(requireContext(), "Volume set to $mVolume", Toast.LENGTH_SHORT).show()
+                FileUtilities.writeToFile(
+                    FileUtilities.mFMVolumeFileName,
+                    mVolume.toString(), requireContext()
+                )
+            }
+            mBeforeChannelBtn.id -> {
+                mFMInterface.setFMMute(fd, true)
+                val mTempFreq = mFMInterface.getBeforeChannel(fd)
+                if (mTempFreq > mFMInterface.getFMLower(fd) && mTempFreq < mFMInterface.getFmUpper(
+                        fd
+                    )){
+                    mFreqCurrent = mTempFreq
+                }
+                if (!mFMInterface.getSysfsSupport()){
+                    mFMInterface.setFMFreq(fd, mFreqCurrent)
+                }
+                mFMInterface.setFMMute(fd, false)
+                FileUtilities.writeToFile(
+                    FileUtilities.mFMFreqFileName,
+                    mFreqCurrent.toString(), requireContext()
+                )
+                mFavButton.let {
+                    if (mFavStats[mFreqCurrent] == null){
+                        mFavStats.putIfAbsent(mFreqCurrent, false)
+                    }
+                    if (mFavStats[mFreqCurrent]!!){
+                        it.setImageDrawable(mStarFilled)
+                    }else {
+                        it.setImageDrawable(mStar)
+                    }
+                }
+            }
+            mPowerBtn.id -> {
+                if (mFMPower){
+                    mAudioManager.setParameters(FM_RADIO_OFF)
+                    mFMFreq.text = getText(R.string.inital_freq)
+                }else{
+                    mAudioManager.setParameters(FM_RADIO_ON)
+                    mFMFreq.text = mCleanFormat.format(mFreqCurrent.toFloat() / 1000)
+                }
+                mUpdateEnableDisable(!mFMPower)
+                mFMPower = !mFMPower
+            }
+            mNextChannelBtn.id -> {
+                mFMInterface.setFMMute(fd, true)
+                val mTempFreq = mFMInterface.getNextChannel(fd)
+                if (mTempFreq > mFMInterface.getFMLower(fd) && mTempFreq < mFMInterface.getFmUpper(
+                        fd
+                    )){
+                    mFreqCurrent = mTempFreq
+                }
+                if (!mFMInterface.getSysfsSupport()){
+                    mFMInterface.setFMFreq(fd, mFreqCurrent)
+                }
+                mFMInterface.setFMMute(fd, false)
+                FileUtilities.writeToFile(
+                    FileUtilities.mFMFreqFileName,
+                    mFreqCurrent.toString(), requireContext()
+                )
+                mFavButton.let {
+                    if (mFavStats[mFreqCurrent] == null){
+                        mFavStats.putIfAbsent(mFreqCurrent, false)
+                    }
+                    if (mFavStats[mFreqCurrent]!!){
+                        it.setImageDrawable(mStarFilled)
+                    }else {
+                        it.setImageDrawable(mStar)
+                    }
+                }
+            }
+            mFavButton.id -> {
+               val mIndex = mFreqCurrent
+                if (mFavStats[mIndex] == null){
+                    mFavStats.putIfAbsent(mIndex, false)
+                }
+                mFavStats[mIndex] = !mFavStats[mIndex]!!
+                mFavButton.let {
+                    if (mFavStats[mIndex]!!){
+                        it.setImageDrawable(mStarFilled)
+                    }else {
+                        it.setImageDrawable(mStar)
+                    }
+                }
+                Log.d(
+                    "Fav stats for $mIndex changed. " +
+                            "Current value ${mFavStats[mIndex]}"
+                )
+            }
+        }
+        mFMFreq.text = mCleanFormat.format(mFreqCurrent.toFloat() / 1000)
+    }
+
+    override fun onProgressChanged(p0: SeekBar?, p1: Int, p2: Boolean) {
+        mFMInterface.setFMVolume(fd, p1)
+        FileUtilities.writeToFile(FileUtilities.mFMVolumeFileName, p1.toString(), requireContext())
+        mVolume = p1
+    }
+    override fun onStartTrackingTouch(p0: SeekBar?) {}
+    override fun onStopTrackingTouch(p0: SeekBar?) {
+        Toast.makeText(requireContext(), "Volume set to $mVolume", Toast.LENGTH_SHORT).show()
+    }
+    companion object {
+        private var mVolume = -1
+        var fd = -1
+        private var mHeadset = false
+        var mFreqCurrent = -1
+        private var mFMPower = false
+        var mHeadSetPlugged = false
+        var mTracks : LongArray = emptyArray<Long>().toLongArray()
+        private const val FM_RADIO_ON = "l_fmradio_mode=on"
+        private const val FM_RADIO_OFF = "l_fmradio_mode=off"
+        fun mRefreshTracks(){
+            NativeFMInterface().setFMFreq(fd, NativeFMInterface().getFMLower(fd))
+            mTracks = NativeFMInterface().getFMTracks(fd)
+            mTracks = MainFragment().removeZeros(mTracks)
+            (mFreqCurrent != -1).let { NativeFMInterface().setFMFreq(fd, mFreqCurrent) }
+        }
+        fun getIndex(): Int {
+            return mTracks.indexOf(mFreqCurrent.toLong())
+        }
+        val mFavStats = HashMap<Int, Boolean>(30)
+    }
+
+    private fun removeZeros(array : LongArray): LongArray{
+        val mArray : MutableList<Long> = emptyList<Long>().toMutableList()
+        Log.d("removeZeros: Got array")
+        for (i in array.indices){
+            if(array[i] > 0L){
+                mArray.add(array[i])
+            }
+        }
+        return mArray.toLongArray()
+    }
+
+}
\ No newline at end of file
diff --git a/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/utils/FileUtilities.kt b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/utils/FileUtilities.kt
new file mode 100644
index 0000000..03ad842
--- /dev/null
+++ b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/utils/FileUtilities.kt
@@ -0,0 +1,53 @@
+package com.eurekateam.fmradio.utils
+
+import android.content.Context
+import java.io.*
+
+object FileUtilities {
+    const val mFMFreqFileName = "fm_freq_current"
+    const val mFMVolumeFileName = "fm_volume_current"
+    const val mHeadsetFileName = "fm_using_headset"
+
+    fun writeToFile(fileName : String, data: String, mContext: Context){
+        var os: OutputStream? = null
+        try {
+            os = FileOutputStream(File(mContext.filesDir.absolutePath + "/" + fileName))
+            os.write(data.toByteArray(), 0, data.length)
+        } catch (e: IOException) {
+            e.printStackTrace()
+        } finally {
+            try {
+                os?.close()
+            } catch (e: IOException) {
+                e.printStackTrace()
+            }
+        }
+    }
+    fun readFromFile(fileName: String, mContext: Context): String{
+        val mFile = File(mContext.filesDir.absolutePath + "/" + fileName)
+        var os: InputStream? = null
+        val mByteArray = ByteArray(mFile.length().toInt())
+        try {
+            os = FileInputStream(mFile)
+            os.read(mByteArray)
+        } catch (e: IOException) {
+            e.printStackTrace()
+        } finally {
+            try {
+                os?.close()
+            } catch (e: IOException) {
+                e.printStackTrace()
+            }
+        }
+        return String(mByteArray)
+    }
+    fun createFile(fileName: String, mContext: Context){
+        File(mContext.filesDir.absolutePath + "/" + fileName).createNewFile()
+    }
+    fun removeFile(fileName: String, mContext: Context){
+        File(mContext.filesDir.absolutePath + "/" + fileName).delete()
+    }
+    fun checkIfExistFile(fileName: String, mContext: Context): Boolean {
+        return File(mContext.filesDir.absolutePath + "/" + fileName).exists()
+    }
+}
\ No newline at end of file
diff --git a/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/utils/Log.kt b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/utils/Log.kt
new file mode 100644
index 0000000..fd62174
--- /dev/null
+++ b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/utils/Log.kt
@@ -0,0 +1,36 @@
+package com.eurekateam.fmradio.utils
+
+
+import android.util.Log
+
+/**
+ * Created by willi on 22.03.18.
+ */
+object Log {
+    private const val TAG = "FMRadio_slsi"
+    fun i(message: String) {
+        Log.i(TAG, getMessage(message))
+    }
+
+    fun e(message: String) {
+        Log.e(TAG, getMessage(message))
+    }
+
+    fun d(message: String){
+        Log.d(TAG, getMessage(message))
+    }
+    private fun getMessage(message: String): String {
+        val element = Thread.currentThread().stackTrace[4]
+        val className = element.className
+        return String.format(
+            "[%s][%s] %s",
+            className.substring(className.lastIndexOf(".") + 1),
+            element.methodName,
+            message
+        )
+    }
+
+    fun w(message: String) {
+        Log.w(TAG, getMessage(message))
+    }
+}
\ No newline at end of file
diff --git a/universal7885-common/vendorsetup.sh b/universal7885-common/vendorsetup.sh
index ea873df..76d9ef3 100644
--- a/universal7885-common/vendorsetup.sh
+++ b/universal7885-common/vendorsetup.sh
@@ -11,7 +11,6 @@ git clone https://github.com/lineageos/android_hardware_samsung_nfc hardware/sam
 git clone https://github.com/lineageos/android_hardware_samsung_slsi_libbt hardware/samsung_slsi/libbt
 git clone https://github.com/eurekadevelopment/android_hardware_samsung_slsi_scsc_wifibt_wifi_hal.git hardware/samsung_slsi/scsc_wifibt/wifi_hal
 git clone https://github.com/lineageos/android_hardware_samsung_slsi_scsc_wifibt_wpa_supplicant_lib hardware/samsung_slsi/scsc_wifibt/wpa_supplicant_lib
-git clone https://github.com/eurekadevelopment/OneUI-Design-Library external/OneUI --depth=1
 # Vendors
 git clone --depth=1 https://github.com/eurekadevelopment/android_vendor_samsung_exynos7885.git -b master vendor/samsung
 if test -f device/samsung/universal7885-common/vendor_name; then