From 74fe0042c7fc63d953a209b40fc35f09dfc1c6b4 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Thu, 18 Jul 2024 13:22:52 +0200
Subject: [PATCH] introduce VideoPlayerView

---
 .idea/deploymentTargetSelector.xml            |  2 +-
 .../net/newpipe/newplayer/VideoPlayerView.kt  | 24 ++++++++++----
 .../{ => internal}/VideoPlayerFragment.kt     |  4 +--
 .../main/res/layout-land/activity_main.xml    |  2 +-
 app/src/main/res/layout/activity_main.xml     |  8 ++---
 app/src/main/res/layout/video_player_view.xml | 32 +++++++++++++++++++
 6 files changed, 56 insertions(+), 16 deletions(-)
 rename app/src/main/java/net/newpipe/newplayer/{ => internal}/VideoPlayerFragment.kt (97%)
 create mode 100644 app/src/main/res/layout/video_player_view.xml

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 7c4beab..2f596e9 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,7 +4,7 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-07-18T09:59:30.747780687Z">
+        <DropdownSelection timestamp="2024-07-18T11:00:58.651175700Z">
           <Target type="DEFAULT_BOOT">
             <handle>
               <DeviceId pluginId="PhysicalDevice" identifier="serial=981f7af2" />
diff --git a/app/src/main/java/net/newpipe/newplayer/VideoPlayerView.kt b/app/src/main/java/net/newpipe/newplayer/VideoPlayerView.kt
index 114ef57..02e1120 100644
--- a/app/src/main/java/net/newpipe/newplayer/VideoPlayerView.kt
+++ b/app/src/main/java/net/newpipe/newplayer/VideoPlayerView.kt
@@ -2,13 +2,23 @@ package net.newpipe.newplayer
 
 import android.content.Context
 import android.util.AttributeSet
+import android.view.LayoutInflater
 import android.widget.FrameLayout
+import androidx.compose.ui.platform.ComposeView
+import androidx.fragment.app.viewModels
+import dagger.hilt.android.AndroidEntryPoint
+import net.newpipe.newplayer.internal.model.VideoPlayerViewModel
+import net.newpipe.newplayer.internal.model.VideoPlayerViewModelImpl
 
-class VideoPlayerView(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : FrameLayout(context, attrs, defStyleAttr) {
-
-
+@AndroidEntryPoint
+class VideoPlayerView : FrameLayout {
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+    ) : super(context, attrs, defStyleAttr) {
+        val view = LayoutInflater.from(context).inflate(R.layout.video_player_view, this)
+        val composeView = view.findViewById<ComposeView>(R.id.player_copose_view)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/newpipe/newplayer/VideoPlayerFragment.kt b/app/src/main/java/net/newpipe/newplayer/internal/VideoPlayerFragment.kt
similarity index 97%
rename from app/src/main/java/net/newpipe/newplayer/VideoPlayerFragment.kt
rename to app/src/main/java/net/newpipe/newplayer/internal/VideoPlayerFragment.kt
index 6d4117b..e405e72 100644
--- a/app/src/main/java/net/newpipe/newplayer/VideoPlayerFragment.kt
+++ b/app/src/main/java/net/newpipe/newplayer/internal/VideoPlayerFragment.kt
@@ -18,13 +18,12 @@
  * along with NewPlayer.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.newpipe.newplayer
+package net.newpipe.newplayer.internal
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.FrameLayout
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.constraintlayout.widget.ConstraintLayout
@@ -34,6 +33,7 @@ import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import dagger.hilt.android.AndroidEntryPoint
+import net.newpipe.newplayer.R
 import net.newpipe.newplayer.internal.model.VideoPlayerViewModel
 import net.newpipe.newplayer.internal.model.VideoPlayerViewModelImpl
 import net.newpipe.newplayer.internal.ui.VideoPlayerUI
diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
index fd4ebfb..b4d97aa 100644
--- a/app/src/main/res/layout-land/activity_main.xml
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -36,7 +36,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="parent"
-        android:name="net.newpipe.newplayer.VideoPlayerFragment"
+        android:name="net.newpipe.newplayer.internal.VideoPlayerFragment"
         />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2bd7235..1a107c3 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -27,17 +27,15 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/player_frament_view"
+    <net.newpipe.newplayer.VideoPlayerView
+        android:id="@+id/new_player_video_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="50dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        android:name="net.newpipe.newplayer.VideoPlayerFragment"
-        />
+        android:name="net.newpipe.newplayer.VideoPlayerFragment" />
 
     <TextView
         android:id="@+id/hw_view"
diff --git a/app/src/main/res/layout/video_player_view.xml b/app/src/main/res/layout/video_player_view.xml
new file mode 100644
index 0000000..1ce1b9a
--- /dev/null
+++ b/app/src/main/res/layout/video_player_view.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?><!-- NewPlayer
+
+    @author Christian Schabesberger
+
+    Copyright (C) NewPipe e.V. 2024 <code(at)newpipe-ev.de>
+
+    NewPlayer is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NewPlayer is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NewPlayer.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<androidx.fragment.app.FragmentContainerView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/player_frament_view"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="50dp"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    android:name="net.newpipe.newplayer.internal.VideoPlayerFragment"
+    />
\ No newline at end of file