From 15475923cb42508064c5a7f2908cb8149aed2b62 Mon Sep 17 00:00:00 2001 From: Raymond Yang Date: Tue, 31 Jan 2023 09:49:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E5=B0=88=E6=A1=88=E7=B5=90?= =?UTF-8?q?=E6=A7=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 2 +- .../gstreamer_demo_app/{ => extensions}/UnitExtension.kt | 0 .../gstreamer_demo_app/{ => ui/mainScreen}/MainActivity.kt | 5 ++--- .../gstreamer_demo_app/{ => ui/mainScreen}/MainViewModel.kt | 2 +- .../{ => ui/mainScreen}/SplitViewFragment.kt | 3 ++- .../gstreamer_demo_app/{ => ui/mainScreen}/VideoView.kt | 2 +- .../{ => ui/mainScreen}/VideoViewAdapter.kt | 2 +- app/src/main/res/layout/fragment_split_view.xml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) rename app/src/main/java/com/ray650128/gstreamer_demo_app/{ => extensions}/UnitExtension.kt (100%) rename app/src/main/java/com/ray650128/gstreamer_demo_app/{ => ui/mainScreen}/MainActivity.kt (96%) rename app/src/main/java/com/ray650128/gstreamer_demo_app/{ => ui/mainScreen}/MainViewModel.kt (98%) rename app/src/main/java/com/ray650128/gstreamer_demo_app/{ => ui/mainScreen}/SplitViewFragment.kt (98%) rename app/src/main/java/com/ray650128/gstreamer_demo_app/{ => ui/mainScreen}/VideoView.kt (99%) rename app/src/main/java/com/ray650128/gstreamer_demo_app/{ => ui/mainScreen}/VideoViewAdapter.kt (96%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6cb839a..201f1a5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,7 +10,7 @@ android:supportsRtl="true" android:theme="@style/Theme.Gstreamer"> diff --git a/app/src/main/java/com/ray650128/gstreamer_demo_app/UnitExtension.kt b/app/src/main/java/com/ray650128/gstreamer_demo_app/extensions/UnitExtension.kt similarity index 100% rename from app/src/main/java/com/ray650128/gstreamer_demo_app/UnitExtension.kt rename to app/src/main/java/com/ray650128/gstreamer_demo_app/extensions/UnitExtension.kt diff --git a/app/src/main/java/com/ray650128/gstreamer_demo_app/MainActivity.kt b/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/MainActivity.kt similarity index 96% rename from app/src/main/java/com/ray650128/gstreamer_demo_app/MainActivity.kt rename to app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/MainActivity.kt index dc0b13a..b177771 100644 --- a/app/src/main/java/com/ray650128/gstreamer_demo_app/MainActivity.kt +++ b/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/MainActivity.kt @@ -1,19 +1,18 @@ -package com.ray650128.gstreamer_demo_app +package com.ray650128.gstreamer_demo_app.ui.mainScreen import android.content.Context import android.graphics.Color import android.os.Bundle import android.util.Log import android.view.WindowManager -import android.widget.Toast import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity import androidx.viewpager2.widget.ViewPager2 +import com.ray650128.gstreamer_demo_app.R import com.ray650128.gstreamer_demo_app.databinding.ActivityMainBinding import com.ray650128.gstreamer_demo_app.model.Device import kotlinx.coroutines.MainScope import kotlinx.coroutines.launch -import org.freedesktop.gstreamer.GStreamer class MainActivity : AppCompatActivity() { diff --git a/app/src/main/java/com/ray650128/gstreamer_demo_app/MainViewModel.kt b/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/MainViewModel.kt similarity index 98% rename from app/src/main/java/com/ray650128/gstreamer_demo_app/MainViewModel.kt rename to app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/MainViewModel.kt index 7e269ec..c6b7711 100644 --- a/app/src/main/java/com/ray650128/gstreamer_demo_app/MainViewModel.kt +++ b/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/MainViewModel.kt @@ -1,4 +1,4 @@ -package com.ray650128.gstreamer_demo_app +package com.ray650128.gstreamer_demo_app.ui.mainScreen import androidx.lifecycle.MediatorLiveData import androidx.lifecycle.MutableLiveData diff --git a/app/src/main/java/com/ray650128/gstreamer_demo_app/SplitViewFragment.kt b/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/SplitViewFragment.kt similarity index 98% rename from app/src/main/java/com/ray650128/gstreamer_demo_app/SplitViewFragment.kt rename to app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/SplitViewFragment.kt index 9ab01af..5ab3f61 100644 --- a/app/src/main/java/com/ray650128/gstreamer_demo_app/SplitViewFragment.kt +++ b/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/SplitViewFragment.kt @@ -1,4 +1,4 @@ -package com.ray650128.gstreamer_demo_app +package com.ray650128.gstreamer_demo_app.ui.mainScreen import android.os.Bundle import android.util.Log @@ -8,6 +8,7 @@ import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.gridlayout.widget.GridLayout import com.ray650128.gstreamer_demo_app.databinding.FragmentSplitViewBinding +import com.ray650128.gstreamer_demo_app.dp import com.ray650128.gstreamer_demo_app.model.Device import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.MainScope diff --git a/app/src/main/java/com/ray650128/gstreamer_demo_app/VideoView.kt b/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/VideoView.kt similarity index 99% rename from app/src/main/java/com/ray650128/gstreamer_demo_app/VideoView.kt rename to app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/VideoView.kt index 10d6aee..dc0b95a 100644 --- a/app/src/main/java/com/ray650128/gstreamer_demo_app/VideoView.kt +++ b/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/VideoView.kt @@ -1,4 +1,4 @@ -package com.ray650128.gstreamer_demo_app +package com.ray650128.gstreamer_demo_app.ui.mainScreen import android.content.Context import android.os.Handler diff --git a/app/src/main/java/com/ray650128/gstreamer_demo_app/VideoViewAdapter.kt b/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/VideoViewAdapter.kt similarity index 96% rename from app/src/main/java/com/ray650128/gstreamer_demo_app/VideoViewAdapter.kt rename to app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/VideoViewAdapter.kt index 53741d3..ebd5ab0 100644 --- a/app/src/main/java/com/ray650128/gstreamer_demo_app/VideoViewAdapter.kt +++ b/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/VideoViewAdapter.kt @@ -1,4 +1,4 @@ -package com.ray650128.gstreamer_demo_app +package com.ray650128.gstreamer_demo_app.ui.mainScreen import android.annotation.SuppressLint import androidx.fragment.app.FragmentManager diff --git a/app/src/main/res/layout/fragment_split_view.xml b/app/src/main/res/layout/fragment_split_view.xml index 8b71ef6..b975c88 100644 --- a/app/src/main/res/layout/fragment_split_view.xml +++ b/app/src/main/res/layout/fragment_split_view.xml @@ -9,4 +9,4 @@ app:columnCount="3" app:rowCount="3" app:useDefaultMargins="false" - tools:context=".SplitViewFragment" /> \ No newline at end of file + tools:context=".ui.mainScreen.SplitViewFragment" /> \ No newline at end of file