Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions feature/article/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,9 @@
<application>
<activity
android:name=".ArticleActivity"
android:exported="true"
android:exported="false"
android:launchMode="singleTop"
android:windowSoftInputMode="adjustResize">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<action android:name="keyword" />

<category android:name="android.intent.category.DEFAULT" />

<data
android:host="article"
android:pathPrefix="/navigation"
android:scheme="koin" />
</intent-filter>
</activity>
android:windowSoftInputMode="adjustResize" />
</application>

</manifest>
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
package `in`.koreatech.koin.feature.home.profile
const val DEEPLINK_NEW_MAIN_PROFILE = "koin://newmain/navigation"
const val DEEPLINK_MAIN_PROFILE = "koin://main/navigation"
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,14 @@ fun ProfileScreen(
viewModel.onLogoutClick()
} else {
EventLogger.logCampusClickEvent(AnalyticsConstant.Label.LOGIN, "로그인")
navigator.navigateToSignIn(context, DEEPLINK_NEW_MAIN_PROFILE).let { context.startActivity(it) }
navigator.navigateToSignIn(context, DEEPLINK_MAIN_PROFILE).let { context.startActivity(it) }
}
},
onSettingClick = {
if (uiState.isLoggedIn) {
onNavigateToSetting()
} else {
if (!uiState.isLoggedIn) {
EventLogger.logCampusClickEvent(AnalyticsConstant.Label.LOGIN_PROMPT, "설정(비로그인)")
navigator.navigateToSignIn(context, DEEPLINK_NEW_MAIN_PROFILE).let { context.startActivity(it) }
}
onNavigateToSetting()
},
onNotificationClick = {
EventLogger.logCampusClickEvent(AnalyticsConstant.Label.NOTIFICATION, "알림 아이콘")
Expand Down
4 changes: 1 addition & 3 deletions koin/detekt-baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,10 @@
<ID>LongMethod:KoinNavigationDrawerActivity.kt$KoinNavigationDrawerActivity$override fun onPostCreate(savedInstanceState: Bundle?)</ID>
<ID>LongMethod:KoinNavigationDrawerActivity.kt$KoinNavigationDrawerActivity$private fun initDrawerViewModel()</ID>
<ID>LongMethod:LandDetailActivity.kt$LandDetailActivity$private fun setRoomOption(landDetail: LandDetail)</ID>
<ID>LongMethod:MainActivity.kt$MainActivity$private fun initView()</ID>
<ID>LongMethod:NotificationActivity.kt$NotificationActivity$private fun observeData()</ID>
<ID>LongMethod:SettingActivity.kt$SettingActivity$private fun initListeners()</ID>
<ID>LongMethod:TimetableActivity.kt$TimetableActivity$private fun initComposeView()</ID>
<ID>LongMethod:TimetableSemesterActivity.kt$TimetableSemesterActivity$override fun onCreate(savedInstanceState: Bundle?)</ID>
<ID>PrintStackTrace:MainActivity.kt$MainActivity$e</ID>
<ID>SpreadOperator:MainActivity.kt$MainActivity$( context = this, type = Pair(EXTRA_TYPE, type), *arrayOf( Pair(EXTRA_ID, targetId), Pair(EXTRA_BOARD_ID, targetBoardId), Pair(EXTRA_ARTICLE_ID, targetArticleId), Pair(EXTRA_CHAT_ROOM_ID, targetChatId), Pair(EXTRA_CLUB_ID, targetClubId), Pair(EXTRA_EVENT_ID, targetEventId) ) )</ID>
<ID>SpreadOperator:SchemeActivity.kt$SchemeActivity$( context = this, type = Pair(EXTRA_TYPE, url?.toHost()), *(getExtraIds(url ?: "").toTypedArray()) )</ID>
<ID>SpreadOperator:SchemeActivity.kt$SchemeActivity$( context = this, type = Pair(EXTRA_TYPE, url?.toHost()), navType = Pair(EXTRA_NAV_TYPE, NavigatorType.MAIN.type), *(getExtraIds(url ?: "").toTypedArray()) )</ID>
Expand All @@ -29,7 +27,7 @@
<ID>SwallowedException:KakaoTalkLinkExtensions.kt$e: NameNotFoundException</ID>
<ID>TooGenericExceptionCaught:KoinFirebaseMessagingService.kt$KoinFirebaseMessagingService$e: Exception</ID>
<ID>TooGenericExceptionCaught:KoinNavigationDrawerViewModel.kt$KoinNavigationDrawerViewModel$e: Exception</ID>
<ID>TooGenericExceptionCaught:MainActivity.kt$MainActivity$e: Exception</ID>
<ID>TooGenericExceptionCaught:MainActivityViewModel.kt$MainActivityViewModel$e: Exception</ID>
<ID>TooManyFunctions:AuthNetworkModule.kt$AuthNetworkModule</ID>
<ID>TooManyFunctions:KoinNavigationDrawerActivity.kt$KoinNavigationDrawerActivity : ActivityBaseOnNavigationItemSelectedListener</ID>
<ID>TooManyFunctions:NotificationActivity.kt$NotificationActivity : ActivityBase</ID>
Expand Down
18 changes: 8 additions & 10 deletions koin/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,17 +99,15 @@
android:pathPrefix="/navigation"
android:scheme="koin" />
</intent-filter>
</activity>

<activity
android:name=".ui.newmain.NewMainActivity"
android:exported="true"
android:label="@string/app_name"
android:theme="@style/KAPTheme.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<data android:host="newmain" android:pathPrefix="/navigation" android:scheme="koin"/>
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.DEFAULT" />

<data
android:host="article"
android:pathPrefix="/navigation"
android:scheme="koin" />
</intent-filter>
</activity>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
package `in`.koreatech.koin.navigation

import `in`.koreatech.koin.feature.article.ArticleActivity
import `in`.koreatech.koin.feature.callvan.CallvanActivity
import `in`.koreatech.koin.feature.chat.ui.groupchat.GroupChatActivity
import `in`.koreatech.koin.feature.chat.ui.room.ChatRoomActivity
import `in`.koreatech.koin.feature.club.ui.ClubActivity
import `in`.koreatech.koin.feature.dining.ui.DiningActivity
import `in`.koreatech.koin.feature.lostandfound.ui.LostAndFoundActivity
import `in`.koreatech.koin.feature.store.StoreActivity
import `in`.koreatech.koin.ui.main.activity.MainActivity

enum class SchemeType(
val type: String,
val className: Class<*>
) {
SHOP("shop", StoreActivity::class.java),
DINING("dining", DiningActivity::class.java),
ARTICLE("keyword", ArticleActivity::class.java),
ARTICLE("keyword", MainActivity::class.java),
CHAT("chat", ChatRoomActivity::class.java),
CLUB_RECRUIT("club-recruitment", ClubActivity::class.java),
CLUB("club", ClubActivity::class.java),
Expand Down
Loading
Loading