From 0089f232c4db7af5f5c2e68cd0c313b4093e07c7 Mon Sep 17 00:00:00 2001 From: FooIbar <118464521+FooIbar@users.noreply.github.com> Date: Sun, 2 Apr 2023 16:03:33 +0800 Subject: [PATCH] Convert GetText to kotlin --- .../java/com/hippo/ehviewer/EhApplication.kt | 1 - .../main/java/com/hippo/ehviewer/GetText.kt | 28 +++++-------------- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt index 27fc8a132..80423b634 100644 --- a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt +++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt @@ -89,7 +89,6 @@ class EhApplication : Application(), DefaultLifecycleObserver, ImageLoaderFactor } super.onCreate() System.loadLibrary("ehviewer") - GetText.initialize(this) Settings.initialize() ReadableTime.initialize(this) AppConfig.initialize(this) diff --git a/app/src/main/java/com/hippo/ehviewer/GetText.kt b/app/src/main/java/com/hippo/ehviewer/GetText.kt index eca9bc0f9..289399cd2 100644 --- a/app/src/main/java/com/hippo/ehviewer/GetText.kt +++ b/app/src/main/java/com/hippo/ehviewer/GetText.kt @@ -13,30 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.hippo.ehviewer -package com.hippo.ehviewer; +import androidx.annotation.StringRes -import android.content.Context; -import android.content.res.Resources; - -import androidx.annotation.NonNull; -import androidx.annotation.StringRes; - -public class GetText { - - private static Resources sResources; - - public static void initialize(Context context) { - sResources = context.getApplicationContext().getResources(); +object GetText { + fun getString(@StringRes id: Int): String { + return EhApplication.application.getString(id) } - @NonNull - public static String getString(@StringRes int id) { - return sResources.getString(id); - } - - @NonNull - public static String getString(@StringRes int id, Object... formatArgs) { - return sResources.getString(id, formatArgs); + fun getString(@StringRes id: Int, vararg formatArgs: Any?): String { + return EhApplication.application.getString(id, *formatArgs) } }