장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
soonmyeong2
5b9c8afe 2 parents 2e85c91e e019a8bd

Merge branch 'master' of http://khuhub.khu.ac.kr/2014104141/WELLO

Inline Side-by-side
Showing 4 changed files with 97 additions and 116 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,132 +27,110 @@ ...@@ -26,132 +27,110 @@
26 android:textSize="16dp" /> 27 android:textSize="16dp" />
27 </androidx.appcompat.widget.Toolbar> 28 </androidx.appcompat.widget.Toolbar>
28 29
29 - <LinearLayout 30 + <ScrollView
30 android:layout_width="match_parent" 31 android:layout_width="match_parent"
31 - android:layout_height="match_parent" 32 + android:layout_height="match_parent">
32 - android:layout_weight="1"
33 - android:background="#fff"
34 - android:orientation="vertical">
35 33
36 <LinearLayout 34 <LinearLayout
37 android:layout_width="match_parent" 35 android:layout_width="match_parent"
38 android:layout_height="wrap_content" 36 android:layout_height="wrap_content"
39 - android:layout_marginLeft="11dp" 37 + android:orientation="vertical" >
40 - android:layout_marginRight="11dp"
41 - android:background="@drawable/bottom_border"
42 38
43 - android:orientation="horizontal"> 39 + <LinearLayout
44 -
45 - <Button
46 - android:id="@+id/notice4"
47 - style="?android:attr/borderlessButtonStyle"
48 - android:layout_width="match_parent"
49 - android:layout_height="65dp"
50 - android:layout_weight="1"
51 - android:gravity="left|center_vertical"
52 - android:paddingLeft="33dp"
53 - android:text="공지4"
54 - android:textSize="17dp" />
55 -
56 - <ImageView
57 - android:id="@+id/notice4_img"
58 - android:layout_width="match_parent"
59 - android:layout_height="wrap_content"
60 - android:layout_gravity="center|right"
61 - android:layout_weight="6"
62 - app:srcCompat="@drawable/down_arrow" />
63 - </LinearLayout>
64 -
65 - <LinearLayout
66 - android:layout_width="match_parent"
67 - android:layout_height="wrap_content"
68 - android:layout_marginLeft="11dp"
69 - android:layout_marginRight="11dp"
70 - android:background="@drawable/bottom_border"
71 -
72 - android:orientation="horizontal">
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 -
85 - <ImageView
86 - android:id="@+id/notice3_img"
87 - android:layout_width="match_parent"
88 - android:layout_height="wrap_content"
89 - android:layout_gravity="center|right"
90 - android:layout_weight="6"
91 - app:srcCompat="@drawable/down_arrow" />
92 - </LinearLayout>
93 -
94 - <LinearLayout
95 - android:layout_width="match_parent"
96 - android:layout_height="wrap_content"
97 - android:layout_marginLeft="11dp"
98 - android:layout_marginRight="11dp"
99 - android:background="@drawable/bottom_border"
100 - android:orientation="horizontal"
101 - android:stateListAnimator="@null">
102 -
103 - <Button
104 - android:id="@+id/notice2"
105 - style="?android:attr/borderlessButtonStyle"
106 - android:layout_width="match_parent"
107 - android:layout_height="65dp"
108 - android:layout_weight="1"
109 - android:gravity="left|center_vertical"
110 - android:paddingLeft="33dp"
111 - android:stateListAnimator="@null"
112 - android:text="공지2"
113 - android:textSize="17dp" />
114 -
115 - <ImageView
116 - android:id="@+id/notice2_img"
117 android:layout_width="match_parent" 40 android:layout_width="match_parent"
118 android:layout_height="wrap_content" 41 android:layout_height="wrap_content"
119 - android:layout_gravity="center|right" 42 + android:layout_marginBottom="15dp"
120 - android:layout_weight="6" 43 + android:orientation="vertical">
121 - app:srcCompat="@drawable/down_arrow" /> 44 +
122 - 45 + <LinearLayout
123 - </LinearLayout> 46 + android:layout_width="match_parent"
124 - 47 + android:layout_height="wrap_content"
125 - <LinearLayout 48 + android:layout_marginLeft="11dp"
126 - android:layout_width="match_parent" 49 + android:layout_marginRight="11dp"
127 - android:layout_height="wrap_content" 50 + android:background="@drawable/bottom_border"
128 - android:layout_marginLeft="11dp" 51 +
129 - android:layout_marginRight="11dp" 52 + android:orientation="horizontal">
130 - android:background="@drawable/bottom_border" 53 +
131 - 54 + <Button
132 - android:orientation="horizontal"> 55 + android:id="@+id/notice1"
133 - 56 + style="?android:attr/borderlessButtonStyle"
134 - <Button 57 + android:layout_width="match_parent"
135 - android:id="@+id/notice1" 58 + android:layout_height="65dp"
136 - style="?android:attr/borderlessButtonStyle" 59 + android:layout_weight="1"
137 - android:layout_width="match_parent" 60 + android:gravity="left|center_vertical"
138 - android:layout_height="65dp" 61 + android:paddingLeft="33dp"
139 - android:layout_weight="1" 62 + android:text="[이벤트] 복지야 안녕"
140 - android:gravity="left|center_vertical" 63 + android:textSize="17dp" />
141 - android:paddingLeft="33dp" 64 +
142 - android:text="공지1" 65 + <ImageView
143 - android:textSize="17dp" /> 66 + android:id="@+id/notice1_img"
144 - 67 + android:layout_width="match_parent"
145 - <ImageView 68 + android:layout_height="wrap_content"
146 - android:id="@+id/notice1_img" 69 + android:layout_gravity="center|right"
70 + android:layout_weight="6"
71 + app:srcCompat="@drawable/down_arrow" />
72 + </LinearLayout>
73 +
74 + <ImageView
75 + android:id="@+id/imageView4"
76 + android:layout_width="match_parent"
77 + android:layout_height="wrap_content"
78 + android:layout_marginLeft="11dp"
79 + android:layout_marginRight="11dp"
80 + android:background="@drawable/noticeimage_1"
81 + tools:srcCompat="@tools:sample/avatars" />
82 +
83 + </LinearLayout>
84 +
85 + <LinearLayout
147 android:layout_width="match_parent" 86 android:layout_width="match_parent"
148 android:layout_height="wrap_content" 87 android:layout_height="wrap_content"
149 - android:layout_gravity="center|right" 88 + android:layout_marginBottom="15dp"
150 - android:layout_weight="6" 89 + android:orientation="vertical">
151 - app:srcCompat="@drawable/down_arrow" /> 90 +
91 + <LinearLayout
92 + android:layout_width="match_parent"
93 + android:layout_height="wrap_content"
94 + android:layout_marginLeft="11dp"
95 + android:layout_marginRight="11dp"
96 + android:background="@drawable/bottom_border"
97 + android:orientation="horizontal"
98 + android:stateListAnimator="@null">
99 +
100 + <Button
101 + android:id="@+id/notice2"
102 + style="?android:attr/borderlessButtonStyle"
103 + android:layout_width="match_parent"
104 + android:layout_height="65dp"
105 + android:layout_weight="1"
106 + android:gravity="left|center_vertical"
107 + android:paddingLeft="33dp"
108 + android:stateListAnimator="@null"
109 + android:text="[이벤트] Wello 캐릭터 이름 공모"
110 + android:textSize="17dp" />
111 +
112 + <ImageView
113 + android:id="@+id/notice2_img"
114 + android:layout_width="match_parent"
115 + android:layout_height="wrap_content"
116 + android:layout_gravity="center|right"
117 + android:layout_weight="6"
118 + app:srcCompat="@drawable/down_arrow" />
119 +
120 + </LinearLayout>
121 +
122 + <ImageView
123 + android:id="@+id/imageView5"
124 + android:layout_width="match_parent"
125 + android:layout_height="wrap_content"
126 + android:layout_marginLeft="11dp"
127 + android:layout_marginRight="11dp"
128 + android:background="@drawable/noticeimage_2"
129 + tools:srcCompat="@tools:sample/avatars" />
130 +
131 + </LinearLayout>
152 </LinearLayout> 132 </LinearLayout>
153 - 133 + </ScrollView>
154 - </LinearLayout>
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"
......