Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #36

Merged
merged 51 commits into from
Oct 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
1f7fd78
test : testInitValue 구현 (#23)
KDW03 Sep 28, 2023
dd57916
test : wirteStory update 메서드 Test 구현(#23)
KDW03 Sep 28, 2023
10e8b55
test : writeStoryFirstPageScreen 및 writeStorySecondPageScreen Test 구현…
KDW03 Sep 28, 2023
f4e2a1f
🤖 Updates screenshots
KDW03 Sep 28, 2023
c7878be
Merge pull request #28 from NaJuDoRyeong/feature/#23-StoryDetail
KDW03 Sep 28, 2023
a9e6f9f
feat : detailStory repository 구현(#23)
KDW03 Sep 28, 2023
a3e420e
Merge branch 'feature/#23-StoryDetail' of https://github.com/NaJuDoRy…
KDW03 Sep 28, 2023
1e0f32e
feat : fake DetailStory network 구현(#23)
KDW03 Sep 28, 2023
c369286
feat : storyDetail navigation 구현(#23)
KDW03 Sep 28, 2023
01b5f0a
feat : DetailStoryUiState 구현(#23)
KDW03 Sep 28, 2023
a64de0f
refactor : imageslider designsystem componenet로 변경(#23)
KDW03 Sep 28, 2023
cf04046
feat : detail custom toolbar 구현 (#23)
KDW03 Sep 28, 2023
91012c5
feat : cotent default 3줄 확장 가능하게 구현 (#23)
KDW03 Sep 28, 2023
7504e85
feat : item 구분 dottedLine 적용 및 padding 수정 (#23)
KDW03 Sep 28, 2023
12e710a
push : detail story top safe spacer 추가 및 slider 둥글게 수정 (#23)
KDW03 Sep 28, 2023
bdbc1ff
feat : detail story top safe spacer 추가 및 slider 둥글게 수정 (#23)
KDW03 Sep 28, 2023
27cc12f
all Module gitignore /build 추가(#23)
KDW03 Sep 28, 2023
177f982
fix TestDataModule에 DetailStoryResourceRepository binds 추가(#23)
KDW03 Sep 28, 2023
9db59f4
fix : TestDataModule에 DetailStoryResourceRepository binds 추가(#23)
KDW03 Sep 28, 2023
443f558
Merge branch 'feature/#23-StoryDetail' of https://github.com/NaJuDoRy…
KDW03 Sep 28, 2023
53097ac
🤖 Updates screenshots
KDW03 Sep 28, 2023
e7720b4
Merge pull request #30 from NaJuDoRyeong/feature/#23-StoryDetail
KDW03 Sep 29, 2023
950901b
feat : Settings Icon Image 추가(#31)
KDW03 Sep 29, 2023
abd5e84
feat : SettingsItem 구현(#31)
KDW03 Sep 29, 2023
c62c24a
feat : 기본 구분선 componenet 구현(#31)
KDW03 Sep 29, 2023
3e64bbf
feat : DoApp navigation TopBar 로직 변경 (#31)
KDW03 Sep 29, 2023
ef63c25
feat : SETTINGS 내부 Navigation 구현 (#31)
KDW03 Sep 29, 2023
018d594
feat : Settings custom toolBar 구현 (#31)
KDW03 Sep 29, 2023
9b2e452
feat : settings getCode DomainClass 및 DTO 정의 (#31)
KDW03 Sep 29, 2023
5ef31c9
feat : settings dto -> domain func 구현 (#31)
KDW03 Sep 29, 2023
dd370f1
feat : settingsResourceRepository 구현 (#31)
KDW03 Sep 29, 2023
c7f4bfb
feat : settingsViewModel 구현 (#31)
KDW03 Sep 29, 2023
ab40a97
feat : settings Account ui 구현 완료 (#31)
KDW03 Sep 29, 2023
9b20883
test : settings Viewmodel test 구현 (#31)
KDW03 Sep 29, 2023
4d39217
test : settings_main , account screenshots 구현 (#31)
KDW03 Sep 29, 2023
ebec31f
feat : TestDataModule settingsRepo 구현(#31)
KDW03 Sep 29, 2023
314bdf1
🤖 Updates screenshots
KDW03 Sep 29, 2023
b6f434a
Merge pull request #32 from NaJuDoRyeong/feature/#31-Settings
KDW03 Sep 29, 2023
be17e03
feat : jwt datastore UserPreferences 추가(#33)
KDW03 Sep 29, 2023
04beeed
feat : jwt empty 로직 분기, 소셜 로그인 jwt 저장 구현 (#33)
KDW03 Sep 29, 2023
5bd132d
feat : SignUpApp 구현 (#33)
KDW03 Sep 29, 2023
46ac5d6
feat : kakaoLogin Logic 구현 (#33)
KDW03 Sep 29, 2023
a7adf33
ci/cd : build.yaml --stacktrace --info 삭제 (#33)
KDW03 Sep 29, 2023
5500661
fix : ci/cd settings 찾지 못하는 버그 (#33)
KDW03 Sep 30, 2023
94594e5
🤖 Updates screenshots
KDW03 Sep 30, 2023
454584f
fix : navigationTest fail (#33)
KDW03 Sep 30, 2023
0508831
Merge branch 'feature/#33-sign_up' of https://github.com/NaJuDoRyeong…
KDW03 Sep 30, 2023
2a551f8
🤖 Updates screenshots
KDW03 Sep 30, 2023
fc8cef1
test : 수정된 navigationTest 구현 (#33)
KDW03 Sep 30, 2023
3ce2057
Merge branch 'feature/#33-sign_up' of https://github.com/NaJuDoRyeong…
KDW03 Sep 30, 2023
ad889a4
Merge pull request #35 from NaJuDoRyeong/feature/#33-sign_up
KDW03 Sep 30, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/Build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
- name: Run all local screenshot tests (Roborazzi)
id: screenshotsverify
continue-on-error: true
run: ./gradlew verifyRoborazziDemoDebug --stacktrace --info
run: ./gradlew verifyRoborazziDemoDebug

- name: Prevent pushing new screenshots if this is a fork
id: checkfork
Expand Down
3 changes: 0 additions & 3 deletions .idea/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion .idea/.name

This file was deleted.

151 changes: 0 additions & 151 deletions .idea/androidTestResultsUserPreferences.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/compiler.xml

This file was deleted.

17 changes: 0 additions & 17 deletions .idea/deploymentTargetDropDown.xml

This file was deleted.

57 changes: 0 additions & 57 deletions .idea/gradle.xml

This file was deleted.

41 changes: 0 additions & 41 deletions .idea/inspectionProfiles/Project_Default.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/kotlinc.xml

This file was deleted.

9 changes: 0 additions & 9 deletions .idea/misc.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

26 changes: 20 additions & 6 deletions app/src/androidTest/java/com/najudoryeong/mineme/NavigationTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,27 @@ import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import androidx.test.espresso.Espresso
import androidx.test.espresso.NoActivityResumedException
import com.najudoryeong.mineme.core.model.data.DarkThemeConfig
import com.najudoryeong.mineme.core.model.data.UserData
import com.najudoryeong.mineme.core.testing.repository.TestUserDataRepository
import com.najudoryeong.mineme.core.ui.HomeUiState
import com.najudoryeong.mineme.core.ui.MainActivityUiState
import com.najudoryeong.mineme.core.ui.RegionStoryUiState
import dagger.hilt.android.testing.BindValue
import dagger.hilt.android.testing.HiltAndroidRule
import dagger.hilt.android.testing.HiltAndroidTest
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.launch
import kotlinx.coroutines.test.UnconfinedTestDispatcher
import kotlinx.coroutines.test.runTest
import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.rules.TemporaryFolder
import javax.inject.Inject
import kotlin.properties.ReadOnlyProperty
import kotlin.test.assertEquals
import kotlin.test.assertTrue
import com.najudoryeong.mineme.feature.home.R as FeatureHomeR
import com.najudoryeong.mineme.feature.story.R as FeatureStoryR
import com.najudoryeong.mineme.feature.settings.R as FeatureSettingsR
Expand All @@ -37,6 +49,7 @@ class NavigationTest {
val composeTestRule = createAndroidComposeRule<MainActivity>()



private fun AndroidComposeTestRule<*, *>.stringResource(@StringRes resId: Int) =
ReadOnlyProperty<Any?, String> { _, _ -> activity.getString(resId) }

Expand All @@ -47,10 +60,14 @@ class NavigationTest {
private val settings by composeTestRule.stringResource(FeatureSettingsR.string.settings)




@Before
fun setup() = hiltRule.inject()
fun setup() {
hiltRule.inject()
composeTestRule.apply {
val kakaoSignupText = composeTestRule.activity.getString(R.string.kakao_signup)
onNodeWithText(kakaoSignupText).performClick()
}
}

@Test
fun firstScreen_isHome() {
Expand All @@ -60,9 +77,6 @@ class NavigationTest {
}


//todo restore the state previously visited destinations Test


@Test
fun topLevelDestinations_doNotShowUpArrow() {
composeTestRule.apply {
Expand Down
Loading
Loading