Skip to content

Commit

Permalink
Merge pull request #174 from WithPeace/feat/#173-회원가입_정책_필터_설정_화면_추가
Browse files Browse the repository at this point in the history
Feat/#173 회원가입 정책 필터 설정 화면 추가
  • Loading branch information
rhkrwngud445 authored Nov 19, 2024
2 parents 79dd786 + a8e428d commit d06a255
Show file tree
Hide file tree
Showing 15 changed files with 545 additions and 2 deletions.
2 changes: 2 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ android {
merges += "META-INF/LICENSE-notice.md"
}
}

buildTypes {
getByName("release") {
signingConfig = signingConfigs.getByName("debug")
Expand Down Expand Up @@ -59,6 +60,7 @@ dependencies {
implementation(project(":feature:policybookmarks"))
implementation(project(":feature:disablepolicy"))
implementation(project(":feature:policylist"))
implementation(project(":feature:policyfilter"))
implementation(project(":core:ui"))
implementation(project(":core:interceptor"))
implementation(project(":core:data"))
Expand Down
38 changes: 37 additions & 1 deletion app/src/main/java/com/withpeace/withpeace/navigation/NavHost.kt
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ import com.withpeace.withpeace.feature.policyconsent.navigation.navigateToPolicy
import com.withpeace.withpeace.feature.policyconsent.navigation.policyConsentGraph
import com.withpeace.withpeace.feature.policydetail.navigation.navigateToPolicyDetail
import com.withpeace.withpeace.feature.policydetail.navigation.policyDetailNavGraph
import com.withpeace.withpeace.feature.policyfilter.navigation.navigateToPolicyFilter
import com.withpeace.withpeace.feature.policyfilter.navigation.policyFilterGraph
import com.withpeace.withpeace.feature.policylist.navigation.policyListGraph
import com.withpeace.withpeace.feature.postdetail.navigation.POST_DETAIL_ROUTE_WITH_ARGUMENT
import com.withpeace.withpeace.feature.postdetail.navigation.navigateToPostDetail
Expand Down Expand Up @@ -115,7 +117,7 @@ fun WithpeaceNavHost(
navController.navigateToGallery(imageLimit = 1)
},
onSignUpSuccess = {
navController.navigateHome(
navController.navigateToPolicyFilter(
navOptions =
navOptions {
popUpTo(navController.graph.id) {
Expand Down Expand Up @@ -295,6 +297,40 @@ fun WithpeaceNavHost(
},
)
}
policyFilterGraph(
onShowSnackBar = {
onShowSnackBar(SnackbarState(it))
},
onClickBackButton = {},
onSelectSuccess = {
navController.navigateHome(
navOptions =
navOptions {
popUpTo(navController.graph.id) {
inclusive = true
}
},
)
},
onSelectSkip = {
navController.navigateHome(
navOptions =
navOptions {
popUpTo(navController.graph.id) {
inclusive = true
}
},
)
}
//navController.navigateToPolicyFilter(
// navOptions =
// navOptions {
// popUpTo(navController.graph.id) {
// inclusive = true
// }
// },
// )
)
policyBookmarksNavGraph(
onShowSnackBar = { onShowSnackBar(SnackbarState(it)) },
onClickBackButton = {
Expand Down
1 change: 1 addition & 0 deletions feature/policyfilter/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
10 changes: 10 additions & 0 deletions feature/policyfilter/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
plugins {
id("convention.feature")
}

android {
namespace = "com.withpeace.withpeace.feature.policyfilter"
}

dependencies {
}
Empty file.
21 changes: 21 additions & 0 deletions feature/policyfilter/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package com.withpeace.withpeace.feature.policyfilter

import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4

import org.junit.Test
import org.junit.runner.RunWith

import org.junit.Assert.*

/**
* Instrumented test, which will execute on an Android device.
*
* See [testing documentation](http://d.android.com/tools/testing).
*/
@RunWith(AndroidJUnit4::class)
class ExampleInstrumentedTest {
@Test
fun useAppContext() {
// Context of the app under test.
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
assertEquals("com.withpeace.withpeace.feature.policyfilter.test", appContext.packageName)
}
}
4 changes: 4 additions & 0 deletions feature/policyfilter/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

</manifest>
Loading

0 comments on commit d06a255

Please sign in to comment.