Skip to content

Commit

Permalink
[AN/USER] feat: 축제 목록 화면 UX 개선(#614) (#615)
Browse files Browse the repository at this point in the history
  • Loading branch information
@SeongHoonC @seokjin8678
SeongHoonC authored and seokjin8678 committed Nov 16, 2023
1 parent 204f4db commit d6a5067
Showing 1 changed file with 101 additions and 66 deletions.
167 changes: 101 additions & 66 deletions android/festago/app/src/main/res/layout/fragment_festival_list.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,81 +15,116 @@
android:layout_height="match_parent"
tools:context=".presentation.ui.home.festivallist.FestivalListFragment">

<ImageView
android:id="@+id/imgFestagoLogo"
android:layout_width="160dp"
android:layout_height="45dp"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp"
android:src="@drawable/img_festago_home_logo"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<com.google.android.material.chip.ChipGroup
android:id="@+id/cgFilterOption"
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="16dp"
android:paddingTop="12dp"
app:checkedChip="@+id/chipProgress"
app:layout_constraintTop_toBottomOf="@id/imgFestagoLogo"
app:selectionRequired="true"
app:singleSelection="true">

<com.google.android.material.chip.Chip
android:id="@+id/chipProgress"
style="@style/chipFesta"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/festival_list_chip_progress" />

<com.google.android.material.chip.Chip
android:id="@+id/chipPlanned"
style="@style/chipFesta"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/festival_list_chip_planned" />

<com.google.android.material.chip.Chip
android:id="@+id/chipEnd"
style="@style/chipFesta"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/festival_list_chip_end" />
</com.google.android.material.chip.ChipGroup>
android:layout_height="0dp"
app:layout_constraintTop_toTopOf="parent">

<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

<com.google.android.material.appbar.CollapsingToolbarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_scrollFlags="scroll|snap|enterAlways">

<androidx.appcompat.widget.Toolbar
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorSurface"
app:contentInsetStart="0dp"
app:layout_collapseMode="pin">

<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">

<ImageView
android:id="@+id/imgFestagoLogo"
android:layout_width="160dp"
android:layout_height="44dp"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp"
android:importantForAccessibility="no"
android:src="@drawable/img_festago_home_logo" />

<com.google.android.material.chip.ChipGroup
android:id="@+id/cgFilterOption"
android:layout_width="392dp"
android:layout_height="64dp"
android:paddingHorizontal="16dp"
android:paddingTop="12dp"
app:checkedChip="@+id/chipProgress"
app:selectionRequired="true"
app:singleSelection="true">

<com.google.android.material.chip.Chip
android:id="@+id/chipProgress"
style="@style/chipFesta"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/festival_list_chip_progress" />

<com.google.android.material.chip.Chip
android:id="@+id/chipPlanned"
style="@style/chipFesta"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/festival_list_chip_planned" />

<com.google.android.material.chip.Chip
android:id="@+id/chipEnd"
style="@style/chipFesta"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/festival_list_chip_end" />

</com.google.android.material.chip.ChipGroup>
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>

<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/srlFestivalList"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior">

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvFestivalList"
visibility="@{uiState.shouldShowSuccess}"
android:layout_width="0dp"
android:layout_height="0dp"
android:clipToPadding="false"
android:padding="8dp"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:spanCount="2"
tools:listitem="@layout/item_festival_list" />

</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

<androidx.constraintlayout.widget.Guideline
android:id="@+id/glFestivalListTop"
android:layout_width="0dp"
android:layout_height="match_parent"
android:orientation="horizontal"
app:layout_constraintGuide_begin="132dp" />

<ProgressBar
android:id="@+id/pbLoading"
visibility="@{uiState.shouldShowLoading}"
android:layout_width="wrap_content"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/srlFestivalList"
app:layout_constraintTop_toBottomOf="@id/cgFilterOption"
tools:visibility="gone" />

<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/srlFestivalList"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginTop="12dp"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cgFilterOption">

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvFestivalList"
visibility="@{uiState.shouldShowSuccess}"
android:layout_width="0dp"
android:layout_height="0dp"
android:clipToPadding="false"
android:padding="8dp"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:spanCount="2"
tools:listitem="@layout/item_festival_list" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
app:layout_constraintTop_toBottomOf="@id/glFestivalListTop"
tools:visibility="gone" />

<TextView
android:id="@+id/tvErrorOrEmpty"
Expand All @@ -101,7 +136,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cgFilterOption"
app:layout_constraintTop_toBottomOf="@id/glFestivalListTop"
tools:text="조회된 축제가 없습니다"
tools:visibility="gone" />

Expand Down

0 comments on commit d6a5067

Please sign in to comment.