장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
신기성
e9226d93 1 parent bb2ff6c9

home category size changing and login margin and recyclerview duplicating fixing

Inline Side-by-side
Showing 16 changed files with 95 additions and 80 deletions
......@@ -71,9 +71,12 @@ class AFragment : Fragment() {
memo!!.D_day
)
)
val adapter = PolicyAdapter(policyList)
policyRecyclerView.adapter = adapter
policyRecyclerView.setItemViewCacheSize((200000000))
}
val adapter = PolicyAdapter(policyList)
policyRecyclerView.adapter = adapter
//val adapter = PolicyAdapter(policyList)
//policyRecyclerView.adapter = adapter
}
})
}
......
......@@ -71,6 +71,7 @@ class BFragment : Fragment() {
}
val adapter = PolicyAdapter(policyList)
policyRecyclerView.adapter = adapter
policyRecyclerView.setItemViewCacheSize((200000000))
}
})
}
......
......@@ -71,6 +71,7 @@ class CFragment : Fragment() {
}
val adapter = PolicyAdapter(policyList)
policyRecyclerView.adapter = adapter
policyRecyclerView.setItemViewCacheSize((200000000))
}
})
}
......
......@@ -71,6 +71,7 @@ class DFragment : Fragment() {
}
val adapter = PolicyAdapter(policyList)
policyRecyclerView.adapter = adapter
policyRecyclerView.setItemViewCacheSize((200000000))
}
})
}
......
......@@ -72,6 +72,7 @@ class EFragment : Fragment() {
}
val adapter = PolicyAdapter(policyList)
policyRecyclerView.adapter = adapter
policyRecyclerView.setItemViewCacheSize((200000000))
}
})
}
......
......@@ -5,6 +5,6 @@
android:color="#FFF"/>
<size
android:height="7dp"
android:width="7dp"/>
android:height="8dp"
android:width="8dp"/>
</shape>
\ No newline at end of file
......
......@@ -6,7 +6,7 @@
android:color="#29ABE2"/>
<size
android:height="7dp"
android:width="7dp"/>
android:height="8dp"
android:width="8dp"/>
</shape>
\ No newline at end of file
......
......@@ -46,50 +46,58 @@
<TextView
android:id="@+id/textView4"
android:layout_width="350dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="25dp"
android:layout_marginRight="25dp"
android:text="이메일"
android:textColor="#29ABE2"
android:textSize="13dp" />
<EditText
android:id="@+id/edit_email"
android:layout_width="350dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="25dp"
android:layout_marginRight="25dp"
android:drawableLeft="@drawable/profile"
android:drawablePadding="11dp"
android:paddingLeft="5dp"
android:inputType="textEmailAddress"
android:paddingLeft="5dp"
android:theme="@style/EditTheme" />
<TextView
android:id="@+id/textView5"
android:layout_width="350dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="25dp"
android:layout_marginTop="10dp"
android:layout_marginRight="25dp"
android:text="비밀번호"
android:textColor="#29ABE2"
android:textSize="13dp" />
<EditText
android:id="@+id/edit_password"
android:drawableLeft="@drawable/lock"
android:layout_width="350dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="25dp"
android:layout_marginRight="25dp"
android:drawableLeft="@drawable/lock"
android:drawablePadding="11dp"
android:paddingLeft="5dp"
android:inputType="textPassword"
android:paddingLeft="5dp"
android:theme="@style/EditTheme" />
<Button
android:id="@+id/emailSigninBtn"
android:layout_width="350dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginLeft="16dp"
android:layout_marginLeft="25dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
android:layout_marginRight="25dp"
android:background="@drawable/button_o"
android:text="로그인"
android:textColor="#FFFFFF" />
......
......@@ -39,41 +39,34 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:elevation="5dp"
android:elevation="-7dp"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
<FrameLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="horizontal">
</LinearLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content">
<androidx.viewpager.widget.ViewPager
android:id="@+id/welcomeViewPager"
android:layout_width="match_parent"
android:layout_height="262dp"
android:layout_gravity="top"
android:layout_weight="1">
<androidx.viewpager.widget.ViewPager
android:id="@+id/welcomeViewPager"
android:layout_width="match_parent"
android:layout_height="262dp"
android:layout_gravity="top"
android:layout_weight="1"
android:elevation="-7dp">
</androidx.viewpager.widget.ViewPager>
</androidx.viewpager.widget.ViewPager>
<com.example.vip.CircleIndicator
android:id="@+id/ciMainActivity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|center_horizontal"
android:layout_marginBottom="20dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</FrameLayout>
<com.example.vip.CircleIndicator
android:id="@+id/ciMainActivity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|center_horizontal"
android:layout_marginBottom="20dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</FrameLayout>
<LinearLayout
android:layout_width="match_parent"
......@@ -88,8 +81,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:layout_marginBottom="15dp"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal">
......@@ -105,11 +97,13 @@
<Button
android:id="@+id/kyoyookButton"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_gravity="center"
android:background="@drawable/homecat1"
android:gravity="center" />
android:layout_weight="1"
android:background="@drawable/homecaticon_1"
android:gravity="center"
android:theme="@style/ButtonTheme" />
<TextView
android:id="@+id/kyoyooktextView"
......@@ -134,11 +128,13 @@
<Button
android:id="@+id/koyongButton"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_gravity="center"
android:background="@drawable/homecat2"
android:gravity="center" />
android:layout_weight="1"
android:background="@drawable/homecaticon_2"
android:gravity="center"
android:theme="@style/ButtonTheme" />
<TextView
android:id="@+id/koyongtextView"
......@@ -163,11 +159,13 @@
<Button
android:id="@+id/joogeoButton"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_gravity="center"
android:background="@drawable/homecat3"
android:gravity="center" />
android:layout_weight="1"
android:background="@drawable/homecaticon_3"
android:gravity="center"
android:theme="@style/ButtonTheme" />
<TextView
android:id="@+id/joogeotextView"
......@@ -184,15 +182,13 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_height="wrap_content"
android:orientation="horizontal"></LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:layout_marginBottom="15dp"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal">
......@@ -208,11 +204,13 @@
<Button
android:id="@+id/geongangButton"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_gravity="center"
android:background="@drawable/homecat4"
android:gravity="center" />
android:layout_weight="1"
android:background="@drawable/homecaticon_4"
android:gravity="center"
android:theme="@style/ButtonTheme" />
<TextView
android:id="@+id/geongangtextView"
......@@ -237,11 +235,13 @@
<Button
android:id="@+id/seominButton"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_gravity="center"
android:background="@drawable/homecat5"
android:gravity="center" />
android:layout_weight="1"
android:background="@drawable/homecaticon_5"
android:gravity="center"
android:theme="@style/ButtonTheme" />
<TextView
android:id="@+id/seomintextView"
......@@ -266,11 +266,13 @@
<Button
android:id="@+id/moonhwaButton"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_gravity="center"
android:background="@drawable/homecat6"
android:gravity="center" />
android:layout_weight="1"
android:background="@drawable/homecaticon_6"
android:gravity="center"
android:theme="@style/ButtonTheme" />
<TextView
android:id="@+id/moonhwatextView"
......@@ -285,12 +287,6 @@
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="horizontal"></LinearLayout>
</LinearLayout>
<!--
......
......@@ -30,4 +30,8 @@
<item name="android:textColorSecondary">#000</item> <!-- 탭바 텍스트 -->
</style>
<style name="ButtonTheme">
<item name="android:scaleType">fitXY</item>
</style>
</resources>
......