장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
soonmyeong2
e0343f2f 2 parents 95f79bc4 c0b7b855

Merge branch 'bottomview'

Inline Side-by-side
Showing 24 changed files with 66 additions and 9 deletions
...@@ -33,8 +33,8 @@ dependencies { ...@@ -33,8 +33,8 @@ dependencies {
33 implementation 'com.google.firebase:firebase-auth:19.0.0' 33 implementation 'com.google.firebase:firebase-auth:19.0.0'
34 implementation 'com.google.android.gms:play-services-auth:17.0.0' 34 implementation 'com.google.android.gms:play-services-auth:17.0.0'
35 implementation 'androidx.recyclerview:recyclerview:1.1.0-beta05' 35 implementation 'androidx.recyclerview:recyclerview:1.1.0-beta05'
36 - implementation 'com.android.support:appcompat-v7:23.2.1' 36 + implementation 'com.android.support:appcompat-v7:27.1.1'
37 - implementation 'com.android.support:design:23.2.1' 37 + implementation 'com.android.support:design:27.1.1'
38 38
39 39
40 40
......
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
3 + <!-- 배경 -->
4 + <item
5 + android:drawable="@color/colorPrimary"/>
6 + <!-- 로고 -->
7 + <item>
8 + <bitmap
9 + android:gravity="center"
10 + android:src="@drawable/splash_main"/>
11 + </item>
12 +</layer-list>

176 Bytes | W: | H:

130 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
9 9
10 <LinearLayout 10 <LinearLayout
11 android:id="@+id/linearLayout" 11 android:id="@+id/linearLayout"
12 - android:layout_width="0dp" 12 + android:layout_width="match_parent"
13 - android:layout_height="0dp" 13 + android:layout_height="match_parent"
14 android:orientation="vertical" 14 android:orientation="vertical"
15 app:layout_constraintBottom_toBottomOf="parent" 15 app:layout_constraintBottom_toBottomOf="parent"
16 app:layout_constraintEnd_toEndOf="parent" 16 app:layout_constraintEnd_toEndOf="parent"
...@@ -21,17 +21,17 @@ ...@@ -21,17 +21,17 @@
21 android:id="@+id/toolbar" 21 android:id="@+id/toolbar"
22 android:layout_width="fill_parent" 22 android:layout_width="fill_parent"
23 android:layout_height="wrap_content" 23 android:layout_height="wrap_content"
24 - android:background="#FFF"
25 android:layout_marginBottom="11dp" 24 android:layout_marginBottom="11dp"
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"
28 - app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" > 28 + app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
29 29
30 <ImageView 30 <ImageView
31 android:layout_width="77dp" 31 android:layout_width="77dp"
32 android:layout_height="44dp" 32 android:layout_height="44dp"
33 android:layout_gravity="center" 33 android:layout_gravity="center"
34 - android:src="@drawable/toolbar_logo"/> 34 + android:src="@drawable/toolbar_logo" />
35 </androidx.appcompat.widget.Toolbar> 35 </androidx.appcompat.widget.Toolbar>
36 36
37 <androidx.viewpager.widget.ViewPager 37 <androidx.viewpager.widget.ViewPager
...@@ -46,14 +46,31 @@ ...@@ -46,14 +46,31 @@
46 <androidx.recyclerview.widget.RecyclerView 46 <androidx.recyclerview.widget.RecyclerView
47 android:id="@+id/policyFieldRecyclerView" 47 android:id="@+id/policyFieldRecyclerView"
48 android:layout_width="match_parent" 48 android:layout_width="match_parent"
49 - android:layout_height="178dp" 49 + android:layout_height="340dp"
50 app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" 50 app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
51 app:spanCount="3" 51 app:spanCount="3"
52 + app:layout_constraintBottom_toBottomOf="@id/bottom_navigation"
52 tools:listitem="@layout/item_policyfield" /> 53 tools:listitem="@layout/item_policyfield" />
53 54
55 + <FrameLayout
56 + android:layout_width="match_parent"
57 + android:layout_height="0dp"
58 + android:layout_weight="1"
59 + android:id="@+id/fragmentContainer"
60 + />
54 61
55 - </LinearLayout> 62 + <com.google.android.material.bottomnavigation.BottomNavigationView
63 + android:id="@+id/bottom_navigation"
64 + android:layout_width="match_parent"
65 + android:layout_height="wrap_content"
66 + android:layout_gravity="bottom"
67 + android:background="#FFF"
68 + app:itemIconTint="#29ABE2"
69 + app:itemTextColor="#29ABE2"
70 + app:labelVisibilityMode="labeled"
71 + app:menu="@menu/bottom_nav_menu" />
56 72
73 + </LinearLayout>
57 74
58 </androidx.constraintlayout.widget.ConstraintLayout> 75 </androidx.constraintlayout.widget.ConstraintLayout>
59 76
......
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<menu xmlns:android="http://schemas.android.com/apk/res/android"
3 + xmlns:app="http://schemas.android.com/apk/res-auto">
4 + <item
5 + android:id="@+id/action_recents"
6 + android:enabled="true"
7 + android:icon="@drawable/home"
8 + android:title="WELLO"
9 + app:showAsAction="ifRoom" />
10 + <item
11 + android:id="@+id/action_favorites"
12 + android:enabled="true"
13 + android:icon="@drawable/instagram"
14 + android:title="추천정책"
15 + app:showAsAction="ifRoom" />
16 + <item
17 + android:id="@+id/action_nearby"
18 + android:enabled="true"
19 + android:icon="@drawable/wish"
20 + android:title="찜 목록"
21 + app:showAsAction="ifRoom" />
22 + <item
23 + android:id="@+id/action_info"
24 + android:enabled="true"
25 + android:icon="@drawable/info"
26 + android:title="내 정보"
27 + app:showAsAction="ifRoom" />
28 +</menu>
...\ No newline at end of file ...\ No newline at end of file