Skip to content

Commit

Permalink
Merge pull request #40 from ese111/feature-chart-ui
Browse files Browse the repository at this point in the history
가격 차트 화면, 방 상세 정보 화면
  • Loading branch information
hanchang97 committed Jun 5, 2022
2 parents 2680255 + e905461 commit 217a32d
Show file tree
Hide file tree
Showing 12 changed files with 492 additions and 8 deletions.
20 changes: 17 additions & 3 deletions Android/app/src/main/java/com/team16/airbnb/MoneyRangeFragment.kt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import androidx.databinding.DataBindingUtil
import com.stfalcon.pricerangebar.model.BarEntry
import com.team16.airbnb.databinding.FragmentHomeBinding
import com.team16.airbnb.databinding.FragmentMoneyRangeBinding
import java.text.DecimalFormat
import java.util.ArrayList


Expand All @@ -34,7 +35,7 @@ class MoneyRangeFragment : Fragment() {

val chartList = ArrayList<BarEntry>()

for(i in 1..20){
for (i in 1..20) {
val end = i * 50000f - 3000f
val start = end - 44000f

Expand All @@ -49,13 +50,26 @@ class MoneyRangeFragment : Fragment() {

binding.rangeBarWithChart.setEntries(chartList)


var start = "0"
var end = "1,000,000"

val decimalFormat = DecimalFormat("#,###")
binding.rangeBarWithChart.onLeftPinChanged = { index, leftPinValue ->
Log.d("AppTest", "leftpin / index : ${index}, value : ${leftPinValue}")
binding.tietLeftpin.setText(leftPinValue.toString())

start = decimalFormat.format(leftPinValue?.substring(0, leftPinValue.length - 2)?.toInt())
binding.tietLeftpin.setText(start)

binding.tvMoneyRange.text = getString(R.string.money_label_string, start, end)
}
binding.rangeBarWithChart.onRightPinChanged = { index, rightPinValue ->
Log.d("AppTest", "rightpin / index : ${index}, value : ${rightPinValue}")
binding.tietRightpin.setText(rightPinValue.toString())

end = decimalFormat.format(rightPinValue?.substring(0, rightPinValue.length - 2)?.toInt())
binding.tietRightpin.setText(end)

binding.tvMoneyRange.text = getString(R.string.money_label_string, start, end)
}
}

Expand Down
11 changes: 11 additions & 0 deletions Android/app/src/main/res/drawable/ic_more.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="8dp"
android:height="12dp"
android:viewportWidth="8"
android:viewportHeight="12">
<path
android:pathData="M2,0L0.59,1.41L5.17,6L0.59,10.59L2,12L8,6L2,0Z"
android:fillColor="#000000"
android:fillAlpha="0.87"
android:fillType="evenOdd"/>
</vector>
14 changes: 14 additions & 0 deletions Android/app/src/main/res/drawable/ic_room_detail_back.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="52dp"
android:height="54dp"
android:viewportWidth="52"
android:viewportHeight="54">
<path
android:pathData="M4,26C4,13.85 13.85,4 26,4C38.15,4 48,13.85 48,26C48,38.15 38.15,48 26,48C13.85,48 4,38.15 4,26Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M29.41,21.41L28,20L22,26L28,32L29.41,30.59L24.83,26L29.41,21.41Z"
android:fillColor="#000000"
android:fillAlpha="0.87"
android:fillType="evenOdd"/>
</vector>
14 changes: 14 additions & 0 deletions Android/app/src/main/res/drawable/ic_room_detail_share.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="52dp"
android:height="54dp"
android:viewportWidth="52"
android:viewportHeight="54">
<path
android:pathData="M4,26C4,13.85 13.85,4 26,4C38.15,4 48,13.85 48,26C48,38.15 38.15,48 26,48C13.85,48 4,38.15 4,26Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M32,30.08C31.24,30.08 30.56,30.38 30.04,30.85L22.91,26.7C22.96,26.47 23,26.24 23,26C23,25.76 22.96,25.53 22.91,25.3L29.96,21.19C30.5,21.69 31.21,22 32,22C33.66,22 35,20.66 35,19C35,17.34 33.66,16 32,16C30.34,16 29,17.34 29,19C29,19.24 29.04,19.47 29.09,19.7L22.04,23.81C21.5,23.31 20.79,23 20,23C18.34,23 17,24.34 17,26C17,27.66 18.34,29 20,29C20.79,29 21.5,28.69 22.04,28.19L29.16,32.35C29.11,32.56 29.08,32.78 29.08,33C29.08,34.61 30.39,35.92 32,35.92C33.61,35.92 34.92,34.61 34.92,33C34.92,31.39 33.61,30.08 32,30.08Z"
android:fillColor="#000000"
android:fillAlpha="0.87"
android:fillType="evenOdd"/>
</vector>
16 changes: 16 additions & 0 deletions Android/app/src/main/res/drawable/ic_room_detail_wishlist.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="52dp"
android:height="54dp"
android:viewportWidth="52"
android:viewportHeight="54">
<path
android:pathData="M4,26C4,13.85 13.85,4 26,4C38.15,4 48,13.85 48,26C48,38.15 38.15,48 26,48C13.85,48 4,38.15 4,26Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M34.84,18.61C34.329,18.099 33.723,17.694 33.056,17.417C32.388,17.14 31.673,16.998 30.95,16.998C30.228,16.998 29.512,17.14 28.845,17.417C28.177,17.694 27.571,18.099 27.06,18.61L26,19.67L24.94,18.61C23.908,17.578 22.509,16.999 21.05,16.999C19.591,16.999 18.192,17.578 17.16,18.61C16.128,19.642 15.549,21.041 15.549,22.5C15.549,23.959 16.128,25.358 17.16,26.39L18.22,27.45L26,35.23L33.78,27.45L34.84,26.39C35.351,25.879 35.757,25.273 36.033,24.605C36.31,23.938 36.452,23.222 36.452,22.5C36.452,21.778 36.31,21.062 36.033,20.395C35.757,19.727 35.351,19.121 34.84,18.61V18.61Z"
android:strokeLineJoin="round"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="#333333"
android:strokeLineCap="round"/>
</vector>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 217a32d

Please sign in to comment.