장연우 / WELLO

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

done

Inline Side-by-side
Showing 7 changed files with 81 additions and 44 deletions
...@@ -61,7 +61,7 @@ class RecommendActivity : AppCompatActivity() { ...@@ -61,7 +61,7 @@ class RecommendActivity : AppCompatActivity() {
61 policyList.add( 61 policyList.add(
62 PolicyItem( 62 PolicyItem(
63 ContextCompat.getDrawable(this@RecommendActivity, R.drawable.image01)!!, 63 ContextCompat.getDrawable(this@RecommendActivity, R.drawable.image01)!!,
64 - memo!!.Policy, 64 + "상시",
65 memo!!.Policy, 65 memo!!.Policy,
66 memo!!.Policy, 66 memo!!.Policy,
67 4.toFloat(), 67 4.toFloat(),
...@@ -89,7 +89,7 @@ class RecommendActivity : AppCompatActivity() { ...@@ -89,7 +89,7 @@ class RecommendActivity : AppCompatActivity() {
89 policyList.add( 89 policyList.add(
90 PolicyItem( 90 PolicyItem(
91 ContextCompat.getDrawable(this@RecommendActivity, R.drawable.image01)!!, 91 ContextCompat.getDrawable(this@RecommendActivity, R.drawable.image01)!!,
92 - memo!!.Policy, 92 + "상시",
93 memo!!.Policy, 93 memo!!.Policy,
94 memo!!.Policy, 94 memo!!.Policy,
95 4.toFloat(), 95 4.toFloat(),
......
...@@ -12,9 +12,9 @@ class ViewPagerAdapter(private val context : Context) : PagerAdapter() { ...@@ -12,9 +12,9 @@ class ViewPagerAdapter(private val context : Context) : PagerAdapter() {
12 12
13 private var layoutInflater : LayoutInflater? = null 13 private var layoutInflater : LayoutInflater? = null
14 val Image = arrayOf( 14 val Image = arrayOf(
15 - R.drawable.temp_view_pager_image, 15 + R.drawable.image01,
16 - R.drawable.temp_view_pager_image, 16 + R.drawable.image02,
17 - R.drawable.temp_view_pager_image 17 + R.drawable.image03
18 ) 18 )
19 19
20 20
......
...@@ -12,6 +12,6 @@ ...@@ -12,6 +12,6 @@
12 android:bottom="0dp" 12 android:bottom="0dp"
13 /> 13 />
14 14
15 - <corners android:bottomRightRadius="13dp" android:bottomLeftRadius="13dp" 15 + <corners android:bottomRightRadius="4dp" android:bottomLeftRadius="4dp"
16 - android:topLeftRadius="13dp" android:topRightRadius="13dp"/> 16 + android:topLeftRadius="4dp" android:topRightRadius="4dp"/>
17 </shape> 17 </shape>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -13,5 +13,5 @@ ...@@ -13,5 +13,5 @@
13 /> 13 />
14 14
15 <corners android:bottomRightRadius="0dp" android:bottomLeftRadius="0dp" 15 <corners android:bottomRightRadius="0dp" android:bottomLeftRadius="0dp"
16 - android:topLeftRadius="13dp" android:topRightRadius="13dp"/> 16 + android:topLeftRadius="5dp" android:topRightRadius="5dp"/>
17 </shape> 17 </shape>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
11 android:id="@+id/linearLayout" 11 android:id="@+id/linearLayout"
12 android:layout_width="match_parent" 12 android:layout_width="match_parent"
13 android:layout_height="match_parent" 13 android:layout_height="match_parent"
14 + android:background="#FFF"
14 android:orientation="vertical" 15 android:orientation="vertical"
15 app:layout_constraintBottom_toBottomOf="parent" 16 app:layout_constraintBottom_toBottomOf="parent"
16 app:layout_constraintEnd_toEndOf="parent" 17 app:layout_constraintEnd_toEndOf="parent"
...@@ -21,7 +22,6 @@ ...@@ -21,7 +22,6 @@
21 android:id="@+id/toolbar" 22 android:id="@+id/toolbar"
22 android:layout_width="fill_parent" 23 android:layout_width="fill_parent"
23 android:layout_height="wrap_content" 24 android:layout_height="wrap_content"
24 - android:layout_marginBottom="11dp"
25 android:background="#FFF" 25 android:background="#FFF"
26 android:elevation="5dp" 26 android:elevation="5dp"
27 android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" 27 android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
...@@ -36,24 +36,42 @@ ...@@ -36,24 +36,42 @@
36 36
37 <androidx.viewpager.widget.ViewPager 37 <androidx.viewpager.widget.ViewPager
38 android:id="@+id/welcomeViewPager" 38 android:id="@+id/welcomeViewPager"
39 - android:layout_width="400dp" 39 + android:layout_width="match_parent"
40 - android:layout_height="220dp" 40 + android:layout_height="262dp"
41 android:layout_gravity="center" 41 android:layout_gravity="center"
42 app:layout_constraintEnd_toEndOf="parent" 42 app:layout_constraintEnd_toEndOf="parent"
43 app:layout_constraintStart_toStartOf="parent" 43 app:layout_constraintStart_toStartOf="parent"
44 - app:layout_constraintTop_toTopOf="parent"></androidx.viewpager.widget.ViewPager> 44 + app:layout_constraintTop_toTopOf="parent">
45 +
46 + </androidx.viewpager.widget.ViewPager>
45 47
46 - <androidx.recyclerview.widget.RecyclerView 48 + <LinearLayout
47 - android:id="@+id/policyFieldRecyclerView" 49 + android:layout_width="match_parent"
48 - android:layout_width="400dp"
49 android:layout_height="wrap_content" 50 android:layout_height="wrap_content"
50 - android:layout_gravity="center|center_vertical" 51 + android:layout_gravity="center"
52 + android:layout_marginLeft="16dp"
53 + android:layout_marginRight="16dp"
51 android:layout_weight="1" 54 android:layout_weight="1"
52 - android:padding="20dp" 55 + android:foregroundGravity="center"
53 - app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" 56 + android:gravity="center"
54 - app:layout_constraintBottom_toBottomOf="@id/bottomNavigation" 57 + android:orientation="vertical">
55 - app:spanCount="3" 58 +
56 - tools:listitem="@layout/item_policyfield" /> 59 + <androidx.recyclerview.widget.RecyclerView
60 + android:id="@+id/policyFieldRecyclerView"
61 + android:layout_width="match_parent"
62 + android:layout_height="wrap_content"
63 +
64 + android:layout_gravity="center|center_horizontal"
65 + android:layout_marginTop="11dp"
66 + android:layout_marginBottom="11dp"
67 + android:layout_weight="1"
68 + android:background="@drawable/round_ractagle_solid"
69 + android:foregroundGravity="center"
70 + app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
71 + app:layout_constraintBottom_toBottomOf="@id/bottomNavigation"
72 + app:spanCount="3"
73 + tools:listitem="@layout/item_policyfield" />
74 + </LinearLayout>
57 75
58 <com.google.android.material.bottomnavigation.BottomNavigationView 76 <com.google.android.material.bottomnavigation.BottomNavigationView
59 android:id="@+id/bottomNavigation" 77 android:id="@+id/bottomNavigation"
...@@ -61,6 +79,7 @@ ...@@ -61,6 +79,7 @@
61 android:layout_height="wrap_content" 79 android:layout_height="wrap_content"
62 android:layout_gravity="bottom" 80 android:layout_gravity="bottom"
63 android:background="#FFF" 81 android:background="#FFF"
82 + android:elevation="8dp"
64 app:itemIconTint="#29ABE2" 83 app:itemIconTint="#29ABE2"
65 app:itemTextColor="#29ABE2" 84 app:itemTextColor="#29ABE2"
66 app:labelVisibilityMode="labeled" 85 app:labelVisibilityMode="labeled"
......
...@@ -3,18 +3,18 @@ ...@@ -3,18 +3,18 @@
3 xmlns:app="http://schemas.android.com/apk/res-auto" 3 xmlns:app="http://schemas.android.com/apk/res-auto"
4 xmlns:tools="http://schemas.android.com/tools" 4 xmlns:tools="http://schemas.android.com/tools"
5 android:layout_width="match_parent" 5 android:layout_width="match_parent"
6 - android:layout_height="200dp" 6 + android:layout_height="150dp"
7 - android:layout_margin="10dp" 7 + android:layout_margin="7dp"
8 android:background="@drawable/round_ractagle_solid" 8 android:background="@drawable/round_ractagle_solid"
9 - android:orientation="horizontal" 9 + android:orientation="horizontal">
10 - android:padding="10dp">
11 10
12 11
13 <ImageView 12 <ImageView
14 android:id="@+id/policyImage" 13 android:id="@+id/policyImage"
15 - android:layout_width="100dp" 14 + android:layout_width="120dp"
16 android:layout_height="match_parent" 15 android:layout_height="match_parent"
17 android:layout_weight="1" 16 android:layout_weight="1"
17 + android:paddingLeft="7dp"
18 tools:srcCompat="@tools:sample/avatars" /> 18 tools:srcCompat="@tools:sample/avatars" />
19 19
20 <LinearLayout 20 <LinearLayout
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
23 android:layout_weight="2" 23 android:layout_weight="2"
24 android:orientation="vertical"> 24 android:orientation="vertical">
25 25
26 - <LinearLayout 26 + <RelativeLayout
27 android:layout_width="match_parent" 27 android:layout_width="match_parent"
28 android:layout_height="10dp" 28 android:layout_height="10dp"
29 android:layout_weight="1" 29 android:layout_weight="1"
...@@ -31,44 +31,64 @@ ...@@ -31,44 +31,64 @@
31 31
32 <TextView 32 <TextView
33 android:id="@+id/policyDday" 33 android:id="@+id/policyDday"
34 - android:layout_width="wrap_content" 34 + android:layout_width="77dp"
35 - android:layout_height="wrap_content" 35 + android:layout_height="39dp"
36 - android:layout_weight="1" 36 + android:background="@drawable/broken_rectangle"
37 - android:text="TextView" /> 37 + android:gravity="center"
38 + android:text="TextView"
39 + android:textColor="#FFF"
40 + android:textSize="18sp" />
41 +
38 42
39 <ToggleButton 43 <ToggleButton
40 android:id="@+id/policyFavor" 44 android:id="@+id/policyFavor"
41 - android:layout_width="30dp" 45 + android:layout_width="22dp"
42 - android:layout_height="30dp" 46 + android:layout_height="25dp"
47 + android:layout_alignParentRight="true"
48 + android:layout_gravity="right"
49 + android:layout_marginTop="11dp"
50 + android:layout_marginRight="20dp"
43 android:layout_weight="0" 51 android:layout_weight="0"
44 android:background="@drawable/toggle_selector" 52 android:background="@drawable/toggle_selector"
45 android:checked="false" 53 android:checked="false"
46 android:textOff="" 54 android:textOff=""
47 android:textOn="" /> 55 android:textOn="" />
48 - </LinearLayout> 56 + </RelativeLayout>
49 57
50 <TextView 58 <TextView
51 android:id="@+id/policyHost" 59 android:id="@+id/policyHost"
52 android:layout_width="match_parent" 60 android:layout_width="match_parent"
53 android:layout_height="10dp" 61 android:layout_height="10dp"
54 - android:layout_weight="1" 62 + android:layout_marginLeft="14dp"
55 - android:gravity="center" 63 + android:layout_weight="0.7"
56 - android:text="TextView" /> 64 + android:gravity="bottom|left|center_vertical"
65 + android:text="TextView"
66 + android:textColor="#C04A4A4A"
67 + android:textSize="13dp" />
57 68
58 <TextView 69 <TextView
59 android:id="@+id/policyTitle" 70 android:id="@+id/policyTitle"
60 android:layout_width="match_parent" 71 android:layout_width="match_parent"
61 android:layout_height="10dp" 72 android:layout_height="10dp"
73 + android:layout_marginLeft="11dp"
62 android:layout_weight="1" 74 android:layout_weight="1"
63 - android:gravity="center" 75 + android:gravity="left|center_vertical"
64 - android:text="TextView" /> 76 + android:text="TextView"
77 + android:textColor="#000"
78 + android:textSize="18dp" />
65 79
66 <RatingBar 80 <RatingBar
67 android:id="@+id/policyScore" 81 android:id="@+id/policyScore"
68 android:layout_width="240dp" 82 android:layout_width="240dp"
69 - android:layout_height="10dp" 83 + android:layout_height="22dp"
70 android:layout_gravity="center" 84 android:layout_gravity="center"
71 - android:layout_weight="1" /> 85 + android:layout_weight="1"
86 + android:max="5"
87 + android:rating="3.5"
88 + android:scaleX=".5"
89 + android:scaleY="0.5"
90 + android:transformPivotX="0dp"
91 + android:transformPivotY="0dp" />
72 </LinearLayout> 92 </LinearLayout>
73 93
74 </LinearLayout> 94 </LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -4,10 +4,8 @@ ...@@ -4,10 +4,8 @@
4 android:layout_width="100dp" 4 android:layout_width="100dp"
5 android:layout_height="100dp" 5 android:layout_height="100dp"
6 android:layout_gravity="center" 6 android:layout_gravity="center"
7 - android:layout_margin="10dp"
8 android:gravity="center" 7 android:gravity="center"
9 - android:orientation="vertical" 8 + android:orientation="vertical">
10 - android:padding="3dp">
11 9
12 10
13 <ImageView 11 <ImageView
......