diff --git a/app/src/main/java/sopt/uni/presentation/wish/WishViewModel.kt b/app/src/main/java/sopt/uni/presentation/wish/WishViewModel.kt index f657ac87..a4940df7 100644 --- a/app/src/main/java/sopt/uni/presentation/wish/WishViewModel.kt +++ b/app/src/main/java/sopt/uni/presentation/wish/WishViewModel.kt @@ -1,6 +1,5 @@ package sopt.uni.presentation.wish -import android.util.Log import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel diff --git a/app/src/main/res/drawable-xhdpi/mission_lose.png b/app/src/main/res/drawable-xhdpi/mission_lose.png new file mode 100644 index 00000000..e120655b Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/mission_lose.png differ diff --git a/app/src/main/res/drawable-xhdpi/mission_undecided.png b/app/src/main/res/drawable-xhdpi/mission_undecided.png new file mode 100644 index 00000000..9b24ebc2 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/mission_undecided.png differ diff --git a/app/src/main/res/drawable-xhdpi/mission_win.png b/app/src/main/res/drawable-xhdpi/mission_win.png new file mode 100644 index 00000000..8abaa15e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/mission_win.png differ diff --git a/app/src/main/res/drawable-xhdpi/onboarding1.png b/app/src/main/res/drawable-xhdpi/onboarding1.png new file mode 100644 index 00000000..888b8cb1 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/onboarding1.png differ diff --git a/app/src/main/res/drawable-xhdpi/onboarding2.png b/app/src/main/res/drawable-xhdpi/onboarding2.png new file mode 100644 index 00000000..1da8f987 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/onboarding2.png differ diff --git a/app/src/main/res/drawable-xhdpi/onboarding3.png b/app/src/main/res/drawable-xhdpi/onboarding3.png new file mode 100644 index 00000000..dc0df443 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/onboarding3.png differ diff --git a/app/src/main/res/drawable-xhdpi/score_board.png b/app/src/main/res/drawable-xhdpi/score_board.png new file mode 100644 index 00000000..1d4e1a6f Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/score_board.png differ diff --git a/app/src/main/res/drawable-xhdpi/wish_amount.png b/app/src/main/res/drawable-xhdpi/wish_amount.png new file mode 100644 index 00000000..627cc6bc Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/wish_amount.png differ diff --git a/app/src/main/res/drawable-xhdpi/wish_used.png b/app/src/main/res/drawable-xhdpi/wish_used.png new file mode 100644 index 00000000..736acefe Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/wish_used.png differ diff --git a/app/src/main/res/drawable-xxhdpi/mission_lose.png b/app/src/main/res/drawable-xxhdpi/mission_lose.png new file mode 100644 index 00000000..3cf58edc Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/mission_lose.png differ diff --git a/app/src/main/res/drawable-xxhdpi/mission_undecided.png b/app/src/main/res/drawable-xxhdpi/mission_undecided.png new file mode 100644 index 00000000..db2a5132 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/mission_undecided.png differ diff --git a/app/src/main/res/drawable-xxhdpi/mission_win.png b/app/src/main/res/drawable-xxhdpi/mission_win.png new file mode 100644 index 00000000..e203651b Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/mission_win.png differ diff --git a/app/src/main/res/drawable-xxhdpi/onboarding1.png b/app/src/main/res/drawable-xxhdpi/onboarding1.png new file mode 100644 index 00000000..d0ac4bda Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/onboarding1.png differ diff --git a/app/src/main/res/drawable-xxhdpi/onboarding2.png b/app/src/main/res/drawable-xxhdpi/onboarding2.png new file mode 100644 index 00000000..2677920c Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/onboarding2.png differ diff --git a/app/src/main/res/drawable-xxhdpi/onboarding3.png b/app/src/main/res/drawable-xxhdpi/onboarding3.png new file mode 100644 index 00000000..60ec4f4d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/onboarding3.png differ diff --git a/app/src/main/res/drawable-xxhdpi/score_board.png b/app/src/main/res/drawable-xxhdpi/score_board.png new file mode 100644 index 00000000..14e7f97f Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/score_board.png differ diff --git a/app/src/main/res/drawable-xxhdpi/wish_amount.png b/app/src/main/res/drawable-xxhdpi/wish_amount.png new file mode 100644 index 00000000..33a93d1c Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/wish_amount.png differ diff --git a/app/src/main/res/drawable-xxhdpi/wish_used.png b/app/src/main/res/drawable-xxhdpi/wish_used.png new file mode 100644 index 00000000..e62a491c Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/wish_used.png differ diff --git a/app/src/main/res/drawable/icon.png b/app/src/main/res/drawable/icon.png deleted file mode 100644 index a04bb1a0..00000000 Binary files a/app/src/main/res/drawable/icon.png and /dev/null differ diff --git a/app/src/main/res/drawable/mission_lose.png b/app/src/main/res/drawable/mission_lose.png index e3cdd5dc..99abacd0 100644 Binary files a/app/src/main/res/drawable/mission_lose.png and b/app/src/main/res/drawable/mission_lose.png differ diff --git a/app/src/main/res/drawable/mission_undecided.png b/app/src/main/res/drawable/mission_undecided.png index e7a51e0d..c6ef22f5 100644 Binary files a/app/src/main/res/drawable/mission_undecided.png and b/app/src/main/res/drawable/mission_undecided.png differ diff --git a/app/src/main/res/drawable/mission_win.png b/app/src/main/res/drawable/mission_win.png index 0e399bcc..b62c1123 100644 Binary files a/app/src/main/res/drawable/mission_win.png and b/app/src/main/res/drawable/mission_win.png differ diff --git a/app/src/main/res/drawable/onboarding1.png b/app/src/main/res/drawable/onboarding1.png index 50435650..a9c3466f 100644 Binary files a/app/src/main/res/drawable/onboarding1.png and b/app/src/main/res/drawable/onboarding1.png differ diff --git a/app/src/main/res/drawable/onboarding2.png b/app/src/main/res/drawable/onboarding2.png index a639efe7..651c7675 100644 Binary files a/app/src/main/res/drawable/onboarding2.png and b/app/src/main/res/drawable/onboarding2.png differ diff --git a/app/src/main/res/drawable/onboarding3.png b/app/src/main/res/drawable/onboarding3.png index 4712e650..af091bf5 100644 Binary files a/app/src/main/res/drawable/onboarding3.png and b/app/src/main/res/drawable/onboarding3.png differ diff --git a/app/src/main/res/drawable/rectangle.png b/app/src/main/res/drawable/rectangle.png deleted file mode 100644 index 60c211a3..00000000 Binary files a/app/src/main/res/drawable/rectangle.png and /dev/null differ diff --git a/app/src/main/res/drawable/rectanglebig.png b/app/src/main/res/drawable/rectanglebig.png deleted file mode 100644 index ec197e33..00000000 Binary files a/app/src/main/res/drawable/rectanglebig.png and /dev/null differ diff --git a/app/src/main/res/drawable/right.png b/app/src/main/res/drawable/right.png deleted file mode 100644 index 72644555..00000000 Binary files a/app/src/main/res/drawable/right.png and /dev/null differ diff --git a/app/src/main/res/drawable/score_board.png b/app/src/main/res/drawable/score_board.png index 3bc44086..3dd341d3 100644 Binary files a/app/src/main/res/drawable/score_board.png and b/app/src/main/res/drawable/score_board.png differ diff --git a/app/src/main/res/drawable/temp_imagecard.png b/app/src/main/res/drawable/temp_imagecard.png deleted file mode 100644 index 84c7ce6d..00000000 Binary files a/app/src/main/res/drawable/temp_imagecard.png and /dev/null differ diff --git a/app/src/main/res/drawable/wish_amount.png b/app/src/main/res/drawable/wish_amount.png index 5599d517..ffb7d037 100644 Binary files a/app/src/main/res/drawable/wish_amount.png and b/app/src/main/res/drawable/wish_amount.png differ diff --git a/app/src/main/res/drawable/wish_used.png b/app/src/main/res/drawable/wish_used.png index fd70a77c..8a0b68db 100644 Binary files a/app/src/main/res/drawable/wish_used.png and b/app/src/main/res/drawable/wish_used.png differ diff --git a/app/src/main/res/layout/activity_history_detail.xml b/app/src/main/res/layout/activity_history_detail.xml index 127394c4..ae512054 100644 --- a/app/src/main/res/layout/activity_history_detail.xml +++ b/app/src/main/res/layout/activity_history_detail.xml @@ -62,8 +62,7 @@ android:layout_marginStart="16dp" android:layout_marginTop="12dp" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/tv_history_detail_date" - tools:src="@drawable/rectanglebig" /> + app:layout_constraintTop_toBottomOf="@+id/tv_history_detail_date" />