장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
신기성
36520b8d 1 parent 642b637b

notice done

Inline Side-by-side
Showing 4 changed files with 32 additions and 51 deletions
...@@ -133,10 +133,12 @@ class InputProfilFirstFourActivity : AppCompatActivity() { ...@@ -133,10 +133,12 @@ class InputProfilFirstFourActivity : AppCompatActivity() {
133 startActivity(intent) 133 startActivity(intent)
134 } 134 }
135 135
136 - val doadapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, listOf("선택해주세요.","서울특별시", "부산광역시", "대구광역시", "인천광역시","광주광역시","대전광역시","울산광역시","세종특별자치시","경기도","강원도","충청북도","충청남도","전라북도","전라남도","경상북도","경상남도","제주특별자치도")) 136 + var doadapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, listOf("선택해주세요.","서울특별시", "부산광역시", "대구광역시", "인천광역시","광주광역시","대전광역시","울산광역시","세종특별자치시","경기도","강원도","충청북도","충청남도","전라북도","전라남도","경상북도","경상남도","제주특별자치도"))
137 doadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) 137 doadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
138 doSpinner.adapter = doadapter 138 doSpinner.adapter = doadapter
139 139
140 + doSpinner.setSelection(1)
141 +
140 doSpinner.onItemSelectedListener = object: AdapterView.OnItemSelectedListener { 142 doSpinner.onItemSelectedListener = object: AdapterView.OnItemSelectedListener {
141 override fun onNothingSelected(parent: AdapterView<*>?) { 143 override fun onNothingSelected(parent: AdapterView<*>?) {
142 } 144 }
......
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 2 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 + xmlns:tools="http://schemas.android.com/tools"
3 android:orientation="vertical" android:layout_width="match_parent" 4 android:orientation="vertical" android:layout_width="match_parent"
4 xmlns:app="http://schemas.android.com/apk/res-auto" 5 xmlns:app="http://schemas.android.com/apk/res-auto"
5 android:layout_height="match_parent"> 6 android:layout_height="match_parent">
...@@ -26,11 +27,19 @@ ...@@ -26,11 +27,19 @@
26 android:textSize="16dp" /> 27 android:textSize="16dp" />
27 </androidx.appcompat.widget.Toolbar> 28 </androidx.appcompat.widget.Toolbar>
28 29
30 + <ScrollView
31 + android:layout_width="match_parent"
32 + android:layout_height="match_parent">
33 +
29 <LinearLayout 34 <LinearLayout
30 android:layout_width="match_parent" 35 android:layout_width="match_parent"
31 - android:layout_height="match_parent" 36 + android:layout_height="wrap_content"
32 - android:layout_weight="1" 37 + android:orientation="vertical" >
33 - android:background="#fff" 38 +
39 + <LinearLayout
40 + android:layout_width="match_parent"
41 + android:layout_height="wrap_content"
42 + android:layout_marginBottom="15dp"
34 android:orientation="vertical"> 43 android:orientation="vertical">
35 44
36 <LinearLayout 45 <LinearLayout
...@@ -43,18 +52,18 @@ ...@@ -43,18 +52,18 @@
43 android:orientation="horizontal"> 52 android:orientation="horizontal">
44 53
45 <Button 54 <Button
46 - android:id="@+id/notice4" 55 + android:id="@+id/notice1"
47 style="?android:attr/borderlessButtonStyle" 56 style="?android:attr/borderlessButtonStyle"
48 android:layout_width="match_parent" 57 android:layout_width="match_parent"
49 android:layout_height="65dp" 58 android:layout_height="65dp"
50 android:layout_weight="1" 59 android:layout_weight="1"
51 android:gravity="left|center_vertical" 60 android:gravity="left|center_vertical"
52 android:paddingLeft="33dp" 61 android:paddingLeft="33dp"
53 - android:text="공지4" 62 + android:text="[이벤트] 복지야 안녕"
54 android:textSize="17dp" /> 63 android:textSize="17dp" />
55 64
56 <ImageView 65 <ImageView
57 - android:id="@+id/notice4_img" 66 + android:id="@+id/notice1_img"
58 android:layout_width="match_parent" 67 android:layout_width="match_parent"
59 android:layout_height="wrap_content" 68 android:layout_height="wrap_content"
60 android:layout_gravity="center|right" 69 android:layout_gravity="center|right"
...@@ -62,34 +71,22 @@ ...@@ -62,34 +71,22 @@
62 app:srcCompat="@drawable/down_arrow" /> 71 app:srcCompat="@drawable/down_arrow" />
63 </LinearLayout> 72 </LinearLayout>
64 73
65 - <LinearLayout 74 + <ImageView
75 + android:id="@+id/imageView4"
66 android:layout_width="match_parent" 76 android:layout_width="match_parent"
67 android:layout_height="wrap_content" 77 android:layout_height="wrap_content"
68 android:layout_marginLeft="11dp" 78 android:layout_marginLeft="11dp"
69 android:layout_marginRight="11dp" 79 android:layout_marginRight="11dp"
70 - android:background="@drawable/bottom_border" 80 + android:background="@drawable/noticeimage_1"
81 + tools:srcCompat="@tools:sample/avatars" />
71 82
72 - android:orientation="horizontal"> 83 + </LinearLayout>
73 -
74 - <Button
75 - android:id="@+id/notice3"
76 - style="?android:attr/borderlessButtonStyle"
77 - android:layout_width="match_parent"
78 - android:layout_height="65dp"
79 - android:layout_weight="1"
80 - android:gravity="left|center_vertical"
81 - android:paddingLeft="33dp"
82 - android:text="공지3"
83 - android:textSize="17dp" />
84 84
85 - <ImageView 85 + <LinearLayout
86 - android:id="@+id/notice3_img"
87 android:layout_width="match_parent" 86 android:layout_width="match_parent"
88 android:layout_height="wrap_content" 87 android:layout_height="wrap_content"
89 - android:layout_gravity="center|right" 88 + android:layout_marginBottom="15dp"
90 - android:layout_weight="6" 89 + android:orientation="vertical">
91 - app:srcCompat="@drawable/down_arrow" />
92 - </LinearLayout>
93 90
94 <LinearLayout 91 <LinearLayout
95 android:layout_width="match_parent" 92 android:layout_width="match_parent"
...@@ -109,7 +106,7 @@ ...@@ -109,7 +106,7 @@
109 android:gravity="left|center_vertical" 106 android:gravity="left|center_vertical"
110 android:paddingLeft="33dp" 107 android:paddingLeft="33dp"
111 android:stateListAnimator="@null" 108 android:stateListAnimator="@null"
112 - android:text="공지2" 109 + android:text="[이벤트] Wello 캐릭터 이름 공모"
113 android:textSize="17dp" /> 110 android:textSize="17dp" />
114 111
115 <ImageView 112 <ImageView
...@@ -122,36 +119,18 @@ ...@@ -122,36 +119,18 @@
122 119
123 </LinearLayout> 120 </LinearLayout>
124 121
125 - <LinearLayout 122 + <ImageView
123 + android:id="@+id/imageView5"
126 android:layout_width="match_parent" 124 android:layout_width="match_parent"
127 android:layout_height="wrap_content" 125 android:layout_height="wrap_content"
128 android:layout_marginLeft="11dp" 126 android:layout_marginLeft="11dp"
129 android:layout_marginRight="11dp" 127 android:layout_marginRight="11dp"
130 - android:background="@drawable/bottom_border" 128 + android:background="@drawable/noticeimage_2"
129 + tools:srcCompat="@tools:sample/avatars" />
131 130
132 - android:orientation="horizontal">
133 -
134 - <Button
135 - android:id="@+id/notice1"
136 - style="?android:attr/borderlessButtonStyle"
137 - android:layout_width="match_parent"
138 - android:layout_height="65dp"
139 - android:layout_weight="1"
140 - android:gravity="left|center_vertical"
141 - android:paddingLeft="33dp"
142 - android:text="공지1"
143 - android:textSize="17dp" />
144 -
145 - <ImageView
146 - android:id="@+id/notice1_img"
147 - android:layout_width="match_parent"
148 - android:layout_height="wrap_content"
149 - android:layout_gravity="center|right"
150 - android:layout_weight="6"
151 - app:srcCompat="@drawable/down_arrow" />
152 </LinearLayout> 131 </LinearLayout>
153 -
154 </LinearLayout> 132 </LinearLayout>
133 + </ScrollView>
155 134
156 <com.google.android.material.bottomnavigation.BottomNavigationView 135 <com.google.android.material.bottomnavigation.BottomNavigationView
157 android:id="@+id/bottomNavigation_notice" 136 android:id="@+id/bottomNavigation_notice"
......