diff --git a/app/src/main/kotlin/jackall/moncalc/adapter/MainFragmentPagerAdapter.kt b/app/src/main/kotlin/jackall/moncalc/adapter/MainFragmentPagerAdapter.kt index eb65389..2df497f 100644 --- a/app/src/main/kotlin/jackall/moncalc/adapter/MainFragmentPagerAdapter.kt +++ b/app/src/main/kotlin/jackall/moncalc/adapter/MainFragmentPagerAdapter.kt @@ -4,6 +4,7 @@ import android.support.v4.app.Fragment import android.support.v4.app.FragmentManager import android.support.v4.app.FragmentPagerAdapter +import jackall.moncalc.R import jackall.moncalc.fragment.AnalyzeFragment import jackall.moncalc.fragment.HistoryFragment @@ -12,7 +13,7 @@ */ class MainFragmentPagerAdapter(fragmentManager: FragmentManager, val context: Context) : FragmentPagerAdapter(fragmentManager) { val pageCount = 2 - val titles = arrayOf("履歴", "解析") + val titles = arrayOf(context.resources.getString(R.string.history), context.resources.getString(R.string.analyze)) override fun getItem(position: Int): Fragment? { when (position) { 0 -> { diff --git a/app/src/main/kotlin/jackall/moncalc/viewmodel/MainViewModel.kt b/app/src/main/kotlin/jackall/moncalc/viewmodel/MainViewModel.kt index 90a4d82..cb13575 100644 --- a/app/src/main/kotlin/jackall/moncalc/viewmodel/MainViewModel.kt +++ b/app/src/main/kotlin/jackall/moncalc/viewmodel/MainViewModel.kt @@ -25,9 +25,9 @@ init { if (isMainServiceRunning(context)) { - serviceButtonText.set(context.resources.getResourceName(R.string.start_service)) + serviceButtonText.set(context.resources.getString(R.string.stop_service)) } else { - serviceButtonText.set(context.resources.getResourceName(R.string.stop_service)) + serviceButtonText.set(context.resources.getString(R.string.start_service)) } } @@ -40,10 +40,10 @@ fun onClickServiceButton(view: View) { if (!isMainServiceRunning(context)) { context.startService(serviceIntent) - serviceButtonText.set(context.resources.getResourceName(R.string.stop_service)) + serviceButtonText.set(context.resources.getString(R.string.stop_service)) } else { context.stopService(serviceIntent) - serviceButtonText.set(context.resources.getResourceName(R.string.start_service)) + serviceButtonText.set(context.resources.getString(R.string.start_service)) } } } \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e736a44..0d53898 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,4 +6,6 @@ 終了 常駐開始 常駐終了 + 履歴 + 解析