Skip to content

Commit 365c65d

Browse files
bug fixed
1 parent ddfe47d commit 365c65d

File tree

5 files changed

+11
-15
lines changed

5 files changed

+11
-15
lines changed

.idea/misc.xml

+1-1
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
@@ -14,7 +14,7 @@ android {
1414
minSdk 26
1515
targetSdk 30
1616
versionCode 2
17-
versionName "2.0.2"
17+
versionName "2.1.0"
1818

1919
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2020
}

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

+2-8
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ class MainActivity : AppCompatActivity(), BoidAdapter.OnItemClickListener {
5151
supportActionBar?.title = "IPO Result"
5252
if (!hasInternetConnection(this@MainActivity)) {
5353
binding.apply {
54+
svMainContainer.visibility = View.GONE
5455
pbLoading.visibility = View.GONE
5556
btnSubmit.visibility = View.GONE
56-
svMainContainer.visibility = View.GONE
5757
clError.visibility = View.VISIBLE
5858
btnRetryError.setOnClickListener {
5959
finish()
@@ -114,20 +114,14 @@ class MainActivity : AppCompatActivity(), BoidAdapter.OnItemClickListener {
114114
putExtra("msg", msg)
115115
putExtra("boid", json.boid)
116116
})
117-
117+
finish()
118118
}
119119
}
120120
}
121121
}
122122
}
123123
}
124124

125-
override fun onResume() {
126-
super.onResume()
127-
binding.pbLoading.visibility = View.GONE
128-
binding.svMainContainer.visibility = View.VISIBLE
129-
binding.btnSubmit.visibility = View.VISIBLE
130-
}
131125
private fun loadCompanyNames() {
132126
lifecycleScope.launch {
133127
homeViewModel.getHome()

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

+6-4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import android.graphics.Color
55
import android.os.Bundle
66
import android.view.MenuItem
77
import android.widget.Toast
8+
import androidx.activity.addCallback
89
import androidx.appcompat.app.AppCompatActivity
910
import com.heycode.iporesult.R
1011
import com.heycode.iporesult.databinding.ActivityResultBinding
@@ -41,10 +42,11 @@ class ResultActivity : AppCompatActivity() {
4142
setHomeAsUpIndicator(R.drawable.ic_arrow_back)
4243
}
4344
// back press
44-
// onBackPressedDispatcher.addCallback(this) {
45-
// onBackPressed()
46-
// // Handle the back button event
47-
// }
45+
onBackPressedDispatcher.addCallback(this) {
46+
// Handle the back button event
47+
finish()
48+
startActivity(Intent(this@ResultActivity, MainActivity::class.java))
49+
}
4850
// config animation
4951
val party = Party(
5052
colors = listOf(Color.YELLOW, Color.RED, Color.CYAN, Color.GREEN, Color.MAGENTA),

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
android:layout_margin="16dp"
112112
android:background="@drawable/btn_shape"
113113
android:text="Submit"
114-
android:visibility="visible"
114+
android:visibility="gone"
115115
app:layout_constraintBottom_toBottomOf="parent"
116116
app:layout_constraintEnd_toEndOf="parent"
117117
app:layout_constraintStart_toStartOf="parent" />

0 commit comments

Comments
 (0)