Skip to content

Commit 024a11f

Browse files
GerardGerard
authored andcommitted
Bug fixes
- Fixed bug causing some clouds to pop out of view if startAnimation() called before view was drawn - Refactored app activity
1 parent f2fade9 commit 024a11f

File tree

4 files changed

+158
-124
lines changed

4 files changed

+158
-124
lines changed

app/src/main/java/com/gerardbradshaw/cloudview/MainActivity.kt

Lines changed: 38 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,45 @@ class MainActivity : AppCompatActivity() {
3333
initViewDefaults()
3434
initListeners()
3535

36+
minSizeView.text = cloudView.minCloudSize.toString()
37+
maxSizeView.text = cloudView.maxCloudSize.toString()
38+
39+
cloudView.startAnimation()
40+
}
41+
42+
private fun locateViews() {
43+
cloudView = findViewById(R.id.cloud_view)
44+
45+
cloudCountSeekBar = findViewById(R.id.cloud_count_seek_bar)
46+
cloudCountView = findViewById(R.id.cloud_count_text_view)
47+
48+
minSizeSeekBar = findViewById(R.id.min_size_seek_bar)
49+
minSizeView = findViewById(R.id.min_size_text_view)
50+
51+
maxSizeSeekBar = findViewById(R.id.max_size_seek_bar)
52+
maxSizeView = findViewById(R.id.max_size_text_view)
53+
54+
passTimeEditText = findViewById(R.id.pass_time_edit_text)
55+
varianceTimeEditText = findViewById(R.id.pass_variance_edit_text)
56+
}
3657

58+
private fun initViewDefaults() {
59+
cloudView.setDefaults()
60+
61+
cloudCountSeekBar.progress = cloudView.cloudCount
62+
cloudCountView.text = "${cloudView.cloudCount}"
63+
64+
minSizeSeekBar.progress = cloudView.minCloudSize
65+
minSizeView.text = "${cloudView.minCloudSize}"
66+
67+
maxSizeSeekBar.progress = cloudView.maxCloudSize
68+
maxSizeView.text = "${cloudView.maxCloudSize}"
69+
70+
passTimeEditText.hint = "${cloudView.basePassTimeMs}"
71+
varianceTimeEditText.hint = "${cloudView.passTimeVarianceMs }"
72+
}
73+
74+
private fun initListeners() {
3775
cloudCountSeekBar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
3876
override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
3977
cloudCountView.text = "$progress"
@@ -47,10 +85,6 @@ class MainActivity : AppCompatActivity() {
4785
}
4886
})
4987

50-
51-
minSizeView.text = cloudView.minCloudSize.toString()
52-
maxSizeView.text = cloudView.maxCloudSize.toString()
53-
5488
findViewById<Button>(R.id.start_button).setOnClickListener {
5589
cloudView.startAnimation()
5690
}
@@ -115,42 +149,6 @@ class MainActivity : AppCompatActivity() {
115149
})
116150
}
117151

118-
private fun locateViews() {
119-
cloudView = findViewById(R.id.cloud_view)
120-
121-
cloudCountSeekBar = findViewById(R.id.cloud_count_seek_bar)
122-
cloudCountView = findViewById(R.id.cloud_count_text_view)
123-
124-
minSizeSeekBar = findViewById(R.id.min_size_seek_bar)
125-
minSizeView = findViewById(R.id.min_size_text_view)
126-
127-
maxSizeSeekBar = findViewById(R.id.max_size_seek_bar)
128-
maxSizeView = findViewById(R.id.max_size_text_view)
129-
130-
passTimeEditText = findViewById(R.id.pass_time_edit_text)
131-
varianceTimeEditText = findViewById(R.id.pass_variance_edit_text)
132-
}
133-
134-
private fun initViewDefaults() {
135-
cloudView.setDefaults()
136-
137-
cloudCountSeekBar.progress = cloudView.cloudCount
138-
cloudCountView.text = "${cloudView.cloudCount}"
139-
140-
minSizeSeekBar.progress = cloudView.minCloudSize
141-
minSizeView.text = "${cloudView.minCloudSize}"
142-
143-
maxSizeSeekBar.progress = cloudView.maxCloudSize
144-
maxSizeView.text = "${cloudView.maxCloudSize}"
145-
146-
passTimeEditText.hint = "${cloudView.basePassTimeMs}"
147-
varianceTimeEditText.hint = "${cloudView.passTimeVarianceMs }"
148-
}
149-
150-
private fun initListeners() {
151-
152-
}
153-
154152
companion object {
155153
private const val TAG = "GGG MainActivity"
156154
}

app/src/main/res/layout/activity_main.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@
6262
<SeekBar
6363
android:id="@+id/min_size_seek_bar"
6464
android:layout_width="0dp"
65-
android:min="25"
66-
android:max="100"
65+
android:min="200"
66+
android:max="400"
6767
android:layout_weight="1"
6868
android:layout_height="wrap_content" />
6969

@@ -88,7 +88,7 @@
8888
<SeekBar
8989
android:id="@+id/max_size_seek_bar"
9090
android:layout_width="0dp"
91-
android:min="101"
91+
android:min="400"
9292
android:max="500"
9393
android:layout_weight="1"
9494
android:layout_height="wrap_content" />

library/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ android {
99
buildToolsVersion "30.0.3"
1010

1111
defaultConfig {
12-
minSdkVersion 22
12+
minSdkVersion 21
1313
targetSdkVersion 30
1414
versionCode 1
1515
versionName "1.0"

0 commit comments

Comments
 (0)