Merge branch 'master' into feature/composeBase

Author: carlosvaccari

app/build.gradle.kts

@@ -1,5 +1,7 @@
 @file:Suppress("UnstableApiUsage")
 android {
+    namespace = "${Config.packageName}app"
+
     buildFeatures {
         compose = true
     }
@@ -8,15 +10,18 @@ android {
         kotlinCompilerExtensionVersion = Versions.composeCompilerVersion
     }
 }
-
 dependencies {
     implementation(project(Dependencies.Module.feature_list_streams))
     implementation(project(Dependencies.Module.core_networking))
-    implementation(project(Dependencies.Module.core_ui))
+    implementation(project(Dependencies.Module.core_shared_ui))
     implementation(Dependencies.Koin.koin)
-    Dependencies.Compose.list.forEach { implementation(it) }
     Dependencies.Kotlin.list.forEach { implementation(it) }
     Dependencies.Support.list.forEach { implementation(it) }
     Dependencies.UnitTest.list.forEach { testImplementation(it) }
     Dependencies.AndroidTest.list.forEach { androidTestImplementation(it) }
+
+    val composeBom = platform(Dependencies.Compose.composeBomVersion)
+    implementation(composeBom)
+    Dependencies.Compose.list.forEach { implementation(it) }
+    implementation(Dependencies.lottie)
 }

app/src/main/AndroidManifest.xml

@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/ic_netflix"
+        android:roundIcon="@mipmap/ic_netflix_round"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/Theme.StreamPlayerApp"
-        tools:targetApi="31"
-        android:name=".CustomApplication">
+        android:name="com.codandotv.streamplayerapp.CustomApplication">
+
         <activity
-            android:name=".MainActivity"
-            android:exported="true">
+            android:name="com.codandotv.streamplayerapp.MainActivity"
+            android:exported="true"
+            android:theme="@style/SplashScreenTheme">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>

app/src/main/java/com/codandotv/streamplayerapp/MainActivity.kt

@@ -1,33 +1,27 @@
 package com.codandotv.streamplayerapp
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Scaffold
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import com.codandotv.streamplayerapp.core_ui.theme.StreamPlayerTheme
-import com.codandotv.streamplayerapp.feature_list_streams.presentation.screens.ListStreamsScreen
+import com.codandotv.streamplayerapp.screens.SplashScreen
 
-class MainActivity : AppCompatActivity() {
+class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContent {
-            StreamPlayerApp()
-        }
-    }
-}
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun StreamPlayerApp() {
-    StreamPlayerTheme {
-        Scaffold { innerPadding ->
-            Box(Modifier.padding(innerPadding)) {
-                ListStreamsScreen()
-            }
+
+        setContent{
+            SplashScreen()
         }
     }
 }
+//@OptIn(ExperimentalMaterial3Api::class)
+//@Composable
+//fun StreamPlayerApp() {
+//    StreamPlayerTheme {
+//        Scaffold { innerPadding ->
+//            Box(Modifier.padding(innerPadding)) {
+//                ListStreamsScreen()
+//            }
+//        }
+//    }
+//}

app/src/main/java/com/codandotv/streamplayerapp/screens/SplashScreen.kt

@@ -0,0 +1,44 @@
+package com.codandotv.streamplayerapp.screens
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.tooling.preview.Preview
+import com.airbnb.lottie.compose.LottieAnimation
+import com.airbnb.lottie.compose.LottieCompositionSpec
+import com.airbnb.lottie.compose.animateLottieCompositionAsState
+import com.airbnb.lottie.compose.rememberLottieComposition
+import com.codandotv.streamplayerapp.core_shared_ui.R
+
+@Composable
+fun SplashScreen() {
+    Column(
+        modifier = Modifier.fillMaxSize()
+    ) {
+        Box(
+            contentAlignment = Alignment.Center,
+            modifier = Modifier
+                .fillMaxSize()
+                .background(Color.Black)
+        ) {
+            val composition by rememberLottieComposition(LottieCompositionSpec.RawRes(R.raw.logo))
+            val logoAnimationState = animateLottieCompositionAsState(composition = composition)
+            LottieAnimation(composition = composition, progress = { logoAnimationState.progress })
+            if (logoAnimationState.isAtEnd && logoAnimationState.isPlaying) {
+                println("faz alguma coisa")
+            }
+        }
+    }
+}
+
+@Composable
+@Preview
+fun SplashScreenPreview() {
+    SplashScreen()
+}