Skip to content

Commit

Permalink
[Chore/#1] 코드정렬
Browse files Browse the repository at this point in the history
  • Loading branch information
ss99x2002 committed Jul 3, 2023
1 parent c793ba4 commit 299af6c
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 55 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import com.sopt.umbba_android.R
import com.sopt.umbba_android.databinding.ActivityInviteCodeBinding
import com.sopt.umbba_android.util.binding.BindingActivity

class InviteCodeActivity:BindingActivity<ActivityInviteCodeBinding>(R.layout.activity_invite_code){
class InviteCodeActivity :
BindingActivity<ActivityInviteCodeBinding>(R.layout.activity_invite_code) {

}
6 changes: 3 additions & 3 deletions app/src/main/res/color/sel_invite_code_input_layout.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/grey_300" android:state_focused="true"/>
<item android:color="@color/grey_300" android:state_hovered="true"/>
<item android:color="@color/grey_300" android:state_hovered="true"/>
<item android:color="@color/grey_300" android:state_focused="true" />
<item android:color="@color/grey_300" android:state_hovered="true" />
<item android:color="@color/grey_300" android:state_hovered="true" />
</selector>
8 changes: 4 additions & 4 deletions app/src/main/res/drawable/ic_arrow_back.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M20,11H7.83L13.42,5.41L12,4L4,12L12,20L13.41,18.59L7.83,13H20V11Z"
android:fillColor="#000000"
android:fillAlpha="0.6"/>
<path
android:fillAlpha="0.6"
android:fillColor="#000000"
android:pathData="M20,11H7.83L13.42,5.41L12,4L4,12L12,20L13.41,18.59L7.83,13H20V11Z" />
</vector>
6 changes: 3 additions & 3 deletions app/src/main/res/drawable/ic_close.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z"
android:fillColor="#FF0000"/>
<path
android:fillColor="#FF0000"
android:pathData="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z" />
</vector>
11 changes: 4 additions & 7 deletions app/src/main/res/drawable/shape_black_fill_r50_rect.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
<corners
android:radius="50dp"
/>
<solid
android:color="@color/black"
/>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="50dp" />
<solid android:color="@color/black" />
</shape>
11 changes: 4 additions & 7 deletions app/src/main/res/drawable/shape_g300_fill_r50_rect.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
<corners
android:radius="50dp"
/>
<solid
android:color="@color/grey_btn"
/>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="50dp" />
<solid android:color="@color/grey_btn" />
</shape>
63 changes: 33 additions & 30 deletions app/src/main/res/layout/activity_invite_code.xml
Original file line number Diff line number Diff line change
@@ -1,70 +1,73 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:app="http://schemas.android.com/apk/res-auto">

<data>

<variable
name="titleText"
type="String" />
</data>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">

<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">

<include
android:id="@+id/layout_appbar"
layout="@layout/basic_appbar"
app:titleText="@{`초대코드 입력`}"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
app:layout_constraintTop_toTopOf="parent"
app:titleText="@{`초대코드 입력`}" />

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

<com.google.android.material.textfield.TextInputLayout
android:id="@+id/layout_input_code"
style="@style/TextInputLayoutStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
style="@style/TextInputLayoutStyle"
android:layout_marginHorizontal="24dp"
app:hintEnabled="false"
android:layout_marginTop="12dp"
android:textSize="16sp"
app:layout_constraintTop_toBottomOf="@id/tv_title"
app:layout_constraintStart_toStartOf="parent"
app:hintAnimationEnabled="false"
app:hintEnabled="false"
app:layout_constraintEnd_toEndOf="parent"
app:hintAnimationEnabled="false">
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_title">

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/et_code"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/invite_code_hint"
android:textColor="@color/black"
android:textSize="16sp"
android:hint="@string/invite_code_hint"/>
android:textSize="16sp" />

</com.google.android.material.textfield.TextInputLayout>

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

0 comments on commit 299af6c

Please sign in to comment.