Skip to content

Commit 114526f

Browse files
authored
Merge pull request #161 from Yet-Zio/v2.0.3
provide fix for weight or mass group
2 parents 906a297 + 85d6abf commit 114526f

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ android {
2121
applicationId = "yetzio.yetcalc"
2222
minSdk = 28
2323
targetSdk = 35
24-
versionCode = 18
25-
versionName = "2.0.2"
24+
versionCode = 19
25+
versionName = "2.0.3"
2626

2727
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2828
}

app/src/main/java/yetzio/yetcalc/views/fragments/WeightFragment.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,25 +178,25 @@ class WeightFragment : Fragment() {
178178
firstConvDropField.setEndIconOnClickListener {
179179
pViewModel.currentUnit.value = UnitType.WEIGHT
180180
pViewModel.first.value = true
181-
unitConvDialog = showUnitConvSearchDialog(requireContext(), requireActivity().applicationContext, resources.getStringArray(R.array.volumelist).toCollection(ArrayList()), pViewModel, viewLifecycleOwner)
181+
unitConvDialog = showUnitConvSearchDialog(requireContext(), requireActivity().applicationContext, resources.getStringArray(R.array.weightormasslist).toCollection(ArrayList()), pViewModel, viewLifecycleOwner)
182182
}
183183

184184
firstConvDropDownField.setOnClickListener {
185185
pViewModel.currentUnit.value = UnitType.WEIGHT
186186
pViewModel.first.value = true
187-
unitConvDialog = showUnitConvSearchDialog(requireContext(), requireActivity().applicationContext, resources.getStringArray(R.array.volumelist).toCollection(ArrayList()), pViewModel, viewLifecycleOwner)
187+
unitConvDialog = showUnitConvSearchDialog(requireContext(), requireActivity().applicationContext, resources.getStringArray(R.array.weightormasslist).toCollection(ArrayList()), pViewModel, viewLifecycleOwner)
188188
}
189189

190190
secondConvDropField.setEndIconOnClickListener {
191191
pViewModel.currentUnit.value = UnitType.WEIGHT
192192
pViewModel.first.value = false
193-
unitConvDialog = showUnitConvSearchDialog(requireContext(), requireActivity().applicationContext, resources.getStringArray(R.array.volumelist).toCollection(ArrayList()), pViewModel, viewLifecycleOwner)
193+
unitConvDialog = showUnitConvSearchDialog(requireContext(), requireActivity().applicationContext, resources.getStringArray(R.array.weightormasslist).toCollection(ArrayList()), pViewModel, viewLifecycleOwner)
194194
}
195195

196196
secondConvDropDownField.setOnClickListener {
197197
pViewModel.currentUnit.value = UnitType.WEIGHT
198198
pViewModel.first.value = false
199-
unitConvDialog = showUnitConvSearchDialog(requireContext(), requireActivity().applicationContext, resources.getStringArray(R.array.volumelist).toCollection(ArrayList()), pViewModel, viewLifecycleOwner)
199+
unitConvDialog = showUnitConvSearchDialog(requireContext(), requireActivity().applicationContext, resources.getStringArray(R.array.weightormasslist).toCollection(ArrayList()), pViewModel, viewLifecycleOwner)
200200
}
201201

202202
switchUnitsButton.setOnClickListener {

app/src/main/res/values/strings.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<resources>
22
<string name="author_name">Yet Zio</string>
33
<string name="app_name">yetCalc</string>
4-
<string name="VERSION_NUM">2.0.2</string>
5-
<string name="VERSION_NAMEANDNUM">Back in Action (2.0.2)</string>
4+
<string name="VERSION_NUM">2.0.3</string>
5+
<string name="VERSION_NAMEANDNUM">Back in Action (2.0.3)</string>
66
<string name="eastereggtoast">Congratulations, Now you are a Gigachad!</string>
77
<string name="app_descrp">Yet another calculator by Yet Zio</string>
88
<string name="ghbtext">View on GitHub</string>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
v2.0.3 Bug Fixes
2+
3+
- Weight/Mass Group now shows its correct unit dialog instead of volume related units.

0 commit comments

Comments
 (0)