diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3d504cb6..3a3b4afd 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -118,6 +118,9 @@ dependencies {
implementation("com.vladsch.flexmark:flexmark-all:0.64.0")
// implementation 'com.vladsch.flexmark:flexmark-all:0.64.8'
// implementation("org.opencv:opencv-android:4.11.0")
+ // build.gradle에 추가
+ implementation ("com.github.aeonSolutions:FloatingActionButtonMenuDrag:1.1")
+
implementation ("androidx.media:media:1.7.0")
diff --git a/app/src/main/kotlin/bums/lunatic/launcher/LauncherActivity.kt b/app/src/main/kotlin/bums/lunatic/launcher/LauncherActivity.kt
index 7ce4c0da..ac0dd982 100644
--- a/app/src/main/kotlin/bums/lunatic/launcher/LauncherActivity.kt
+++ b/app/src/main/kotlin/bums/lunatic/launcher/LauncherActivity.kt
@@ -428,6 +428,11 @@ internal class LauncherActivity : CommonActivity() {
return super.dispatchGenericMotionEvent(ev)
}
+ fun floatClick(v : View) {
+ Blog.LOGE("v >>> ${v}")
+ showContents(v.id)
+ }
+
override fun onNewIntent(intent: Intent?) {
Blog.LOGE("onNewIntent intent >> ${intent}")
if(intent?.action?.equals(Intent.ACTION_SEND) == true &&
@@ -524,10 +529,15 @@ internal class LauncherActivity : CommonActivity() {
/* handle navigation back events */
handleBackPress()
updateLocationService()
- binding.feeds.isChecked = true
+
val intent = Intent(this, BluetoothManager::class.java)
ContextCompat.startForegroundService(this, intent)
+ showContents(binding.feeds.id)
+ binding.floatingActionMenu.setOnMenuButtonClickListener { v->
+ Blog.LOGE("v >> ${v}")
+ showContents(v.id)
+ }
}
fun showContents(id : Int) {
diff --git a/app/src/main/kotlin/bums/lunatic/launcher/helpers/BluetoothManager.kt b/app/src/main/kotlin/bums/lunatic/launcher/helpers/BluetoothManager.kt
index fb2106cc..a555d592 100644
--- a/app/src/main/kotlin/bums/lunatic/launcher/helpers/BluetoothManager.kt
+++ b/app/src/main/kotlin/bums/lunatic/launcher/helpers/BluetoothManager.kt
@@ -73,9 +73,9 @@ class BluetoothManager : Service() {
val filter = IntentFilter(BluetoothDevice.ACTION_ACL_CONNECTED)
registerReceiver(bluetoothreceiver, filter)
refreshFeeds()
- GeckoWeb(applicationContext).apply {
- loadUrl("https://arca.live/b/live")
- }
+// GeckoWeb(applicationContext).apply {
+// loadUrl("https://arca.live/b/live")
+// }
}
override fun onBind(intent: Intent?): IBinder? {
diff --git a/app/src/main/kotlin/bums/lunatic/launcher/home/GeckoWeb.kt b/app/src/main/kotlin/bums/lunatic/launcher/home/GeckoWeb.kt
index 9c5bcefa..0f465bcb 100644
--- a/app/src/main/kotlin/bums/lunatic/launcher/home/GeckoWeb.kt
+++ b/app/src/main/kotlin/bums/lunatic/launcher/home/GeckoWeb.kt
@@ -619,6 +619,12 @@ class GeckoWeb : BWebview {
}
}
+
+ decoViews?.forEach {
+ if (it.id == R.id.back) {
+ it.setOnClickListener { session.goBack() }
+ }
+ }
}
override fun onCanGoBack(session: GeckoSession, canGoBack: Boolean) {
diff --git a/app/src/main/kotlin/bums/lunatic/launcher/home/RssHome.kt b/app/src/main/kotlin/bums/lunatic/launcher/home/RssHome.kt
index b3636c9c..28c49747 100644
--- a/app/src/main/kotlin/bums/lunatic/launcher/home/RssHome.kt
+++ b/app/src/main/kotlin/bums/lunatic/launcher/home/RssHome.kt
@@ -630,6 +630,7 @@ internal class RssHome : Fragment() {
binding.geckoWeb.decoViews.add(binding.hide)
binding.geckoWeb.decoViews.add(binding.vote)
binding.geckoWeb.decoViews.add(binding.progressBar)
+ binding.geckoWeb.decoViews.add(binding.back)
return binding.root
}
diff --git a/app/src/main/res/layout/launcher_activity.xml b/app/src/main/res/layout/launcher_activity.xml
index 55cb16bb..adc2adf5 100644
--- a/app/src/main/res/layout/launcher_activity.xml
+++ b/app/src/main/res/layout/launcher_activity.xml
@@ -1,6 +1,7 @@
-
-
-
-
-
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/launcher_home.xml b/app/src/main/res/layout/launcher_home.xml
index 512c3ba6..f2fd9013 100644
--- a/app/src/main/res/layout/launcher_home.xml
+++ b/app/src/main/res/layout/launcher_home.xml
@@ -3,7 +3,6 @@
@@ -24,10 +23,23 @@
android:foregroundTint="@color/finestSilver"
tools:ignore="ContentDescription,UseAppTint"
android:layout_height="30dp" />
-
+
@@ -134,7 +146,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
- app:layout_constraintTop_toBottomOf="@id/bookmark"
+ app:layout_constraintTop_toBottomOf="@id/progressBar"
android:layout_height="0dp"
/>
@@ -149,9 +161,9 @@
android:layout_height="0dp"/>
+
+
\ No newline at end of file