Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/team-winey/Winey-AOS intโ€ฆ
Browse files Browse the repository at this point in the history 
โ€ฆo feature/feat-nickname-duplicate-check
  • Loading branch information
@leeeha
leeeha committed Aug 10, 2023
2 parents c0da192 + 6bbdf96 commit 183c978
Show file tree
Hide file tree
Showing 5 changed files with 122 additions and 54 deletions.
4 changes: 2 additions & 2 deletions app/src/main/res/drawable/ic_recommend_item_saver.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:width="85dp"
android:height="85dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
Expand Down
104 changes: 94 additions & 10 deletions app/src/main/res/layout/fragment_my_page.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,18 +92,26 @@
android:textAppearance="@style/TextAppearance.WINEY.Headline_b_28_xxl"
app:layout_constraintStart_toStartOf="@id/tv_mypage_level_token"
app:layout_constraintTop_toBottomOf="@id/tv_mypage_level_token"
tools:text = "์‹๋น„๋‚ฎ์ถฐ"/>
tools:text="์‹๋น„๋‚ฎ์ถฐ" />

<ImageView
android:id="@+id/iv_mypage_nickname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_mypage_next"
app:layout_constraintBottom_toTopOf="@id/iv_mypage_profile"
app:layout_constraintEnd_toEndOf="parent" />

<ImageView
android:id="@+id/iv_mypage_profile"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/ic_mypage_lv1_profile"
android:adjustViewBounds="true"
android:scaleType="fitXY"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="10dp"
android:adjustViewBounds="true"
android:backgroundTint="@color/purple_100"
android:scaleType="fitXY"
android:src="@drawable/ic_mypage_lv1_profile"
app:cardCornerRadius="10dp"
app:cardElevation="0dp"
app:layout_constraintEnd_toEndOf="parent"
Expand Down Expand Up @@ -310,6 +318,7 @@
android:layout_marginTop="17dp"
android:text="@string/mypage_myfeed"
android:textAppearance="@style/TextAppearance.WINEY.body_m_16"
android:textColor="@color/gray_700"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

Expand All @@ -334,7 +343,7 @@
android:id="@+id/cl_mypage_to_1on1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toTopOf="@id/v_mypage_space"
app:layout_constraintBottom_toTopOf="@id/v_mypage_line7"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/v_mypage_line6">

Expand All @@ -346,6 +355,7 @@
android:layout_marginTop="17dp"
android:text="@string/mypage_1on1"
android:textAppearance="@style/TextAppearance.WINEY.body_m_16"
android:textColor="@color/gray_700"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

Expand All @@ -361,18 +371,92 @@
</androidx.constraintlayout.widget.ConstraintLayout>

<View
android:id="@+id/v_mypage_space"
android:id="@+id/v_mypage_line7"
android:layout_width="match_parent"
android:layout_height="4dp"
android:background="@color/gray_50"
app:layout_constraintTop_toBottomOf="@id/cl_mypage_to_1on1" />

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_mypage_logout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/v_mypage_line7">

<TextView
android:id="@+id/tv_mypage_logout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="23dp"
android:layout_marginTop="17dp"
android:text="@string/mypage_logout"
android:textAppearance="@style/TextAppearance.WINEY.body_m_16"
android:textColor="@color/gray_700"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<ImageView
android:id="@+id/iv_mypage_logout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:src="@drawable/ic_mypage_next"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>

<View
android:id="@+id/v_mypage_line8"
android:layout_width="match_parent"
android:layout_height="33dp"
android:background="@color/gray_50"
app:layout_constraintTop_toBottomOf="@id/cl_mypage_logout" />

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_mypage_withdraw"
android:layout_width="match_parent"
android:layout_height="32dp"
android:layout_height="wrap_content"
android:background="@color/gray_50"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cl_mypage_to_1on1" />
app:layout_constraintTop_toBottomOf="@id/v_mypage_line8">

<TextView
android:id="@+id/tv_mypage_withdraw"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="23dp"
android:layout_marginTop="17dp"
android:text="@string/mypage_withdraw"
android:textAppearance="@style/TextAppearance.WINEY.body_m_14"
android:textColor="@color/gray_400"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<ImageView
android:id="@+id/iv_mypage_withdraw"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:src="@drawable/ic_mypage_next"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>

<View
android:id="@+id/v_mypage_space"
android:layout_width="match_parent"
android:layout_height="25dp"
android:background="@color/gray_50"
app:layout_constraintTop_toBottomOf="@id/cl_mypage_withdraw" />

</androidx.constraintlayout.widget.ConstraintLayout>

</ScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>


</layout>
</layout>
11 changes: 5 additions & 6 deletions app/src/main/res/layout/fragment_target_amount_bottom_sheet.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
xmlns:app="http://schemas.android.com/apk/res-auto">

<data>

Expand Down Expand Up @@ -43,7 +42,7 @@
android:id="@+id/tv_target_amount_set_amount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginStart="20dp"
android:layout_marginTop="18dp"
android:text="@string/target_amount_set_amount"
android:textAppearance="@style/TextAppearance.WINEY.Headline_b_18_xl"
Expand All @@ -56,7 +55,7 @@
style="?textInputOutlinedStyle"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginHorizontal="16dp"
android:layout_marginHorizontal="20dp"
android:layout_marginTop="8dp"
app:boxStrokeColor="@drawable/sel_target_amount_til_stroke_color"
app:boxStrokeErrorColor="@color/red_500"
Expand Down Expand Up @@ -113,7 +112,7 @@
android:id="@+id/tv_target_amount_set_day"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginStart="20dp"
android:layout_marginTop="34dp"
android:text="@string/target_amount_set_day"
android:textAppearance="@style/TextAppearance.WINEY.Headline_b_18_xl"
Expand All @@ -126,7 +125,7 @@
style="?textInputOutlinedStyle"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginHorizontal="16dp"
android:layout_marginHorizontal="20dp"
android:layout_marginTop="8dp"
app:boxStrokeColor="@drawable/sel_target_amount_til_stroke_color"
app:boxStrokeErrorColor="@color/red_500"
Expand Down
53 changes: 18 additions & 35 deletions app/src/main/res/layout/item_recommend_header.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
xmlns:app="http://schemas.android.com/apk/res-auto">

<data>

Expand All @@ -11,56 +10,40 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginBottom="16dp">
android:layout_marginBottom="16dp"
android:background="@color/gray_50">

<TextView
android:id="@+id/tv_recommend_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="11dp"
android:layout_marginTop="16dp"
android:layout_marginStart="14dp"
android:layout_marginTop="30dp"
android:text="@string/recommend_header_title"
android:textAppearance="@style/TextAppearance.WINEY.Headline_b_18_xl"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<androidx.cardview.widget.CardView
android:id="@+id/cv_recommend_card"
android:layout_width="match_parent"
<TextView
android:id="@+id/tv_recommend_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:backgroundTint="@color/purple_100"
app:cardCornerRadius="5dp"
app:cardElevation="0dp"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginStart="16dp"
android:layout_marginBottom="18dp"
android:text="@string/recommend_header_text"
android:textAppearance="@style/TextAppearance.WINEY.body_m_14"
android:textColor="@color/gray_500"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_recommend_title">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="19dp"
android:layout_marginBottom="18dp"
android:text="@string/recommend_header_text"
android:textAppearance="@style/TextAppearance.WINEY.body_m_14"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
app:layout_constraintTop_toBottomOf="@id/tv_recommend_title" />

<ImageView
android:id="@+id/iv_recommend_saver"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:src="@drawable/ic_recommend_item_saver"
app:layout_constraintBottom_toBottomOf="@id/cv_recommend_card"
app:layout_constraintEnd_toEndOf="@id/cv_recommend_card" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

</layout>
</layout>
4 changes: 3 additions & 1 deletion app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@
<string name="impossible_dialog_message">์ ˆ์•ฝ ๋ชฉํ‘œ ๊ธฐ๊ฐ„์ด ์ง€๋‚˜์ง€ ์•Š์•„\n ๋ชฉํ‘œ๋ฅผ ์ˆ˜์ •ํ•  ์ˆ˜ ์—†์–ด์š”</string>
<string name="impossible_dialog_close">๋‹ซ๊ธฐ</string>
<string name="mypage_1on1"><u>1:1 ๋ฌธ์˜</u></string>
<string name="mypage_withdraw">ํƒˆํ‡ดํ•˜๊ธฐ</string>
<string name="mypage_logout">๋กœ๊ทธ์•„์›ƒ</string>

<string name="target_amount_cancel">์ทจ์†Œ</string>
<string name="target_amount_set_amount">๋ชฉํ‘œ ์ ˆ์•ฝ ๊ธˆ์•ก์„ ์„ค์ •ํ•ด์ฃผ์„ธ์š”</string>
Expand Down Expand Up @@ -91,7 +93,7 @@
<!-- recommend -->
<string name="recommend_discount">%s ์ ˆ์•ฝ</string>
<string name="upload_amount_hint_text">0</string>
<string name="recommend_header_title">์œ„๋‹ˆ๊ฐ€ ์•Œ๋ ค์ฃผ๋Š” ์ถ”์ฒœ ์ ˆ์•ฝ๋ฒ•</string>
<string name="recommend_header_title">์˜ˆ๋น„ ํ™ฉ์ œ๋ฅผ ์œ„ํ•œ ์ถ”์ฒœ ์ ˆ์•ฝ๋ฒ•</string>
<string name="recommend_header_text">์‰ฟ, ๊ทธ๋Œ€๋ฅผ ์œ„ํ•œ ์ ˆ์•ฝ๋ฐฉ๋ฒ•์ด ๋„์ฐฉํ–ˆ์–ด.\nํ™ฉ์‹ค ๋‚ด์—์„œ๋„ ๋น„๋ฐ€์ธ๋ฐ ํŠน๋ณ„ํžˆ ์•Œ๋ ค์ค„๊ฒŒ:)</string>

<!-- nickname -->
Expand Down

0 comments on commit 183c978

Please sign in to comment.