Schabi
/
NewPlayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

initial module restructuring

This commit is contained in:
Christian Schabesberger 2024-07-18 12:08:09 +02:00
parent 2dfaa354d7
commit deec8934d8
11 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/net/newpipe/newplayer/VideoPlayerActivity.kt
View File

@ -5,12 +5,11 @@ import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge import androidx.activity.enableEdgeToEdge
import androidx.activity.viewModels import androidx.activity.viewModels
import androidx.compose.material3.Text
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import net.newpipe.newplayer.model.VideoPlayerViewModel import net.newpipe.newplayer.internal.model.VideoPlayerViewModel
import net.newpipe.newplayer.model.VideoPlayerViewModelImpl import net.newpipe.newplayer.internal.model.VideoPlayerViewModelImpl
import net.newpipe.newplayer.ui.VideoPlayerUI import net.newpipe.newplayer.internal.ui.VideoPlayerUI
import net.newpipe.newplayer.ui.theme.VideoPlayerTheme import net.newpipe.newplayer.internal.ui.theme.VideoPlayerTheme
@AndroidEntryPoint @AndroidEntryPoint
class VideoPlayerActivity : ComponentActivity() { class VideoPlayerActivity : ComponentActivity() {

8
app/src/main/java/net/newpipe/newplayer/VideoPlayerFragment.kt
View File

@ -34,10 +34,10 @@ import androidx.core.view.updateLayoutParams
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels import androidx.fragment.app.viewModels
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import net.newpipe.newplayer.model.VideoPlayerViewModel import net.newpipe.newplayer.internal.model.VideoPlayerViewModel
import net.newpipe.newplayer.model.VideoPlayerViewModelImpl import net.newpipe.newplayer.internal.model.VideoPlayerViewModelImpl
import net.newpipe.newplayer.ui.VideoPlayerUI import net.newpipe.newplayer.internal.ui.VideoPlayerUI
import net.newpipe.newplayer.ui.theme.VideoPlayerTheme import net.newpipe.newplayer.internal.ui.theme.VideoPlayerTheme
@AndroidEntryPoint @AndroidEntryPoint
class VideoPlayerFragment() : Fragment() { class VideoPlayerFragment() : Fragment() {

4
app/src/main/java/net/newpipe/newplayer/VideoPlayerComponent.kt → app/src/main/java/net/newpipe/newplayer/internal/VideoPlayerComponent.kt
View File

@ -18,7 +18,7 @@
* along with NewPlayer. If not, see <http://www.gnu.org/licenses/>. * along with NewPlayer. If not, see <http://www.gnu.org/licenses/>.
*/ */
package net.newpipe.newplayer package net.newpipe.newplayer.internal
import android.app.Application import android.app.Application
import androidx.media3.common.Player import androidx.media3.common.Player
@ -26,8 +26,6 @@ import androidx.media3.exoplayer.ExoPlayer
import dagger.Module import dagger.Module
import dagger.Provides import dagger.Provides
import dagger.hilt.InstallIn import dagger.hilt.InstallIn
import dagger.hilt.android.components.ViewModelComponent
import dagger.hilt.android.scopes.ViewModelScoped
import dagger.hilt.components.SingletonComponent import dagger.hilt.components.SingletonComponent
import javax.inject.Singleton import javax.inject.Singleton

4
app/src/main/java/net/newpipe/newplayer/model/VideoPlayerViewModel.kt → app/src/main/java/net/newpipe/newplayer/internal/model/VideoPlayerViewModel.kt
View File

@ -18,7 +18,7 @@
* along with NewPlayer. If not, see <http://www.gnu.org/licenses/>. * along with NewPlayer. If not, see <http://www.gnu.org/licenses/>.
*/ */
package net.newpipe.newplayer.model package net.newpipe.newplayer.internal.model
import android.app.Application import android.app.Application
import android.os.Build import android.os.Build
@ -40,7 +40,7 @@ import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.update import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import net.newpipe.newplayer.utils.VideoSize import net.newpipe.newplayer.internal.utils.VideoSize
import kotlinx.parcelize.Parcelize import kotlinx.parcelize.Parcelize
val VIDEOPLAYER_UI_STATE = "video_player_ui_state" val VIDEOPLAYER_UI_STATE = "video_player_ui_state"

8
app/src/main/java/net/newpipe/newplayer/ui/VideoPlayerControllerUI.kt → app/src/main/java/net/newpipe/newplayer/internal/ui/VideoPlayerControllerUI.kt
View File

@ -19,9 +19,8 @@
*/ */
package net.newpipe.newplayer.ui package net.newpipe.newplayer.internal.ui
import android.content.pm.ActivityInfo
import androidx.activity.compose.BackHandler import androidx.activity.compose.BackHandler
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
@ -80,9 +79,8 @@ import androidx.compose.ui.unit.DpOffset
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import net.newpipe.newplayer.R import net.newpipe.newplayer.R
import net.newpipe.newplayer.ui.theme.VideoPlayerTheme import net.newpipe.newplayer.internal.ui.theme.VideoPlayerTheme
import net.newpipe.newplayer.ui.theme.video_player_onSurface import net.newpipe.newplayer.internal.ui.theme.video_player_onSurface
import net.newpipe.newplayer.utils.LockScreenOrientation
@Composable @Composable
fun VideoPlayerControllerUI( fun VideoPlayerControllerUI(

14
app/src/main/java/net/newpipe/newplayer/ui/VideoPlayerUI.kt → app/src/main/java/net/newpipe/newplayer/internal/ui/VideoPlayerUI.kt
View File

@ -18,7 +18,7 @@
* along with NewPlayer. If not, see <http://www.gnu.org/licenses/>. * along with NewPlayer. If not, see <http://www.gnu.org/licenses/>.
*/ */
package net.newpipe.newplayer.ui package net.newpipe.newplayer.internal.ui
import android.app.Activity import android.app.Activity
import android.content.Intent import android.content.Intent
@ -27,7 +27,6 @@ import androidx.activity.compose.BackHandler
import androidx.activity.compose.ManagedActivityResultLauncher import androidx.activity.compose.ManagedActivityResultLauncher
import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.ActivityResult import androidx.activity.result.ActivityResult
import androidx.activity.result.IntentSenderRequest
import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.Surface import androidx.compose.material3.Surface
@ -47,14 +46,13 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.viewinterop.AndroidView import androidx.compose.ui.viewinterop.AndroidView
import androidx.lifecycle.Lifecycle import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleEventObserver import androidx.lifecycle.LifecycleEventObserver
import androidx.lifecycle.VIEW_MODEL_STORE_OWNER_KEY
import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.collectLatest
import net.newpipe.newplayer.VideoPlayerActivity import net.newpipe.newplayer.VideoPlayerActivity
import net.newpipe.newplayer.model.VIDEOPLAYER_UI_STATE import net.newpipe.newplayer.internal.model.VIDEOPLAYER_UI_STATE
import net.newpipe.newplayer.model.VideoPlayerViewModel import net.newpipe.newplayer.internal.model.VideoPlayerViewModel
import net.newpipe.newplayer.model.VideoPlayerViewModelImpl import net.newpipe.newplayer.internal.model.VideoPlayerViewModelImpl
import net.newpipe.newplayer.ui.theme.VideoPlayerTheme import net.newpipe.newplayer.internal.ui.theme.VideoPlayerTheme
import net.newpipe.newplayer.utils.findActivity import net.newpipe.newplayer.internal.utils.findActivity
@Composable @Composable
fun VideoPlayerUI( fun VideoPlayerUI(

2
app/src/main/java/net/newpipe/newplayer/ui/theme/Color.kt → app/src/main/java/net/newpipe/newplayer/internal/ui/theme/Color.kt
View File

@ -18,7 +18,7 @@
* along with NewPlayer. If not, see <http://www.gnu.org/licenses/>. * along with NewPlayer. If not, see <http://www.gnu.org/licenses/>.
*/ */
package net.newpipe.newplayer.ui.theme package net.newpipe.newplayer.internal.ui.theme
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color

3
app/src/main/java/net/newpipe/newplayer/ui/theme/Theme.kt → app/src/main/java/net/newpipe/newplayer/internal/ui/theme/Theme.kt
View File

@ -18,13 +18,12 @@
* along with NewPlayer. If not, see <http://www.gnu.org/licenses/>. * along with NewPlayer. If not, see <http://www.gnu.org/licenses/>.
*/ */
package net.newpipe.newplayer.ui.theme package net.newpipe.newplayer.internal.ui.theme
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.darkColorScheme import androidx.compose.material3.darkColorScheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color
private val VideoPlayerColorScheme = darkColorScheme( private val VideoPlayerColorScheme = darkColorScheme(
primary = video_player_primary, primary = video_player_primary,

2
app/src/main/java/net/newpipe/newplayer/ui/theme/Type.kt → app/src/main/java/net/newpipe/newplayer/internal/ui/theme/Type.kt
View File

@ -18,7 +18,7 @@
* along with NewPlayer. If not, see <http://www.gnu.org/licenses/>. * along with NewPlayer. If not, see <http://www.gnu.org/licenses/>.
*/ */
package net.newpipe.newplayer.ui.theme package net.newpipe.newplayer.internal.ui.theme
import androidx.compose.material3.Typography import androidx.compose.material3.Typography
import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.TextStyle

2
app/src/main/java/net/newpipe/newplayer/utils/VideoSize.kt → app/src/main/java/net/newpipe/newplayer/internal/utils/VideoSize.kt
View File

@ -1,4 +1,4 @@
package net.newpipe.newplayer.utils package net.newpipe.newplayer.internal.utils
data class VideoSize( data class VideoSize(
val width: Int, val width: Int,

2
app/src/main/java/net/newpipe/newplayer/utils/utils.kt → app/src/main/java/net/newpipe/newplayer/internal/utils/utils.kt
View File

@ -18,7 +18,7 @@
* along with NewPlayer. If not, see <http://www.gnu.org/licenses/>. * along with NewPlayer. If not, see <http://www.gnu.org/licenses/>.
*/ */
package net.newpipe.newplayer.utils package net.newpipe.newplayer.internal.utils
import android.app.Activity import android.app.Activity
import android.content.Context import android.content.Context