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

UI/224 편집 버튼 디자인 변경 사항 반영 #225

Merged
merged 3 commits into from
Sep 14, 2023
Merged

UI/224 편집 버튼 디자인 변경 사항 반영 #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ef4fde
#224 [ui] 보관함 - 편집 버튼 text, color, size, verticalMargin 수정
unam98 Sep 14, 2023
e113317
#224 [ui] 러닝기록 - 편집 버튼 text, color, size, verticalMargin 수정
unam98 Sep 14, 2023
856e761
#224 [ui] 업로드한 코스 - 편집 버튼 text, color, size, verticalMargin 수정
unam98 Sep 14, 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/java/com/runnect/runnect/presentation/mypage/history/MyHistoryActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ class MyHistoryActivity : BindingActivity<ActivityMyHistoryBinding>(R.layout.act
companion object {
const val CHOICE_MODE_DESC = "기록 선택"
const val EDIT_CANCEL = "취소"
const val EDIT_MODE = "편집"
const val EDIT_MODE = "선택"
const val DIALOG_DESC = "러닝 기록을 정말로 삭제하시겠어요?"
const val DELETE_BTN = "삭제하기"
const val EXTRA_HISTORY_DATA = "historyData"
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/com/runnect/runnect/presentation/mypage/upload/MyUploadActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,10 +242,9 @@ class MyUploadActivity : BindingActivity<ActivityMyUploadBinding>(R.layout.activ
companion object {
const val DESCRIPTION_CHOICE_MODE = "기록 선택"
const val EDIT_CANCEL = "취소"
const val EDIT_MODE = "편집"
const val EDIT_MODE = "선택"
const val DESCRIPTION_DIALOG = "코스를 정말로 삭제하시겠어요?"
const val DELETE_BTN = "삭제하기"

const val EXTRA_PUBLIC_COURSE_ID = "publicCourseId"
const val EXTRA_ROOT = "root"
}
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/java/com/runnect/runnect/presentation/storage/StorageMyDrawFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ class StorageMyDrawFragment :
false
)
}
binding.btnEditCourse.text = "편집"
binding.btnEditCourse.text = EDIT_MODE
binding.tvTotalCourseCount.text = "총 코스 ${viewModel.myDrawCourses.size}개"

viewModel.clearItemsToDelete()
Expand Down Expand Up @@ -227,7 +227,7 @@ class StorageMyDrawFragment :

fun deleteCourse() {
viewModel.deleteMyDrawCourse()
binding.btnEditCourse.text = "편집"
binding.btnEditCourse.text = EDIT_MODE
}

private fun showLoadingBar() {
Expand Down Expand Up @@ -355,6 +355,7 @@ class StorageMyDrawFragment :
companion object {
const val EXTRA_COURSE_ID = "courseId"
const val EXTRA_ROOT = "root"
const val EDIT_MODE = "선택"
}
}

Expand Down
7 changes: 7 additions & 0 deletions app/src/main/res/drawable/radius_24_edit_course_button.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">

<solid android:color="@color/M3" />
<corners android:radius="24dp" />
</shape>
10 changes: 0 additions & 10 deletions app/src/main/res/drawable/radius_50_edit_course_button.xml
View file
Open in desktop

This file was deleted.

9 changes: 6 additions & 3 deletions app/src/main/res/layout/activity_my_history.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/W1"
android:paddingVertical="4dp"
android:paddingVertical="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/toolbar_my_page_history">
Expand All @@ -88,12 +88,13 @@

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_my_page_history_edit_history"
android:layout_width="50dp"
android:layout_width="53dp"
android:layout_height="28dp"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="15dp"
android:background="@drawable/radius_50_edit_course_button"
android:background="@drawable/radius_24_edit_course_button"
android:fontFamily="@font/pretendard_medium"
android:outlineProvider="none"
android:text="@string/my_draw_edit"
android:textColor="@color/M1"
android:textSize="12sp"
Expand All @@ -103,13 +104,15 @@
</androidx.constraintlayout.widget.ConstraintLayout>

<androidx.core.widget.NestedScrollView
android:id="@+id/scrollView_nested_history"
android:layout_width="match_parent"
android:layout_height="0dp"
android:overScrollMode="never"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/const_my_page_history_edit_bar">

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_const_history"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="20dp">
Expand Down
7 changes: 4 additions & 3 deletions app/src/main/res/layout/activity_my_upload.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,16 @@

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_my_page_upload_edit_course"
android:layout_width="50dp"
android:layout_width="53dp"
android:layout_height="28dp"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="15dp"
android:background="@drawable/radius_50_edit_course_button"
android:background="@drawable/radius_24_edit_course_button"
android:fontFamily="@font/pretendard_medium"
android:outlineProvider="none"
android:text="@string/my_draw_edit"
android:textColor="@color/M1"
android:textSize="12sp"
android:textSize="13sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
Expand Down
7 changes: 4 additions & 3 deletions app/src/main/res/layout/fragment_storage_my_draw.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,16 @@

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_edit_course"
android:layout_width="50dp"
android:layout_width="53dp"
android:layout_height="28dp"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="15dp"
android:background="@drawable/radius_50_edit_course_button"
android:background="@drawable/radius_24_edit_course_button"
android:fontFamily="@font/pretendard_medium"
android:outlineProvider="none"
android:text="@string/my_draw_edit"
android:textColor="@color/M1"
android:textSize="12sp"
android:textSize="13sp"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<string name="run_description_current_location">current_location</string>
<string name="login_signIn_google">구글로 로그인</string>
<string name="login_signIn_kakao">카카오로 로그인</string>
<string name="my_draw_edit">편집</string>
<string name="my_draw_edit">선택</string>
<string name="my_draw_delete">삭제하기</string>
<string name="discover_upload_btn">업로드</string>
<string name="discover_load_draw_course">코스 그리기</string>
Expand Down
Loading