feat(main-v2): 메인 하단 내비게이션을 추가한다
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:color="@color/white" android:state_checked="true" />
|
||||
<item android:color="@color/white" android:state_selected="true" />
|
||||
<item android:color="@color/gray_600" />
|
||||
</selector>
|
||||
BIN
app/src/main/res/drawable-mdpi/ic_nav_chat.png
Normal file
|
After Width: | Height: | Size: 602 B |
BIN
app/src/main/res/drawable-mdpi/ic_nav_chat_selected.png
Normal file
|
After Width: | Height: | Size: 446 B |
BIN
app/src/main/res/drawable-mdpi/ic_nav_content.png
Normal file
|
After Width: | Height: | Size: 537 B |
BIN
app/src/main/res/drawable-mdpi/ic_nav_content_selected.png
Normal file
|
After Width: | Height: | Size: 378 B |
BIN
app/src/main/res/drawable-mdpi/ic_nav_home.png
Normal file
|
After Width: | Height: | Size: 564 B |
BIN
app/src/main/res/drawable-mdpi/ic_nav_home_selected.png
Normal file
|
After Width: | Height: | Size: 408 B |
BIN
app/src/main/res/drawable-mdpi/ic_nav_my.png
Normal file
|
After Width: | Height: | Size: 723 B |
5
app/src/main/res/drawable/ic_nav_chat_tab.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/ic_nav_chat_selected" android:state_checked="true" />
|
||||
<item android:drawable="@drawable/ic_nav_chat" />
|
||||
</selector>
|
||||
5
app/src/main/res/drawable/ic_nav_content_tab.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/ic_nav_content_selected" android:state_checked="true" />
|
||||
<item android:drawable="@drawable/ic_nav_content" />
|
||||
</selector>
|
||||
5
app/src/main/res/drawable/ic_nav_home_tab.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/ic_nav_home_selected" android:state_checked="true" />
|
||||
<item android:drawable="@drawable/ic_nav_home" />
|
||||
</selector>
|
||||
5
app/src/main/res/drawable/ic_nav_my_tab.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/ic_tabbar_my_selected" android:state_checked="true" />
|
||||
<item android:drawable="@drawable/ic_nav_my" />
|
||||
</selector>
|
||||
108
app/src/main/res/layout/activity_main_v2.xml
Normal file
@@ -0,0 +1,108 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@color/black">
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/fl_container"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/cl_mini_player"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/cl_mini_player"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/color_222222"
|
||||
android:paddingHorizontal="13.3dp"
|
||||
android:paddingVertical="10.7dp"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
tools:visibility="visible">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_player_cover"
|
||||
android:layout_width="36.7dp"
|
||||
android:layout_height="36.7dp"
|
||||
android:contentDescription="@null"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:src="@mipmap/ic_launcher" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_player_title"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginHorizontal="10.7dp"
|
||||
android:ellipsize="end"
|
||||
android:fontFamily="@font/medium"
|
||||
android:maxLines="2"
|
||||
android:textColor="@color/color_eeeeee"
|
||||
android:textSize="13sp"
|
||||
app:layout_constraintEnd_toStartOf="@+id/iv_player_play_or_pause"
|
||||
app:layout_constraintStart_toEndOf="@+id/iv_player_cover"
|
||||
app:layout_constraintTop_toTopOf="@+id/iv_player_cover"
|
||||
tools:text="JFLA 커버곡 Avicii for your self" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_player_nickname"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="2.3dp"
|
||||
android:fontFamily="@font/medium"
|
||||
android:textColor="@color/color_d2d2d2"
|
||||
android:textSize="11sp"
|
||||
app:layout_constraintEnd_toEndOf="@+id/tv_player_title"
|
||||
app:layout_constraintStart_toStartOf="@+id/tv_player_title"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tv_player_title"
|
||||
tools:ignore="SmallSp"
|
||||
tools:text="JFLA 커버곡 Avicii for your self" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_player_play_or_pause"
|
||||
android:layout_width="25dp"
|
||||
android:layout_height="25dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:contentDescription="@null"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/iv_player_stop"
|
||||
app:layout_constraintEnd_toStartOf="@+id/iv_player_stop"
|
||||
app:layout_constraintTop_toTopOf="@+id/iv_player_stop"
|
||||
tools:src="@drawable/btn_bar_play" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_player_stop"
|
||||
android:layout_width="25dp"
|
||||
android:layout_height="25dp"
|
||||
android:contentDescription="@null"
|
||||
android:src="@drawable/ic_noti_stop"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
<com.google.android.material.bottomnavigation.BottomNavigationView
|
||||
android:id="@+id/bottom_navigation"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/black"
|
||||
app:itemActiveIndicatorStyle="@null"
|
||||
app:itemIconTint="@null"
|
||||
app:itemTextAppearanceActive="@style/Typography.Caption3"
|
||||
app:itemTextAppearanceActiveBoldEnabled="false"
|
||||
app:itemTextAppearanceInactive="@style/Typography.Caption3"
|
||||
app:itemTextColor="@color/color_main_v2_bottom_navigation_label"
|
||||
app:labelVisibilityMode="labeled"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:menu="@menu/menu_main_v2_bottom_navigation" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -2,6 +2,7 @@
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/black"
|
||||
android:orientation="vertical">
|
||||
|
||||
<ImageView
|
||||
|
||||
5
app/src/main/res/layout/fragment_v2_main_chat.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@color/black" />
|
||||
5
app/src/main/res/layout/fragment_v2_main_content.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@color/black" />
|
||||
5
app/src/main/res/layout/fragment_v2_main_home.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@color/black" />
|
||||
19
app/src/main/res/menu/menu_main_v2_bottom_navigation.xml
Normal file
@@ -0,0 +1,19 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item
|
||||
android:id="@+id/menu_main_v2_home"
|
||||
android:icon="@drawable/ic_nav_home_tab"
|
||||
android:title="@string/tab_home" />
|
||||
<item
|
||||
android:id="@+id/menu_main_v2_content"
|
||||
android:icon="@drawable/ic_nav_content_tab"
|
||||
android:title="@string/tab_content" />
|
||||
<item
|
||||
android:id="@+id/menu_main_v2_chat"
|
||||
android:icon="@drawable/ic_nav_chat_tab"
|
||||
android:title="@string/tab_chat" />
|
||||
<item
|
||||
android:id="@+id/menu_main_v2_my"
|
||||
android:icon="@drawable/ic_nav_my_tab"
|
||||
android:title="@string/tab_my" />
|
||||
</menu>
|
||||
@@ -137,6 +137,7 @@
|
||||
|
||||
<!-- Main / Home -->
|
||||
<string name="tab_home">Home</string>
|
||||
<string name="tab_content">Content</string>
|
||||
<string name="tab_chat">Chat</string>
|
||||
<string name="tab_live">Live</string>
|
||||
<string name="tab_my">My</string>
|
||||
|
||||
@@ -137,6 +137,7 @@
|
||||
|
||||
<!-- Main / Home -->
|
||||
<string name="tab_home">ホーム</string>
|
||||
<string name="tab_content">コンテンツ</string>
|
||||
<string name="tab_chat">チャット</string>
|
||||
<string name="tab_live">ライブ</string>
|
||||
<string name="tab_my">マイ</string>
|
||||
|
||||
@@ -136,6 +136,7 @@
|
||||
|
||||
<!-- Main / Home -->
|
||||
<string name="tab_home">홈</string>
|
||||
<string name="tab_content">콘텐츠</string>
|
||||
<string name="tab_chat">채팅</string>
|
||||
<string name="tab_live">라이브</string>
|
||||
<string name="tab_my">마이</string>
|
||||
|
||||