Skip to content

Commit

Permalink
πŸ“š 곡지사항 슀크둀 λ²”μœ„ μˆ˜μ • (#21)
Browse files Browse the repository at this point in the history 
* Update Get Alarm List Path

* Modify Notice Scroll Area
  • Loading branch information
@moondev03
moondev03 authored Sep 11, 2024
1 parent 17caf9c commit cc30da2
Show file tree
Hide file tree
Showing 4 changed files with 96 additions and 82 deletions.
2 changes: 1 addition & 1 deletion ThinkerBell/data/src/main/java/com/neverland/data/remote/service/AlarmService.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ interface AlarmService {
@Query("alarmId") alarmId: Int
): Response<BaseResponse<String>>

@GET("/api/alarm")
@GET("/api/alarm/get")
suspend fun getAlarm(
@Query("SSAID") ssaId: String,
@Query("keyword") keyword: String
Expand Down
5 changes: 2 additions & 3 deletions ThinkerBell/presentation/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,14 @@ android {
applicationId = "com.neverland.thinkerbell"
minSdk = 29
targetSdk = 34
versionCode = 1

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

versionName = "0.0.1"
versionName = "0.0.2"
versionCode = if (project.hasProperty("versionCode")) {
project.property("versionCode").toString().toInt()
} else {
1
2
}
}

Expand Down
4 changes: 4 additions & 0 deletions .../presentation/src/main/java/com/neverland/thinkerbell/view/notice/CommonNoticeFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ class CommonNoticeFragment(

binding.tvNoticeTitle.text = noticeType.koName
binding.groupNoticeSearchView.visibility = View.GONE
binding.btnBack.visibility = View.GONE
setupRecyclerView()

if(spinnerRequiredNotices.contains(noticeType)) setCampusSpinner() else binding.spinnerCampus.visibility = View.GONE
Expand Down Expand Up @@ -177,6 +178,7 @@ class CommonNoticeFragment(
private fun showNoticePage() {
viewModel.searchNotice = emptyList()
binding.groupNoticeSearchView.visibility = View.GONE
binding.btnBack.visibility = View.GONE
binding.llNoticePage.visibility = View.VISIBLE
if(spinnerRequiredNotices.contains(noticeType)) setCampusSpinner() else binding.spinnerCampus.visibility = View.GONE
binding.tvEmptyView.visibility = View.GONE
Expand Down Expand Up @@ -234,11 +236,13 @@ class CommonNoticeFragment(
binding.llNoticePage.visibility = View.GONE
binding.spinnerCampus.visibility = View.GONE
binding.groupNoticeSearchView.visibility = View.GONE
binding.btnBack.visibility = View.GONE
binding.etSearch.text.clear()
}
is UiState.Success -> {
commonNoticeAdapter.submitList(state.data)
binding.groupNoticeSearchView.visibility = View.VISIBLE
binding.btnBack.visibility = View.VISIBLE
binding.llNoticePage.visibility = View.GONE
binding.tvSearchNoticeResult.text = "'${binding.etSearch.text}'이(κ°€) ν¬ν•¨λœ 곡지사항 (${state.data.size}개)"
binding.etSearch.text.clear()
Expand Down
167 changes: 89 additions & 78 deletions ThinkerBell/presentation/src/main/res/layout/fragment_common_notice.xml
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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"
android:background="@color/primary2"
android:orientation="vertical">
android:background="@color/primary2">

<Toolbar
android:id="@+id/tb_notice"
android:layout_width="match_parent"
android:layout_height="32dp"
android:background="@color/primary1"
android:contentInsetStart="20dp">
android:contentInsetStart="20dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/ll_notice_title">

<ImageButton
android:id="@+id/ib_menu"
Expand Down Expand Up @@ -45,8 +46,13 @@
</Toolbar>

<LinearLayout
android:id="@+id/ll_notice_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"

app:layout_constraintTop_toBottomOf="@id/ll_notice_title"
app:layout_constraintBottom_toTopOf="@id/sv_notice"

android:background="@color/primary1"
android:gravity="center|top"
android:orientation="vertical">
Expand Down Expand Up @@ -88,8 +94,12 @@
</LinearLayout>

<ScrollView
android:id="@+id/sv_notice"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="0dp"
app:layout_constraintTop_toBottomOf="@id/ll_notice_title"
app:layout_constraintBottom_toTopOf="@id/ll_notice_page"
app:layout_goneMarginBottom="48dp">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
Expand All @@ -99,8 +109,7 @@
android:id="@+id/group_notice_search_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:constraint_referenced_ids="tv_search_notice_result, btn_back, divider_search" />

app:constraint_referenced_ids="tv_search_notice_result, divider_search" />

<Spinner
android:id="@+id/spinner_campus"
Expand Down Expand Up @@ -147,23 +156,6 @@
android:translationZ="1dp"
app:layout_constraintTop_toBottomOf="@id/tv_search_notice_result" />

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_back"
style="@style/Pretendard_Text"
android:layout_width="68dp"

android:layout_height="24dp"
android:layout_marginTop="68dp"
android:background="@drawable/search_result_back_btn_background"
android:gravity="center"

android:text="@string/text_btn_back"
android:textColor="@color/red_gray_500"

app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/rv_notice" />

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_notice"
android:layout_width="match_parent"
Expand Down Expand Up @@ -193,62 +185,81 @@
app:layout_constraintBottom_toBottomOf="@id/rv_notice"
app:layout_constraintEnd_toEndOf="@id/rv_notice" />

<LinearLayout
android:id="@+id/ll_notice_page"
android:layout_width="match_parent"
android:layout_height="34dp"
android:layout_marginVertical="10dp"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/rv_notice">

<ImageButton
android:id="@+id/ib_page_left_2"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginEnd="4dp"
android:background="@color/transparent"
android:contentDescription="@string/desc_notice_page_left_2"
android:src="@drawable/ic_direaction_left_2" />

<ImageButton
android:id="@+id/ib_page_left_1"
android:layout_width="24dp"
android:layout_height="24dp"
android:background="@color/transparent"
android:contentDescription="@string/desc_notice_page_left_2"
android:src="@drawable/ic_direaction_left_1" />

<TextView
android:id="@+id/tv_notice_page"
style="@style/Paragraph_Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20dp"
android:textColor="@color/primary3"
tools:text="1/96" />

<ImageButton
android:id="@+id/ib_page_right_1"
android:layout_width="24dp"
android:layout_height="24dp"
android:background="@color/transparent"
android:contentDescription="@string/desc_notice_page_left_2"
android:src="@drawable/ic_direaction_right_1" />

<ImageButton
android:id="@+id/ib_page_right_2"
android:layout_width="24dp"
android:layout_height="24dp"
android:background="@color/transparent"
android:contentDescription="@string/desc_notice_page_left_2"
android:src="@drawable/ic_direaction_right_2" />
</LinearLayout>

</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>

<LinearLayout
android:id="@+id/ll_notice_page"
android:layout_width="match_parent"
android:layout_height="wrap_content"

app:layout_constraintTop_toBottomOf="@id/sv_notice"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintVertical_bias="1"

android:layout_gravity="bottom"
android:gravity="center"
android:orientation="horizontal">

<ImageButton
android:id="@+id/ib_page_left_2"
android:layout_width="32dp"
android:layout_height="48dp"
android:background="@color/transparent"
android:contentDescription="@string/desc_notice_page_left_2"
android:src="@drawable/ic_direaction_left_2" />

<ImageButton
android:id="@+id/ib_page_left_1"
android:layout_width="40dp"
android:layout_height="48dp"
android:background="@color/transparent"
android:contentDescription="@string/desc_notice_page_left_2"
android:src="@drawable/ic_direaction_left_1" />

<TextView
android:id="@+id/tv_notice_page"
style="@style/Paragraph_Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
android:textColor="@color/primary3"
tools:text="1/96" />

<ImageButton
android:id="@+id/ib_page_right_1"
android:layout_width="40dp"
android:layout_height="48dp"
android:background="@color/transparent"
android:contentDescription="@string/desc_notice_page_left_2"
android:src="@drawable/ic_direaction_right_1" />

<ImageButton
android:id="@+id/ib_page_right_2"
android:layout_width="32dp"
android:layout_height="48dp"
android:background="@color/transparent"
android:contentDescription="@string/desc_notice_page_left_2"
android:src="@drawable/ic_direaction_right_2" />
</LinearLayout>

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_back"
style="@style/Pretendard_Text"
android:layout_width="68dp"
android:layout_height="24dp"

app:layout_constraintTop_toBottomOf="@id/sv_notice"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"

android:background="@drawable/search_result_back_btn_background"
android:gravity="center"

android:text="@string/text_btn_back"
android:textColor="@color/red_gray_500" />

<TextView
android:id="@+id/tv_empty_view"
style="@style/Paragraph_Medium"
Expand All @@ -259,4 +270,4 @@
android:textColor="@color/content_secondary"
android:visibility="gone"
tools:text="'검색어'이(κ°€) ν¬ν•œλœ 곡지사항을\n찾을 수 μ—†μŠ΅λ‹ˆλ‹€." />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

0 comments on commit cc30da2

Please sign in to comment.