depau/EtchDroid
1
0
Fork 0
Code Issues Releases Activity

Fix onButtonClick bug on Android 6.0

Browse source
This commit is contained in:
Davide Depau 2018-11-19 03:03:13 +01:00
parent 7db42212ea
commit 691bddcc00
Signed by: depau
GPG key ID: C7D999B6A55EFE86
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/eu/depau/etchdroid/activities/ConfirmationActivity.kt
View file

@ -56,6 +56,8 @@ class ConfirmationActivity : ActivityBase() {
setContentView(R.layout.activity_confirmation) setContentView(R.layout.activity_confirmation)
actionBar?.setDisplayHomeAsUpEnabled(true) actionBar?.setDisplayHomeAsUpEnabled(true)
confirm_fab.setOnClickListener(this::onButtonClicked)
// displayImageLayout must be called before displayDetails // displayImageLayout must be called before displayDetails
// to ensure uncompressed image size is available // to ensure uncompressed image size is available
displayImageLayout() displayImageLayout()

3
app/src/main/java/eu/depau/etchdroid/activities/StartActivity.kt
View file

@ -12,6 +12,7 @@ import eu.depau.etchdroid.R
import eu.depau.etchdroid.StateKeeper import eu.depau.etchdroid.StateKeeper
import eu.depau.etchdroid.enums.FlashMethod import eu.depau.etchdroid.enums.FlashMethod
import eu.depau.etchdroid.utils.DoNotShowAgainDialogFragment import eu.depau.etchdroid.utils.DoNotShowAgainDialogFragment
import kotlinx.android.synthetic.main.activity_start.*
import java.io.File import java.io.File
@ -34,6 +35,8 @@ class StartActivity : ActivityBase() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_start) setContentView(R.layout.activity_start)
btn_image_raw.setOnClickListener(this::onButtonClicked)
btn_image_dmg.setOnClickListener(this::onButtonClicked)
} }
fun onButtonClicked(view: View) = onButtonClicked(view, true) fun onButtonClicked(view: View) = onButtonClicked(view, true)

1
app/src/main/res/layout/activity_confirmation.xml
View file

@ -215,7 +215,6 @@
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
android:onClick="onButtonClicked"
app:srcCompat="@drawable/ic_twotone_save_alt_24px"/> app:srcCompat="@drawable/ic_twotone_save_alt_24px"/>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

6
app/src/main/res/layout/activity_start.xml
View file

@ -38,8 +38,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:theme="@style/CardContentStyle" android:theme="@style/CardContentStyle"
android:foreground="?attr/selectableItemBackground" android:foreground="?attr/selectableItemBackground">
android:onClick="onButtonClicked">
<ImageView <ImageView
android:id="@+id/imageView" android:id="@+id/imageView"
@ -102,8 +101,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:theme="@style/CardContentStyle" android:theme="@style/CardContentStyle"
android:foreground="?attr/selectableItemBackground" android:foreground="?attr/selectableItemBackground">
android:onClick="onButtonClicked">
<ImageView <ImageView
android:id="@+id/imageView2" android:id="@+id/imageView2"