diff options
| -rw-r--r-- | app/src/main/res/layout-xlarge/eip_service_fragment.xml | 18 | ||||
| -rw-r--r-- | app/src/main/res/layout/eip_service_fragment.xml | 13 | ||||
| -rw-r--r-- | app/src/main/res/values-es/strings.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/values/dimens.xml | 1 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 4 |
5 files changed, 20 insertions, 20 deletions
diff --git a/app/src/main/res/layout-xlarge/eip_service_fragment.xml b/app/src/main/res/layout-xlarge/eip_service_fragment.xml index 7fcaacbc..9efc209c 100644 --- a/app/src/main/res/layout-xlarge/eip_service_fragment.xml +++ b/app/src/main/res/layout-xlarge/eip_service_fragment.xml @@ -10,27 +10,27 @@ android:id="@+id/eipLabel" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_alignParentTop="true" android:layout_marginLeft="10dp" android:layout_marginStart="10dp" - android:clickable="true" + android:layout_marginTop="12dp" android:text="@string/eip_service_label" android:textAppearance="?android:attr/textAppearanceLarge" - android:textSize="26sp" /> + android:textSize="24dp"/> <Button android:id="@+id/vpn.main.button" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginStart="24dp" + android:layout_marginLeft="24dp" + android:textSize="32sp" /> <view android:id="@+id/vpn.Status.Image" - android:layout_width="@dimen/progress_button" + android:layout_width="48dp" + android:layout_height="48dp" android:color="@android:color/holo_blue_dark" - android:layout_height="@dimen/progress_button" class="mbanje.kurt.fabbutton.FabButton" android:layout_gravity="center" android:visibility="visible" @@ -43,8 +43,8 @@ android:layout_toRightOf="@id/eipLabel" android:layout_toEndOf="@id/eipLabel" android:layout_alignTop="@id/eipLabel" - android:layout_marginStart="@dimen/add_button_margin" - android:layout_marginLeft="@dimen/add_button_margin" + android:layout_marginStart="24dp" + android:layout_marginLeft="24dp" /> </com.wefika.flowlayout.FlowLayout> diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml index b3651b51..9a396080 100644 --- a/app/src/main/res/layout/eip_service_fragment.xml +++ b/app/src/main/res/layout/eip_service_fragment.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <com.wefika.flowlayout.FlowLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="10dp" android:orientation="horizontal"> @@ -11,7 +11,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="10dp" android:layout_marginStart="10dp" - android:clickable="true" + android:layout_marginTop="12dp" android:text="@string/eip_service_label" android:textAppearance="?android:attr/textAppearanceMedium" /> @@ -19,13 +19,16 @@ android:id="@+id/vpn.main.button" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:textSize="12sp" /> <view android:id="@+id/vpn.Status.Image" - android:layout_width="@dimen/progress_button" + android:layout_width="32dp" + android:layout_height="32dp" + android:layout_marginLeft="3dp" + android:layout_marginStart="3dp" android:color="@android:color/holo_blue_dark" - android:layout_height="@dimen/progress_button" class="mbanje.kurt.fabbutton.FabButton" android:layout_gravity="center" android:visibility="visible" @@ -35,8 +38,6 @@ fbb_autoStart="true" fbb_progressColor="#ff170aff" fbb_progressWidthRatio="0.1" - android:layout_marginStart="@dimen/add_button_margin" - android:layout_marginLeft="@dimen/add_button_margin" /> </com.wefika.flowlayout.FlowLayout> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 063c3f8b..acf002bc 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -77,6 +77,6 @@ <string name="logging_in_user_status">está iniciando sesión.</string> <string name="logging_out_user_status">está cerrando sesión.</string> <string name="signingup_message">está siendo registrado.</string> - <string name="vpn.button.turn.on">Iniciar VPN</string> - <string name="vpn.button.turn.off">Apagar VPN</string> + <string name="vpn.button.turn.on">Iniciar</string> + <string name="vpn.button.turn.off">Apagar</string> </resources> diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 4e8dad45..727f5a78 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -17,5 +17,4 @@ <dimen name="round_button_diameter">56dp</dimen> <dimen name="switchbar_pad">16dp</dimen> <dimen name="vpn_setting_padding">16dp</dimen> - <dimen name="progress_button">32dp</dimen> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 674bb7c8..6856b713 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -75,6 +75,6 @@ <string name="logging_in_user_status">is logging in.</string> <string name="logging_out_user_status">is logging out.</string> <string name="signingup_message">is being registered.</string> - <string name="vpn.button.turn.on">Turn on VPN</string> - <string name="vpn.button.turn.off">Turn off VPN</string> + <string name="vpn.button.turn.on">Turn on</string> + <string name="vpn.button.turn.off">Turn off</string> </resources> |