From 108087f14e6a2a40d3ddb2810b42ad151c5eb8c8 Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Wed, 29 May 2019 16:49:42 +0300 Subject: [PATCH] - Do not set popup spinner background resource. Use whatever is Android's default. --- app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt | 5 ++--- app/src/main/res/drawable/spinner_background.xml | 2 +- app/src/main/res/layout/activity_account.xml | 8 +++++--- app/src/main/res/layout/activity_config.xml | 3 +-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt index abc08fc1..5756f78f 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt @@ -70,7 +70,6 @@ class AccountActivity : AppCompatActivity() { val spinner = Spinner(applicationContext) spinner.id = i + 100 spinner.layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT) - spinner.setPopupBackgroundResource(R.drawable.spinner_background) layout.addView(spinner) if (acc.audioCodec.size > i) { val codec = acc.audioCodec[i] @@ -82,7 +81,7 @@ class AccountActivity : AppCompatActivity() { spinnerList[i].add(0, "-") } val codecSpinner = findViewById(spinner.id) as Spinner - val adapter = ArrayAdapter(this,android.R.layout.simple_spinner_item, + val adapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, spinnerList[i]) adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) codecSpinner.adapter = adapter @@ -105,7 +104,7 @@ class AccountActivity : AppCompatActivity() { mediaNatVals.removeAt(keyIx) mediaNatKeys.add(0, acc.mediaNat) mediaNatVals.add(0, keyVal) - val mediaNatAdapter = ArrayAdapter(this,android.R.layout.simple_spinner_item, + val mediaNatAdapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, mediaNatVals) mediaNatAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) mediaNatSpinner.adapter = mediaNatAdapter diff --git a/app/src/main/res/drawable/spinner_background.xml b/app/src/main/res/drawable/spinner_background.xml index a0a88be7..52e7e017 100644 --- a/app/src/main/res/drawable/spinner_background.xml +++ b/app/src/main/res/drawable/spinner_background.xml @@ -1,6 +1,6 @@ + android:shape="rectangle" > \ No newline at end of file diff --git a/app/src/main/res/layout/activity_account.xml b/app/src/main/res/layout/activity_account.xml index d4808a89..ab16a1fe 100644 --- a/app/src/main/res/layout/activity_account.xml +++ b/app/src/main/res/layout/activity_account.xml @@ -145,6 +145,7 @@ android:id="@+id/CodecSpinners" android:layout_width="match_parent" android:layout_height="wrap_content" + android:paddingTop="8dp" android:orientation="vertical" > @@ -163,7 +164,7 @@ android:id="@+id/mediaNatSpinner" android:layout_width="match_parent" android:layout_height="wrap_content" - android:popupBackground="@drawable/spinner_background" > + android:paddingTop="8dp" > + android:paddingTop="8dp" > + android:orientation="horizontal" + android:paddingTop="10dp"> + android:layout_gravity="end" >