Mastodon/SubwayTooter-Android-App
1
0
Fork 0
mirror of https://github.com/tateisu/SubwayTooter synced 2025-02-07 06:04:23 +01:00
Code Issues Releases Wiki Activity

update translators list

Browse Source
This commit is contained in:
tateisu 2019-11-21 19:40:54 +09:00
parent 64a2851f80
commit 5a17245eeb
4 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/java/jp/juggler/subwaytooter/ActAbout.kt
View File

@ -13,6 +13,14 @@ import jp.juggler.util.LogCategory
class ActAbout : AppCompatActivity() {
class Translators(
val name:String,
_search:String?,
val lang:String
){
val search :String = _search ?: name
}
companion object {
val log = LogCategory("ActAbout")
@ -30,8 +38,22 @@ class ActAbout : AppCompatActivity() {
const val url_weblate = "https://hosted.weblate.org/projects/subway-tooter/"
val contributors = arrayOf(
Pair("@ButterflyOfFire@mstdn.fr", "arabic & french")
val translators = arrayOf(
Translators("Allan Nordhøy",null,"English & Norwegian Bokmål"),
Translators("ButterflyOfFire","@ButterflyOfFire@mstdn.fr", "Arabic & French"),
Translators("Ch",null,"Korean"),
Translators("Elizabeth Sherrock",null,"Chinese (Simplified)"),
Translators("Gennady Archangorodsky",null,"Hebrew"),
Translators("inqbs Siina",null,"Korean"),
Translators("Jeong Arm","jarm@qdon.space","Korean"),
Translators("Kai Zhang",null,"Chinese (Simplified)"),
Translators("lptprjh",null,"Korean"),
Translators("mynameismonkey",null,"Welsh"),
Translators("Nathan",null,"French"),
Translators("Owain Rhys Lewis",null,"Welsh"),
Translators("Swann Martinet",null,"French"),
Translators("takubunn",null,"Chinese (Simplified)"),
Translators("배태길",null,"Korea")
)
}
@ -89,11 +111,8 @@ class ActAbout : AppCompatActivity() {
val margin_top = (0.5f + density * 8).toInt()
val padding = (0.5f + density * 8).toInt()
for(pair in contributors) {
for(who in translators) {
ll.addView(Button(this).apply {
val acct = pair.first
val languages = pair.second
//
layoutParams = LinearLayout.LayoutParams(
LinearLayout.LayoutParams.WRAP_CONTENT,
@ -107,14 +126,13 @@ class ActAbout : AppCompatActivity() {
isAllCaps = false
//
text = getString(R.string.search_for, acct) + "\n" +
getString(R.string.thanks_for, languages)
text = who.name + "\n" + getString(R.string.thanks_for, who.lang)
gravity = Gravity.START or Gravity.CENTER_VERTICAL
setOnClickListener {
val data = Intent()
data.putExtra(EXTRA_SEARCH, acct)
data.putExtra(EXTRA_SEARCH, who.search)
setResult(Activity.RESULT_OK, data)
finish()
}

2
app/src/main/java/jp/juggler/subwaytooter/ActAppSettingChild.kt
View File

@ -2033,7 +2033,7 @@ class ActAppSettingChild : AppCompatActivity()
tv ?: return
val cn = CustomShare.getCustomShareComponentName(this, pref, target)
val cn = CustomShare.getCustomShareComponentName(pref, target)
val (label, icon) = CustomShare.getInfo(packageManager, cn)
tv.text = label ?: getString(R.string.not_selected)

9
app/src/main/java/jp/juggler/subwaytooter/action/CustomShare.kt
View File

@ -23,6 +23,8 @@ object CustomShare {
private val log = LogCategory("CustomShare")
private const val translate_app_component_default = "com.google.android.apps.translate/com.google.android.apps.translate.TranslateActivity"
// convert "pkgName/className" string to ComponentName object.
private fun String.cn() : ComponentName? {
try {
@ -35,7 +37,6 @@ object CustomShare {
}
fun getCustomShareComponentName(
context : Context,
pref : SharedPreferences,
target : CustomShareTarget
) : ComponentName? {
@ -44,7 +45,7 @@ object CustomShare {
when(target) {
CustomShareTarget.Translate -> {
src = Pref.spTranslateAppComponent(pref)
defaultComponentName = context.getString(R.string.translate_app_component_default)
defaultComponentName = translate_app_component_default
}
CustomShareTarget.CustomShare1 -> {
@ -100,7 +101,7 @@ object CustomShare {
try {
// convert "pkgName/className" string to ComponentName object.
val cn = getCustomShareComponentName(activity, activity.pref, target)
val cn = getCustomShareComponentName(activity.pref, target)
if(cn == null) {
showToast(activity,true,R.string.custom_share_app_not_found)
return
@ -130,7 +131,7 @@ object CustomShare {
fun reloadCache(context : Context, pref : SharedPreferences) {
val pm = context.packageManager
CustomShareTarget.values().forEach { target ->
val cn = getCustomShareComponentName(context, pref, target)
val cn = getCustomShareComponentName(pref, target)
val pair = getInfo(pm, cn)
cache[target] = pair
}

1
app/src/main/res/values/strings.xml
View File

@ -920,7 +920,6 @@
<string name="show_translate_button">Show translate button</string>
<string name="translate">Translate</string>
<string name="translation_app" >Translation app</string>
<string name="translate_app_component_default" translatable="false">com.google.android.apps.translate/com.google.android.apps.translate.TranslateActivity</string>
<string name="missing_app_can_receive_action_send">Missing app that can receive ACTION_SEND.</string>
<string name="select_destination_app_and_back">Select the destination app, then back to app setting.</string>
<string name="app_chooser_works_android_5_1">Sorry, app chooser works on Android 5.1+.</string>