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

[Design/#4] 온보딩 질문 화면 UI 구현 #5

Merged
merged 13 commits into from
Jul 5, 2023
Merged

[Design/#4] 온보딩 질문 화면 UI 구현 #5

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
faf814f
[Design/#4] QuestActivity 전체 뷰 구현
ss99x2002 Jul 4, 2023
a08ed3e
[Design/#4] 세부 질문 fragment 구현
ss99x2002 Jul 4, 2023
3a2f8b5
[Design/#4] 시간 통지 화면 구현
ss99x2002 Jul 4, 2023
37ac7b4
[Design/#4] tools:text로 변경
ss99x2002 Jul 4, 2023
5f9a9f5
[Feat/#4] intent 추가
ss99x2002 Jul 4, 2023
1ea9cac
[Design/#4] button 글자 크기 조정
ss99x2002 Jul 4, 2023
e727a47
[Design/#4] 코드리뷰 반영
ss99x2002 Jul 4, 2023
5bbe80e
Merge branch 'develop' of https://github.com/Team-Umbba/Umbba-Android…
ss99x2002 Jul 5, 2023
9a03d05
[Design/#4] margin 수정
ss99x2002 Jul 5, 2023
de751b2
[Design/#4] 시간공지뷰 activity 이름 수정
ss99x2002 Jul 5, 2023
29858c1
[Design/#4] font style 적용, chip 변경
ss99x2002 Jul 5, 2023
88be54b
[Design/#4] next button drawable 이름 수정
ss99x2002 Jul 5, 2023
4525214
[Design/#4] 오타수정
ss99x2002 Jul 5, 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
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
android:exported="false"
android:screenOrientation="portrait" />
<activity
android:name=".presentation.onboarding.GoPastActivity"
android:name=".presentation.onboarding.NotifyTimeActivity"
android:exported="false"
android:screenOrientation="portrait" />
</application>
Expand Down
6 changes: 2 additions & 4 deletions app/src/main/java/com/sopt/umbba_android/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@ package com.sopt.umbba_android
import android.content.Intent
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import com.sopt.umbba_android.presentation.onboarding.GoPastActivity
import com.sopt.umbba_android.presentation.onboarding.InviteCodeActivity
import com.sopt.umbba_android.presentation.onboarding.QuestActivity
import com.sopt.umbba_android.presentation.onboarding.NotifyTimeActivity

class MainActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
startActivity(Intent(this, GoPastActivity::class.java))
startActivity(Intent(this, NotifyTimeActivity::class.java))
}
}
6 changes: 3 additions & 3 deletions ...presentation/onboarding/GoPastActivity.kt → ...entation/onboarding/NotifyTimeActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package com.sopt.umbba_android.presentation.onboarding
import android.content.Intent
import android.os.Bundle
import com.sopt.umbba_android.R
import com.sopt.umbba_android.databinding.ActivityGoPastBinding
import com.sopt.umbba_android.databinding.ActivityNotifyTimeBinding
import com.sopt.umbba_android.util.binding.BindingActivity

class GoPastActivity : BindingActivity<ActivityGoPastBinding>(R.layout.activity_go_past) {
class NotifyTimeActivity : BindingActivity<ActivityNotifyTimeBinding>(R.layout.activity_notify_time) {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setClickButton()
Expand All @@ -15,7 +15,7 @@ class GoPastActivity : BindingActivity<ActivityGoPastBinding>(R.layout.activity_
private fun setClickButton() {
with(binding) {
btnGoPast.setOnClickListener {
startActivity(Intent(this@GoPastActivity, QuestActivity::class.java))
startActivity(Intent(this@NotifyTimeActivity, QuestActivity::class.java))
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/color/sel_choice_chip_stroke.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/grey_btn_checked_solid" android:state_checked="true" />
<item android:color="@color/grey_btn_stroke"/>
<item android:color="@color/grey_btn_solid"/>
</selector>
5 changes: 5 additions & 0 deletions app/src/main/res/color/sel_quest_choice_chip_text.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/white" android:state_checked="true" />
<item android:color="@color/black"/>
</selector>
0 app/src/main/res/drawable/progress_qeust.xml → .../main/res/drawable/progress_bar_qeust.xml
View file
Open in desktop
File renamed without changes.
0 ...res/drawable/sel_invite_code_btn_next.xml → app/src/main/res/drawable/sel_btn_next.xml
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions app/src/main/res/drawable/sel_quest_btn_answer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
<item android:state_checked="true">
<shape android:shape="rectangle">
<corners android:radius="50dp" />
<stroke android:color="@color/grey_CFCFCF"
android:width="1dp"/>
<stroke android:color="@color/grey_CFCFCF" android:width="1dp"/>
<solid android:color="@color/grey_747474"/>
</shape>
</item>
Expand Down
7 changes: 0 additions & 7 deletions app/src/main/res/drawable/shape_gd4d4_line_r8_rect.xml
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion ...es/drawable/shape_grey_stroke_r8_rect.xml → ...s/drawable/shape_gd4d4_stroke_r8_rect.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="8dp" />
<stroke android:color="@color/grey_stroke" android:width="1dp" />
<stroke
android:width="1dp"
android:color="@color/grey_D4D4D4" />
</shape>
10 changes: 5 additions & 5 deletions app/src/main/res/layout/activity_input_info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
android:id="@+id/cl_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_grey_stroke_r8_rect"
android:background="@drawable/shape_gd4d4_stroke_r8_rect"
app:layout_constraintTop_toTopOf="parent">

<TextView
Expand Down Expand Up @@ -102,7 +102,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:background="@drawable/shape_grey_stroke_r8_rect"
android:background="@drawable/shape_gd4d4_stroke_r8_rect"
app:layout_constraintTop_toBottomOf="@id/cl_name">

<TextView
Expand Down Expand Up @@ -156,7 +156,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:background="@drawable/shape_grey_stroke_r8_rect"
android:background="@drawable/shape_gd4d4_stroke_r8_rect"
app:layout_constraintTop_toBottomOf="@id/cl_sex">

<TextView
Expand Down Expand Up @@ -207,9 +207,9 @@
android:layout_height="60dp"
android:layout_marginHorizontal="24dp"
android:layout_marginVertical="24dp"
android:background="@drawable/sel_invite_code_btn_next"
android:background="@drawable/sel_btn_next"
android:enabled="false"
android:text="@string/invite_code_next"
android:text="@string/btn_next"
android:textColor="@color/white"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
Expand Down
17 changes: 8 additions & 9 deletions app/src/main/res/layout/activity_invite_code.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,13 @@

<TextView
android:id="@+id/tv_title"
style="@style/AndroidHead1SemiBold24"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="18dp"
android:layout_marginStart="28dp"
android:layout_marginTop="12dp"
android:text="@string/invite_code_title"
android:textColor="@color/black"
android:textSize="24sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/layout_appbar" />

Expand All @@ -49,6 +48,7 @@

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/et_code"
style="@style/AndroidBody2Regular16"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/invite_code_hint"
Expand All @@ -59,15 +59,14 @@

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_next"
style="@style/NextButtonStyle"
android:layout_width="match_parent"
android:layout_height="60dp"
android:enabled="true"
android:text="@string/btn_next"
android:layout_marginHorizontal="24dp"
android:layout_marginVertical="24dp"
android:background="@drawable/sel_invite_code_btn_next"
android:enabled="false"
android:text="@string/btn_next"
android:textColor="@color/white"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
5 changes: 3 additions & 2 deletions app/src/main/res/layout/activity_go_past.xml → .../main/res/layout/activity_notify_time.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,13 @@

<TextView
android:id="@+id/tv_title"
style="@style/AndroidHead1SemiBold24"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="18dp"
android:text="@string/go_past_title"
android:textColor="@color/black"
android:textSize="24sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/layout_appbar" />

Expand All @@ -37,6 +36,8 @@
android:background="@drawable/shape_black_fill_r50_rect"
android:text="@string/go_past"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>
Expand Down
26 changes: 8 additions & 18 deletions app/src/main/res/layout/activity_quest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,58 +18,48 @@

<TextView
android:id="@+id/tv_title"
style="@style/AndroidHead1SemiBold24"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="18dp"
android:layout_marginTop="12dp"
android:text="@string/quest_activity_title"
android:textColor="@color/black"
android:textSize="24sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/layout_appbar" />

<TextView
android:id="@+id/tv_progress_sub"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="12dp"
android:text="@string/quest_progressbar_comment"
android:textColor="@color/grey_999999"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_title" />

<ProgressBar
android:id="@+id/progress_bar"
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="5dp"
android:layout_marginHorizontal="24dp"
android:layout_marginTop="12dp"
android:progressDrawable="@drawable/progress_qeust"
android:progressDrawable="@drawable/progress_bar_qeust"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

지금 확인했는데 이거 철자 틀린 것 같아요!!

app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_progress_sub" />
app:layout_constraintTop_toBottomOf="@id/tv_title" />

<FrameLayout
android:id="@+id/fragment_question"
android:layout_width="match_parent"
android:layout_height="335dp"
android:layout_marginHorizontal="24dp"
android:layout_marginTop="24dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/progress_bar" />
app:layout_constraintTop_toTopOf="parent" />

<androidx.appcompat.widget.AppCompatButton
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_margin="24dp"
android:background="@drawable/sel_invite_code_btn_next"
android:background="@drawable/sel_btn_next"
android:enabled="false"
android:text="@string/btn_next"
android:textColor="@color/white"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/res/layout/activity_select_family.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="28dp"
android:layout_marginTop="12dp"
android:background="@drawable/shape_grey_stroke_r8_rect"
android:background="@drawable/shape_gd4d4_stroke_r8_rect"
app:layout_constraintTop_toBottomOf="@id/tv_travel_to_timemachine">

<TextView
Expand Down Expand Up @@ -95,7 +95,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="28dp"
android:layout_marginTop="12dp"
android:background="@drawable/shape_grey_stroke_r8_rect"
android:background="@drawable/shape_gd4d4_stroke_r8_rect"
app:layout_constraintTop_toBottomOf="@id/cl_family">

<TextView
Expand Down Expand Up @@ -149,9 +149,9 @@
android:layout_height="60dp"
android:layout_marginHorizontal="24dp"
android:layout_marginVertical="24dp"
android:background="@drawable/sel_invite_code_btn_next"
android:background="@drawable/sel_btn_next"
android:enabled="false"
android:text="@string/invite_code_next"
android:text="@string/btn_next"
android:textColor="@color/white"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent" />
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/layout/basic_appbar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@
android:id="@+id/iv_back"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="12dp"
android:layout_marginStart="16dp"
android:src="@drawable/ic_arrow_back"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/tv_appbar_title"
style="@style/AndroidBody2Regular16"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{titleText == null ? ` ` : titleText}"
android:text="@{titleText == null ? null : titleText}"
android:textColor="@color/black"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand Down
Loading