From 98690a02d16fa0d40bc2412a35c087bccbd8e20c Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 17 May 2023 11:12:15 +0200 Subject: [PATCH] Makes dialog strings translatable and move to themed Material dialog Signed-off-by: Andy Scherzinger --- .../talk/translate/TranslateActivity.kt | 30 +++++++++++++++---- app/src/main/res/values/strings.xml | 2 ++ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/translate/TranslateActivity.kt b/app/src/main/java/com/nextcloud/talk/translate/TranslateActivity.kt index 73f98a124..ee9c90e55 100644 --- a/app/src/main/java/com/nextcloud/talk/translate/TranslateActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/translate/TranslateActivity.kt @@ -2,7 +2,9 @@ * Nextcloud Talk application * * @author Julius Linus + * @author Andy Scherzinger * Copyright (C) 2023 Julius Linus + * Copyright (C) 2023 Andy Scherzinger * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,7 +21,6 @@ */ package com.nextcloud.talk.translate -import android.app.AlertDialog import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.text.method.ScrollingMovementMethod @@ -27,7 +28,9 @@ import android.util.Log import android.view.View import android.widget.AdapterView import android.widget.ArrayAdapter +import androidx.appcompat.app.AlertDialog import autodagger.AutoInjector +import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.nextcloud.talk.R import com.nextcloud.talk.activities.BaseActivity import com.nextcloud.talk.api.NcApi @@ -172,11 +175,26 @@ class TranslateActivity : BaseActivity() { override fun onError(e: Throwable) { binding.progressBar.visibility = View.GONE - val builder = AlertDialog.Builder(this@TranslateActivity) - builder.setTitle("Translation Failed") - builder.setMessage("Could not detect language") - val dialog = builder.create() - dialog.show() + val dialogBuilder = MaterialAlertDialogBuilder(this@TranslateActivity) + .setIcon( + viewThemeUtils.dialog.colorMaterialAlertDialogIcon( + context, + R.drawable.ic_warning_white + ) + ) + .setTitle(R.string.translation_error_title) + .setMessage(R.string.translation_error_message) + .setPositiveButton(R.string.nc_ok) { dialog, _ -> + dialog.dismiss() + } + + viewThemeUtils.dialog.colorMaterialAlertDialogBackground(context, dialogBuilder) + + val dialog = dialogBuilder.show() + + viewThemeUtils.platform.colorTextButtons( + dialog.getButton(AlertDialog.BUTTON_POSITIVE) + ) } override fun onComplete() { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5f6fc167b..a1b3e757b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -658,5 +658,7 @@ How to translate with transifex: Scroll to bottom Translate Translation + Translation failed + Could not detect language