Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 68 additions & 0 deletions app/src/main/res/layout/chart_card_item.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto">


<androidx.cardview.widget.CardView
android:id="@+id/cardView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:cardCornerRadius="20dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent">

<TextView
android:id="@+id/tv_name"
android:layout_width="150dp"
android:layout_height="150dp"
android:background="@drawable/btn_background_filled"
android:padding="16dp"
android:text="축구"
android:textColor="@color/white"
android:textSize="32sp"
android:textStyle="bold"
android:layout_marginTop="10dp"
android:layout_marginRight="13dp"
android:layout_marginLeft="20dp"/>

</androidx.cardview.widget.CardView>

<TextView
android:id="@+id/textView8"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="1. 어쩌구저쩌구동아리"
android:textColor="@color/black"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/textView6"
app:layout_constraintStart_toEndOf="@+id/cardView"
android:layout_marginBottom="10dp"/>

<TextView
android:id="@+id/textView6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="2. 어쩌구저쩌구동아리"
android:textColor="@color/black"
android:textSize="16sp"
app:layout_constraintTop_toTopOf="@id/cardView"
app:layout_constraintBottom_toBottomOf="@id/cardView"
app:layout_constraintStart_toEndOf="@+id/cardView" />

<TextView
android:id="@+id/textView7"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="3. 어쩌구저쩌구동아리"
android:textColor="@color/black"
android:textSize="16sp"
android:layout_marginTop="10dp"
app:layout_constraintStart_toEndOf="@+id/cardView"
app:layout_constraintTop_toBottomOf="@id/textView6" />

</androidx.constraintlayout.widget.ConstraintLayout>
147 changes: 139 additions & 8 deletions app/src/main/res/layout/fragment_chart.xml
Original file line number Diff line number Diff line change
@@ -1,15 +1,146 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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"
tools:context=".ui.main.chart.ChartFragment">
tools:context=".ui.main.MainActivity">

<!-- TODO: Update blank fragment layout -->
<TextView
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/fragment_chart" />
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent">

<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="72dp"
android:paddingStart="24dp"
android:paddingEnd="24dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

<TextView
android:id="@+id/tv_menu_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:background="@android:color/transparent"
android:text="BATTLE'S"
android:textColor="@color/black"
android:textSize="20sp"
android:textStyle="bold" />

<TextView
android:id="@+id/btn_profile"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:clickable="true"
android:focusable="true"
android:src="@drawable/ic_search_24dp"
android:text="MY"
android:textSize="18sp" />
</androidx.appcompat.widget.Toolbar>

<com.google.android.material.tabs.TabLayout
android:id="@+id/tl_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tl_battle_category"
app:tabIndicatorColor="@color/black"
app:tabMode="auto"
app:tabPaddingTop="10dp"
app:tabSelectedTextColor="@color/black"
app:tabTextAppearance="@style/CustomTabText">

<com.google.android.material.tabs.TabItem
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="경기 참여" />

<com.google.android.material.tabs.TabItem
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="동아리 가입" />
</com.google.android.material.tabs.TabLayout>

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_chart"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:gravity="center"
android:paddingHorizontal="20dp"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/spinner_filter"
app:spanCount="1"
tools:listitem="@layout/chart_card_item" />

</LinearLayout>





<FrameLayout
android:id="@+id/fl_bnv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">

<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bnv_main"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:foregroundGravity="center"
android:paddingVertical="20dp"
app:elevation="15dp"
app:itemIconTint="@drawable/navi_btn_color"
app:itemRippleColor="@color/transparent"
app:itemTextColor="@drawable/navi_btn_color"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:menu="@menu/bottom_nav_menu" />
</FrameLayout>

<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_battle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="30dp"
android:contentDescription="@string/app_name"
android:foregroundGravity="center"
android:src="@drawable/ic_battles_24dp"
app:backgroundTint="@color/white"
app:fabCustomSize="88dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:tint="@drawable/navi_btn_color" />


</androidx.constraintlayout.widget.ConstraintLayout>







</FrameLayout>
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,6 @@
<string name="fragment_profile">ProfileFragment</string>
<string name="fragment_battle_join">BattleJoinFragment</string>
<string name="fragment_club_join">ClubJoinFragment</string>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
</resources>