diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountScreen.kt index 1a6821c3..39f0f265 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/AccountScreen.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/AccountScreen.kt @@ -14,12 +14,14 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.statusBars import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.filled.ArrowDropDown import androidx.compose.material.icons.filled.Check import androidx.compose.material.icons.filled.Visibility import androidx.compose.material.icons.filled.VisibilityOff @@ -563,7 +565,11 @@ private fun AccountContent( } ) { Text(text = mediaEncMap[mediaEnc]!!) - CustomElements.DrawDrawable(R.drawable.arrow_drop_down) + Icon( + imageVector = Icons.Filled.ArrowDropDown, + contentDescription = null, + modifier = Modifier.size(36.dp) + ) } DropdownMenu( expanded = isDropDownExpanded.value, @@ -616,7 +622,11 @@ private fun AccountContent( } ) { Text(text = mediaNatMap[mediaNat]!!) - CustomElements.DrawDrawable(R.drawable.arrow_drop_down) + Icon( + imageVector = Icons.Filled.ArrowDropDown, + contentDescription = null, + modifier = Modifier.size(36.dp) + ) } DropdownMenu( expanded = isDropDownExpanded.value, @@ -818,7 +828,11 @@ private fun AccountContent( } ) { Text(text = dtmfModeMap[dtmfMode]!!) - CustomElements.DrawDrawable(R.drawable.arrow_drop_down) + Icon( + imageVector = Icons.Filled.ArrowDropDown, + contentDescription = null, + modifier = Modifier.size(36.dp) + ) } DropdownMenu( expanded = isDropDownExpanded.value, @@ -870,7 +884,11 @@ private fun AccountContent( modifier = Modifier.clickable { isDropDownExpanded.value = true } ) { Text(text = answerModeMap[answerMode]!!) - CustomElements.DrawDrawable(R.drawable.arrow_drop_down) + Icon( + imageVector = Icons.Filled.ArrowDropDown, + contentDescription = null, + modifier = Modifier.size(36.dp) + ) } DropdownMenu( expanded = isDropDownExpanded.value, @@ -920,7 +938,11 @@ private fun AccountContent( modifier = Modifier.clickable { isDropDownExpanded.value = true } ) { Text(text = redirectModeMap[autoRedirect]!!) - CustomElements.DrawDrawable(R.drawable.arrow_drop_down) + Icon( + imageVector = Icons.Filled.ArrowDropDown, + contentDescription = null, + modifier = Modifier.size(36.dp) + ) } DropdownMenu( expanded = isDropDownExpanded.value, diff --git a/app/src/main/kotlin/com/tutpro/baresip/AudioScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/AudioScreen.kt index 6c201aa5..3686b96c 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/AudioScreen.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/AudioScreen.kt @@ -15,12 +15,14 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.statusBars import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.filled.ArrowDropDown import androidx.compose.material.icons.filled.Check import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenuItem @@ -224,7 +226,11 @@ private fun CallVolume() { } ) { Text(text = volNames[itemPosition.intValue]) - CustomElements.DrawDrawable(R.drawable.arrow_drop_down) + Icon( + imageVector = Icons.Filled.ArrowDropDown, + contentDescription = null, + modifier = Modifier.size(36.dp) + ) } DropdownMenu( expanded = isDropDownExpanded.value, @@ -467,7 +473,11 @@ private fun ToneCountry() { } ) { Text(text = countryNames[itemPosition.intValue]) - CustomElements.DrawDrawable(R.drawable.arrow_drop_down) + Icon( + imageVector = Icons.Filled.ArrowDropDown, + contentDescription = null, + modifier = Modifier.size(36.dp) + ) } DropdownMenu( expanded = isDropDownExpanded.value, diff --git a/app/src/main/kotlin/com/tutpro/baresip/SettingsScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/SettingsScreen.kt index 3fe49a4b..c83c1fba 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/SettingsScreen.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/SettingsScreen.kt @@ -34,12 +34,14 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.statusBars import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.filled.ArrowDropDown import androidx.compose.material.icons.filled.Check import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenuItem @@ -367,7 +369,12 @@ private fun SettingsContent( } ) { Text(text = familyNames[itemPosition.intValue]) - CustomElements.DrawDrawable(R.drawable.arrow_drop_down) + Icon( + imageVector = Icons.Filled.ArrowDropDown, + contentDescription = null, + modifier = Modifier.size(36.dp) + ) + //CustomElements.DrawDrawable(R.drawable.arrow_drop_down) } DropdownMenu( expanded = isDropDownExpanded.value, @@ -744,7 +751,11 @@ private fun SettingsContent( } ) { Text(text = contactNames[itemPosition.intValue]) - CustomElements.DrawDrawable(R.drawable.arrow_drop_down) + Icon( + imageVector = Icons.Filled.ArrowDropDown, + contentDescription = null, + modifier = Modifier.size(36.dp) + ) } DropdownMenu( expanded = isDropDownExpanded.value, diff --git a/app/src/main/res/drawable/arrow_drop_down.xml b/app/src/main/res/drawable/arrow_drop_down.xml deleted file mode 100644 index b7f553c2..00000000 --- a/app/src/main/res/drawable/arrow_drop_down.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - -