장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
soonmyeong2
b25a41ff 1 parent ba873ed5

back up stage file

Expand all
Inline Side-by-side
Showing 29 changed files with 183 additions and 29 deletions
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
31 <activity android:name=".InputProfilFirstThreeActivity" /> 31 <activity android:name=".InputProfilFirstThreeActivity" />
32 <activity android:name=".InputProfilFirstTwoActivity" /> 32 <activity android:name=".InputProfilFirstTwoActivity" />
33 <activity android:name=".InputProfilFirstOneActivity" /> 33 <activity android:name=".InputProfilFirstOneActivity" />
34 + <activity android:name=".AccountSettingActivity"/>
34 <activity android:name=".PrivacyPolicyActivity"/> 35 <activity android:name=".PrivacyPolicyActivity"/>
35 <activity android:name=".TermsOfUserActivity"/> 36 <activity android:name=".TermsOfUserActivity"/>
36 <activity android:name=".NoticeActivity"/> 37 <activity android:name=".NoticeActivity"/>
......
1 +package com.example.vip
2 +
3 +import android.os.Bundle
4 +import androidx.appcompat.app.AppCompatActivity
5 +
6 +class AccountSettingActivity : AppCompatActivity() {
7 + override fun onCreate(savedInstanceState: Bundle?) {
8 + super.onCreate(savedInstanceState)
9 + setContentView(R.layout.activity_account_settings)
10 + }
11 +}
...\ No newline at end of file ...\ No newline at end of file
...@@ -77,7 +77,7 @@ class DetailActivity : AppCompatActivity() { ...@@ -77,7 +77,7 @@ class DetailActivity : AppCompatActivity() {
77 detailDday.text=memo!!.Date 77 detailDday.text=memo!!.Date
78 detailTitle.text=memo!!.Policy 78 detailTitle.text=memo!!.Policy
79 detailScore.rating=4.toFloat() 79 detailScore.rating=4.toFloat()
80 - detailFavor.text="0" 80 + detailFavor.text=" [실행 부처]"
81 81
82 val web : WebView = findViewById(R.id.policy_context) 82 val web : WebView = findViewById(R.id.policy_context)
83 val summary : String = memo!!.Content 83 val summary : String = memo!!.Content
......
...@@ -66,10 +66,12 @@ class SearchActivity : AppCompatActivity() { ...@@ -66,10 +66,12 @@ class SearchActivity : AppCompatActivity() {
66 } 66 }
67 override fun onDataChange(dataSnapshot: DataSnapshot) { 67 override fun onDataChange(dataSnapshot: DataSnapshot) {
68 if (dataSnapshot.exists() == false){ // 값 없을 때 68 if (dataSnapshot.exists() == false){ // 값 없을 때
69 + policy_scroll_view.setVisibility(View.GONE)
69 no_search.setVisibility(View.VISIBLE) 70 no_search.setVisibility(View.VISIBLE)
70 } 71 }
71 else { 72 else {
72 no_search.setVisibility(View.GONE) 73 no_search.setVisibility(View.GONE)
74 + policy_scroll_view.setVisibility(View.VISIBLE)
73 } 75 }
74 76
75 for (memoSnapshot in dataSnapshot.children){ 77 for (memoSnapshot in dataSnapshot.children){
......
...@@ -11,6 +11,10 @@ class SettingsInForm : AppCompatActivity() { ...@@ -11,6 +11,10 @@ class SettingsInForm : AppCompatActivity() {
11 super.onCreate(savedInstanceState) 11 super.onCreate(savedInstanceState)
12 setContentView(R.layout.activity_settings_in_form) 12 setContentView(R.layout.activity_settings_in_form)
13 13
14 + accountBtn.setOnClickListener {
15 + var intent = Intent(this, AccountSettingActivity::class.java)
16 + startActivity(intent)
17 + }
14 18
15 info_push.setOnClickListener { 19 info_push.setOnClickListener {
16 var intent = Intent(this, PushInfoActivity::class.java) 20 var intent = Intent(this, PushInfoActivity::class.java)
......
...@@ -12,6 +12,6 @@ ...@@ -12,6 +12,6 @@
12 android:bottom="0dp" 12 android:bottom="0dp"
13 /> 13 />
14 14
15 - <corners android:bottomRightRadius="22dp" android:bottomLeftRadius="0dp" 15 + <corners android:bottomRightRadius="13dp" android:bottomLeftRadius="0dp"
16 android:topLeftRadius="0dp" android:topRightRadius="0dp"/> 16 android:topLeftRadius="0dp" android:topRightRadius="0dp"/>
17 </shape> 17 </shape>
...\ No newline at end of file ...\ No newline at end of file
......
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<shape xmlns:android="http://schemas.android.com/apk/res/android">
3 + <solid android:color="#FFF"/>
4 +
5 + <stroke android:width="1dp"
6 + android:color="#E6E6E6"
7 + />
8 +
9 + <padding android:left="0dp"
10 + android:top="0dp"
11 + android:right="0dp"
12 + android:bottom="0dp"
13 + />
14 +
15 + <corners android:bottomRightRadius="13dp" android:bottomLeftRadius="13dp"
16 + android:topLeftRadius="13dp" android:topRightRadius="13dp"/>
17 +</shape>
...\ No newline at end of file ...\ No newline at end of file
1 -<?xml version="1.0" encoding="utf-8"?> 1 +<?xml version="1.0" encoding="UTF-8"?>
2 -<shape xmlns:android="http://schemas.android.com/apk/res/android" 2 +<shape xmlns:android="http://schemas.android.com/apk/res/android">
3 - android:shape="rectangle"> 3 + <solid android:color="#FFF"/>
4 - <corners android:radius="10dp" /> 4 +
5 + <stroke android:width="0dp"
6 + android:color="#FFF"
7 + />
8 +
9 + <padding android:left="0dp"
10 + android:top="0dp"
11 + android:right="0dp"
12 + android:bottom="0dp"
13 + />
14 +
15 + <corners android:bottomRightRadius="0dp" android:bottomLeftRadius="0dp"
16 + android:topLeftRadius="13dp" android:topRightRadius="13dp"/>
5 </shape> 17 </shape>
...\ No newline at end of file ...\ No newline at end of file
......
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 + android:orientation="vertical" android:layout_width="match_parent"
4 + xmlns:app="http://schemas.android.com/apk/res-auto"
5 + xmlns:tools="http://schemas.android.com/tools"
6 + android:layout_height="match_parent">
7 +
8 + <androidx.appcompat.widget.Toolbar
9 + android:id="@+id/toolbar"
10 + android:layout_width="fill_parent"
11 + android:layout_height="wrap_content"
12 + android:layout_gravity="center"
13 + android:layout_marginBottom="11dp"
14 + android:background="#FFF"
15 + android:elevation="5dp"
16 + android:gravity="center"
17 + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
18 + app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
19 +
20 + <TextView
21 + android:layout_width="77dp"
22 + android:layout_height="44dp"
23 + android:layout_gravity="center"
24 + android:gravity="center"
25 + android:text="계정 설정"
26 + android:textColor="#000"
27 + android:textSize="16dp" />
28 + </androidx.appcompat.widget.Toolbar>
29 +
30 + <LinearLayout
31 + android:layout_width="match_parent"
32 + android:layout_height="match_parent"
33 + android:layout_weight="1"
34 + android:background="#fff"
35 + android:orientation="vertical">
36 +
37 + <LinearLayout
38 + android:layout_width="match_parent"
39 + android:layout_height="wrap_content"
40 + android:orientation="vertical"></LinearLayout>
41 +
42 + <Button
43 + android:id="@+id/button"
44 + style="?android:attr/borderlessButtonStyle"
45 + android:layout_width="match_parent"
46 + android:layout_height="65dp"
47 + android:layout_marginLeft="11dp"
48 + android:layout_marginRight="11dp"
49 + android:background="@drawable/bottom_border"
50 + android:gravity="left|center_vertical"
51 + android:paddingLeft="33dp"
52 + android:text="정보 수정 (준비중)"
53 + android:textSize="17dp" />
54 +
55 + <Button
56 + android:id="@+id/info_push"
57 + style="?android:attr/borderlessButtonStyle"
58 + android:layout_width="match_parent"
59 + android:layout_height="65dp"
60 + android:layout_marginLeft="11dp"
61 + android:layout_marginRight="11dp"
62 + android:background="@drawable/bottom_border"
63 + android:gravity="left|center_vertical"
64 + android:paddingLeft="33dp"
65 + android:text="로그아웃 (준비중)"
66 + android:textSize="17dp" />
67 +
68 + <Button
69 + android:id="@+id/terms_of_use"
70 + style="?android:attr/borderlessButtonStyle"
71 + android:layout_width="match_parent"
72 + android:layout_height="65dp"
73 + android:layout_marginLeft="11dp"
74 + android:layout_marginRight="11dp"
75 + android:background="@drawable/bottom_border"
76 + android:gravity="left|center_vertical"
77 + android:paddingLeft="33dp"
78 + android:text="회원 탈퇴 (준비중)"
79 + android:textSize="17dp" />
80 +
81 + </LinearLayout>
82 +
83 + <com.google.android.material.bottomnavigation.BottomNavigationView
84 + android:id="@+id/bottomNavigation"
85 + android:layout_width="match_parent"
86 + android:layout_height="wrap_content"
87 + android:layout_gravity="bottom"
88 + android:background="#FFF"
89 + app:itemIconTint="#29ABE2"
90 + app:itemTextColor="#29ABE2"
91 + app:labelVisibilityMode="labeled"
92 + app:menu="@menu/bottom_nav_menu" />
93 +
94 +</LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
...@@ -37,13 +37,13 @@ ...@@ -37,13 +37,13 @@
37 <ScrollView 37 <ScrollView
38 android:layout_width="match_parent" 38 android:layout_width="match_parent"
39 android:layout_height="match_parent" 39 android:layout_height="match_parent"
40 - android:layout_marginStart="8dp"
41 android:layout_marginLeft="8dp" 40 android:layout_marginLeft="8dp"
42 - android:layout_marginEnd="8dp"
43 android:layout_marginRight="8dp" 41 android:layout_marginRight="8dp"
44 android:layout_weight="1" 42 android:layout_weight="1"
45 - android:elevation="5dp" 43 + android:background="@drawable/round_ratangle"
46 - android:fillViewport="true"> 44 + android:elevation="3dp"
45 + android:fillViewport="true"
46 + android:padding="7dp">
47 47
48 <LinearLayout 48 <LinearLayout
49 android:layout_width="match_parent" 49 android:layout_width="match_parent"
...@@ -55,18 +55,20 @@ ...@@ -55,18 +55,20 @@
55 android:layout_width="match_parent" 55 android:layout_width="match_parent"
56 android:layout_height="200dp" 56 android:layout_height="200dp"
57 android:background="@drawable/round_ratangle" 57 android:background="@drawable/round_ratangle"
58 + android:elevation="5dp"
58 android:scaleType="fitXY" 59 android:scaleType="fitXY"
59 app:srcCompat="@drawable/image03" /> 60 app:srcCompat="@drawable/image03" />
60 61
61 <LinearLayout 62 <LinearLayout
62 android:layout_width="match_parent" 63 android:layout_width="match_parent"
63 android:layout_height="match_parent" 64 android:layout_height="match_parent"
65 + android:elevation="7dp"
64 android:orientation="vertical"> 66 android:orientation="vertical">
65 67
66 <TextView 68 <TextView
67 android:id="@+id/policyDdayDetail" 69 android:id="@+id/policyDdayDetail"
68 android:layout_width="77dp" 70 android:layout_width="77dp"
69 - android:layout_height="44dp" 71 + android:layout_height="39dp"
70 android:background="@drawable/broken_rectangle" 72 android:background="@drawable/broken_rectangle"
71 android:gravity="center" 73 android:gravity="center"
72 android:text="TextView" 74 android:text="TextView"
...@@ -74,24 +76,33 @@ ...@@ -74,24 +76,33 @@
74 android:textSize="18sp" /> 76 android:textSize="18sp" />
75 77
76 <TextView 78 <TextView
79 + android:id="@+id/policyFavorDetail"
80 + android:layout_width="wrap_content"
81 + android:layout_height="wrap_content"
82 + android:layout_marginTop="5dp"
83 + android:text="TextView" />
84 +
85 + <TextView
77 android:id="@+id/policyTitleDetail" 86 android:id="@+id/policyTitleDetail"
78 android:layout_width="match_parent" 87 android:layout_width="match_parent"
79 android:layout_height="wrap_content" 88 android:layout_height="wrap_content"
80 android:layout_marginLeft="11dp" 89 android:layout_marginLeft="11dp"
81 - android:layout_marginBottom="5dp" 90 + android:layout_marginBottom="4dp"
82 android:text="Textw" 91 android:text="Textw"
83 android:textSize="30sp" /> 92 android:textSize="30sp" />
84 93
85 <RatingBar 94 <RatingBar
86 android:id="@+id/policyScoreDetail" 95 android:id="@+id/policyScoreDetail"
87 - android:layout_width="wrap_content" 96 + style="?android:attr/ratingBarStyleIndicator"
88 - android:layout_height="wrap_content" />
89 -
90 - <TextView
91 - android:id="@+id/policyFavorDetail"
92 android:layout_width="wrap_content" 97 android:layout_width="wrap_content"
93 android:layout_height="wrap_content" 98 android:layout_height="wrap_content"
94 - android:text="TextView" /> 99 + android:layout_marginLeft="11dp"
100 + android:max="5"
101 + android:rating="3.5"
102 + android:scaleX=".5"
103 + android:scaleY="0.5"
104 + android:transformPivotX="0dp"
105 + android:transformPivotY="0dp" />
95 106
96 <WebView 107 <WebView
97 android:id="@+id/policy_context" 108 android:id="@+id/policy_context"
...@@ -105,6 +116,7 @@ ...@@ -105,6 +116,7 @@
105 android:id="@+id/fragmentContainer" 116 android:id="@+id/fragmentContainer"
106 android:layout_width="match_parent" 117 android:layout_width="match_parent"
107 android:layout_height="wrap_content" 118 android:layout_height="wrap_content"
119 + android:elevation="4dp"
108 app:layout_constraintBottom_toBottomOf="parent"> 120 app:layout_constraintBottom_toBottomOf="parent">
109 121
110 <LinearLayout 122 <LinearLayout
...@@ -116,7 +128,7 @@ ...@@ -116,7 +128,7 @@
116 <LinearLayout 128 <LinearLayout
117 android:layout_width="match_parent" 129 android:layout_width="match_parent"
118 android:layout_height="match_parent" 130 android:layout_height="match_parent"
119 - android:layout_weight="1.3" 131 + android:layout_weight="1.2"
120 android:orientation="horizontal"> 132 android:orientation="horizontal">
121 133
122 <com.google.android.material.bottomnavigation.BottomNavigationView 134 <com.google.android.material.bottomnavigation.BottomNavigationView
...@@ -125,6 +137,7 @@ ...@@ -125,6 +137,7 @@
125 android:layout_height="wrap_content" 137 android:layout_height="wrap_content"
126 android:layout_gravity="bottom" 138 android:layout_gravity="bottom"
127 android:background="#FFF" 139 android:background="#FFF"
140 + android:elevation="5dp"
128 app:itemIconTint="#DDDDDD" 141 app:itemIconTint="#DDDDDD"
129 app:labelVisibilityMode="unlabeled" 142 app:labelVisibilityMode="unlabeled"
130 app:menu="@menu/detailpage_navigation" /> 143 app:menu="@menu/detailpage_navigation" />
...@@ -141,7 +154,8 @@ ...@@ -141,7 +154,8 @@
141 android:layout_width="match_parent" 154 android:layout_width="match_parent"
142 android:layout_height="wrap_content" 155 android:layout_height="wrap_content"
143 android:layout_gravity="bottom" 156 android:layout_gravity="bottom"
144 - android:background="@drawable/link1" 157 + android:background="@drawable/link2"
158 + android:elevation="5dp"
145 app:itemIconTint="#FFF" 159 app:itemIconTint="#FFF"
146 app:itemTextColor="#FFF" 160 app:itemTextColor="#FFF"
147 app:labelVisibilityMode="unlabeled" 161 app:labelVisibilityMode="unlabeled"
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 android:orientation="vertical"></LinearLayout> 40 android:orientation="vertical"></LinearLayout>
41 41
42 <Button 42 <Button
43 - android:id="@+id/button" 43 + android:id="@+id/accountBtn"
44 style="?android:attr/borderlessButtonStyle" 44 style="?android:attr/borderlessButtonStyle"
45 android:layout_width="match_parent" 45 android:layout_width="match_parent"
46 android:layout_height="65dp" 46 android:layout_height="65dp"
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
49 android:background="@drawable/bottom_border" 49 android:background="@drawable/bottom_border"
50 android:gravity="left|center_vertical" 50 android:gravity="left|center_vertical"
51 android:paddingLeft="33dp" 51 android:paddingLeft="33dp"
52 - android:text="계정 설정 (미구현)" 52 + android:text="계정 설정"
53 android:textSize="17dp" /> 53 android:textSize="17dp" />
54 54
55 <Button 55 <Button
...@@ -67,16 +67,16 @@ ...@@ -67,16 +67,16 @@
67 67
68 <Button 68 <Button
69 android:id="@+id/button3" 69 android:id="@+id/button3"
70 - android:textSize="17dp"
71 style="?android:attr/borderlessButtonStyle" 70 style="?android:attr/borderlessButtonStyle"
72 android:layout_width="match_parent" 71 android:layout_width="match_parent"
72 + android:layout_height="65dp"
73 android:layout_marginLeft="11dp" 73 android:layout_marginLeft="11dp"
74 android:layout_marginRight="11dp" 74 android:layout_marginRight="11dp"
75 - android:layout_height="65dp"
76 - android:gravity="left|center_vertical"
77 android:background="@drawable/bottom_border" 75 android:background="@drawable/bottom_border"
76 + android:gravity="left|center_vertical"
78 android:paddingLeft="33dp" 77 android:paddingLeft="33dp"
79 - android:text="접근권한 설정 (미구현)" /> 78 + android:text="접근권한 설정 (준비중)"
79 + android:textSize="17dp" />
80 80
81 <Button 81 <Button
82 android:id="@+id/terms_of_use" 82 android:id="@+id/terms_of_use"
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 android:layout_width="match_parent" 5 android:layout_width="match_parent"
6 android:layout_height="200dp" 6 android:layout_height="200dp"
7 android:layout_margin="10dp" 7 android:layout_margin="10dp"
8 - android:background="@drawable/edgemaking" 8 + android:background="@drawable/round_ractagle_solid"
9 android:orientation="horizontal" 9 android:orientation="horizontal"
10 android:padding="10dp"> 10 android:padding="10dp">
11 11
......
This diff is collapsed. Click to expand it.
...@@ -6,8 +6,7 @@ ...@@ -6,8 +6,7 @@
6 <item 6 <item
7 android:id="@+id/linkBtn" 7 android:id="@+id/linkBtn"
8 android:enabled="true" 8 android:enabled="true"
9 - android:icon="@drawable/link1" 9 + android:title=""
10 - android:title="사이트 바로가기"
11 app:showAsAction="ifRoom" /> 10 app:showAsAction="ifRoom" />
12 </menu> 11 </menu>
13 12
......