diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActAbout.kt b/app/src/main/java/jp/juggler/subwaytooter/ActAbout.kt index 57c38c17..ee5d0ee1 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/ActAbout.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/ActAbout.kt @@ -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() } diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActAppSettingChild.kt b/app/src/main/java/jp/juggler/subwaytooter/ActAppSettingChild.kt index e8d5d6c8..fe3da789 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/ActAppSettingChild.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/ActAppSettingChild.kt @@ -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) diff --git a/app/src/main/java/jp/juggler/subwaytooter/action/CustomShare.kt b/app/src/main/java/jp/juggler/subwaytooter/action/CustomShare.kt index e3186344..9a045796 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/action/CustomShare.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/action/CustomShare.kt @@ -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 } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7b7ef726..8d04e5c3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -920,7 +920,6 @@ Show translate button Translate Translation app - com.google.android.apps.translate/com.google.android.apps.translate.TranslateActivity Missing app that can receive ACTION_SEND. Select the destination app, then back to app setting. Sorry, app chooser works on Android 5.1+.