From f343d0f04c9cbb210f2b56b4f0c534ac56aa76ef Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Wed, 8 Nov 2017 22:40:06 -0500 Subject: Translations Vietnamese (#99) * Add translations * Lint * Inline * Optimize imports * Replace ellipsis --- .../ca/allanwang/kau/about/CollapsibleTextView.kt | 1 - .../kotlin/ca/allanwang/kau/about/CutoutIItem.kt | 1 - about/src/main/res/values-vi/strings_about.xml | 6 ++ .../ca/allanwang/kau/colorpicker/CircleView.kt | 5 +- .../src/main/res/values-vi/strings_colorpicker.xml | 6 ++ .../kau/ui/activities/ElasticRecyclerActivity.kt | 1 - .../ui/widgets/ElasticDragDismissFrameLayout.kt | 1 - .../kotlin/ca/allanwang/kau/xml/ChangelogTest.kt | 3 - .../kau/ui/views/CollapsibleViewDelegate.kt | 2 +- .../kotlin/ca/allanwang/kau/utils/AnimUtils.kt | 2 +- .../kotlin/ca/allanwang/kau/utils/ColorUtils.kt | 20 +++---- .../kotlin/ca/allanwang/kau/utils/FileUtils.kt | 5 -- .../main/res-public/values-vi/strings_commons.xml | 67 ++++++++++++++++++++++ .../kotlin/ca/allanwang/kau/kotlin/DebounceTest.kt | 1 - .../ca/allanwang/kau/mediapicker/MediaItem.kt | 1 - .../ca/allanwang/kau/mediapicker/MediaItemBasic.kt | 4 -- .../ca/allanwang/kau/mediapicker/MediaUtils.kt | 1 - .../src/main/res/values-vi/strings_mediapicker.xml | 11 ++++ 18 files changed, 103 insertions(+), 35 deletions(-) create mode 100644 about/src/main/res/values-vi/strings_about.xml create mode 100644 colorpicker/src/main/res/values-vi/strings_colorpicker.xml create mode 100644 core/src/main/res-public/values-vi/strings_commons.xml create mode 100644 mediapicker/src/main/res/values-vi/strings_mediapicker.xml diff --git a/about/src/main/kotlin/ca/allanwang/kau/about/CollapsibleTextView.kt b/about/src/main/kotlin/ca/allanwang/kau/about/CollapsibleTextView.kt index 32573bc..036f16c 100644 --- a/about/src/main/kotlin/ca/allanwang/kau/about/CollapsibleTextView.kt +++ b/about/src/main/kotlin/ca/allanwang/kau/about/CollapsibleTextView.kt @@ -3,7 +3,6 @@ package ca.allanwang.kau.about import android.content.Context import android.content.res.Configuration import android.util.AttributeSet -import android.widget.LinearLayout import android.widget.TextView import ca.allanwang.kau.ui.views.CollapsibleView import ca.allanwang.kau.ui.views.CollapsibleViewDelegate diff --git a/about/src/main/kotlin/ca/allanwang/kau/about/CutoutIItem.kt b/about/src/main/kotlin/ca/allanwang/kau/about/CutoutIItem.kt index 3f764d3..10a18b2 100644 --- a/about/src/main/kotlin/ca/allanwang/kau/about/CutoutIItem.kt +++ b/about/src/main/kotlin/ca/allanwang/kau/about/CutoutIItem.kt @@ -7,7 +7,6 @@ import ca.allanwang.kau.adapters.ThemableIItemDelegate import ca.allanwang.kau.iitems.KauIItem import ca.allanwang.kau.ui.views.CutoutView import ca.allanwang.kau.utils.bindView -import com.mikepenz.fastadapter.items.AbstractItem /** * Created by Allan Wang on 2017-06-28. diff --git a/about/src/main/res/values-vi/strings_about.xml b/about/src/main/res/values-vi/strings_about.xml new file mode 100644 index 0000000..57696a1 --- /dev/null +++ b/about/src/main/res/values-vi/strings_about.xml @@ -0,0 +1,6 @@ + + + + Ứng dụng này ra đời nhờ những thư viện tuyệt vời dưới đây. + CÂU HỎI THƯỜNG GẶP + diff --git a/colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/CircleView.kt b/colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/CircleView.kt index ed98090..713b800 100644 --- a/colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/CircleView.kt +++ b/colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/CircleView.kt @@ -24,7 +24,10 @@ import android.util.AttributeSet import android.view.Gravity import android.widget.FrameLayout import android.widget.Toast -import ca.allanwang.kau.utils.* +import ca.allanwang.kau.utils.getDip +import ca.allanwang.kau.utils.setBackgroundColorRes +import ca.allanwang.kau.utils.toColor +import ca.allanwang.kau.utils.toHSV /** * Created by Allan Wang on 2017-06-10. diff --git a/colorpicker/src/main/res/values-vi/strings_colorpicker.xml b/colorpicker/src/main/res/values-vi/strings_colorpicker.xml new file mode 100644 index 0000000..5149c21 --- /dev/null +++ b/colorpicker/src/main/res/values-vi/strings_colorpicker.xml @@ -0,0 +1,6 @@ + + + + Bảng màu + Cài đặt sẵn + diff --git a/core-ui/src/main/kotlin/ca/allanwang/kau/ui/activities/ElasticRecyclerActivity.kt b/core-ui/src/main/kotlin/ca/allanwang/kau/ui/activities/ElasticRecyclerActivity.kt index 4c5563b..d2c1190 100644 --- a/core-ui/src/main/kotlin/ca/allanwang/kau/ui/activities/ElasticRecyclerActivity.kt +++ b/core-ui/src/main/kotlin/ca/allanwang/kau/ui/activities/ElasticRecyclerActivity.kt @@ -6,7 +6,6 @@ import android.support.annotation.RequiresApi import android.support.design.widget.AppBarLayout import android.support.design.widget.CoordinatorLayout import android.support.design.widget.FloatingActionButton -import android.support.v7.app.AppCompatActivity import android.support.v7.widget.RecyclerView import android.support.v7.widget.Toolbar import android.transition.TransitionInflater diff --git a/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/ElasticDragDismissFrameLayout.kt b/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/ElasticDragDismissFrameLayout.kt index 3c477c1..49e31a1 100644 --- a/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/ElasticDragDismissFrameLayout.kt +++ b/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/ElasticDragDismissFrameLayout.kt @@ -21,7 +21,6 @@ import android.content.Context import android.graphics.Color import android.os.Build import android.support.annotation.RequiresApi -import android.support.v7.widget.RecyclerView import android.transition.TransitionInflater import android.util.AttributeSet import android.view.View diff --git a/core/src/androidTest/kotlin/ca/allanwang/kau/xml/ChangelogTest.kt b/core/src/androidTest/kotlin/ca/allanwang/kau/xml/ChangelogTest.kt index a3c9ff1..e3b3170 100644 --- a/core/src/androidTest/kotlin/ca/allanwang/kau/xml/ChangelogTest.kt +++ b/core/src/androidTest/kotlin/ca/allanwang/kau/xml/ChangelogTest.kt @@ -1,10 +1,7 @@ package ca.allanwang.kau.xml -import android.support.test.InstrumentationRegistry import android.support.test.filters.MediumTest import android.support.test.runner.AndroidJUnit4 -import ca.allanwang.kau.test.R -import org.junit.Test import org.junit.runner.RunWith /** diff --git a/core/src/main/kotlin/ca/allanwang/kau/ui/views/CollapsibleViewDelegate.kt b/core/src/main/kotlin/ca/allanwang/kau/ui/views/CollapsibleViewDelegate.kt index 6994ca2..514b483 100644 --- a/core/src/main/kotlin/ca/allanwang/kau/ui/views/CollapsibleViewDelegate.kt +++ b/core/src/main/kotlin/ca/allanwang/kau/ui/views/CollapsibleViewDelegate.kt @@ -37,7 +37,7 @@ interface CollapsibleView { class CollapsibleViewDelegate : CollapsibleView { private lateinit var viewRef: WeakReference - private val view + private inline val view get() = viewRef.get() private var animator: ValueAnimator? = null diff --git a/core/src/main/kotlin/ca/allanwang/kau/utils/AnimUtils.kt b/core/src/main/kotlin/ca/allanwang/kau/utils/AnimUtils.kt index 5da21bb..5cef0ac 100644 --- a/core/src/main/kotlin/ca/allanwang/kau/utils/AnimUtils.kt +++ b/core/src/main/kotlin/ca/allanwang/kau/utils/AnimUtils.kt @@ -126,4 +126,4 @@ import android.widget.TextView @KauUtils fun TextView.setTextWithFade(@StringRes textId: Int, duration: Long = 200, onFinish: (() -> Unit)? = null) = setTextWithFade(context.getString(textId), duration, onFinish) -@KauUtils inline fun ViewPropertyAnimator.scaleXY(value: Float) = scaleX(value).scaleY(value) \ No newline at end of file +@KauUtils fun ViewPropertyAnimator.scaleXY(value: Float) = scaleX(value).scaleY(value) \ No newline at end of file diff --git a/core/src/main/kotlin/ca/allanwang/kau/utils/ColorUtils.kt b/core/src/main/kotlin/ca/allanwang/kau/utils/ColorUtils.kt index 16d1d01..d0e1f8f 100644 --- a/core/src/main/kotlin/ca/allanwang/kau/utils/ColorUtils.kt +++ b/core/src/main/kotlin/ca/allanwang/kau/utils/ColorUtils.kt @@ -149,6 +149,7 @@ fun Context.colorStateList(@ColorInt color: Int): ColorStateList { * Largely based on MDTintHelper * https://github.com/afollestad/material-dialogs/blob/master/core/src/main/java/com/afollestad/materialdialogs/internal/MDTintHelper.java */ +@SuppressLint("PrivateResource") fun RadioButton.tint(colors: ColorStateList) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { buttonTintList = colors @@ -162,6 +163,7 @@ fun RadioButton.tint(colors: ColorStateList) { fun RadioButton.tint(@ColorInt color: Int) = tint(context.colorStateList(color)) +@SuppressLint("PrivateResource") fun CheckBox.tint(colors: ColorStateList) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { buttonTintList = colors @@ -180,20 +182,13 @@ fun SeekBar.tint(@ColorInt color: Int) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { thumbTintList = s1 progressTintList = s1 - } else if (Build.VERSION.SDK_INT > Build.VERSION_CODES.GINGERBREAD_MR1) { + } else { val progressDrawable = DrawableCompat.wrap(progressDrawable) this.progressDrawable = progressDrawable DrawableCompat.setTintList(progressDrawable, s1) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { - val thumbDrawable = DrawableCompat.wrap(thumb) - DrawableCompat.setTintList(thumbDrawable, s1) - thumb = thumbDrawable - } - } else { - val mode: PorterDuff.Mode = if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.GINGERBREAD_MR1) - PorterDuff.Mode.MULTIPLY else PorterDuff.Mode.SRC_IN - indeterminateDrawable?.setColorFilter(color, mode) - progressDrawable?.setColorFilter(color, mode) + val thumbDrawable = DrawableCompat.wrap(thumb) + DrawableCompat.setTintList(thumbDrawable, s1) + thumb = thumbDrawable } } @@ -204,8 +199,7 @@ fun ProgressBar.tint(@ColorInt color: Int, skipIndeterminate: Boolean = false) { secondaryProgressTintList = sl if (!skipIndeterminate) indeterminateTintList = sl } else { - val mode: PorterDuff.Mode = if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.GINGERBREAD_MR1) - PorterDuff.Mode.MULTIPLY else PorterDuff.Mode.SRC_IN + val mode: PorterDuff.Mode = PorterDuff.Mode.SRC_IN indeterminateDrawable?.setColorFilter(color, mode) progressDrawable?.setColorFilter(color, mode) } diff --git a/core/src/main/kotlin/ca/allanwang/kau/utils/FileUtils.kt b/core/src/main/kotlin/ca/allanwang/kau/utils/FileUtils.kt index b03707d..b97f4aa 100644 --- a/core/src/main/kotlin/ca/allanwang/kau/utils/FileUtils.kt +++ b/core/src/main/kotlin/ca/allanwang/kau/utils/FileUtils.kt @@ -1,12 +1,7 @@ package ca.allanwang.kau.utils -import android.content.Context -import android.os.Environment import java.io.File -import java.io.IOException import java.io.InputStream -import java.text.SimpleDateFormat -import java.util.* /** * Created by Allan Wang on 2017-08-04. diff --git a/core/src/main/res-public/values-vi/strings_commons.xml b/core/src/main/res-public/values-vi/strings_commons.xml new file mode 100644 index 0000000..e42087d --- /dev/null +++ b/core/src/main/res-public/values-vi/strings_commons.xml @@ -0,0 +1,67 @@ + + + + + Giới thiệu + Giới thiệu về %s + Thêm tài khoản + Quay lại + Bỏ + Nhật ký thay đổi + Đóng + Liên hệ với chúng tôi + Sao chép + Khác + Tối + Mặc định + Không hiện lại + Xong + Lỗi + Thoát + Bạn chắc chắn muốn thoát? + Bạn chắc chắn muốn thoát %s? + Trong suốt + Được rồi + Tuyệt + Ẩn + Sáng + Đăng nhập + Đăng xuất + Bạn chắc chắn muốn đăng xuất %s? + Quản lý tài khoản + Có thể + Menu + Không + Không tìm thấy kết quả nào + Trống + OK + Cửa hàng Play + Đánh giá + Báo cáo lỗi + Tìm + Gửi phản hồi + Gửi bằng + Thiết lập + Chia sẻ + Đã chép vào bộ nhớ tạm. + Cảm ơn + Ồ… + Cảnh báo + + %d ngày + + + %d giờ + + + %d phút + + + %d giây + + Đồng ý + Quyền bị từ chối + diff --git a/core/src/test/kotlin/ca/allanwang/kau/kotlin/DebounceTest.kt b/core/src/test/kotlin/ca/allanwang/kau/kotlin/DebounceTest.kt index 12bc5a4..05345bd 100644 --- a/core/src/test/kotlin/ca/allanwang/kau/kotlin/DebounceTest.kt +++ b/core/src/test/kotlin/ca/allanwang/kau/kotlin/DebounceTest.kt @@ -1,6 +1,5 @@ package ca.allanwang.kau.kotlin -import org.jetbrains.anko.doAsync import org.junit.Test import kotlin.test.assertEquals diff --git a/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaItem.kt b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaItem.kt index 0431465..486ee31 100644 --- a/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaItem.kt +++ b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaItem.kt @@ -5,7 +5,6 @@ import android.support.v7.widget.RecyclerView import android.view.View import ca.allanwang.kau.iitems.KauIItem import ca.allanwang.kau.utils.bindView -import com.bumptech.glide.Glide import com.bumptech.glide.load.DataSource import com.bumptech.glide.load.engine.GlideException import com.bumptech.glide.request.RequestListener diff --git a/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaItemBasic.kt b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaItemBasic.kt index 2d6cefa..fb2d383 100644 --- a/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaItemBasic.kt +++ b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaItemBasic.kt @@ -2,16 +2,12 @@ package ca.allanwang.kau.mediapicker import android.annotation.SuppressLint import android.app.Activity -import android.content.Intent import android.graphics.drawable.Drawable -import android.support.v7.app.AppCompatActivity import android.support.v7.widget.RecyclerView import android.view.View import ca.allanwang.kau.iitems.KauIItem import ca.allanwang.kau.ui.views.MeasuredImageView import ca.allanwang.kau.utils.bindView -import ca.allanwang.kau.utils.buildIsLollipopAndUp -import com.bumptech.glide.Glide import com.bumptech.glide.load.DataSource import com.bumptech.glide.load.engine.GlideException import com.bumptech.glide.request.RequestListener diff --git a/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaUtils.kt b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaUtils.kt index 0fb5824..f37be75 100644 --- a/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaUtils.kt +++ b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaUtils.kt @@ -8,7 +8,6 @@ import android.net.Uri import android.os.Environment import android.support.v7.app.AppCompatActivity import ca.allanwang.kau.utils.buildIsLollipopAndUp -import com.mikepenz.fastadapter.IItem import java.io.File import java.io.IOException import java.text.SimpleDateFormat diff --git a/mediapicker/src/main/res/values-vi/strings_mediapicker.xml b/mediapicker/src/main/res/values-vi/strings_mediapicker.xml new file mode 100644 index 0000000..6dfcb82 --- /dev/null +++ b/mediapicker/src/main/res/values-vi/strings_mediapicker.xml @@ -0,0 +1,11 @@ + + + + Không tìm thấy mục nào + Chưa chọn mục nào + Không có mục nào + Không tìm thấy máy ảnh + Hãy cài một ứng dụng máy ảnh và thử lại. + Không thể tạo tập tin tạm thời. + Chọn kiểu + -- cgit v1.2.3