Skip to content
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

Jump to bottom

[modify] strings.xml 수정 #95

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[modify] strings.xml 수정 #95

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
28ff4c9
[modify] strings.xml 수정
Aug 17, 2021
4dca7c0
[modify] 삭제함 탭, 삭제휴지통기간 탭 삭제
Aug 17, 2021
23e489d
[modify] 칩 색깔 변경
Aug 17, 2021
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
2 changes: 1 addition & 1 deletion app/src/main/java/team/bum/ui/main/archive/ArchiveFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class ArchiveFragment : BaseFragment<FragmentArchiveBinding>() {
when (position) {
0 -> { tab.text = "글"}
1 -> { tab.text = "리워드"}
2 -> { tab.text = "삭제함"}
// 2 -> { tab.text = "삭제함"}
}
}.attach()
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/team/bum/ui/main/home/writing/HomeWritingFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class HomeWritingFragment : BaseFragment<FragmentHomeWritingBinding>(), CommonDi
Paper.values().forEach {
if (paperId == it.id) {
val text = listOf(binding.title, binding.content, binding.count, binding.countTotal)
binding.root.setBackgroundColor(getColor(it.backgroundColor))
// binding.root.setBackgroundColor(getColor(it.backgroundColor))
text.forEach { view -> view.setTextColor(getColor(it.textColor)) }
binding.title.setHintTextColor(getColor(it.hintColor))
binding.content.setHintTextColor(getColor(it.hintColor))
Expand Down
34 changes: 17 additions & 17 deletions app/src/main/java/team/bum/ui/main/setting/SettingFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ class SettingFragment : BaseFragment<FragmentSettingBinding>() {
FragmentSettingBinding.inflate(inflater, container, false)

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
bottomSheetEvent()
// bottomSheetEvent()
configureSettingBinNavigation()
setDuration()
// setDuration()
}

private fun bottomSheetEvent() {
binding.layoutDeleteDuration.setOnClickListener {
sheetFragment.show(requireActivity().supportFragmentManager, sheetFragment.tag)
}
}
// private fun bottomSheetEvent() {
// binding.layoutDeleteDuration.setOnClickListener {
// sheetFragment.show(requireActivity().supportFragmentManager, sheetFragment.tag)
// }
// }

private fun configureSettingBinNavigation() {
binding.layoutTrashManagement.setOnClickListener {
Expand All @@ -43,16 +43,16 @@ class SettingFragment : BaseFragment<FragmentSettingBinding>() {
}
}

private fun setDuration() {
binding.tvDurationDay.text = "${sharedPreferences.getValue("period", "")}일"
sheetFragment.setClickYesListener(object : SheetFragment.ClickListener {
override fun onClickYes(date: String) {
binding.tvDurationDay.text = date
if (date == "즉시 삭제") editUserInfo(0)
else editUserInfo(Integer.parseInt(date.split("일")[0]))
}
})
}
// private fun setDuration() {
// binding.tvDurationDay.text = "${sharedPreferences.getValue("period", "")}일"
// sheetFragment.setClickYesListener(object : SheetFragment.ClickListener {
// override fun onClickYes(date: String) {
// binding.tvDurationDay.text = date
// if (date == "즉시 삭제") editUserInfo(0)
// else editUserInfo(Integer.parseInt(date.split("일")[0]))
// }
// })
// }

private fun editUserInfo(date: Int) {
val call: Call<ResponseUser> = ServiceCreator.bumService.editUser(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/color/home_chip_background_color.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/home_chip_background" android:state_checked="true"/>
<item android:color="@color/disable" android:state_checked="false"/>
<item android:color="@color/paper_1" android:state_checked="false"/>
</selector>
2 changes: 1 addition & 1 deletion app/src/main/res/color/home_chip_stroke_color.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/home_chip_stroke" android:state_checked="true"/>
<item android:color="@color/text_grey" android:state_checked="false"/>
<item android:color="@color/paper_1" android:state_checked="false"/>
</selector>
2 changes: 1 addition & 1 deletion app/src/main/res/color/home_chip_text_color.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/header" android:state_checked="true"/>
<item android:color="@color/blue_3" android:state_checked="true"/>
<item android:color="@color/paper_3" android:state_checked="false"/>
</selector>
84 changes: 42 additions & 42 deletions app/src/main/res/layout/fragment_setting.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,55 +26,55 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_setting_header">

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_delete_duration"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginTop="16dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

<TextView
android:id="@+id/tv_delete_duration"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="16dp"
android:text="@string/setting_delete_duration"
android:textColor="@color/paper_4"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/tv_duration_day"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:text="@string/setting_day"
android:textColor="@color/black"
app:layout_constraintEnd_toStartOf="@id/image_delete_time"
app:layout_constraintTop_toTopOf="@id/tv_delete_duration" />

<ImageView
android:id="@+id/image_delete_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:src="@drawable/brn_edit"
app:layout_constraintBottom_toBottomOf="@id/tv_delete_duration"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tv_delete_duration" />

</androidx.constraintlayout.widget.ConstraintLayout>
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
<!-- android:id="@+id/layout_delete_duration"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="48dp"-->
<!-- android:layout_marginTop="16dp"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent">-->

<!-- <TextView-->
<!-- android:id="@+id/tv_delete_duration"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="24dp"-->
<!-- android:layout_marginTop="16dp"-->
<!-- android:text="@string/setting_delete_duration"-->
<!-- android:textColor="@color/paper_4"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->

<!-- <TextView-->
<!-- android:id="@+id/tv_duration_day"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginEnd="16dp"-->
<!-- android:text="@string/setting_day"-->
<!-- android:textColor="@color/black"-->
<!-- app:layout_constraintEnd_toStartOf="@id/image_delete_time"-->
<!-- app:layout_constraintTop_toTopOf="@id/tv_delete_duration" />-->

<!-- <ImageView-->
<!-- android:id="@+id/image_delete_time"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginEnd="16dp"-->
<!-- android:src="@drawable/brn_edit"-->
<!-- app:layout_constraintBottom_toBottomOf="@id/tv_delete_duration"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="@id/tv_delete_duration" />-->

<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_trash_management"
android:layout_width="match_parent"
android:layout_height="48dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/layout_delete_duration">
app:layout_constraintTop_toTopOf="parent">

<TextView
android:id="@+id/tv_trash_management"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
<color name="text_grey">#C2C2C2</color>
<color name="icon_grey">#A1A1A1</color>
<color name="bg">#fafafa</color>
<color name="home_chip_background">#b7e3cd</color>
<color name="home_chip_stroke">#8fd4b1</color>
<color name="home_chip_background">#DFF7FF</color>
<color name="home_chip_stroke">#6ed5f5</color>
<color name="archive_chip_stroke">#9fe8ff</color>
<color name="toast">#faf9fb</color>
<color name="picker_main">#232326</color>
Expand Down
14 changes: 7 additions & 7 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@
<string name="popup_writtenContent">당신의 고민을 적어주세요.당신의 고민을 적어주세요.당신의 고민을 적어주세요.당신의 고민을 적어주세요.당신의 고민을 적어주세요.당신의 고민을 적어주세요.당신의 고민을 적어주세요.당신의 고민을 적어주세요.당신의 고민을 적어주세요.당신의 고민을 적어주세요.당신의 고민을 적어주세요.당신의 고민을 적어주세요.당신의 고민을 적어주세요.당신의 고민을 적어주세요.당신의 고민을 적어주세요.당신의 고민을 적어주세요.당신의 고민을 적어주세요.당신의 고민을 적어주세요.당신의 고민을 적어주세요.당신의 고민을 적어주세요.당신의 고민을 적어주세요.당신의 고민을 적어주세요.당신의 고민을 적어주세요.당신의 고민을 적어주세요.당신의 고민을 적어주세요.당신의 고민을 적어주세요.당신의 고민을 적어주세요.당신의 고민을 적어주세요.당신의 고민을 적어주세요.</string>

<!--collection-->
<string name="collection_header">분리수거</string>
<string name="collection_explain_first">당신이 보관한&#160;</string>
<string name="collection_stress">스트레스</string>
<string name="collection_explain_last">입니다.</string>
<string name="collection_header">보관함</string>
<string name="collection_explain_first">&#160;</string>
<string name="collection_stress">쓰레기</string>
<string name="collection_explain_last">가 꽉 차면 미화원이 비워갈게요!</string>
<string name="collection_card_category">인간관계</string>
<string name="collection_card_name">글제목1</string>
<string name="collection_card_context">글 내용 미리보기 미리보기 미리보기</string>
Expand All @@ -88,10 +88,10 @@
<string name="filter_start">시작</string>

<!--stats-->
<string name="stats_header">통계</string>
<string name="stats_month_header">월간 통계</string>
<string name="stats_header">그래프</string>
<string name="stats_month_header">월간 그래프</string>
<string name="stats_month_context">한 달 내 카테고리별 스트레스 비율입니다</string>
<string name="stats_total_header">전체 통계</string>
<string name="stats_total_header">전체 그래프</string>
<string name="stats_total_context">전체 사용 기간 동안의 스트레스 비율입니다</string>
<string name="stats_item_category">인간관계</string>
<string name="stats_item_percent">%</string>
Expand Down