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.

Sign up for GitHub

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

Jump to bottom

#156 한판승부 생성,진행뷰 워딩,에셋 변경 및 메모장 초기화 로직 추가 #159

Merged
merged 5 commits into from
Dec 10, 2023
Merged

#156 한판승부 생성,진행뷰 워딩,에셋 변경 및 메모장 초기화 로직 추가 #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c7107a7
#156/한판승부 생성,진행 String resource 수정
rkdmf1026 Dec 10, 2023
a07cafb
#156/한판승부 진행뷰 이미지 에셋 추가
rkdmf1026 Dec 10, 2023
554b61e
#156/한판승부진행뷰 수정
rkdmf1026 Dec 10, 2023
96bd767
#156/한판승부진행 뷰페이저 이미지 에셋 변경
rkdmf1026 Dec 10, 2023
8533e14
#156/메모장 초기화 로직 추가
rkdmf1026 Dec 10, 2023
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
7 changes: 7 additions & 0 deletions app/src/main/java/sopt/uni/presentation/IntroActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,25 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
import dagger.hilt.android.AndroidEntryPoint
import sopt.uni.data.datasource.local.SparkleStorage
import sopt.uni.data.repository.shortgame.ShortGameRepository
import sopt.uni.presentation.home.HomeActivity
import sopt.uni.presentation.invite.NickNameActivity
import sopt.uni.presentation.onboarding.OnBoardingActivity
import sopt.uni.util.extension.startActivity
import javax.inject.Inject

@AndroidEntryPoint
class IntroActivity : AppCompatActivity() {
@Inject
lateinit var shortGameRepository: ShortGameRepository
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
installSplashScreen()

checkUserStatus()

// 메모장 초기화
shortGameRepository.setMemoText("")
}

private fun checkUserStatus() {
Expand Down
20 changes: 20 additions & 0 deletions app/src/main/res/drawable/ic_check.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="32dp"
android:height="32dp"
android:viewportWidth="32"
android:viewportHeight="32">
<path
android:pathData="M10,6L22,6A4,4 0,0 1,26 10L26,22A4,4 0,0 1,22 26L10,26A4,4 0,0 1,6 22L6,10A4,4 0,0 1,10 6z"
android:fillColor="#56E463"/>
<path
android:pathData="M10,6.095L22,6.095A3.905,3.905 0,0 1,25.905 10L25.905,22A3.905,3.905 0,0 1,22 25.905L10,25.905A3.905,3.905 0,0 1,6.095 22L6.095,10A3.905,3.905 0,0 1,10 6.095z"
android:strokeWidth="0.189189"
android:fillColor="#00000000"
android:strokeColor="#CAFFCF"/>
<path
android:pathData="M20.622,11.808L20.123,11.445A0.783,0.73 79.019,0 0,19.109 11.642L14.336,19.274A0.783,0.73 79.019,0 0,14.546 20.361L15.046,20.724A0.783,0.73 79.019,0 0,16.059 20.527L20.833,12.895A0.783,0.73 79.019,0 0,20.622 11.808z"
android:fillColor="#FCF3FF"/>
<path
android:pathData="M10.714,15.914L10.401,16.414A0.783,0.73 79.019,0 0,10.612 17.501L15.046,20.724A0.783,0.73 79.019,0 0,16.059 20.527L16.372,20.027A0.783,0.73 79.019,0 0,16.161 18.941L11.727,15.718A0.783,0.73 79.019,0 0,10.714 15.914z"
android:fillColor="#FCF3FF"/>
</vector>
27 changes: 27 additions & 0 deletions app/src/main/res/drawable/ic_memo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="32dp"
android:height="32dp"
android:viewportWidth="32"
android:viewportHeight="32">
<path
android:pathData="M15.135,10.595L24.217,10.595A2.27,2.27 0,0 1,26.487 12.865L26.487,26.108A2.27,2.27 0,0 1,24.217 28.378L15.135,28.378A2.27,2.27 0,0 1,12.865 26.108L12.865,12.865A2.27,2.27 0,0 1,15.135 10.595z"
android:fillColor="#0181F8"/>
<path
android:pathData="M8.703,4.162L19.297,4.162A2.27,2.27 0,0 1,21.568 6.432L21.568,22.324A2.27,2.27 0,0 1,19.297 24.595L8.703,24.595A2.27,2.27 0,0 1,6.433 22.324L6.433,6.432A2.27,2.27 0,0 1,8.703 4.162z"
android:fillColor="#0181F8"
android:fillAlpha="0.4"/>
<path
android:pathData="M8.703,4.257L19.297,4.257A2.176,2.176 0,0 1,21.473 6.432L21.473,22.324A2.176,2.176 0,0 1,19.297 24.5L8.703,24.5A2.176,2.176 0,0 1,6.527 22.324L6.527,6.432A2.176,2.176 0,0 1,8.703 4.257z"
android:strokeWidth="0.189189"
android:fillColor="#00000000"
android:strokeColor="#BFE0FF"/>
<path
android:pathData="M19,10L19,10A1,1 0,0 1,18 11L10,11A1,1 0,0 1,9 10L9,10A1,1 0,0 1,10 9L18,9A1,1 0,0 1,19 10z"
android:fillColor="#EFF7FF"/>
<path
android:pathData="M17,14L17,14A1,1 0,0 1,16 15L10,15A1,1 0,0 1,9 14L9,14A1,1 0,0 1,10 13L16,13A1,1 0,0 1,17 14z"
android:fillColor="#EFF7FF"/>
<path
android:pathData="M19,18L19,18A1,1 0,0 1,18 19L10,19A1,1 0,0 1,9 18L9,18A1,1 0,0 1,10 17L18,17A1,1 0,0 1,19 18z"
android:fillColor="#EFF7FF"/>
</vector>
24 changes: 24 additions & 0 deletions app/src/main/res/drawable/ic_timer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="32dp"
android:height="32dp"
android:viewportWidth="32"
android:viewportHeight="32">
<path
android:pathData="M13,2L18,2A3,3 0,0 1,21 5L21,7A3,3 0,0 1,18 10L13,10A3,3 0,0 1,10 7L10,5A3,3 0,0 1,13 2z"
android:fillColor="#D663FF"/>
<path
android:pathData="M4,17.382a11.85,11.85 0,1 0,23.701 0a11.85,11.85 0,1 0,-23.701 0z"
android:fillColor="#D663FF"
android:fillAlpha="0.4"/>
<path
android:pathData="M27.606,17.382C27.606,23.875 22.343,29.138 15.85,29.138C9.358,29.138 4.095,23.875 4.095,17.382C4.095,10.89 9.358,5.627 15.85,5.627C22.343,5.627 27.606,10.89 27.606,17.382Z"
android:strokeWidth="0.189189"
android:fillColor="#00000000"
android:strokeColor="#F3D1FF"/>
<path
android:pathData="M15.757,12L15.757,12A0.757,0.757 0,0 1,16.514 12.757L16.514,18.811A0.757,0.757 0,0 1,15.757 19.568L15.757,19.568A0.757,0.757 0,0 1,15 18.811L15,12.757A0.757,0.757 0,0 1,15.757 12z"
android:fillColor="#FCF3FF"/>
<path
android:pathData="M21.433,18.811L21.433,18.811A0.757,0.757 91.816,0 1,20.676 19.568L15.757,19.568A0.757,0.757 91.816,0 1,15 18.811L15,18.811A0.757,0.757 91.816,0 1,15.757 18.054L20.676,18.054A0.757,0.757 91.816,0 1,21.433 18.811z"
android:fillColor="#FCF3FF"/>
</vector>
9 changes: 5 additions & 4 deletions app/src/main/res/layout/activity_mission_record.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
android:id="@+id/scrollView"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginBottom="28dp"
app:layout_constraintBottom_toTopOf="@+id/cl_bottom_navigation_bar"
app:layout_constraintTop_toBottomOf="@id/cl_toolbar">

Expand Down Expand Up @@ -176,10 +177,10 @@
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginStart="18dp"
android:src="@drawable/ic_heart_filled"
android:src="@drawable/ic_memo"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/ic_heart_filled" />
tools:src="@drawable/ic_memo" />

<TextView
android:id="@+id/tv_memo"
Expand Down Expand Up @@ -212,10 +213,10 @@
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginStart="18dp"
android:src="@drawable/ic_heart_filled"
android:src="@drawable/ic_timer"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/ic_heart_filled" />
tools:src="@drawable/ic_timer"/>

<TextView
android:id="@+id/tv_timer"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/item_game_guide.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_margin="6dp"
android:src="@drawable/ic_heart_filled"
android:src="@drawable/ic_check"
app:layout_constraintEnd_toStartOf="@id/tv_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
<!-- missionRecord -->
<string name="mission_record_title">한판 승부 진행중</string>
<string name="mission_record_my_mission">나의 미션</string>
<string name="mission_record_your_mission_script">상대가 미션을 수행하면 공개</string>
<string name="mission_record_your_mission_script">상대가 미션을 수행하면 공개돼요</string>
<string name="mission_record_mission_complete">미션 완료</string>
<string name="mission_record_mission_fail">미션 실패</string>
<string name="mission_record_stop_game">승부 그만두기</string>
Expand Down Expand Up @@ -210,7 +210,7 @@

<!-- CreateShortGame dialog -->
<string name="create_short_game_exit_dialog_title">승부 만들기가 완료되지 않았어요</string>
<string name="create_short_game_exit_dialog_body">여기서 나가실래요</string>
<string name="create_short_game_exit_dialog_body">여기서 나가면 되돌릴 수 없어요</string>
<string name="create_short_game_exit_dialog_exit">나가기</string>
<string name="create_short_game_create_dialog_title">설정된 내용으로 승부를 만들까요?</string>
<string name="create_short_game_create_dialog_body">한번 설정한 내용은 변경할 수 없어요</string>
Expand Down
Loading