Skip to content

Commit

Permalink
Add files via upload
Browse files Browse the repository at this point in the history
  • Loading branch information
@genwo123
genwo123 committed Dec 1, 2022
1 parent ed15d8a commit 4995b7f
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 15 deletions.
2 changes: 2 additions & 0 deletions .idea/misc.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions app/src/main/res/drawable/l_f_round_adg_purple.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="@color/white"/>
<stroke android:width="15px" android:color="#9370db"/>
<solid android:color="#9370db"/>
<stroke android:width="15px" android:color="#6441a5"/>
<corners android:radius="40dp"/>
</shape>

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/l_f_toolbar_with.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
android:id="@+id/toolbar"
app:title="."
app:titleTextColor="#00FFFFFF"
android:background="#8b00ff"
android:background="#b09cdd"
android:elevation="30dp"
app:menu="@menu/l_f_menu_toolbar">
<!--같이묵자 툴바-->
Expand All @@ -22,7 +22,7 @@
android:transitionName="L_V_with_txTransition"
android:textSize="35sp"
android:gravity="center"
android:layout_gravity="center"/>
android:layout_gravity="left"/>
<!-- android:includeFontPadding="false"-->

</androidx.appcompat.widget.Toolbar>
50 changes: 44 additions & 6 deletions app/src/main/res/layout/test_activity_createparty.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
android:orientation="horizontal">

<EditText
android:fontFamily="@font/l_f_binggraebold"
android:layout_width="280dp"
android:layout_height="60dp"
android:gravity="center"
Expand All @@ -30,6 +31,8 @@
android:gravity="right">

<Button
android:backgroundTint="#9370db"
android:fontFamily="@font/l_f_binggraebold"
android:layout_width="40pt"
android:layout_height="60dp"
android:layout_marginRight="5pt"
Expand All @@ -52,6 +55,7 @@
android:orientation="vertical">

<EditText
android:fontFamily="@font/l_f_binggraebold"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="text"
Expand All @@ -74,6 +78,7 @@
android:orientation="vertical">

<TextView
android:fontFamily="@font/l_f_binggraebold"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="5pt"
Expand All @@ -89,6 +94,7 @@
android:id="@+id/M_V_pp_platform_select">

<RadioButton
android:fontFamily="@font/l_f_binggraebold"
android:layout_width="match_parent"
android:layout_height="14pt"
android:layout_marginLeft="5pt"
Expand All @@ -97,6 +103,7 @@
android:text="배달의민족"/>

<RadioButton
android:fontFamily="@font/l_f_binggraebold"
android:layout_width="match_parent"
android:layout_height="14pt"
android:layout_marginLeft="5pt"
Expand All @@ -105,6 +112,7 @@
android:text="요기요"/>

<RadioButton
android:fontFamily="@font/l_f_binggraebold"
android:layout_width="match_parent"
android:layout_height="14pt"
android:layout_marginLeft="5pt"
Expand All @@ -114,6 +122,7 @@
</RadioGroup>

<TextView
android:fontFamily="@font/l_f_binggraebold"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="5pt"
Expand All @@ -130,23 +139,29 @@
android:layout_marginBottom="1pt">

<Button
android:layout_width="60dp"
android:backgroundTint="#9370db"
android:fontFamily="@font/l_f_binggraebold"
android:layout_width="70dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5pt"
android:textSize="7pt"
android:text="1명"
android:id="@+id/M_V_pp_pn_1"/>

<Button
android:layout_width="60dp"
android:backgroundTint="#9370db"
android:fontFamily="@font/l_f_binggraebold"
android:layout_width="70dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5pt"
android:textSize="7pt"
android:text="2명"
android:id="@+id/M_V_pp_pn_2"/>

<Button
android:layout_width="60dp"
android:backgroundTint="#9370db"
android:fontFamily="@font/l_f_binggraebold"
android:layout_width="70dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5pt"
android:textSize="7pt"
Expand All @@ -162,23 +177,29 @@
android:layout_marginBottom="1pt">

<Button
android:layout_width="60dp"
android:backgroundTint="#9370db"
android:fontFamily="@font/l_f_binggraebold"
android:layout_width="70dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5pt"
android:textSize="7pt"
android:text="4명"
android:id="@+id/M_V_pp_pn_4"/>

<Button
android:layout_width="60dp"
android:backgroundTint="#9370db"
android:fontFamily="@font/l_f_binggraebold"
android:layout_width="70dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5pt"
android:textSize="7pt"
android:text="5명"
android:id="@+id/M_V_pp_pn_5"/>

<Button
android:layout_width="60dp"
android:backgroundTint="#9370db"
android:fontFamily="@font/l_f_binggraebold"
android:layout_width="70dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5pt"
android:textSize="7pt"
Expand All @@ -187,6 +208,7 @@
</LinearLayout>

<TextView
android:fontFamily="@font/l_f_binggraebold"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="5pt"
Expand All @@ -196,6 +218,7 @@
android:text="3. 주문시간"/>

<TextView
android:fontFamily="@font/l_f_binggraebold"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="2pt"
Expand All @@ -210,13 +233,17 @@
android:gravity="center">

<Button
android:backgroundTint="#9370db"
android:fontFamily="@font/l_f_binggraebold"
android:layout_width="140dp"
android:layout_height="wrap_content"
android:textSize="8pt"
android:text="오늘"
android:id="@+id/M_V_pp_date_today"/>

<Button
android:backgroundTint="#9370db"
android:fontFamily="@font/l_f_binggraebold"
android:layout_width="140dp"
android:layout_height="wrap_content"
android:textSize="8pt"
Expand All @@ -233,6 +260,7 @@
android:layout_marginTop="10pt">

<TextView
android:fontFamily="@font/l_f_binggraebold"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="2pt"
Expand All @@ -241,13 +269,15 @@
android:text="2) 몇시에 먹을까요?"/>

<TimePicker

android:layout_width="330dp"
android:layout_height="155dp"
android:timePickerMode="spinner"
android:id="@+id/M_V_pp_date_TimePicker"/>
</LinearLayout>

<TextView
android:fontFamily="@font/l_f_binggraebold"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="5pt"
Expand All @@ -257,6 +287,7 @@
android:text="4. 오픈 채팅방 링크"/>

<EditText
android:fontFamily="@font/l_f_binggraebold"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
Expand All @@ -267,6 +298,7 @@
android:hint="링크를 복사하여 붙여넣어주세요."/>

<TextView
android:fontFamily="@font/l_f_binggraebold"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="5pt"
Expand Down Expand Up @@ -296,6 +328,7 @@
android:layout_marginBottom="10pt">

<TextView
android:fontFamily="@font/l_f_binggraebold"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="5pt"
Expand All @@ -311,6 +344,7 @@
android:id="@+id/M_V_pp_pay_select">

<RadioButton
android:fontFamily="@font/l_f_binggraebold"
android:layout_width="match_parent"
android:layout_height="14pt"
android:layout_marginLeft="5pt"
Expand All @@ -319,6 +353,7 @@
android:text="모여서 후결제"/>

<RadioButton
android:fontFamily="@font/l_f_binggraebold"
android:layout_width="match_parent"
android:layout_height="14pt"
android:layout_marginLeft="5pt"
Expand All @@ -327,6 +362,7 @@
android:text="파티장 선결제"/>

<RadioButton
android:fontFamily="@font/l_f_binggraebold"
android:layout_width="match_parent"
android:layout_height="14pt"
android:layout_marginLeft="5pt"
Expand All @@ -350,6 +386,8 @@
android:background="@color/purple_200">

<TextView
android:backgroundTint="#9370db"
android:fontFamily="@font/l_f_binggraebold"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/res/layout/test_activity_user.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
android:layout_width="250dp"
android:layout_height="wrap_content"
android:fontFamily="@font/l_f_binggraebold"
android:text="21960005"
android:text=""
android:textSize="25sp" />


Expand All @@ -65,7 +65,7 @@
android:layout_width="250dp"
android:layout_height="wrap_content"
android:fontFamily="@font/l_f_binggraebold"
android:text="김건우"
android:text=""
android:textSize="25sp" />


Expand All @@ -91,7 +91,7 @@
android:layout_width="250dp"
android:layout_height="wrap_content"
android:fontFamily="@font/l_f_binggraebold"
android:text="연암공과대학교"
android:text=""
android:textSize="25sp" />


Expand Down Expand Up @@ -121,7 +121,7 @@
android:layout_width="250dp"
android:layout_height="wrap_content"
android:fontFamily="@font/l_f_binggraebold"
android:text="남"
android:text=""
android:textSize="25sp" />


Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/colors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
<color name="colorPrimary">#FFC107</color>
<color name="colorPrimaryDark">#FF7043</color>
<color name="colorAccent">#FFAB40</color>
<color name="nonapurple">#6441a5</color>
<color name="nonapurple">#9370db</color>
</resources>

0 comments on commit 4995b7f

Please sign in to comment.