mirror of
https://github.com/SimpleMobileTools/Simple-Keyboard.git
synced 2025-02-18 04:40:37 +01:00
remove duplicate layouts, use commons
This commit is contained in:
parent
e7a02cf460
commit
72abe07284
@ -6,13 +6,13 @@ import android.view.View
|
|||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import android.widget.RadioButton
|
import android.widget.RadioButton
|
||||||
import android.widget.RadioGroup
|
import android.widget.RadioGroup
|
||||||
|
import android.widget.ScrollView
|
||||||
import androidx.appcompat.app.AlertDialog
|
import androidx.appcompat.app.AlertDialog
|
||||||
import com.simplemobiletools.commons.extensions.onGlobalLayout
|
import com.simplemobiletools.commons.extensions.onGlobalLayout
|
||||||
import com.simplemobiletools.commons.models.RadioItem
|
import com.simplemobiletools.commons.models.RadioItem
|
||||||
import com.simplemobiletools.keyboard.R
|
import com.simplemobiletools.keyboard.R
|
||||||
import com.simplemobiletools.keyboard.extensions.getKeyboardDialogBuilder
|
import com.simplemobiletools.keyboard.extensions.getKeyboardDialogBuilder
|
||||||
import com.simplemobiletools.keyboard.extensions.setupKeyboardDialogStuff
|
import com.simplemobiletools.keyboard.extensions.setupKeyboardDialogStuff
|
||||||
import kotlinx.android.synthetic.main.dialog_radio_group.view.*
|
|
||||||
|
|
||||||
class KeyboardRadioGroupDialog(
|
class KeyboardRadioGroupDialog(
|
||||||
private val inputView: View,
|
private val inputView: View,
|
||||||
@ -31,7 +31,7 @@ class KeyboardRadioGroupDialog(
|
|||||||
|
|
||||||
init {
|
init {
|
||||||
val view = layoutInflater.inflate(R.layout.dialog_radio_group, null)
|
val view = layoutInflater.inflate(R.layout.dialog_radio_group, null)
|
||||||
view.dialog_radio_group.apply {
|
val radioGroup = view.findViewById<RadioGroup>(R.id.dialog_radio_group).apply {
|
||||||
for (i in 0 until items.size) {
|
for (i in 0 until items.size) {
|
||||||
val radioButton = (layoutInflater.inflate(R.layout.radio_button, null) as RadioButton).apply {
|
val radioButton = (layoutInflater.inflate(R.layout.radio_button, null) as RadioButton).apply {
|
||||||
text = items[i].title
|
text = items[i].title
|
||||||
@ -62,9 +62,9 @@ class KeyboardRadioGroupDialog(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (selectedItemId != -1) {
|
if (selectedItemId != -1) {
|
||||||
view.dialog_radio_holder.apply {
|
view.findViewById<ScrollView>(R.id.dialog_radio_holder).apply {
|
||||||
onGlobalLayout {
|
onGlobalLayout {
|
||||||
scrollY = view.dialog_radio_group.findViewById<View>(selectedItemId).bottom - height
|
scrollY = radioGroup.findViewById<View>(selectedItemId).bottom - height
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,16 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:id="@+id/dialog_radio_holder"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content">
|
|
||||||
|
|
||||||
<RadioGroup
|
|
||||||
android:id="@+id/dialog_radio_group"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:paddingLeft="@dimen/activity_margin"
|
|
||||||
android:paddingTop="@dimen/normal_margin"
|
|
||||||
android:paddingRight="@dimen/activity_margin"
|
|
||||||
android:paddingBottom="@dimen/normal_margin" />
|
|
||||||
|
|
||||||
</ScrollView>
|
|
@ -1,5 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<RadioButton xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:id="@+id/dialog_radio_button"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content" />
|
|
Loading…
x
Reference in New Issue
Block a user