Create new `widget` package

7 files changed, 64 insertions, 59 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
index b0616a3abc..6d993a8a55 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
@@ -11,6 +11,8 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import net.mullvad.mullvadvpn.R
+import net.mullvad.mullvadvpn.ui.widget.CopyableInformationView
+import net.mullvad.mullvadvpn.ui.widget.InformationView
 import org.joda.time.DateTime
 
 class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) {
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt
index b5dbb60f17..74b43e7572 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt
@@ -19,6 +19,9 @@ import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.model.KeygenEvent
 import net.mullvad.mullvadvpn.model.KeygenFailure
 import net.mullvad.mullvadvpn.model.TunnelState
+import net.mullvad.mullvadvpn.ui.widget.Button
+import net.mullvad.mullvadvpn.ui.widget.CopyableInformationView
+import net.mullvad.mullvadvpn.ui.widget.InformationView
 import net.mullvad.mullvadvpn.util.TimeAgoFormatter
 import org.joda.time.DateTime
 import org.joda.time.DateTimeZone
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/Button.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Button.kt
index bea4eeed78..e4f2f1e8be 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/Button.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Button.kt
@@ -1,4 +1,4 @@
-package net.mullvad.mullvadvpn.ui
+package net.mullvad.mullvadvpn.ui.widget
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/CopyableInformationView.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CopyableInformationView.kt
index 7e06c40e6a..ac1b7e8125 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/CopyableInformationView.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CopyableInformationView.kt
@@ -1,4 +1,4 @@
-package net.mullvad.mullvadvpn.ui
+package net.mullvad.mullvadvpn.ui.widget
 
 import android.content.ClipData
 import android.content.ClipboardManager
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/InformationView.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/InformationView.kt
index 3d4dc2b691..fed5ab8c28 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/InformationView.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/InformationView.kt
@@ -1,4 +1,4 @@
-package net.mullvad.mullvadvpn.ui
+package net.mullvad.mullvadvpn.ui.widget
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/android/src/main/res/layout/account.xml b/android/src/main/res/layout/account.xml
index 146b9ed7d3..092b4d2817 100644
--- a/android/src/main/res/layout/account.xml
+++ b/android/src/main/res/layout/account.xml
@@ -39,22 +39,22 @@
                   android:textSize="32sp"
                   android:textStyle="bold"
                   android:text="@string/settings_account" />
-        <net.mullvad.mullvadvpn.ui.CopyableInformationView android:id="@+id/account_number"
-                                                           android:layout_width="match_parent"
-                                                           android:layout_height="wrap_content"
-                                                           android:paddingHorizontal="24dp"
-                                                           android:paddingVertical="12dp"
-                                                           mullvad:clipboardLabel="@string/mullvad_account_number"
-                                                           mullvad:copiedToast="@string/copied_mullvad_account_number"
-                                                           mullvad:description="@string/account_number"
-                                                           mullvad:whenMissing="hide"/>
-        <net.mullvad.mullvadvpn.ui.InformationView android:id="@+id/account_expiry"
-                                                   android:layout_width="match_parent"
-                                                   android:layout_height="wrap_content"
-                                                   android:paddingHorizontal="24dp"
-                                                   android:paddingVertical="12dp"
-                                                   mullvad:description="@string/paid_until"
-                                                   mullvad:whenMissing="hide"/>
+        <net.mullvad.mullvadvpn.ui.widget.CopyableInformationView android:id="@+id/account_number"
+                                                                  android:layout_width="match_parent"
+                                                                  android:layout_height="wrap_content"
+                                                                  android:paddingHorizontal="24dp"
+                                                                  android:paddingVertical="12dp"
+                                                                  mullvad:clipboardLabel="@string/mullvad_account_number"
+                                                                  mullvad:copiedToast="@string/copied_mullvad_account_number"
+                                                                  mullvad:description="@string/account_number"
+                                                                  mullvad:whenMissing="hide"/>
+        <net.mullvad.mullvadvpn.ui.widget.InformationView android:id="@+id/account_expiry"
+                                                          android:layout_width="match_parent"
+                                                          android:layout_height="wrap_content"
+                                                          android:paddingHorizontal="24dp"
+                                                          android:paddingVertical="12dp"
+                                                          mullvad:description="@string/paid_until"
+                                                          mullvad:whenMissing="hide"/>
         <Button android:id="@+id/logout"
                 android:layout_marginTop="12dp"
                 android:layout_marginHorizontal="24dp"
diff --git a/android/src/main/res/layout/wireguard_key.xml b/android/src/main/res/layout/wireguard_key.xml
index 59a79a4179..20e6250f49 100644
--- a/android/src/main/res/layout/wireguard_key.xml
+++ b/android/src/main/res/layout/wireguard_key.xml
@@ -37,24 +37,24 @@
               android:textColor="@color/white"
               android:textSize="32sp"
               android:textStyle="bold" />
-    <net.mullvad.mullvadvpn.ui.CopyableInformationView android:id="@+id/public_key"
-                                                       android:layout_width="match_parent"
-                                                       android:layout_height="wrap_content"
-                                                       android:layout_weight="0"
-                                                       android:paddingHorizontal="24dp"
-                                                       android:paddingVertical="12dp"
-                                                       mullvad:clipboardLabel="@string/wireguard_public_key"
-                                                       mullvad:copiedToast="@string/copied_wireguard_public_key"
-                                                       mullvad:description="@string/public_key"
-                                                       mullvad:whenMissing="showSpinner"/>
-    <net.mullvad.mullvadvpn.ui.InformationView android:id="@+id/key_age"
-                                               android:layout_width="match_parent"
-                                               android:layout_height="wrap_content"
-                                               android:layout_weight="0"
-                                               android:paddingHorizontal="24dp"
-                                               android:paddingVertical="12dp"
-                                               mullvad:description="@string/wireguard_key_generated"
-                                               mullvad:whenMissing="showSpinner"/>
+    <net.mullvad.mullvadvpn.ui.widget.CopyableInformationView android:id="@+id/public_key"
+                                                              android:layout_width="match_parent"
+                                                              android:layout_height="wrap_content"
+                                                              android:layout_weight="0"
+                                                              android:paddingHorizontal="24dp"
+                                                              android:paddingVertical="12dp"
+                                                              mullvad:clipboardLabel="@string/wireguard_public_key"
+                                                              mullvad:copiedToast="@string/copied_wireguard_public_key"
+                                                              mullvad:description="@string/public_key"
+                                                              mullvad:whenMissing="showSpinner"/>
+    <net.mullvad.mullvadvpn.ui.widget.InformationView android:id="@+id/key_age"
+                                                      android:layout_width="match_parent"
+                                                      android:layout_height="wrap_content"
+                                                      android:layout_weight="0"
+                                                      android:paddingHorizontal="24dp"
+                                                      android:paddingVertical="12dp"
+                                                      mullvad:description="@string/wireguard_key_generated"
+                                                      mullvad:whenMissing="showSpinner"/>
     <FrameLayout android:layout_width="wrap_content"
                  android:layout_height="wrap_content"
                  android:paddingHorizontal="24dp"
@@ -79,26 +79,26 @@
     <Space android:layout_width="match_parent"
            android:layout_height="0dp"
            android:layout_weight="1" />
-    <net.mullvad.mullvadvpn.ui.Button android:id="@+id/generate_key"
-                                      android:layout_weight="0"
-                                      android:layout_marginHorizontal="24dp"
-                                      android:paddingHorizontal="8dp"
-                                      android:text="@string/wireguard_generate_key"
-                                      style="@style/GreenButton" />
-    <net.mullvad.mullvadvpn.ui.Button android:id="@+id/verify_key"
-                                      android:layout_weight="0"
-                                      android:layout_marginTop="24dp"
-                                      android:layout_marginHorizontal="24dp"
-                                      android:paddingHorizontal="8dp"
-                                      android:text="@string/wireguard_verify_key"
-                                      style="@style/BlueButton" />
-    <net.mullvad.mullvadvpn.ui.Button android:id="@+id/manage_keys"
-                                      android:layout_weight="0"
-                                      android:layout_marginTop="24dp"
-                                      android:layout_marginBottom="24dp"
-                                      android:layout_marginHorizontal="24dp"
-                                      android:paddingHorizontal="8dp"
-                                      android:text="@string/wireguard_manage_keys"
-                                      android:drawableRight="@drawable/icon_extlink"
-                                      style="@style/BlueButton" />
+    <net.mullvad.mullvadvpn.ui.widget.Button android:id="@+id/generate_key"
+                                             android:layout_weight="0"
+                                             android:layout_marginHorizontal="24dp"
+                                             android:paddingHorizontal="8dp"
+                                             android:text="@string/wireguard_generate_key"
+                                             style="@style/GreenButton" />
+    <net.mullvad.mullvadvpn.ui.widget.Button android:id="@+id/verify_key"
+                                             android:layout_weight="0"
+                                             android:layout_marginTop="24dp"
+                                             android:layout_marginHorizontal="24dp"
+                                             android:paddingHorizontal="8dp"
+                                             android:text="@string/wireguard_verify_key"
+                                             style="@style/BlueButton" />
+    <net.mullvad.mullvadvpn.ui.widget.Button android:id="@+id/manage_keys"
+                                             android:layout_weight="0"
+                                             android:layout_marginTop="24dp"
+                                             android:layout_marginBottom="24dp"
+                                             android:layout_marginHorizontal="24dp"
+                                             android:paddingHorizontal="8dp"
+                                             android:text="@string/wireguard_manage_keys"
+                                             android:drawableRight="@drawable/icon_extlink"
+                                             style="@style/BlueButton" />
 </LinearLayout>