From 9856c66606665c92b9791dc9e45f2eadc7d9572b Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Thu, 18 Jul 2024 12:37:32 +0200
Subject: [PATCH] clean up VideoPlayerFragment

---
 .idea/deploymentTargetSelector.xml            |  2 +-
 .idea/gradle.xml                              |  1 +
 NewPlayer/.gitignore                          |  1 +
 NewPlayer/build.gradle.kts                    | 43 +++++++++++++++++++
 NewPlayer/consumer-rules.pro                  |  0
 NewPlayer/proguard-rules.pro                  | 21 +++++++++
 .../newplayer/ExampleInstrumentedTest.kt      | 24 +++++++++++
 NewPlayer/src/main/AndroidManifest.xml        |  4 ++
 .../net/newpipe/newplayer/ExampleUnitTest.kt  | 17 ++++++++
 app/build.gradle.kts                          |  4 ++
 .../newpipe/newplayer/VideoPlayerFragment.kt  |  3 +-
 .../net/newpipe/newplayer/VideoPlayerView.kt  | 14 ++++++
 .../res/layout-land/video_player_framgent.xml | 39 -----------------
 .../main/res/layout/video_player_framgent.xml | 21 +++------
 build.gradle.kts                              |  1 +
 gradle/libs.versions.toml                     |  3 +-
 settings.gradle.kts                           |  2 +-
 17 files changed, 142 insertions(+), 58 deletions(-)
 create mode 100644 NewPlayer/.gitignore
 create mode 100644 NewPlayer/build.gradle.kts
 create mode 100644 NewPlayer/consumer-rules.pro
 create mode 100644 NewPlayer/proguard-rules.pro
 create mode 100644 NewPlayer/src/androidTest/java/net/newpipe/newplayer/ExampleInstrumentedTest.kt
 create mode 100644 NewPlayer/src/main/AndroidManifest.xml
 create mode 100644 NewPlayer/src/test/java/net/newpipe/newplayer/ExampleUnitTest.kt
 create mode 100644 app/src/main/java/net/newpipe/newplayer/VideoPlayerView.kt
 delete mode 100644 app/src/main/res/layout-land/video_player_framgent.xml

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 1f560f7..7c4beab 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-17T13:42:13.936108406Z">
+        <DropdownSelection timestamp="2024-07-18T09:59:30.747780687Z">
           <Target type="DEFAULT_BOOT">
             <handle>
               <DeviceId pluginId="PhysicalDevice" identifier="serial=981f7af2" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0897082..76ec269 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -9,6 +9,7 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/NewPlayer" />
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
diff --git a/NewPlayer/.gitignore b/NewPlayer/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/NewPlayer/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/NewPlayer/build.gradle.kts b/NewPlayer/build.gradle.kts
new file mode 100644
index 0000000..a872762
--- /dev/null
+++ b/NewPlayer/build.gradle.kts
@@ -0,0 +1,43 @@
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.jetbrains.kotlin.android)
+}
+
+android {
+    namespace = "net.newpipe.newplayer"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 21
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+dependencies {
+
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.material)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+}
\ No newline at end of file
diff --git a/NewPlayer/consumer-rules.pro b/NewPlayer/consumer-rules.pro
new file mode 100644
index 0000000..e69de29
diff --git a/NewPlayer/proguard-rules.pro b/NewPlayer/proguard-rules.pro
new file mode 100644
index 0000000..481bb43
--- /dev/null
+++ b/NewPlayer/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/NewPlayer/src/androidTest/java/net/newpipe/newplayer/ExampleInstrumentedTest.kt b/NewPlayer/src/androidTest/java/net/newpipe/newplayer/ExampleInstrumentedTest.kt
new file mode 100644
index 0000000..c9d580a
--- /dev/null
+++ b/NewPlayer/src/androidTest/java/net/newpipe/newplayer/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package net.newpipe.newplayer
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("net.newpipe.newplayer.test", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/NewPlayer/src/main/AndroidManifest.xml b/NewPlayer/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..a5918e6
--- /dev/null
+++ b/NewPlayer/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
\ No newline at end of file
diff --git a/NewPlayer/src/test/java/net/newpipe/newplayer/ExampleUnitTest.kt b/NewPlayer/src/test/java/net/newpipe/newplayer/ExampleUnitTest.kt
new file mode 100644
index 0000000..ed8c8e8
--- /dev/null
+++ b/NewPlayer/src/test/java/net/newpipe/newplayer/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package net.newpipe.newplayer
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 30fe8c1..e9f1b3e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -38,6 +38,10 @@ android {
         kotlinCompilerExtensionVersion = "1.5.1"
     }
 
+    hilt {
+        enableExperimentalClasspathAggregation = true
+    }
+
     defaultConfig {
         applicationId = "net.newpipe.newplayer"
         minSdk = 21
diff --git a/app/src/main/java/net/newpipe/newplayer/VideoPlayerFragment.kt b/app/src/main/java/net/newpipe/newplayer/VideoPlayerFragment.kt
index d9d0964..6d4117b 100644
--- a/app/src/main/java/net/newpipe/newplayer/VideoPlayerFragment.kt
+++ b/app/src/main/java/net/newpipe/newplayer/VideoPlayerFragment.kt
@@ -62,11 +62,10 @@ class VideoPlayerFragment() : Fragment() {
 
         val view = inflater.inflate(R.layout.video_player_framgent, container, false)
         val composeView = view.findViewById<ComposeView>(R.id.player_copose_view)
-        val frameView = view.findViewById<FrameLayout>(R.id.frame_layout)
 
         viewModel.listener = object : VideoPlayerViewModel.Listener {
             override fun requestUpdateLayoutRatio(ratio: Float) {
-                frameView.updateLayoutParams<ConstraintLayout.LayoutParams> {
+                composeView.updateLayoutParams<ConstraintLayout.LayoutParams> {
                     dimensionRatio = "$ratio:1"
                 }
             }
diff --git a/app/src/main/java/net/newpipe/newplayer/VideoPlayerView.kt b/app/src/main/java/net/newpipe/newplayer/VideoPlayerView.kt
new file mode 100644
index 0000000..114ef57
--- /dev/null
+++ b/app/src/main/java/net/newpipe/newplayer/VideoPlayerView.kt
@@ -0,0 +1,14 @@
+package net.newpipe.newplayer
+
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.FrameLayout
+
+class VideoPlayerView(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : FrameLayout(context, attrs, defStyleAttr) {
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/video_player_framgent.xml b/app/src/main/res/layout-land/video_player_framgent.xml
deleted file mode 100644
index 2b3976c..0000000
--- a/app/src/main/res/layout-land/video_player_framgent.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <FrameLayout
-        android:id="@+id/frame_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.compose.ui.platform.ComposeView
-            android:id="@+id/player_copose_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-    </FrameLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/video_player_framgent.xml b/app/src/main/res/layout/video_player_framgent.xml
index 7410100..83a1a90 100644
--- a/app/src/main/res/layout/video_player_framgent.xml
+++ b/app/src/main/res/layout/video_player_framgent.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- NewPlayer
+<?xml version="1.0" encoding="utf-8"?><!-- NewPlayer
 
     @author Christian Schabesberger
 
@@ -20,22 +19,16 @@
 -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="wrap_content">
 
-    <FrameLayout
-        android:id="@+id/frame_layout"
+    <androidx.compose.ui.platform.ComposeView
+        android:id="@+id/player_copose_view"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintDimensionRatio="H,2:1">
+        app:layout_constraintDimensionRatio="H,2:1"
+        app:layout_constraintTop_toTopOf="parent" />
 
-        <androidx.compose.ui.platform.ComposeView
-            android:id="@+id/player_copose_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-    </FrameLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 9623718..8d3fc9f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,4 +25,5 @@ plugins {
     alias(libs.plugins.kotlinAndroidKsp) apply false
     alias(libs.plugins.kotlinParcelize) apply false
     alias(libs.plugins.composeCompiler) apply false
+    alias(libs.plugins.android.library) apply false
 }
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1921ebe..5726826 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -79,4 +79,5 @@ jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref =
 composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 androidHilt = { id = "com.google.dagger.hilt.android", version.ref = "hiltAndroid" }
 kotlinAndroidKsp = { id = "com.google.devtools.ksp", version.ref = "kspVersion" }
-kotlinParcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlinParcelize" }
\ No newline at end of file
+kotlinParcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlinParcelize" }
+android-library = { id = "com.android.library", version.ref = "agp" }
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index ef04d28..20256f8 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -21,4 +21,4 @@ dependencyResolutionManagement {
 
 rootProject.name = "NewPlayer"
 include(":app")
- 
\ No newline at end of file
+include(":NewPlayer")