Skip to content

Commit

Permalink
[style] mash-up-kr#111 HomeActivity 네이밍 변경 -> MainActivity
Browse files Browse the repository at this point in the history
  • Loading branch information
JaesungLeee committed Jul 9, 2023
1 parent f1d8954 commit 7f4c7f2
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 68 deletions.
16 changes: 9 additions & 7 deletions presentation/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,14 @@

<application>
<activity
android:name=".feature.home.HomeActivity"
android:exported="false"
android:windowSoftInputMode="adjustResize" />
android:name=".navigation.MainActivity"
android:exported="true"
android:windowSoftInputMode="adjustResize" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".feature.onboarding.OnBoardingActivity"
android:exported="false"
Expand All @@ -15,10 +20,7 @@
android:name=".feature.login.LoginActivity"
android:exported="true"
android:windowSoftInputMode="adjustResize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>

</activity>

<activity
Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,9 @@
package com.mashup.presentation.feature.home
package com.mashup.presentation.navigation

import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.navigation.fragment.NavHostFragment
import androidx.navigation.ui.setupWithNavController
import com.google.android.material.bottomnavigation.BottomNavigationItemView
import com.google.android.material.bottomnavigation.BottomNavigationMenuView
import com.mashup.presentation.KeyLinkApp
import com.mashup.presentation.R
import com.mashup.presentation.common.base.BaseActivity
import com.mashup.presentation.common.extension.addBadge
import com.mashup.presentation.common.extension.removeBadge
import com.mashup.presentation.common.extension.setThemeContent
import com.mashup.presentation.databinding.ActivityHomeBinding
import com.mashup.presentation.ui.theme.SsamDTheme
import dagger.hilt.android.AndroidEntryPoint

/**
Expand All @@ -25,6 +12,17 @@ import dagger.hilt.android.AndroidEntryPoint
* @created 2023/06/03
*/
@AndroidEntryPoint
class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

setThemeContent {
KeyLinkApp()
}
}
}


//class HomeActivity : BaseActivity<ActivityHomeBinding>(R.layout.activity_home) {
// private val navHostFragment by lazy {
// supportFragmentManager.findFragmentById(binding.fcvHome.id) as NavHostFragment
Expand Down Expand Up @@ -64,12 +62,3 @@ import dagger.hilt.android.AndroidEntryPoint
// navigationItemView.addView(signalItemView)
// }
//}
class HomeActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

setThemeContent {
KeyLinkApp()
}
}
}
37 changes: 0 additions & 37 deletions presentation/src/main/res/layout/activity_home.xml

This file was deleted.

2 changes: 1 addition & 1 deletion presentation/src/main/res/navigation/graph_signal.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
</fragment>
<activity
android:id="@+id/homeActivity"
android:name="com.mashup.presentation.feature.home.HomeActivity"
android:name="com.mashup.presentation.navigation.MainActivity"
android:label="HomeActivity" />

</navigation>

0 comments on commit 7f4c7f2

Please sign in to comment.