Merge pull request #89 from debz-g/develop

Added Global Strings and removed hardcoded strings for directions.
The-Robotics-Forum · Dec 14, 2021 · b129e5a · b129e5a
2 parents d84956c + 28bf469
commit b129e5a
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 30 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -18,6 +18,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
     lintOptions {
         abortOnError false
     }

diff --git a/app/src/main/java/com/vitpunerobotics/netra/activities/Main3Activity.kt b/app/src/main/java/com/vitpunerobotics/netra/activities/Main3Activity.kt
@@ -109,23 +109,23 @@ class Main3Activity : BluetoothActivity() {
 
 
                         if (item.value == "L") {
-                            sendMessage("L")
+                            sendMessage(getString(R.string.left_direction))
                             Toast.makeText(applicationContext, "Done Left", Toast.LENGTH_SHORT).show()
                             startActivity(i)
                             finish()
                         } else if (item.value == "R") {
-                            sendMessage("R")
+                            sendMessage(getString(R.string.right_direction))
                             Toast.makeText(applicationContext, "Done Right", Toast.LENGTH_SHORT).show()
                             startActivity(i)
                             finish()
                         }
                         if (item.value == "F") {
-                            sendMessage("F")
+                            sendMessage(getString(R.string.forward_direction))
                             Toast.makeText(applicationContext, "Done Forwerd", Toast.LENGTH_SHORT).show()
                             startActivity(i)
                             finish()
                         } else if (item.value == "S") {
-                            sendMessage("S")
+                            sendMessage(getString(R.string.stop_direction))
                             Toast.makeText(applicationContext, "Done ", Toast.LENGTH_SHORT).show()
                             startActivity(i)
                             finish()

diff --git a/app/src/main/java/com/vitpunerobotics/netra/activities/ManualControlActivity.kt b/app/src/main/java/com/vitpunerobotics/netra/activities/ManualControlActivity.kt
@@ -20,31 +20,31 @@ class ManualControlActivity : BluetoothActivity() {
         var t = findViewById<TextView>(R.id.STT)
         right.setOnClickListener(View.OnClickListener {
             if (global_variables.bT == 1) {
-                sendMessage("R")
-                t.text = "R"
+                sendMessage(getString(R.string.right_direction))
             }
+            t.text = "R"
         })
         left.setOnClickListener(View.OnClickListener {
             if (global_variables.bT == 1) {
-                sendMessage("L")
+                sendMessage(getString(R.string.left_direction))
             }
             t.text = "L"
         })
         forward.setOnClickListener(View.OnClickListener {
             if (global_variables.bT == 1) {
-                sendMessage("F")
+                sendMessage(getString(R.string.forward_direction))
             }
             t.text = "F"
         })
         backward.setOnClickListener(View.OnClickListener {
             if (global_variables.bT == 1) {
-                sendMessage("B")
+                sendMessage(getString(R.string.backward_direction))
             }
             t.text = "B"
         })
         stop.setOnClickListener(View.OnClickListener {
             if (global_variables.bT == 1) {
-                sendMessage("S")
+                sendMessage(getString(R.string.stop_direction))
             }
             t.text = "S"
         })

diff --git a/app/src/main/java/com/vitpunerobotics/netra/activities/VoiceControlActivity.kt b/app/src/main/java/com/vitpunerobotics/netra/activities/VoiceControlActivity.kt
@@ -35,7 +35,7 @@ class VoiceControlActivity : BluetoothActivity() {
         b.setOnClickListener { startActivityForResult(intent, 1) }
         s.setOnClickListener {
             if (global_variables.bT == 1) {
-                sendMessage("S")
+                sendMessage(getString(R.string.stop_direction))
             }
         }
     }
@@ -50,31 +50,31 @@ class VoiceControlActivity : BluetoothActivity() {
             for (s in str) {
                 if (s.contains("forward")) {
                     if (global_variables.bT == 1) {
-                        sendMessage("F")
+                        sendMessage(getString(R.string.forward_direction))
                     }
                     Log.d("TAG", s)
                     break
                 } else if (s.contains("backward")) {
                     if (global_variables.bT == 1) {
-                        sendMessage("B")
+                        sendMessage(getString(R.string.backward_direction))
                     }
                     Log.d("TAG", s)
                     break
                 } else if (s.contains("left")) {
                     if (global_variables.bT == 1) {
-                        sendMessage("L")
+                        sendMessage(getString(R.string.left_direction))
                     }
                     Log.d("TAG", s)
                     break
                 } else if (s.contains("right")) {
                     if (global_variables.bT == 1) {
-                        sendMessage("R")
+                        sendMessage(getString(R.string.right_direction))
                     }
                     Log.d("TAG", s)
                     break
                 } else if (s.contains("stop")) {
                     if (global_variables.bT == 1) {
-                        sendMessage("S")
+                        sendMessage(getString(R.string.stop_direction))
                     }
                     Log.d("TAG", s)
                     break

diff --git a/app/src/main/res/values-night/strings.xml b/app/src/main/res/values-night/strings.xml
@@ -71,4 +71,11 @@
     <string name="hello_world">Hello World!</string>
     <!--    content_main3-->
 
+    <!--Direction Strings-->
+    <string name="stop_direction">S</string>
+    <string name="forward_direction">F</string>
+    <string name="backward_direction">B</string>
+    <string name="left_direction">L</string>
+    <string name="right_direction">R</string>
+
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -71,4 +71,13 @@
     <string name="hello_world">Hello World!</string>
     <!--    content_main3-->
 
+    <!--Direction Strings-->
+    <string name="stop_direction">S</string>
+    <string name="forward_direction">F</string>
+    <string name="backward_direction">B</string>
+    <string name="left_direction">L</string>
+    <string name="right_direction">R</string>
+
+
+
 </resources>
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,7 @@ android { @@
                 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             }
         }
         lintOptions {
             abortOnError false
         }
@@ Expand Down @@