fix cancel text for german translation

This commit is contained in:
Jannik 2020-10-14 20:58:42 +02:00
parent 442a02db70
commit 36c8678646
Signed by: Seil0
GPG Key ID: E8459F3723C52C24
3 changed files with 13 additions and 8 deletions

View File

@ -6,7 +6,7 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.Fragment
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.afollestad.materialdialogs.MaterialDialog
import de.psdev.licensesdialog.LicensesDialog
import kotlinx.android.synthetic.main.fragment_account.*
import org.mosad.teapod.BuildConfig
@ -36,9 +36,9 @@ class AccountFragment : Fragment() {
}
linear_about.setOnClickListener {
MaterialAlertDialogBuilder(requireContext())
.setTitle(R.string.info_about)
.setMessage(R.string.info_about_dialog)
MaterialDialog(requireContext())
.title(R.string.info_about)
.message(R.string.info_about_dialog)
.show()
}

View File

@ -13,7 +13,7 @@ import java.util.*
class MediaItemAdapter(val context: Context, private val originalMedia: ArrayList<Media>) : BaseAdapter(), Filterable {
private var filteredMedia = originalMedia.map { it.copy() }
private val customFilter = CustomFilter()
private val filer = MediaFilter()
override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
val view = convertView ?: LayoutInflater.from(context).inflate(R.layout.item_media, parent, false)
@ -28,7 +28,7 @@ class MediaItemAdapter(val context: Context, private val originalMedia: ArrayLis
}
override fun getFilter(): Filter {
return customFilter
return filer
}
override fun getCount(): Int {
@ -43,7 +43,8 @@ class MediaItemAdapter(val context: Context, private val originalMedia: ArrayLis
return position.toLong()
}
inner class CustomFilter : Filter() {
inner class MediaFilter : Filter() {
override fun performFiltering(constraint: CharSequence?): FilterResults {
val filterTerm = constraint.toString().toLowerCase(Locale.ROOT)
val results = FilterResults()
@ -62,6 +63,10 @@ class MediaItemAdapter(val context: Context, private val originalMedia: ArrayLis
return results
}
@Suppress("unchecked_cast")
/**
* suppressing unchecked cast is safe, since we only use Media
*/
override fun publishResults(constraint: CharSequence?, results: FilterResults?) {
filteredMedia = results?.values as ArrayList<Media>
notifyDataSetChanged()

View File

@ -24,7 +24,7 @@
<!-- dialogs -->
<string name="save">speichern</string>
<string name="cancel">\@android:string/cancel</string>
<string name="cancel">@android:string/cancel</string>
<!-- etc -->
<string name="login">Login</string>