Skip to content

Week8 #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jiyoung02 merged 3 commits into from
May 27, 2025
Merged

Week8 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46851ff
keyword: 키워드 초안 작성
jiyoung02 May 20, 2025
a3df85f
Merge pull request #11 from jiyoung02/main
jiyoung02 May 22, 2025
a91718a
mission : 둘러보기 구현
jiyoung02 May 24, 2025
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
Empty file added keyword/Chapter08/키워드정리.md
View file
Open in desktop
Empty file.
6 changes: 6 additions & 0 deletions mission/Flo/app/src/main/res/drawable/background_search_bottom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/white"/>
<corners android:topLeftRadius="12dp" android:topRightRadius="12dp"/>
<stroke android:color="@color/gray_color" android:width="1dp"/>
</shape>
15 changes: 15 additions & 0 deletions mission/Flo/app/src/main/res/drawable/custom_chip.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="false">
<shape android:shape="rectangle">
<corners android:radius="250dp"/>
<solid android:color="@color/gray_color"/>
</shape>
</item>
<item android:state_checked="true">
<shape android:shape="rectangle">
<corners android:radius="250dp"/>
<solid android:color="@color/select_color"/>
</shape>
</item>
</selector>
7 changes: 7 additions & 0 deletions mission/Flo/app/src/main/res/drawable/custom_chip_text.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:color="@color/white">
</item>
<item android:state_checked="false" android:color="@color/black">
</item>
</selector>
164 changes: 155 additions & 9 deletions mission/Flo/app/src/main/res/layout/fragment_notifications.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,162 @@
android:background="@color/white">

<TextView
android:id="@+id/text_notifications"
android:layout_width="match_parent"
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="둘러보기"
android:textAppearance="@style/TextAppearance.App.Bold.Black"
android:textSize="24sp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:textAlignment="center"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/>

<RadioGroup
android:id="@+id/layout_button"
android:layout_width="match_parent"
android:layout_height="36dp"
android:orientation="horizontal"
android:layout_marginStart="4dp"
android:layout_marginTop="16dp"
app:layout_constraintTop_toBottomOf="@id/tv_title">
<RadioButton
android:checked="true"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@drawable/custom_chip"
android:textColor="@drawable/custom_chip_text"
android:text="차트"
android:textSize="14sp"
android:gravity="center"
android:button="@null"
android:paddingHorizontal="16dp"
android:layout_marginHorizontal="6dp"/>
<RadioButton
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@drawable/custom_chip"
android:textColor="@drawable/custom_chip_text"
android:text="영상"
android:textSize="14sp"
android:gravity="center"
android:button="@null"
android:paddingHorizontal="16dp"
android:layout_marginHorizontal="6dp"/>
<RadioButton
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@drawable/custom_chip"
android:textColor="@drawable/custom_chip_text"
android:text="장르"
android:textSize="14sp"
android:gravity="center"
android:button="@null"
android:paddingHorizontal="16dp"
android:layout_marginHorizontal="6dp"/>
<RadioButton
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@drawable/custom_chip"
android:textColor="@drawable/custom_chip_text"
android:text="상황"
android:textSize="14sp"
android:gravity="center"
android:button="@null"
android:paddingHorizontal="16dp"
android:layout_marginHorizontal="6dp"/>
<RadioButton
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@drawable/custom_chip"
android:textColor="@drawable/custom_chip_text"
android:text="분위기"
android:textSize="14sp"
android:gravity="center"
android:button="@null"
android:paddingHorizontal="16dp"
android:layout_marginHorizontal="6dp"/>
</RadioGroup>

<TextView
android:id="@+id/tv_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="차트"
android:textColor="@color/black"
android:textStyle="bold"
android:textSize="22sp"
android:layout_marginTop="16sp"
android:layout_marginStart="8dp"
app:layout_constraintTop_toBottomOf="@id/layout_button"
app:layout_constraintStart_toStartOf="parent"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginStart="-18dp"
android:padding="4dp"
android:src="@drawable/btn_main_arrow_more"
app:layout_constraintTop_toTopOf="@id/tv_type"
app:layout_constraintBottom_toBottomOf="@id/tv_type"
app:layout_constraintStart_toEndOf="@id/tv_type"/>

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginHorizontal="4dp"
android:layout_marginTop="24dp"
android:background="@drawable/background_search_bottom"
app:layout_constraintTop_toBottomOf="@id/tv_type"
app:layout_constraintBottom_toBottomOf="parent">
<TextView
android:id="@+id/tv_sub_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="FLO 차트"
android:textSize="22sp"
android:textStyle="bold"
android:textColor="@color/black"
android:layout_marginTop="12dp"
android:layout_marginStart="16dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<TextView
android:id="@+id/tv_timeline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=" 19시 기준"
android:textSize="16sp"
app:layout_constraintStart_toEndOf="@id/tv_sub_title"
app:layout_constraintTop_toTopOf="@id/tv_sub_title"
app:layout_constraintBottom_toBottomOf="@id/tv_sub_title"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="전체듣기"
android:textSize="16sp"
android:textColor="@color/black"
android:layout_marginTop="12dp"
android:layout_marginEnd="16dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<TextView
android:id="@+id/tv_sub_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="최근 24시간 집계, FLO 최고 인기곡 차트!"
android:textSize="14sp"
app:layout_constraintTop_toBottomOf="@id/tv_sub_title"
app:layout_constraintStart_toStartOf="@id/tv_sub_title"/>
<androidx.recyclerview.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="200dp"
android:orientation="vertical"
app:layout_constraintTop_toBottomOf="@id/tv_sub_info"/>

</androidx.constraintlayout.widget.ConstraintLayout>





</androidx.constraintlayout.widget.ConstraintLayout>