Skip to content

Commit 649eedc

Browse files
Pygmalion69Pygmalion69
committed
Refactor members
1 parent 03634ae commit 649eedc

File tree

1 file changed

+53
-53
lines changed

1 file changed

+53
-53
lines changed

‎app/src/main/java/org/nitri/opentopo/GpxDetailFragment.kt‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,19 @@ import java.util.Locale
4646

4747
class GpxDetailFragment : Fragment(), WayPointListAdapter.OnItemClickListener,
4848
WayPointDetailDialogFragment.Callback {
49-
private lateinit var mListener: OnFragmentInteractionListener
50-
private lateinit var mTrackDistanceLine: MutableList<DistancePoint>
51-
private var mDistance = 0.0
52-
private var mElevation = false
53-
private lateinit var mElevationChart: LineChart
49+
private lateinit var fragmentInteractionListener: OnFragmentInteractionListener
50+
private lateinit var trackDistancePoints: MutableList<DistancePoint>
51+
private var totalDistance = 0.0
52+
private var hasElevationData = false
53+
private lateinit var elevationChart: LineChart
5454
private lateinit var tvName: TextView
5555
private lateinit var tvDescription: TextView
5656
private lateinit var tvLength: TextView
57-
private val mTfRegular: Typeface? = null
58-
private val mTfLight: Typeface? = null
59-
private var mMinElevation = 0.0
60-
private var mMaxElevation = 0.0
61-
private var mWayPointListItems: MutableList<WayPointListItem> = ArrayList()
57+
private val regularTypeface: Typeface? = null
58+
private val lightTypeface: Typeface? = null
59+
private var minElevation = 0.0
60+
private var maxElevation = 0.0
61+
private var wayPointListItems: MutableList<WayPointListItem> = ArrayList()
6262
private lateinit var mWayPointListAdapter: WayPointListAdapter
6363
private lateinit var wvDescription: WebView
6464
private var mSelectedIndex = 0
@@ -67,7 +67,7 @@ class GpxDetailFragment : Fragment(), WayPointListAdapter.OnItemClickListener,
6767
override fun onCreate(savedInstanceState: Bundle?) {
6868
super.onCreate(savedInstanceState)
6969
setHasOptionsMenu(true)
70-
mWayPointListAdapter = WayPointListAdapter(mWayPointListItems, this)
70+
mWayPointListAdapter = WayPointListAdapter(wayPointListItems, this)
7171
}
7272

7373
override fun onCreateView(
@@ -81,7 +81,7 @@ class GpxDetailFragment : Fragment(), WayPointListAdapter.OnItemClickListener,
8181
wvDescription.setBackgroundColor(Color.TRANSPARENT)
8282
tvLength = rootView.findViewById(R.id.tvLength)
8383
chartContainer = rootView.findViewById(R.id.chartContainer)
84-
mElevationChart = rootView.findViewById(R.id.elevationChart)
84+
elevationChart = rootView.findViewById(R.id.elevationChart)
8585
val wayPointRecyclerView = rootView.findViewById<RecyclerView>(R.id.way_point_recycler_view)
8686
wayPointRecyclerView.isNestedScrollingEnabled = false
8787
wayPointRecyclerView.layoutManager = LinearLayoutManager(activity)
@@ -97,8 +97,8 @@ class GpxDetailFragment : Fragment(), WayPointListAdapter.OnItemClickListener,
9797
buildTrackDistanceLine(it)
9898
}
9999
/* if (getActivity() != null) {
100-
mTfRegular = Typeface.createFromAsset(getActivity().getAssets(), "OpenSans-Regular.ttf");
101-
mTfLight = Typeface.createFromAsset(getActivity().getAssets(), "OpenSans-Light.ttf");
100+
regularTypeface = Typeface.createFromAsset(getActivity().getAssets(), "OpenSans-Regular.ttf");
101+
lightTypeface = Typeface.createFromAsset(getActivity().getAssets(), "OpenSans-Light.ttf");
102102
}*/
103103

104104
// For now, use title and description of first track
@@ -130,14 +130,14 @@ class GpxDetailFragment : Fragment(), WayPointListAdapter.OnItemClickListener,
130130
}
131131
}
132132
}
133-
if (mElevation) {
133+
if (hasElevationData) {
134134
setUpElevationChart()
135135
setChartData()
136136
} else {
137137
chartContainer.visibility = View.GONE
138138
}
139-
if (mDistance > 0) {
140-
tvLength.text = String.format(Locale.getDefault(), "%.2f km", mDistance / 1000f)
139+
if (totalDistance > 0) {
140+
tvLength.text = String.format(Locale.getDefault(), "%.2f km", totalDistance / 1000f)
141141
} else {
142142
tvLength.visibility = View.GONE
143143
}
@@ -148,26 +148,26 @@ class GpxDetailFragment : Fragment(), WayPointListAdapter.OnItemClickListener,
148148
}
149149

150150
private fun buildTrackDistanceLine(track: Track) {
151-
mTrackDistanceLine = ArrayList()
152-
mDistance = 0.0
153-
mElevation = false
151+
trackDistancePoints = ArrayList()
152+
totalDistance = 0.0
153+
hasElevationData = false
154154
var prevTrackPoint: TrackPoint? = null
155155
track.trackSegments?.forEach { segment ->
156156
segment.trackPoints?.let { points ->
157-
mMaxElevation = points.first().elevation ?: 0.0
158-
mMinElevation = mMaxElevation
157+
maxElevation = points.first().elevation ?: 0.0
158+
minElevation = maxElevation
159159
points.forEach { trackPoint ->
160160
prevTrackPoint?.let { prevPoint ->
161-
mDistance += DistanceCalculator.distance(prevPoint, trackPoint)
161+
totalDistance += DistanceCalculator.distance(prevPoint, trackPoint)
162162
}
163163
val builder = DistancePoint.Builder()
164-
builder.setDistance(mDistance)
164+
builder.setDistance(totalDistance)
165165
trackPoint.elevation?.also { elevation ->
166-
if (elevation < mMinElevation) mMinElevation = elevation
167-
if (elevation > mMaxElevation) mMaxElevation = elevation
166+
if (elevation < minElevation) minElevation = elevation
167+
if (elevation > maxElevation) maxElevation = elevation
168168
builder.setElevation(elevation)
169-
mElevation = true
170-
mTrackDistanceLine.add(builder.build())
169+
hasElevationData = true
170+
trackDistancePoints.add(builder.build())
171171
}
172172
prevTrackPoint = trackPoint
173173
}
@@ -179,7 +179,7 @@ class GpxDetailFragment : Fragment(), WayPointListAdapter.OnItemClickListener,
179179
private fun buildWayPointList() {
180180
val defaultType = getString(R.string.poi)
181181
var wayPoints: MutableList<WayPoint?>
182-
mWayPointListItems.clear()
182+
wayPointListItems.clear()
183183

184184
var waypointTypes: List<String>?
185185
mGpxViewModel.gpx?.let { gpx ->
@@ -192,27 +192,27 @@ class GpxDetailFragment : Fragment(), WayPointListAdapter.OnItemClickListener,
192192
)
193193
)
194194
if (wayPoints.isNotEmpty()) {
195-
mWayPointListItems.add(WayPointHeaderItem(type))
195+
wayPointListItems.add(WayPointHeaderItem(type))
196196
for (wayPoint in wayPoints) {
197197
wayPoint?.let { WayPointItem(it)}
198-
?.let { mWayPointListItems.add(it) }
198+
?.let { wayPointListItems.add(it) }
199199
}
200200
}
201201
}
202202
}
203203
}
204204

205205
private fun setUpElevationChart() {
206-
val l = mElevationChart.legend
206+
val l = elevationChart.legend
207207
l.isEnabled = false
208-
mElevationChart.description.isEnabled = false
208+
elevationChart.description.isEnabled = false
209209
val mv = ChartValueMarkerView(activity, R.layout.chart_value_marker_view)
210-
mv.chartView = mElevationChart
211-
mElevationChart.marker = mv
210+
mv.chartView = elevationChart
211+
elevationChart.marker = mv
212212
val primaryTextColorInt = context?.let { Utils.resolveColorAttr(it, android.R.attr.textColorPrimary) }
213-
val xAxis = mElevationChart.xAxis
213+
val xAxis = elevationChart.xAxis
214214
xAxis.position = XAxis.XAxisPosition.BOTTOM
215-
xAxis.typeface = mTfLight
215+
xAxis.typeface = lightTypeface
216216
xAxis.textSize = 10f
217217
xAxis.textColor = Color.WHITE
218218
xAxis.setDrawAxisLine(true)
@@ -227,29 +227,29 @@ class GpxDetailFragment : Fragment(), WayPointListAdapter.OnItemClickListener,
227227
)
228228
}
229229
xAxis.axisMinimum = 0f
230-
xAxis.axisMaximum = mDistance.toFloat()
231-
val yAxis = mElevationChart.axisLeft
230+
xAxis.axisMaximum = totalDistance.toFloat()
231+
val yAxis = elevationChart.axisLeft
232232
yAxis.setPosition(YAxis.YAxisLabelPosition.OUTSIDE_CHART)
233-
yAxis.typeface = mTfLight
233+
yAxis.typeface = lightTypeface
234234
yAxis.setDrawGridLines(false)
235235
yAxis.isGranularityEnabled = true
236236
if (primaryTextColorInt != null) {
237237
yAxis.textColor = primaryTextColorInt
238238
}
239-
val margin = mMaxElevation.toFloat() * .2f
240-
var yMin = mMinElevation.toFloat() - margin
241-
val yMax = mMaxElevation.toFloat() + margin
242-
if (yMin < 0 && mMinElevation >= 0) yMin = 0f
239+
val margin = maxElevation.toFloat() * .2f
240+
var yMin = minElevation.toFloat() - margin
241+
val yMax = maxElevation.toFloat() + margin
242+
if (yMin < 0 && minElevation >= 0) yMin = 0f
243243
yAxis.axisMinimum = yMin
244244
yAxis.axisMaximum = yMax
245-
mElevationChart.axisRight.setDrawLabels(false)
246-
mElevationChart.viewPortHandler.setMaximumScaleX(2f)
247-
mElevationChart.viewPortHandler.setMaximumScaleY(2f)
245+
elevationChart.axisRight.setDrawLabels(false)
246+
elevationChart.viewPortHandler.setMaximumScaleX(2f)
247+
elevationChart.viewPortHandler.setMaximumScaleY(2f)
248248
}
249249

250250
private fun setChartData() {
251251
val elevationValues = ArrayList<Entry>()
252-
for (point in mTrackDistanceLine) {
252+
for (point in trackDistancePoints) {
253253
if (point.distance != null && point.elevation != null) elevationValues.add(
254254
Entry(
255255
point.distance.toFloat(),
@@ -265,8 +265,8 @@ class GpxDetailFragment : Fragment(), WayPointListAdapter.OnItemClickListener,
265265
elevationDataSet.setDrawCircles(false)
266266
elevationDataSet.axisDependency = YAxis.AxisDependency.LEFT
267267
val elevationData = LineData(elevationDataSet)
268-
mElevationChart.data = elevationData
269-
mElevationChart.invalidate()
268+
elevationChart.data = elevationData
269+
elevationChart.invalidate()
270270
}
271271

272272
override fun onItemClick(index: Int) {
@@ -281,17 +281,17 @@ class GpxDetailFragment : Fragment(), WayPointListAdapter.OnItemClickListener,
281281
}
282282

283283
override fun getSelectedWayPointItem(): WayPointItem {
284-
return mWayPointListItems[mSelectedIndex] as WayPointItem
284+
return wayPointListItems[mSelectedIndex] as WayPointItem
285285
}
286286

287287
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
288288
super.onCreateOptionsMenu(menu, inflater)
289-
mListener.setUpNavigation(true)
289+
fragmentInteractionListener.setUpNavigation(true)
290290
}
291291

292292
override fun onAttach(context: Context) {
293293
super.onAttach(context)
294-
mListener = if (context is OnFragmentInteractionListener) {
294+
fragmentInteractionListener = if (context is OnFragmentInteractionListener) {
295295
context
296296
} else {
297297
throw RuntimeException(

0 commit comments

Comments
 (0)