Skip to content

Commit 4e82b6b

Browse files
committed
adding a toggle for using english
1 parent 5e22077 commit 4e82b6b

3 files changed

Lines changed: 47 additions & 0 deletions

File tree

app/src/main/kotlin/com/simplemobiletools/draw/activities/MainActivity.kt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ class MainActivity : SimpleActivity(), MyCanvas.PathsChangedListener {
4444
private var isEraserOn = false
4545
private var isImageCaptureIntent = false
4646

47+
private var storedUseEnglish = false
48+
4749
override fun onCreate(savedInstanceState: Bundle?) {
4850
super.onCreate(savedInstanceState)
4951
setContentView(R.layout.activity_main)
@@ -64,10 +66,16 @@ class MainActivity : SimpleActivity(), MyCanvas.PathsChangedListener {
6466

6567
checkIntents()
6668
checkWhatsNewDialog()
69+
storeStateVariables()
6770
}
6871

6972
override fun onResume() {
7073
super.onResume()
74+
if (storedUseEnglish != config.useEnglish) {
75+
restartActivity()
76+
return
77+
}
78+
7179
val isStrokeWidthBarEnabled = config.showBrushSize
7280
stroke_width_bar.beVisibleIf(isStrokeWidthBarEnabled)
7381
my_canvas.setIsStrokeWidthBarEnabled(isStrokeWidthBarEnabled)
@@ -78,6 +86,7 @@ class MainActivity : SimpleActivity(), MyCanvas.PathsChangedListener {
7886
super.onPause()
7987
config.brushColor = color
8088
config.brushSize = strokeWidth
89+
storeStateVariables()
8190
}
8291

8392
override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -106,6 +115,10 @@ class MainActivity : SimpleActivity(), MyCanvas.PathsChangedListener {
106115
return true
107116
}
108117

118+
private fun storeStateVariables() {
119+
storedUseEnglish = config.useEnglish
120+
}
121+
109122
private fun launchSettings() {
110123
startActivity(Intent(applicationContext, SettingsActivity::class.java))
111124
}

app/src/main/kotlin/com/simplemobiletools/draw/activities/SettingsActivity.kt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
package com.simplemobiletools.draw.activities
22

33
import android.os.Bundle
4+
import com.simplemobiletools.commons.extensions.beVisibleIf
45
import com.simplemobiletools.commons.extensions.updateTextColors
6+
import com.simplemobiletools.commons.extensions.useEnglishToggled
57
import com.simplemobiletools.draw.R
68
import com.simplemobiletools.draw.extensions.config
79
import kotlinx.android.synthetic.main.activity_settings.*
10+
import java.util.*
811

912
class SettingsActivity : SimpleActivity() {
1013
override fun onCreate(savedInstanceState: Bundle?) {
@@ -16,6 +19,7 @@ class SettingsActivity : SimpleActivity() {
1619
super.onResume()
1720

1821
setupCustomizeColors()
22+
setupUseEnglish()
1923
setupBrushSize()
2024
updateTextColors(settings_holder)
2125
}
@@ -26,6 +30,16 @@ class SettingsActivity : SimpleActivity() {
2630
}
2731
}
2832

33+
private fun setupUseEnglish() {
34+
settings_use_english_holder.beVisibleIf(config.wasUseEnglishToggled || Locale.getDefault().language != "en")
35+
settings_use_english.isChecked = config.useEnglish
36+
settings_use_english_holder.setOnClickListener {
37+
settings_use_english.toggle()
38+
config.useEnglish = settings_use_english.isChecked
39+
useEnglishToggled()
40+
}
41+
}
42+
2943
private fun setupBrushSize() {
3044
settings_show_brush_size.isChecked = config.showBrushSize
3145
settings_show_brush_size_holder.setOnClickListener {

app/src/main/res/layout/activity_settings.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,26 @@
3030

3131
</RelativeLayout>
3232

33+
<RelativeLayout
34+
android:id="@+id/settings_use_english_holder"
35+
android:layout_width="match_parent"
36+
android:layout_height="wrap_content"
37+
android:layout_marginTop="@dimen/medium_margin"
38+
android:background="?attr/selectableItemBackground"
39+
android:padding="@dimen/activity_margin">
40+
41+
<com.simplemobiletools.commons.views.MySwitchCompat
42+
android:id="@+id/settings_use_english"
43+
android:layout_width="match_parent"
44+
android:layout_height="wrap_content"
45+
android:background="@null"
46+
android:clickable="false"
47+
android:paddingLeft="@dimen/medium_margin"
48+
android:paddingStart="@dimen/medium_margin"
49+
android:text="@string/use_english_language"/>
50+
51+
</RelativeLayout>
52+
3353
<RelativeLayout
3454
android:id="@+id/settings_show_brush_size_holder"
3555
android:layout_width="match_parent"

0 commit comments

Comments
 (0)