Skip to content

Commit 27bf98a

Browse files
[ISSUE-17] - remove module onboarding and move splash for module app
1 parent 961efd4 commit 27bf98a

File tree

16 files changed

+31
-90
lines changed

16 files changed

+31
-90
lines changed

app/build.gradle.kts

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,26 @@
1+
android {
2+
namespace = "${Config.packageName}app"
3+
4+
buildFeatures {
5+
compose = true
6+
}
7+
8+
composeOptions {
9+
kotlinCompilerExtensionVersion = Versions.composeCompilerVersion
10+
}
11+
}
112
dependencies {
213
implementation(project(Dependencies.Module.feature_list_streams))
314
implementation(project(Dependencies.Module.core_networking))
4-
implementation(project(Dependencies.Module.feature_onboarding))
515
implementation(project(Dependencies.Module.core_shared_ui))
616
implementation(Dependencies.Koin.koin)
717
Dependencies.Kotlin.list.forEach { implementation(it) }
818
Dependencies.Support.list.forEach { implementation(it) }
919
Dependencies.UnitTest.list.forEach { testImplementation(it) }
1020
Dependencies.AndroidTest.list.forEach { androidTestImplementation(it) }
21+
22+
val composeBom = platform(Dependencies.Compose.composeBomVersion)
23+
implementation(composeBom)
24+
Dependencies.Compose.list.forEach { implementation(it) }
25+
Dependencies.Lottie.list.forEach { implementation(it) }
1126
}

app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@
99
android:roundIcon="@mipmap/ic_netflix_round"
1010
android:label="@string/app_name"
1111
android:supportsRtl="true"
12-
android:theme="@style/Theme.StreamPlayerApp"
13-
android:name=".CustomApplication">
12+
android:name="com.codandotv.streamplayerapp.CustomApplication">
1413

1514
<activity
16-
android:name=".MainActivity"
15+
android:name="com.codandotv.streamplayerapp.MainActivity"
1716
android:exported="true"
18-
android:theme="@android:style/Theme.Translucent.NoTitleBar">
17+
android:theme="@style/SplashScreenTheme">
1918
<intent-filter>
2019
<action android:name="android.intent.action.MAIN" />
2120

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
package com.codandotv.streamplayerapp
22

3-
import android.content.Intent
43
import android.os.Bundle
54
import androidx.activity.ComponentActivity
6-
import com.codandotv.streamplayerapp.feature_onboarding.OnboardingActivity
5+
import androidx.activity.compose.setContent
6+
import com.codandotv.streamplayerapp.screens.SplashScreen
77

88
class MainActivity : ComponentActivity() {
99
override fun onCreate(savedInstanceState: Bundle?) {
1010
super.onCreate(savedInstanceState)
11-
startActivity(Intent(this@MainActivity, OnboardingActivity::class.java))
11+
12+
setContent{
13+
SplashScreen()
14+
}
1215
}
1316
}
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
package com.codandotv.streamplayerapp.feature_onboarding.screens
1+
package com.codandotv.streamplayerapp.screens
22

33
import androidx.compose.foundation.background
4-
import androidx.compose.foundation.layout.Arrangement
54
import androidx.compose.foundation.layout.Box
65
import androidx.compose.foundation.layout.Column
76
import androidx.compose.foundation.layout.fillMaxSize
8-
import androidx.compose.material3.MaterialTheme
97
import androidx.compose.runtime.Composable
108
import androidx.compose.runtime.getValue
119
import androidx.compose.ui.Alignment
@@ -16,7 +14,7 @@ import com.airbnb.lottie.compose.LottieAnimation
1614
import com.airbnb.lottie.compose.LottieCompositionSpec
1715
import com.airbnb.lottie.compose.animateLottieCompositionAsState
1816
import com.airbnb.lottie.compose.rememberLottieComposition
19-
import com.codandotv.streamplayerapp.feature_onboarding.R
17+
import com.codandotv.streamplayerapp.core_shared_ui.R
2018

2119
@Composable
2220
fun SplashScreen() {

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ allprojects {
1818
google()
1919
mavenCentral()
2020
maven(url = uri("https://oss.sonatype.org/content/repositories/snapshots/"))
21+
2122
}
2223
configureAndroid()
2324
}

buildSrc/src/main/java/Dependencies.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ object Dependencies {
1212
const val core_networking = ":core-networking"
1313
const val core_shared_ui = ":core-shared-ui"
1414
const val feature_list_streams = ":feature-list-streams"
15-
const val feature_onboarding = ":feature-onboarding"
15+
// const val feature_onboarding = ":feature-onboarding"
1616
}
1717

1818
val modules: List<String> by lazy {
@@ -140,7 +140,7 @@ object Dependencies {
140140
const val composeBomVersion = "androidx.compose:compose-bom:${Versions.composeBomVersion}"
141141
const val composeUI = "androidx.compose.ui:ui"
142142
const val coposeUIToolingPreview = "androidx.compose.ui:ui-tooling-preview"
143-
const val composeActivityCompose = "androidx.activity:activity-compose"
143+
const val composeActivityCompose = "androidx.activity:activity-compose:"+"${Versions.composeActivity}"
144144
const val composeUITooling = "androidx.compose.ui:ui-tooling"
145145
const val composeMaterial3 = "androidx.compose.material3:material3:" +
146146
"${Versions.composeMaterial3Version}"

buildSrc/src/main/java/Versions.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ object Versions {
3030
const val composeBomVersion = "2023.01.00"
3131
const val composeCompilerVersion = "1.4.2"
3232
const val composeMaterial3Version = "1.0.1"
33+
const val composeActivity = "1.5.0"
3334

3435
const val coilVersion = "2.3.0"
3536

feature-onboarding/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

feature-onboarding/build.gradle.kts

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)