Seil0/teapod
Seil0
/
teapod
1
0
Fork 0
Code Issues 7 Pull Requests Releases 17 Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/mosad/teapod/ui/account/AccountFragment.kt
View File

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

11
app/src/main/java/org/mosad/teapod/util/adapter/MediaItemAdapter.kt
View File

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

2
app/src/main/res/values-de-rDE/strings.xml
View File

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