Skip to content

Commit 3ec3bdb

Browse files
Bug fixed and icon changed
1 parent 2906d1d commit 3ec3bdb

23 files changed

+48
-42
lines changed

.idea/misc.xml

+4-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ android {
1313
minSdk 26
1414
targetSdk 30
1515
versionCode 2
16-
versionName "2.0.1"
16+
versionName "2.0.2"
1717

1818
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1919
}
-679 Bytes
Loading

app/src/main/java/com/heycode/iporesult/activities/MainActivity.kt

+36-33
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import android.view.View
1212
import android.view.inputmethod.InputMethodManager
1313
import android.widget.ArrayAdapter
1414
import android.widget.AutoCompleteTextView
15-
import android.widget.Toast
1615
import androidx.activity.viewModels
1716
import androidx.appcompat.app.AppCompatActivity
1817
import androidx.lifecycle.lifecycleScope
@@ -86,40 +85,12 @@ class MainActivity : AppCompatActivity(), BoidAdapter.OnItemClickListener {
8685
binding.tvMiddleTitle.visibility = View.GONE
8786
}
8887
}
89-
}else{
88+
} else {
9089
binding.tvMiddleTitle.visibility = View.GONE
9190
}
9291

93-
94-
lifecycleScope.launch {
95-
homeViewModel.getHome()
96-
homeViewModel.homeContent.observe(this@MainActivity) { data ->
97-
companies = data.body.companyShareList
98-
captchaData = data.body.captchaData
99-
binding.apply {
100-
clError.visibility = View.GONE
101-
pbLoading.visibility = View.GONE
102-
btnSubmit.visibility = View.VISIBLE
103-
svMainContainer.visibility = View.VISIBLE
104-
}
105-
106-
// get names
107-
companies.forEach {
108-
compNames.add(it.name)
109-
compHash[it.name] = it.id.toString()
110-
}
111-
val ad = ArrayAdapter(
112-
this@MainActivity,
113-
android.R.layout.simple_spinner_dropdown_item,
114-
compNames.asReversed()
115-
)
116-
binding.actMainSelect.apply {
117-
setAdapter(ad)
118-
}
119-
// set captcha
120-
setCaptcha(captchaData.captcha)
121-
}
122-
}
92+
// load data
93+
loadCompanyNames()
12394

12495
binding.apply {
12596
btnSubmit.setOnClickListener {
@@ -158,6 +129,38 @@ class MainActivity : AppCompatActivity(), BoidAdapter.OnItemClickListener {
158129
}
159130
}
160131

132+
private fun loadCompanyNames() {
133+
lifecycleScope.launch {
134+
homeViewModel.getHome()
135+
homeViewModel.homeContent.observe(this@MainActivity) { data ->
136+
companies = data.body.companyShareList
137+
captchaData = data.body.captchaData
138+
binding.apply {
139+
clError.visibility = View.GONE
140+
pbLoading.visibility = View.GONE
141+
btnSubmit.visibility = View.VISIBLE
142+
svMainContainer.visibility = View.VISIBLE
143+
}
144+
145+
// get names
146+
companies.forEach {
147+
compNames.add(it.name)
148+
compHash[it.name] = it.id.toString()
149+
}
150+
val ad = ArrayAdapter(
151+
this@MainActivity,
152+
android.R.layout.simple_spinner_dropdown_item,
153+
compNames.asReversed()
154+
)
155+
binding.actMainSelect.apply {
156+
setAdapter(ad)
157+
}
158+
// set captcha
159+
setCaptcha(captchaData.captcha)
160+
}
161+
}
162+
}
163+
161164
override fun onItemClick(position: Int) {
162165
// Toast.makeText(this, "hhhhh", Toast.LENGTH_SHORT).show()
163166
binding.tietBoid.setText(storedBoids.toTypedArray()[position])
@@ -248,7 +251,7 @@ class MainActivity : AppCompatActivity(), BoidAdapter.OnItemClickListener {
248251
USER_BOID_SET,
249252
storedBoids
250253
)
251-
val ss= BoidAdapter(storedBoids.toTypedArray(), this@MainActivity)
254+
val ss = BoidAdapter(storedBoids.toTypedArray(), this@MainActivity)
252255
binding.rvSavedBoid.adapter = ss
253256
d.dismiss()
254257
}

app/src/main/res/drawable/logo.png

-851 Bytes
Loading

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
android:layout_width="match_parent"
1313
android:layout_height="0dp"
1414
android:scrollIndicators="none"
15+
app:layout_constraintBottom_toTopOf="@+id/btnSubmit"
1516
app:layout_constraintEnd_toEndOf="parent"
1617
app:layout_constraintStart_toStartOf="parent"
17-
app:layout_constraintTop_toTopOf="parent"
18-
app:layout_constraintBottom_toTopOf="@+id/btnSubmit">
18+
app:layout_constraintTop_toTopOf="parent">
1919

2020
<androidx.constraintlayout.widget.ConstraintLayout
2121
android:layout_width="match_parent"
@@ -30,15 +30,16 @@
3030
android:visibility="visible"
3131
app:cardCornerRadius="@dimen/dp_8"
3232
app:cardElevation="@dimen/dp_5"
33-
app:layout_constraintTop_toTopOf="parent"
33+
app:layout_constraintEnd_toEndOf="parent"
3434
app:layout_constraintStart_toStartOf="parent"
35-
app:layout_constraintEnd_toEndOf="parent">
35+
app:layout_constraintTop_toTopOf="parent">
3636

3737
<LinearLayout
3838
android:layout_width="match_parent"
3939
android:layout_height="wrap_content"
4040
android:orientation="vertical"
4141
android:padding="@dimen/dp_10">
42+
4243
<com.google.android.material.textfield.TextInputLayout
4344
android:id="@+id/tilBox"
4445
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
android:layout_height="@dimen/dp_60"
2222
android:padding="@dimen/dp_5"
2323
android:src="@drawable/logo"
24-
app:civ_border_color="@color/black"
24+
app:civ_border_color="@color/purple_500"
2525
app:civ_border_width="2dp"
2626
app:layout_constraintBottom_toBottomOf="parent"
2727
app:layout_constraintEnd_toEndOf="parent"
85 Bytes
Loading
Loading
668 Bytes
Loading
94 Bytes
Loading
Loading
428 Bytes
Loading
99 Bytes
Loading
Loading
Loading
327 Bytes
Loading
Loading
Loading
423 Bytes
Loading
Loading
Loading
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<color name="ic_launcher_background">#000000</color>
3+
<color name="ic_launcher_background">#7319F3</color>
44
</resources>

0 commit comments

Comments
 (0)