diff --git a/app/src/main/java/jp/juggler/subwaytooter/Column.kt b/app/src/main/java/jp/juggler/subwaytooter/Column.kt index 97c83c5d..76a3ebf5 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/Column.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/Column.kt @@ -250,14 +250,7 @@ class Column( } - // 短い名前 - fun getColumnTypeName(context : Context, type : Int) = - when(val item = columnTypeProcMap[type]) { - null -> "?" - else -> item.name(context) - } - - internal fun getIconId(acct : String, type : Int) = + fun getIconId(acct : String, type : Int) = when(val item = columnTypeProcMap[type]) { null -> R.drawable.ic_info else -> item.iconId(acct) diff --git a/app/src/main/java/jp/juggler/subwaytooter/action/Action_Account.kt b/app/src/main/java/jp/juggler/subwaytooter/action/Action_Account.kt index bf655801..0890ff47 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/action/Action_Account.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/action/Action_Account.kt @@ -217,7 +217,10 @@ object Action_Account { bAuto = true, message = activity.getString( R.string.account_picker_add_timeline_of, - Column.getColumnTypeName(activity, type) + when(val ctp = columnTypeProcMap[type]) { + null -> "?" + else -> ctp.name(activity) + } ) ) { ai -> when(type) {