Skip to content

Commit

Permalink
[maro/#18] feat : Splash 화면 Theme으로 구현
Browse files Browse the repository at this point in the history
  • Loading branch information
leesumin0526 committed May 6, 2024
1 parent fbdf6a3 commit b625be4
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 19 deletions.
26 changes: 15 additions & 11 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 3 additions & 6 deletions UMC_6th/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
android:theme="@style/Theme.UMC_6th"
tools:targetApi="31">
<activity
android:name=".SplashActivity"
android:exported="true">
android:name=".MainActivity"
android:exported="true"
android:theme="@style/SplashTheme">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand All @@ -24,10 +25,6 @@
<activity
android:name=".SongActivity"
android:exported="true"/>

<activity
android:name=".MainActivity"
android:exported="false"/>
</application>

</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class MainActivity : AppCompatActivity() {

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setTheme(R.style.SplashTheme)
binding = ActivityMainBinding.inflate(layoutInflater)
setContentView(binding.root)

Expand Down
4 changes: 3 additions & 1 deletion UMC_6th/app/src/main/res/drawable/splash.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/white"/>
<item>
<bitmap android:src="@drawable/ic_flo_logo" android:gravity="center"/>
<bitmap
android:src="@drawable/ic_flo_logo"
android:gravity="center"/>
</item>

</layer-list>
5 changes: 4 additions & 1 deletion UMC_6th/app/src/main/res/values/themes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
<!-- Customize your light theme here. -->
<!-- <item name="colorPrimary">@color/my_light_primary</item> -->
</style>

<style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
<item name="android:windowBackground"> @drawable/splash </item>
<item name="android:statusBarColor">@color/transparent </item>
</style>
<style name="Theme.UMC_6th" parent="Base.Theme.UMC_6th" />
</resources>

0 comments on commit b625be4

Please sign in to comment.