Commit 0b0befe4e40b79e94f3abed0f6e412db689348f4
1 parent
efa2f6cf
- add scroll view
Showing
2 changed files
with
191 additions
and
169 deletions
app/src/main/res/layout/activity_about.xml
| ... | ... | @@ -4,8 +4,7 @@ |
| 4 | 4 | android:orientation="vertical" |
| 5 | 5 | android:layout_width="match_parent" |
| 6 | 6 | android:layout_height="match_parent" |
| 7 | - android:gravity="center_horizontal" | |
| 8 | - android:weightSum="10"> | |
| 7 | + android:gravity="center_horizontal"> | |
| 9 | 8 | |
| 10 | 9 | <android.support.design.widget.AppBarLayout android:layout_height="wrap_content" |
| 11 | 10 | android:layout_width="match_parent" android:theme="@style/AppTheme.AppBarOverlay"> |
| ... | ... | @@ -15,203 +14,226 @@ |
| 15 | 14 | </android.support.v7.widget.Toolbar> |
| 16 | 15 | </android.support.design.widget.AppBarLayout> |
| 17 | 16 | |
| 18 | - <ImageView | |
| 19 | - android:layout_width="wrap_content" | |
| 20 | - android:layout_height="0dp" | |
| 21 | - android:id="@+id/imageView3" | |
| 22 | - android:src="@drawable/about_main_icon_coffee" | |
| 23 | - android:layout_weight="2" | |
| 24 | - android:layout_marginTop="10dp" | |
| 25 | - android:layout_marginBottom="10dp" /> | |
| 26 | - | |
| 27 | - <TextView | |
| 28 | - android:layout_width="wrap_content" | |
| 29 | - android:layout_height="0dp" | |
| 30 | - android:textAppearance="?android:attr/textAppearanceSmall" | |
| 31 | - android:text="@string/about_description" | |
| 32 | - android:id="@+id/textView12" | |
| 33 | - android:gravity="center" | |
| 34 | - android:layout_weight="4.5" /> | |
| 35 | - | |
| 36 | - <LinearLayout | |
| 37 | - android:orientation="vertical" | |
| 38 | - android:layout_width="match_parent" | |
| 39 | - android:layout_height="0dp" | |
| 40 | - android:layout_marginLeft="30dp" | |
| 41 | - android:layout_marginRight="30dp" | |
| 42 | - android:layout_weight="3.5"> | |
| 17 | + <ScrollView | |
| 18 | + android:layout_width="fill_parent" | |
| 19 | + android:layout_height="fill_parent"> | |
| 43 | 20 | |
| 44 | 21 | <LinearLayout |
| 45 | - android:orientation="horizontal" | |
| 22 | + android:orientation="vertical" | |
| 46 | 23 | android:layout_width="match_parent" |
| 47 | 24 | android:layout_height="wrap_content" |
| 48 | - android:weightSum="10" | |
| 49 | - android:gravity="center_vertical"> | |
| 25 | + android:gravity="center_horizontal" | |
| 26 | + android:weightSum="10"> | |
| 50 | 27 | |
| 51 | 28 | <ImageView |
| 52 | - android:layout_width="0dp" | |
| 53 | - android:layout_height="wrap_content" | |
| 54 | - android:id="@+id/imageView4" | |
| 55 | - android:src="@drawable/about_pay_coffee_3" | |
| 56 | - android:layout_weight="3" | |
| 57 | - android:adjustViewBounds="true" /> | |
| 29 | + android:layout_width="wrap_content" | |
| 30 | + android:layout_height="0dp" | |
| 31 | + android:id="@+id/imageView3" | |
| 32 | + android:src="@drawable/about_main_icon_coffee" | |
| 33 | + android:layout_marginTop="10dp" | |
| 34 | + android:layout_marginBottom="10dp" | |
| 35 | + android:adjustViewBounds="true" | |
| 36 | + android:layout_weight="2" | |
| 37 | + android:baselineAlignBottom="true" | |
| 38 | + android:paddingLeft="140dp" | |
| 39 | + android:paddingRight="140dp" /> | |
| 58 | 40 | |
| 59 | 41 | <TextView |
| 60 | - android:layout_width="0dp" | |
| 61 | - android:layout_height="wrap_content" | |
| 42 | + android:layout_width="wrap_content" | |
| 43 | + android:layout_height="0dp" | |
| 62 | 44 | android:textAppearance="?android:attr/textAppearanceSmall" |
| 63 | - android:text="1000원" | |
| 64 | - android:id="@+id/textView14" | |
| 65 | - android:layout_weight="1.8" | |
| 66 | - android:gravity="right" | |
| 67 | - android:layout_marginRight="10dp" /> | |
| 68 | - | |
| 69 | - <FrameLayout | |
| 70 | - android:layout_width="0dp" | |
| 71 | - android:layout_height="match_parent" | |
| 72 | - android:layout_weight="5"> | |
| 73 | - | |
| 74 | - <TextView | |
| 45 | + android:text="@string/about_description" | |
| 46 | + android:id="@+id/textView12" | |
| 47 | + android:gravity="center" | |
| 48 | + android:layout_weight="4.5" | |
| 49 | + android:layout_marginTop="5dp" | |
| 50 | + android:layout_marginBottom="20dp" /> | |
| 51 | + | |
| 52 | + <LinearLayout | |
| 53 | + android:orientation="vertical" | |
| 54 | + android:layout_width="match_parent" | |
| 55 | + android:layout_height="0dp" | |
| 56 | + android:layout_marginLeft="30dp" | |
| 57 | + android:layout_marginRight="30dp" | |
| 58 | + android:layout_weight="3.5" | |
| 59 | + android:layout_marginBottom="30dp"> | |
| 60 | + | |
| 61 | + <LinearLayout | |
| 62 | + android:orientation="horizontal" | |
| 75 | 63 | android:layout_width="match_parent" |
| 76 | 64 | android:layout_height="wrap_content" |
| 77 | - android:textAppearance="?android:attr/textAppearanceSmall" | |
| 78 | - android:text="감사합니다" | |
| 79 | - android:id="@+id/textView15" | |
| 80 | - android:layout_gravity="center_vertical" | |
| 81 | - android:gravity="left" | |
| 82 | - android:paddingLeft="10dp" /> | |
| 83 | - | |
| 84 | - <ImageView | |
| 85 | - android:layout_width="match_parent" | |
| 86 | - android:layout_height="match_parent" | |
| 87 | - android:id="@+id/imageView5" | |
| 88 | - android:background="#333333" | |
| 89 | - android:layout_marginTop="17dp" | |
| 90 | - android:layout_marginBottom="20dp" | |
| 91 | - android:layout_marginLeft="10dp" | |
| 92 | - android:layout_marginRight="90dp" /> | |
| 93 | - </FrameLayout> | |
| 65 | + android:weightSum="10" | |
| 66 | + android:gravity="center_vertical"> | |
| 94 | 67 | |
| 95 | - </LinearLayout> | |
| 68 | + <ImageView | |
| 69 | + android:layout_width="0dp" | |
| 70 | + android:layout_height="wrap_content" | |
| 71 | + android:id="@+id/imageView4" | |
| 72 | + android:src="@drawable/about_pay_coffee_3" | |
| 73 | + android:layout_weight="3" | |
| 74 | + android:adjustViewBounds="true" /> | |
| 96 | 75 | |
| 97 | - <LinearLayout | |
| 98 | - android:orientation="horizontal" | |
| 99 | - android:layout_width="match_parent" | |
| 100 | - android:layout_height="wrap_content" | |
| 101 | - android:weightSum="10" | |
| 102 | - android:gravity="center_vertical" > | |
| 76 | + <TextView | |
| 77 | + android:layout_width="0dp" | |
| 78 | + android:layout_height="wrap_content" | |
| 79 | + android:textAppearance="?android:attr/textAppearanceSmall" | |
| 80 | + android:text="1000원" | |
| 81 | + android:id="@+id/text_about_price1" | |
| 82 | + android:layout_weight="1.8" | |
| 83 | + android:gravity="right" | |
| 84 | + android:layout_marginRight="10dp" /> | |
| 85 | + | |
| 86 | + <FrameLayout | |
| 87 | + android:layout_width="0dp" | |
| 88 | + android:layout_height="match_parent" | |
| 89 | + android:layout_weight="5"> | |
| 90 | + | |
| 91 | + <TextView | |
| 92 | + android:layout_width="match_parent" | |
| 93 | + android:layout_height="wrap_content" | |
| 94 | + android:textAppearance="?android:attr/textAppearanceSmall" | |
| 95 | + android:text="감사합니다" | |
| 96 | + android:id="@+id/textView15" | |
| 97 | + android:layout_gravity="center_vertical" | |
| 98 | + android:gravity="left" | |
| 99 | + android:paddingLeft="10dp" /> | |
| 100 | + | |
| 101 | + <ImageView | |
| 102 | + android:layout_width="match_parent" | |
| 103 | + android:layout_height="match_parent" | |
| 104 | + android:id="@+id/image_view_about_hide1" | |
| 105 | + android:background="#333333" | |
| 106 | + android:layout_marginTop="17dp" | |
| 107 | + android:layout_marginBottom="20dp" | |
| 108 | + android:layout_marginLeft="10dp" | |
| 109 | + android:layout_marginRight="90dp" /> | |
| 110 | + </FrameLayout> | |
| 103 | 111 | |
| 104 | - <ImageView | |
| 105 | - android:layout_width="0dp" | |
| 106 | - android:layout_height="wrap_content" | |
| 107 | - android:id="@+id/imageView6" | |
| 108 | - android:src="@drawable/about_pay_coffee_3" | |
| 109 | - android:layout_weight="3" | |
| 110 | - android:adjustViewBounds="true" /> | |
| 112 | + </LinearLayout> | |
| 111 | 113 | |
| 112 | - <TextView | |
| 113 | - android:layout_width="0dp" | |
| 114 | - android:layout_height="wrap_content" | |
| 115 | - android:textAppearance="?android:attr/textAppearanceSmall" | |
| 116 | - android:text="1000원" | |
| 117 | - android:id="@+id/textView16" | |
| 118 | - android:layout_weight="1.8" | |
| 119 | - android:gravity="right" | |
| 120 | - android:layout_marginRight="10dp" /> | |
| 121 | - | |
| 122 | - <FrameLayout | |
| 123 | - android:layout_width="0dp" | |
| 124 | - android:layout_height="match_parent" | |
| 125 | - android:layout_weight="5" > | |
| 126 | - | |
| 127 | - <TextView | |
| 114 | + <LinearLayout | |
| 115 | + android:orientation="horizontal" | |
| 128 | 116 | android:layout_width="match_parent" |
| 129 | 117 | android:layout_height="wrap_content" |
| 130 | - android:textAppearance="?android:attr/textAppearanceSmall" | |
| 131 | - android:text="작은 감사가 큰 감사를 낳는다-알렉스 헤일리\n“크게 감사합니다.!!”" | |
| 132 | - android:id="@+id/textView17" | |
| 133 | - android:layout_gravity="center_vertical" | |
| 134 | - android:gravity="left" | |
| 135 | - android:paddingLeft="10dp" /> | |
| 136 | - | |
| 137 | - <ImageView | |
| 138 | - android:layout_width="match_parent" | |
| 139 | - android:layout_height="match_parent" | |
| 140 | - android:id="@+id/imageView7" | |
| 141 | - android:background="#BBBBBB" | |
| 142 | - android:layout_marginBottom="1dp" | |
| 143 | - android:layout_marginLeft="12dp" | |
| 144 | - android:layout_marginRight="0dp" | |
| 145 | - android:layout_marginTop="4dp" /> | |
| 146 | - </FrameLayout> | |
| 147 | - </LinearLayout> | |
| 118 | + android:weightSum="10" | |
| 119 | + android:gravity="center_vertical" > | |
| 148 | 120 | |
| 149 | - <LinearLayout | |
| 150 | - android:orientation="horizontal" | |
| 151 | - android:layout_width="match_parent" | |
| 152 | - android:layout_height="wrap_content" | |
| 153 | - android:weightSum="10" | |
| 154 | - android:gravity="top" > | |
| 155 | - | |
| 156 | - <ImageView | |
| 157 | - android:layout_width="0dp" | |
| 158 | - android:layout_height="wrap_content" | |
| 159 | - android:id="@+id/imageView8" | |
| 160 | - android:src="@drawable/about_pay_coffee_3" | |
| 161 | - android:layout_weight="3" | |
| 162 | - android:adjustViewBounds="true" /> | |
| 121 | + <ImageView | |
| 122 | + android:layout_width="0dp" | |
| 123 | + android:layout_height="wrap_content" | |
| 124 | + android:id="@+id/imageView6" | |
| 125 | + android:src="@drawable/about_pay_coffee_3" | |
| 126 | + android:layout_weight="3" | |
| 127 | + android:adjustViewBounds="true" /> | |
| 163 | 128 | |
| 164 | - <TextView | |
| 165 | - android:layout_width="0dp" | |
| 166 | - android:layout_height="wrap_content" | |
| 167 | - android:textAppearance="?android:attr/textAppearanceSmall" | |
| 168 | - android:text="1000원" | |
| 169 | - android:id="@+id/textView18" | |
| 170 | - android:layout_weight="1.8" | |
| 171 | - android:gravity="right" | |
| 172 | - android:layout_marginRight="10dp" | |
| 173 | - android:layout_marginTop="20dp" /> | |
| 174 | - | |
| 175 | - <FrameLayout | |
| 176 | - android:layout_width="0dp" | |
| 177 | - android:layout_height="wrap_content" | |
| 178 | - android:layout_weight="5"> | |
| 129 | + <TextView | |
| 130 | + android:layout_width="0dp" | |
| 131 | + android:layout_height="wrap_content" | |
| 132 | + android:textAppearance="?android:attr/textAppearanceSmall" | |
| 133 | + android:text="1000원" | |
| 134 | + android:id="@+id/text_about_price2" | |
| 135 | + android:layout_weight="1.8" | |
| 136 | + android:gravity="right" | |
| 137 | + android:layout_marginRight="10dp" /> | |
| 138 | + | |
| 139 | + <FrameLayout | |
| 140 | + android:layout_width="0dp" | |
| 141 | + android:layout_height="match_parent" | |
| 142 | + android:layout_weight="5" > | |
| 143 | + | |
| 144 | + <TextView | |
| 145 | + android:layout_width="match_parent" | |
| 146 | + android:layout_height="wrap_content" | |
| 147 | + android:textAppearance="?android:attr/textAppearanceSmall" | |
| 148 | + android:text="작은 감사가 큰 감사를 낳는다-알렉스 헤일리\n“크게 감사합니다.!!”" | |
| 149 | + android:id="@+id/textView17" | |
| 150 | + android:layout_gravity="center_vertical" | |
| 151 | + android:gravity="left" | |
| 152 | + android:paddingLeft="10dp" /> | |
| 153 | + | |
| 154 | + <ImageView | |
| 155 | + android:layout_width="match_parent" | |
| 156 | + android:layout_height="match_parent" | |
| 157 | + android:id="@+id/image_view_about_hide2" | |
| 158 | + android:background="#BBBBBB" | |
| 159 | + android:layout_marginBottom="1dp" | |
| 160 | + android:layout_marginLeft="12dp" | |
| 161 | + android:layout_marginRight="0dp" | |
| 162 | + android:layout_marginTop="4dp" /> | |
| 163 | + </FrameLayout> | |
| 164 | + </LinearLayout> | |
| 179 | 165 | |
| 180 | 166 | <LinearLayout |
| 181 | - android:orientation="vertical" | |
| 167 | + android:orientation="horizontal" | |
| 182 | 168 | android:layout_width="match_parent" |
| 183 | 169 | android:layout_height="wrap_content" |
| 184 | - android:layout_weight="5"> | |
| 170 | + android:weightSum="10" | |
| 171 | + android:gravity="top" > | |
| 185 | 172 | |
| 186 | 173 | <ImageView |
| 187 | - android:layout_width="wrap_content" | |
| 174 | + android:layout_width="0dp" | |
| 188 | 175 | android:layout_height="wrap_content" |
| 189 | - android:id="@+id/imageView10" | |
| 190 | - android:src="@drawable/about_bear_small" | |
| 191 | - android:adjustViewBounds="true" | |
| 192 | - android:layout_gravity="center_horizontal" /> | |
| 176 | + android:id="@+id/imageView8" | |
| 177 | + android:src="@drawable/about_pay_coffee_3" | |
| 178 | + android:layout_weight="3" | |
| 179 | + android:adjustViewBounds="true" /> | |
| 193 | 180 | |
| 194 | 181 | <TextView |
| 195 | - android:layout_width="match_parent" | |
| 182 | + android:layout_width="0dp" | |
| 196 | 183 | android:layout_height="wrap_content" |
| 197 | 184 | android:textAppearance="?android:attr/textAppearanceSmall" |
| 198 | - android:text="감격의 눈물이.!!\n업데이트로 보답드리겠습니다." | |
| 199 | - android:id="@+id/textView19" | |
| 200 | - android:layout_gravity="center_vertical" | |
| 201 | - android:gravity="center" /> | |
| 185 | + android:text="1000원" | |
| 186 | + android:id="@+id/text_about_price3" | |
| 187 | + android:layout_weight="1.8" | |
| 188 | + android:gravity="right" | |
| 189 | + android:layout_marginRight="10dp" | |
| 190 | + android:layout_marginTop="20dp" /> | |
| 191 | + | |
| 192 | + <FrameLayout | |
| 193 | + android:layout_width="0dp" | |
| 194 | + android:layout_height="wrap_content" | |
| 195 | + android:layout_weight="5"> | |
| 196 | + | |
| 197 | + <LinearLayout | |
| 198 | + android:orientation="vertical" | |
| 199 | + android:layout_width="match_parent" | |
| 200 | + android:layout_height="wrap_content" | |
| 201 | + android:layout_weight="5"> | |
| 202 | + | |
| 203 | + <ImageView | |
| 204 | + android:layout_width="wrap_content" | |
| 205 | + android:layout_height="wrap_content" | |
| 206 | + android:id="@+id/imageView10" | |
| 207 | + android:src="@drawable/about_bear_small" | |
| 208 | + android:adjustViewBounds="true" | |
| 209 | + android:layout_gravity="center_horizontal" /> | |
| 210 | + | |
| 211 | + <TextView | |
| 212 | + android:layout_width="match_parent" | |
| 213 | + android:layout_height="wrap_content" | |
| 214 | + android:textAppearance="?android:attr/textAppearanceSmall" | |
| 215 | + android:text="감격의 눈물이.!!\n업데이트로 보답드리겠습니다." | |
| 216 | + android:id="@+id/textView19" | |
| 217 | + android:layout_gravity="center_vertical" | |
| 218 | + android:gravity="center" /> | |
| 219 | + </LinearLayout> | |
| 220 | + | |
| 221 | + <ImageView | |
| 222 | + android:layout_width="match_parent" | |
| 223 | + android:layout_height="match_parent" | |
| 224 | + android:id="@+id/image_view_about_hide3" | |
| 225 | + android:background="#444444" | |
| 226 | + android:layout_marginLeft="9dp" | |
| 227 | + android:layout_marginTop="12dp" | |
| 228 | + android:layout_marginRight="10dp" /> | |
| 229 | + | |
| 230 | + </FrameLayout> | |
| 231 | + | |
| 202 | 232 | </LinearLayout> |
| 233 | + </LinearLayout> | |
| 234 | + </LinearLayout> | |
| 235 | + </ScrollView> | |
| 203 | 236 | |
| 204 | - <ImageView | |
| 205 | - android:layout_width="match_parent" | |
| 206 | - android:layout_height="match_parent" | |
| 207 | - android:id="@+id/imageView9" | |
| 208 | - android:background="#444444" | |
| 209 | - android:layout_marginLeft="9dp" | |
| 210 | - android:layout_marginTop="12dp" | |
| 211 | - android:layout_marginRight="10dp" /> | |
| 212 | 237 | |
| 213 | - </FrameLayout> | |
| 238 | +</LinearLayout> | |
| 214 | 239 | |
| 215 | - </LinearLayout> | |
| 216 | - </LinearLayout> | |
| 217 | -</LinearLayout> | |
| 218 | 240 | \ No newline at end of file | ... | ... |
app/src/main/res/values/strings.xml
| ... | ... | @@ -8,6 +8,6 @@ |
| 8 | 8 | <string name="action_main_about">About</string> |
| 9 | 9 | |
| 10 | 10 | <string name="about_description">책을 사랑하는 개인 개발자입니다.\n아무리 기다려도 UserStory의\n클라이언트 소식이 없어 직접 개발에 나섰습니다.\n |
| 11 | -\n사무실이 없어 마땅한 작업공간이 없는 관계로 커피샵을\n전전하며 작업을 이어가고 있습니다.\n\n...\n\n이제는 향기로운 커피 향기와 함께\n새로운 기능을 개발하는 일에 익숙해지고 말았습니다.\n | |
| 11 | +\n마땅한 작업공간이 없는 관계로 카페를\n전전하며 작업을 이어가고 있습니다.\n\n...\n\n이제는 향기로운 커피 향기와 함께\n새로운 기능을 개발하는 일에 익숙해 졌네요.\n | |
| 12 | 12 | \n업데이트를 위해 커피한잔 대접해 주실래요?</string> |
| 13 | 13 | </resources> | ... | ... |