Move common sentence to a separate string

Matches how the message is built in the desktop app.

5 files changed, 19 insertions, 9 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt
index 2dcaff637c..7835cd56a8 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.TextView
 import kotlinx.coroutines.delay
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.model.TunnelState
@@ -40,6 +41,10 @@ class OutOfTimeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen)
 
         headerBar = HeaderBar(view, parentActivity)
 
+        view.findViewById<TextView>(R.id.no_more_vpn_time_left).text =
+            parentActivity.getString(R.string.no_more_vpn_time_left) + " " +
+            parentActivity.getString(R.string.add_time_to_account)
+
         disconnectButton = view.findViewById<Button>(R.id.disconnect).apply {
             setOnClickAction("disconnect", jobTracker) {
                 connectionProxy.disconnect()
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt
index 3aa26db640..261630e784 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt
@@ -35,6 +35,10 @@ class WelcomeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
             setOnClickListener { copyAccountTokenToClipboard() }
         }
 
+        view.findViewById<TextView>(R.id.pay_to_start_using).text =
+            parentActivity.getString(R.string.pay_to_start_using) + " " +
+            parentActivity.getString(R.string.add_time_to_account)
+
         view.findViewById<UrlButton>(R.id.buy_credit).apply {
             prepare(daemon, jobTracker)
         }
diff --git a/android/src/main/res/layout/out_of_time.xml b/android/src/main/res/layout/out_of_time.xml
index bb4380bc44..150a86787e 100644
--- a/android/src/main/res/layout/out_of_time.xml
+++ b/android/src/main/res/layout/out_of_time.xml
@@ -55,14 +55,14 @@
                       android:textSize="32sp"
                       android:textStyle="bold"
                       android:text="@string/out_of_time" />
-            <TextView android:layout_width="wrap_content"
+            <TextView android:id="@+id/no_more_vpn_time_left"
+                      android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
                       android:layout_marginHorizontal="24dp"
                       android:layout_marginTop="8dp"
                       android:layout_marginBottom="11dp"
                       android:textColor="@color/white"
-                      android:textSize="13sp"
-                      android:text="@string/no_more_vpn_time_left" />
+                      android:textSize="13sp" />
             <Space android:layout_width="match_parent"
                    android:layout_height="0dp"
                    android:layout_weight="1" />
diff --git a/android/src/main/res/layout/welcome.xml b/android/src/main/res/layout/welcome.xml
index 5c13b11837..147e0b3294 100644
--- a/android/src/main/res/layout/welcome.xml
+++ b/android/src/main/res/layout/welcome.xml
@@ -69,13 +69,13 @@
                       android:textSize="24sp"
                       android:textStyle="bold"
                       android:text="" />
-            <TextView android:layout_width="wrap_content"
+            <TextView android:id="@+id/pay_to_start_using"
+                      android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
                       android:layout_marginHorizontal="24dp"
                       android:layout_marginTop="11dp"
                       android:textColor="@color/white"
-                      android:textSize="13sp"
-                      android:text="@string/pay_to_start_using" />
+                      android:textSize="13sp" />
             <Space android:layout_width="match_parent"
                    android:layout_height="0dp"
                    android:layout_weight="1" />
diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml
index 19ed11e341..b0e9cdfa21 100644
--- a/android/src/main/res/values/strings.xml
+++ b/android/src/main/res/values/strings.xml
@@ -30,7 +30,7 @@
     <string name="congrats">Congrats!</string>
     <string name="here_is_your_account_number">Here\'s your account number. Save it!</string>
     <string name="pay_to_start_using">To start using the app, you first need to add time to your
-    account. Either buy credit on our website or redeem a voucher.</string>
+    account.</string>
     <string name="buy_credit">Buy credit</string>
     <string name="buy_more_credit">Buy more credit</string>
     <string name="redeem_voucher">Redeem voucher</string>
@@ -49,8 +49,9 @@
     <string name="account_credit_has_expired">You have no more VPN time left on this
     account.</string>
     <string name="out_of_time">Out of time</string>
-    <string name="no_more_vpn_time_left">You have no more VPN time left on this account. Either buy
-    credit on our website or redeem a voucher.</string>
+    <string name="no_more_vpn_time_left">You have no more VPN time left on this account.</string>
+    <string name="add_time_to_account">Either buy credit on our website or redeem a
+    voucher.</string>
     <string name="settings_preferences">Preferences</string>
     <string name="settings_advanced">Advanced</string>
     <string name="app_version">App version</string>