Extracted string resources

5 files changed, 21 insertions, 16 deletions

diff --git a/app/src/main/java/com/clusterrr/usbserialtelnetserver/MainActivity.java b/app/src/main/java/com/clusterrr/usbserialtelnetserver/MainActivity.java
index 0206003..019820b 100644
--- a/app/src/main/java/com/clusterrr/usbserialtelnetserver/MainActivity.java
+++ b/app/src/main/java/com/clusterrr/usbserialtelnetserver/MainActivity.java
@@ -211,9 +211,9 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         mStopBits.setSelection(prefs.getInt(SETTING_STOP_BITS, 0));
         mParity.setSelection(prefs.getInt(SETTING_PARITY, 0));
         if (started)
-             mStatus.setText("Started, please connect to: telnet://" + UsbSerialTelnetService.getIPAddress() + ": "+ mTcpPort.getText());
+             mStatus.setText(getString(R.string.started_please_connect) + " telnet://" + UsbSerialTelnetService.getIPAddress() + ": "+ mTcpPort.getText());
         else
-            mStatus.setText("Not started");
+            mStatus.setText(R.string.not_started);
     }
 
     public static Intent prepareIntentForWhiteListingOfBatteryOptimization(Context context, String packageName, boolean alsoWhenWhiteListed) {
@@ -254,5 +254,4 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
             return WhiteListedInBatteryOptimizations.ERROR_GETTING_STATE;
         return pm.isIgnoringBatteryOptimizations(packageName) ? WhiteListedInBatteryOptimizations.WHITE_LISTED : WhiteListedInBatteryOptimizations.NOT_WHITE_LISTED;
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/clusterrr/usbserialtelnetserver/UsbSerialTelnetService.java b/app/src/main/java/com/clusterrr/usbserialtelnetserver/UsbSerialTelnetService.java
index eb0f292..d7749ff 100644
--- a/app/src/main/java/com/clusterrr/usbserialtelnetserver/UsbSerialTelnetService.java
+++ b/app/src/main/java/com/clusterrr/usbserialtelnetserver/UsbSerialTelnetService.java
@@ -238,4 +238,4 @@ public class UsbSerialTelnetService extends Service {
         if (mTcpServerThread == null) return;
         mTcpServerThread.write(buffer, pos, len);
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/clusterrr/usbserialtelnetserver/UsbSerialThread.java b/app/src/main/java/com/clusterrr/usbserialtelnetserver/UsbSerialThread.java
index 6bfe4e6..0ace8a5 100644
--- a/app/src/main/java/com/clusterrr/usbserialtelnetserver/UsbSerialThread.java
+++ b/app/src/main/java/com/clusterrr/usbserialtelnetserver/UsbSerialThread.java
@@ -57,4 +57,4 @@ public class UsbSerialThread extends Thread {
             e.printStackTrace();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 20ffbb6..51334e1 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -14,7 +14,7 @@
         android:layout_marginStart="24dp"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="16dp"
-        android:text="Start"
+        android:text="@string/start"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/buttonStop"
         app:layout_constraintStart_toStartOf="parent" />
@@ -26,7 +26,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="16dp"
-        android:text="Stop"
+        android:text="@string/stop"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/buttonStart" />
@@ -40,7 +40,6 @@
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="16dp"
         android:gravity="center"
-        android:text="status"
         app:layout_constraintBottom_toTopOf="@+id/buttonStart"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -66,7 +65,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
-                android:text="TCP port to listen"
+                android:text="@string/tcp_port_to_listen"
                 app:layout_constraintBottom_toBottomOf="@+id/editTextTcpPort"
                 app:layout_constraintEnd_toStartOf="@+id/editTextTcpPort"
                 app:layout_constraintStart_toStartOf="parent"
@@ -80,7 +79,6 @@
                 android:ems="10"
                 android:inputType="number"
                 android:maxLength="5"
-                android:text="0"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/textViewTcpPort"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -90,7 +88,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
-                android:text="Baud rate"
+                android:text="@string/baud_rate"
                 app:layout_constraintBottom_toBottomOf="@+id/editTextNumberBaudRate"
                 app:layout_constraintEnd_toStartOf="@+id/editTextNumberBaudRate"
                 app:layout_constraintStart_toStartOf="parent"
@@ -104,7 +102,6 @@
                 android:ems="10"
                 android:inputType="number"
                 android:maxLength="6"
-                android:text="0"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/textViewBaudRate"
                 app:layout_constraintTop_toBottomOf="@+id/editTextTcpPort" />
@@ -114,7 +111,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
-                android:text="Data bits"
+                android:text="@string/data_bits"
                 app:layout_constraintBottom_toBottomOf="@+id/spinnerDataBits"
                 app:layout_constraintEnd_toStartOf="@+id/spinnerDataBits"
                 app:layout_constraintStart_toStartOf="parent"
@@ -135,7 +132,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
-                android:text="Stop bits"
+                android:text="@string/stop_bits"
                 app:layout_constraintBottom_toBottomOf="@+id/spinnerStopBits"
                 app:layout_constraintEnd_toStartOf="@+id/spinnerStopBits"
                 app:layout_constraintStart_toStartOf="parent"
@@ -156,7 +153,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
-                android:text="Parity"
+                android:text="@string/parity"
                 app:layout_constraintBottom_toBottomOf="@+id/spinnerParity"
                 app:layout_constraintEnd_toStartOf="@+id/spinnerParity"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 72528ed..acf622f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,14 @@
 <resources>
     <string name="app_name">USB Serial Telnet Server</string>
+    <string name="started_please_connect">Started, please connect to:</string>
+    <string name="not_started">Not started</string>
+    <string name="start">Start</string>
+    <string name="stop">Stop</string>
+    <string name="tcp_port_to_listen">TCP port to listen</string>
+    <string name="baud_rate">Baud rate</string>
+    <string name="data_bits">Data bits</string>
+    <string name="stop_bits">Stop bits</string>
+    <string name="parity">Parity</string>
     <string-array name="data_bits">
         <item>5</item>
         <item>6</item>