Skip to content

Commit

Permalink
Merge pull request #18 from mihajlo0743/rm-hardcoded-strs
Browse files Browse the repository at this point in the history 
Added translation
  • Loading branch information
@BennyKok
BennyKok authored Jun 12, 2021
2 parents ee76522 + 95823fd commit a9e2ff9
Show file tree
Hide file tree
Showing 6 changed files with 130 additions and 10 deletions.
16 changes: 12 additions & 4 deletions app/src/main/java/com/benny/pxerstudio/activity/DrawingActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,13 @@ class DrawingActivity : AppCompatActivity(), ItemTouchCallback, PxerView.OnDropp
val lineShapeFactory = LineShape()
val eraserShapeFactory = EraserShape()
var currentProjectPath: String? = null
// Used to access resources outside of activities
lateinit var appContext: Context;
var mContext: Context
get() : Context = appContext
private set(value) {
appContext = value
}
}

var isEdited = false
Expand Down Expand Up @@ -97,6 +104,7 @@ class DrawingActivity : AppCompatActivity(), ItemTouchCallback, PxerView.OnDropp

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
mContext = this;
binding = ActivityDrawingBinding.inflate(layoutInflater)
val view = binding!!.root
setContentView(view)
Expand Down Expand Up @@ -600,10 +608,10 @@ class DrawingActivity : AppCompatActivity(), ItemTouchCallback, PxerView.OnDropp

widthSeekBar.max = 127
widthSeekBar.progress = 39
widthText.text = "Width : " + 40
widthText.text = resources.getText(R.string.width).toString() + 40
widthSeekBar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
override fun onProgressChanged(seekBar: SeekBar, i: Int, b: Boolean) {
widthText.text = "Width : " + (i + 1).toString()
widthText.text = resources.getText(R.string.width).toString() + (i + 1).toString()
}

override fun onStartTrackingTouch(seekBar: SeekBar) {}
Expand All @@ -612,10 +620,10 @@ class DrawingActivity : AppCompatActivity(), ItemTouchCallback, PxerView.OnDropp
})
heightSeekBar.max = 127
heightSeekBar.progress = 39
heightText.text = "Height : " + 40
heightText.text = resources.getText(R.string.width).toString() + 40
heightSeekBar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
override fun onProgressChanged(seekBar: SeekBar, i: Int, b: Boolean) {
heightText.text = "Height : " + (i + 1).toString()
heightText.text = resources.getText(R.string.width).toString() + (i + 1).toString()
}

override fun onStartTrackingTouch(seekBar: SeekBar) {}
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/java/com/benny/pxerstudio/exportable/ExportingUtils.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import android.widget.SeekBar.OnSeekBarChangeListener
import com.afollestad.materialdialogs.MaterialDialog
import com.afollestad.materialdialogs.customview.customView
import com.benny.pxerstudio.R
import com.benny.pxerstudio.activity.DrawingActivity
import com.benny.pxerstudio.databinding.DialogActivityDrawingBinding
import com.benny.pxerstudio.util.displayToast
import com.benny.pxerstudio.widget.PxerView
Expand Down Expand Up @@ -109,14 +110,15 @@ object ExportingUtils {
} else {
binding.dialogDrawingSizeSeekBar.max = maxSize / pxerView.picHeight.coerceAtLeast(pxerView.picWidth)
}
val res = DrawingActivity.mContext.resources;
binding.dialogDrawingSize.text =
"Size : " + java.lang.String.valueOf(pxerView.picWidth) +
res.getText(R.string.exportSize).toString() + java.lang.String.valueOf(pxerView.picWidth) +
" x " + java.lang.String.valueOf(pxerView.picHeight)
binding.dialogDrawingSizeSeekBar
.setOnSeekBarChangeListener(object : OnSeekBarChangeListener {
override fun onProgressChanged(seekBar: SeekBar, i: Int, b: Boolean) {
binding.dialogDrawingSize.text =
"Size : " + (i * pxerView.picWidth).toString() +
res.getText(R.string.exportSize).toString() + (i * pxerView.picWidth).toString() +
" x " + (i * pxerView.picHeight).toString()
}

Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/layout/dialog_activity_drawing.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
android:layout_marginStart="16dp"
android:layout_marginLeft="16dp"
android:gravity="center_vertical"
android:text="Name :"
android:text="@string/exportName"
android:textColor="?android:textColorPrimary"
app:layout_constraintBottom_toBottomOf="@+id/dialog_drawing_name_edit"
app:layout_constraintLeft_toLeftOf="parent"
Expand All @@ -36,7 +36,7 @@
android:layout_marginLeft="16dp"
android:layout_marginTop="8dp"
android:gravity="center_vertical"
android:text="Size :"
android:text="@string/exportSize"
android:textColor="?android:textColorPrimary"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/dialog_frame_delay_edit"
Expand Down Expand Up @@ -68,7 +68,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginLeft="16dp"
android:text="Speed: "
android:text="@string/gifSpeed"
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintBottom_toBottomOf="@+id/dialog_frame_delay_edit"
app:layout_constraintStart_toStartOf="parent"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/dialog_activity_drawing_newproject.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
android:layout_marginStart="16dp"
android:layout_marginLeft="16dp"
android:gravity="center_vertical"
android:text="Name :"
android:text="@string/exportName"
android:textColor="?android:textColorPrimary"
app:layout_constraintBottom_toBottomOf="@+id/dialog_drawing_np_name_edit"
app:layout_constraintLeft_toLeftOf="parent"
Expand Down
100 changes: 100 additions & 0 deletions app/src/main/res/values-ru/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
<resources>
<!-- Toolbar menu (always shown) -->
<string name="grid_on_off">Вкл./выкл. сетку</string>
<string name="reset_view_port">Сбросить масштаб</string>

<!-- menu_popup_layer -->
<string name="toggle_visibility">Показать/скрыть</string>
<string name="duplicate_layer">Дублировать</string>
<string name="remove">Удалить</string>
<string name="clear">Очистить</string>
<string name="merge_down">Объединить со слоем ниже</string>

<!-- Layers menu -->
<string name="layers">Слои</string>
<string name="only_show_selected_layer">Показывать только выбранный слой</string>
<string name="show_all_layers">Показать все слои</string>
<string name="hide_all_layers">Скрыть все слои</string>
<string name="merge_all_layers">Объединить все слои</string>

<!-- Export menu -->
<string name="export">Экспорт</string>
<string name="png">PNG</string>
<string name="gif">GIF</string>
<string name="sprite_atlas">Sprite Atlas</string>
<string name="folder">Папка</string>

<!-- Project menu -->
<string name="project">Проект</string>
<string name="project_manager">Управление проектами</string>
<string name="save">Сохранить</string>
<string name="open">Открыть</string>
<string name="new_new">Создать</string>

<!-- Dialogs -->
<string name="merge">Объединить</string>
<string name="merge_all_layers_warning">Объединить все слои?</string>

<string name="remove_layer">Удаление слоя</string>
<string name="remove_layer_warning">Удалить этот слой?</string>

<string name="clear_current_layer">Очистка слоя</string>
<string name="clear_current_layer_warning">Очистить текущий слой?</string>

<string name="merge_down_layer">Объединение слоёв</string>
<string name="merge_down_layer_warning">Объединить слой со слоем ниже?</string>

<string name="new_project">Новый проект</string>
<string name="create">Создать</string>

<string name="save_project">Сохранить проект</string>
<string name="name">Имя</string>

<!-- ProjectManagerActivity -->
<string name="rename">Переименовать</string>
<string name="delete">Удалить</string>
<string name="delete_project">Удаление проекта</string>
<string name="delete_project_warning">Удалить этот проект?</string>
<string name="project_deleted">Проект удалён</string>
<string name="no_project_found">Не найдено ни одного проекта</string>

<!-- About -->
<string name="about">О программе</string>
<!-- About activity -->
<string name="app_creator">Создано BennyKok</string>
<string name="get_more_apps"><u>Больше приложений</u></string>
<string name="find_on_github"><u>Исходный код на GitHub</u></string>
<string name="brought_to_you_by"><![CDATA[<b>При разработке использовались следующие замечательные проекты с открытым исходным кодом:</b>]]></string>
<string name="opensource_libraries">Библиотеки с открытым исходным кодом</string>
<string name="opensource_contributors"><u>Все авторы</u></string>

<!-- Toasts -->
<string name="storage_permission_denied">Приложению требуется доступ к внутренней памяти для работы с файлами проектов.</string>
<string name="file_name_cannot_be_empty">Имя файла не может быть пустым!</string>
<string name="frame_time_cannot_be_empty">Скорость не может быть пустой!</string>
<string name="export_successful">Проект успешно экспортирован</string>
<string name="no_more_redo">Нет действий для повтора</string>
<string name="no_more_undo">Нет действий для отмены</string>

<!-- Content descriptors -->
<string name="fab_undo">Отменить</string>
<string name="fab_redo">Повторить</string>
<string name="fab_selected_color">Текущий цвет</string>
<string name="fab_eyedropper">Пипетка</string>
<string name="fab_tools">Инструменты</string>

<!-- Errors -->
<string name="error_something_went_wrong">Что-то пошло не так!</string>
<string name="error_loading_project">При загрузке проекта произошла ошибка.</string>
<string name="error_deleting_project">Не удалось удалить проект!</string>

<!-- Export dialog -->
<string name="gifSpeed">Скорость(ms): </string>
<string name="exportSize">Размер: </string>

<string name="exportName">Имя: </string>

<!-- Project creation -->
<string name="width">Ширина: </string>
<string name="height">Высота: </string>
</resources>
10 changes: 10 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,14 @@
<string name="error_something_went_wrong">Something went wrong!</string>
<string name="error_loading_project">An error occurred while loading your project.</string>
<string name="error_deleting_project">Unable to delete project!</string>

<!-- Export dialog -->
<string name="gifSpeed">Speed(ms): </string>
<string name="exportSize">Size: </string>

<string name="exportName">Name: </string>

<!-- Project creation -->
<string name="width">Width: </string>
<string name="height">Height: </string>
</resources>

0 comments on commit a9e2ff9

Please sign in to comment.