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

#184 / [초대코드공유] 버튼 마진값 조정 #185

Merged
merged 3 commits into from
Dec 29, 2023
Merged

#184 / [초대코드공유] 버튼 마진값 조정 #185

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
a029fa3
#184 / invitecode text tools 처리
taeheeL Dec 22, 2023
d7bfa73
#184 / button height - dimen 처리
taeheeL Dec 22, 2023
21bd2e0
#184 / button margin 값 조정
taeheeL Dec 24, 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
11 changes: 6 additions & 5 deletions app/src/main/res/layout/activity_share_invite_code.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?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:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">

<data>

Expand Down Expand Up @@ -54,7 +55,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/example_code"
tools:text="@string/example_code"
android:textColor="@color/Lightblue_950"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -64,7 +65,7 @@
android:id="@+id/btn_copy_invite_code"
style="@style/Btn1"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_height="@dimen/long_button_height"
android:layout_margin="16dp"
android:background="@drawable/bg_nickname_btn"
android:stateListAnimator="@null"
Expand All @@ -78,9 +79,9 @@
<LinearLayout
android:id="@+id/ll_check_connection"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_height="@dimen/long_button_height"
android:layout_marginHorizontal="16dp"
android:layout_marginBottom="100dp"
android:layout_marginBottom="16dp"
android:background="@drawable/bg_enter_invite_code_btn"
android:gravity="center"
android:orientation="horizontal"
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/values/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,8 @@
<dimen name="on_boarding_image">328dp</dimen>
<dimen name="dialog_width">300dp</dimen>
<dimen name="dialog_height">165dp</dimen>

<!-- Button -->
<dimen name="long_button_height">48dp</dimen>
</resources>

Loading