Skip to content

Commit b129e5a

Browse files
avivijay19avivijay19
authored
Merge pull request #89 from debz-g/develop
Added Global Strings and removed hardcoded strings for directions.
2 parents d84956c + 28bf469 commit b129e5a

File tree

9 files changed

+42
-30
lines changed

9 files changed

+42
-30
lines changed

‎.idea/gradle.xml‎

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/runConfigurations.xml‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎app/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ android {
1818
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1919
}
2020
}
21+
2122
lintOptions {
2223
abortOnError false
2324
}

‎app/src/main/java/com/vitpunerobotics/netra/activities/Main3Activity.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,23 +109,23 @@ class Main3Activity : BluetoothActivity() {
109109

110110

111111
if (item.value == "L") {
112-
sendMessage("L")
112+
sendMessage(getString(R.string.left_direction))
113113
Toast.makeText(applicationContext, "Done Left", Toast.LENGTH_SHORT).show()
114114
startActivity(i)
115115
finish()
116116
} else if (item.value == "R") {
117-
sendMessage("R")
117+
sendMessage(getString(R.string.right_direction))
118118
Toast.makeText(applicationContext, "Done Right", Toast.LENGTH_SHORT).show()
119119
startActivity(i)
120120
finish()
121121
}
122122
if (item.value == "F") {
123-
sendMessage("F")
123+
sendMessage(getString(R.string.forward_direction))
124124
Toast.makeText(applicationContext, "Done Forwerd", Toast.LENGTH_SHORT).show()
125125
startActivity(i)
126126
finish()
127127
} else if (item.value == "S") {
128-
sendMessage("S")
128+
sendMessage(getString(R.string.stop_direction))
129129
Toast.makeText(applicationContext, "Done ", Toast.LENGTH_SHORT).show()
130130
startActivity(i)
131131
finish()

‎app/src/main/java/com/vitpunerobotics/netra/activities/ManualControlActivity.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,31 +20,31 @@ class ManualControlActivity : BluetoothActivity() {
2020
var t = findViewById<TextView>(R.id.STT)
2121
right.setOnClickListener(View.OnClickListener {
2222
if (global_variables.bT == 1) {
23-
sendMessage("R")
24-
t.text = "R"
23+
sendMessage(getString(R.string.right_direction))
2524
}
25+
t.text = "R"
2626
})
2727
left.setOnClickListener(View.OnClickListener {
2828
if (global_variables.bT == 1) {
29-
sendMessage("L")
29+
sendMessage(getString(R.string.left_direction))
3030
}
3131
t.text = "L"
3232
})
3333
forward.setOnClickListener(View.OnClickListener {
3434
if (global_variables.bT == 1) {
35-
sendMessage("F")
35+
sendMessage(getString(R.string.forward_direction))
3636
}
3737
t.text = "F"
3838
})
3939
backward.setOnClickListener(View.OnClickListener {
4040
if (global_variables.bT == 1) {
41-
sendMessage("B")
41+
sendMessage(getString(R.string.backward_direction))
4242
}
4343
t.text = "B"
4444
})
4545
stop.setOnClickListener(View.OnClickListener {
4646
if (global_variables.bT == 1) {
47-
sendMessage("S")
47+
sendMessage(getString(R.string.stop_direction))
4848
}
4949
t.text = "S"
5050
})

‎app/src/main/java/com/vitpunerobotics/netra/activities/VoiceControlActivity.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class VoiceControlActivity : BluetoothActivity() {
3535
b.setOnClickListener { startActivityForResult(intent, 1) }
3636
s.setOnClickListener {
3737
if (global_variables.bT == 1) {
38-
sendMessage("S")
38+
sendMessage(getString(R.string.stop_direction))
3939
}
4040
}
4141
}
@@ -50,31 +50,31 @@ class VoiceControlActivity : BluetoothActivity() {
5050
for (s in str) {
5151
if (s.contains("forward")) {
5252
if (global_variables.bT == 1) {
53-
sendMessage("F")
53+
sendMessage(getString(R.string.forward_direction))
5454
}
5555
Log.d("TAG", s)
5656
break
5757
} else if (s.contains("backward")) {
5858
if (global_variables.bT == 1) {
59-
sendMessage("B")
59+
sendMessage(getString(R.string.backward_direction))
6060
}
6161
Log.d("TAG", s)
6262
break
6363
} else if (s.contains("left")) {
6464
if (global_variables.bT == 1) {
65-
sendMessage("L")
65+
sendMessage(getString(R.string.left_direction))
6666
}
6767
Log.d("TAG", s)
6868
break
6969
} else if (s.contains("right")) {
7070
if (global_variables.bT == 1) {
71-
sendMessage("R")
71+
sendMessage(getString(R.string.right_direction))
7272
}
7373
Log.d("TAG", s)
7474
break
7575
} else if (s.contains("stop")) {
7676
if (global_variables.bT == 1) {
77-
sendMessage("S")
77+
sendMessage(getString(R.string.stop_direction))
7878
}
7979
Log.d("TAG", s)
8080
break

‎app/src/main/res/values-night/strings.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,11 @@
7171
<string name="hello_world">Hello World!</string>
7272
<!-- content_main3-->
7373

74+
<!--Direction Strings-->
75+
<string name="stop_direction">S</string>
76+
<string name="forward_direction">F</string>
77+
<string name="backward_direction">B</string>
78+
<string name="left_direction">L</string>
79+
<string name="right_direction">R</string>
80+
7481
</resources>

‎app/src/main/res/values/strings.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,13 @@
7171
<string name="hello_world">Hello World!</string>
7272
<!-- content_main3-->
7373

74+
<!--Direction Strings-->
75+
<string name="stop_direction">S</string>
76+
<string name="forward_direction">F</string>
77+
<string name="backward_direction">B</string>
78+
<string name="left_direction">L</string>
79+
<string name="right_direction">R</string>
80+
81+
82+
7483
</resources>

0 commit comments

Comments
 (0)