sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-04 00:00:14 -04:00
Code Issues Projects Releases Wiki Activity

android: Consistently use *Start/End in layouts and remove redundant old settings

Browse Source
This commit is contained in:
Tobias Brunner 2025-02-18 12:11:43 +01:00
parent b021406f6b
commit 0b6d42661d
10 changed files with 44 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/frontends/android/app/src/main/res/layout/imc_state_fragment.xml
View File

@ -30,15 +30,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="20dp" android:layout_marginStart="20dp"
android:layout_marginRight="20dp" android:layout_marginEnd="20dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:orientation="horizontal" > android:orientation="horizontal" >
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="5dp" android:layout_marginEnd="5dp"
android:text="@string/imc_state_label" android:text="@string/imc_state_label"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
android:textSize="20sp" /> android:textSize="20sp" />
@ -58,8 +58,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:layout_marginLeft="20dp" android:layout_marginStart="20dp"
android:layout_marginRight="20dp" android:layout_marginEnd="20dp"
android:text="@string/show_remediation_instructions" android:text="@string/show_remediation_instructions"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary" /> android:textColor="?android:attr/textColorSecondary" />

35
src/frontends/android/app/src/main/res/layout/profile_detail_view.xml
View File

@ -27,7 +27,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/state_background" android:background="@drawable/state_background"
android:drawableStart="@android:drawable/ic_dialog_alert" app:drawableStartCompat="@android:drawable/ic_dialog_alert"
android:drawablePadding="8dp" android:drawablePadding="8dp"
android:padding="8dp" android:padding="8dp"
android:text="@string/alert_text_vpn_profile_read_only" android:text="@string/alert_text_vpn_profile_read_only"
@ -73,7 +73,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:text="@string/profile_vpn_type_label" android:text="@string/profile_vpn_type_label"
android:textSize="12sp" /> android:textSize="12sp" />
@ -140,7 +140,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:text="@string/profile_user_certificate_label" android:text="@string/profile_user_certificate_label"
android:textSize="12sp" /> android:textSize="12sp" />
@ -153,8 +153,8 @@
android:id="@+id/install_user_certificate" android:id="@+id/install_user_certificate"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:layout_marginRight="4dp" android:layout_marginEnd="4dp"
android:text="@string/profile_user_certificate_install" /> android:text="@string/profile_user_certificate_install" />
</LinearLayout> </LinearLayout>
@ -162,7 +162,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:text="@string/profile_ca_label" android:text="@string/profile_ca_label"
android:textSize="12sp" /> android:textSize="12sp" />
@ -210,7 +210,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:text="@string/profile_advanced_label" android:text="@string/profile_advanced_label"
android:textSize="20sp" /> android:textSize="20sp" />
@ -319,14 +319,12 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_marginLeft="4dp"
android:text="@string/profile_cert_req_label" /> android:text="@string/profile_cert_req_label" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_marginLeft="4dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:text="@string/profile_cert_req_hint" android:text="@string/profile_cert_req_hint"
android:textSize="12sp" /> android:textSize="12sp" />
@ -336,14 +334,12 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_marginLeft="4dp"
android:text="@string/profile_use_ocsp_label" /> android:text="@string/profile_use_ocsp_label" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_marginLeft="4dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:text="@string/profile_use_ocsp_hint" android:text="@string/profile_use_ocsp_hint"
android:textSize="12sp" /> android:textSize="12sp" />
@ -353,14 +349,12 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_marginLeft="4dp"
android:text="@string/profile_use_crl_label" /> android:text="@string/profile_use_crl_label" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_marginLeft="4dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:text="@string/profile_use_crl_hint" android:text="@string/profile_use_crl_hint"
android:textSize="12sp" /> android:textSize="12sp" />
@ -370,14 +364,12 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_marginLeft="4dp"
android:text="@string/profile_strict_revocation_label" /> android:text="@string/profile_strict_revocation_label" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_marginLeft="4dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:text="@string/profile_strict_revocation_hint" android:text="@string/profile_strict_revocation_hint"
android:textSize="12sp" /> android:textSize="12sp" />
@ -387,14 +379,12 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_marginLeft="4dp"
android:text="@string/profile_rsa_pss_label" /> android:text="@string/profile_rsa_pss_label" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_marginLeft="4dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:text="@string/profile_rsa_pss_hint" android:text="@string/profile_rsa_pss_hint"
android:textSize="12sp" /> android:textSize="12sp" />
@ -404,14 +394,12 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_marginLeft="4dp"
android:text="@string/profile_ipv6_transport_label" /> android:text="@string/profile_ipv6_transport_label" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_marginLeft="4dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:text="@string/profile_ipv6_transport_hint" android:text="@string/profile_ipv6_transport_hint"
android:textSize="12sp" /> android:textSize="12sp" />
@ -420,7 +408,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_marginLeft="4dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:text="@string/profile_split_tunneling_label" android:text="@string/profile_split_tunneling_label"
@ -429,7 +416,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:text="@string/profile_split_tunneling_intro" android:text="@string/profile_split_tunneling_intro"
@ -484,7 +471,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_marginLeft="4dp"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:text="@string/profile_select_apps_label" android:text="@string/profile_select_apps_label"
@ -505,7 +491,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_marginLeft="4dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:text="@string/profile_proposals_label" android:text="@string/profile_proposals_label"
@ -515,7 +500,7 @@
android:id="@+id/proposal_intro" android:id="@+id/proposal_intro"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:text="@string/profile_proposals_intro" android:text="@string/profile_proposals_intro"
@ -558,7 +543,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_marginLeft="4dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:text="@string/profile_profile_id" android:text="@string/profile_profile_id"
@ -568,7 +552,6 @@
android:id="@+id/profile_id" android:id="@+id/profile_id"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:textIsSelectable="true" android:textIsSelectable="true"

17
src/frontends/android/app/src/main/res/layout/profile_import_view.xml
View File

@ -40,8 +40,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:drawableLeft="@android:drawable/ic_dialog_alert" app:drawableStartCompat="@android:drawable/ic_dialog_alert"
android:drawableStart="@android:drawable/ic_dialog_alert"
android:drawablePadding="8dp" android:drawablePadding="8dp"
android:textStyle="bold" android:textStyle="bold"
android:text="@string/profile_import_exists" android:text="@string/profile_import_exists"
@ -57,7 +56,6 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:textSize="12sp" android:textSize="12sp"
android:text="@string/profile_name_label_simple" /> android:text="@string/profile_name_label_simple" />
@ -66,7 +64,6 @@
android:id="@+id/name" android:id="@+id/name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorPrimary" /> android:textColor="?android:attr/textColorPrimary" />
@ -75,7 +72,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:textSize="12sp" android:textSize="12sp"
android:text="@string/profile_gateway_label" /> android:text="@string/profile_gateway_label" />
@ -84,7 +80,6 @@
android:id="@+id/gateway" android:id="@+id/gateway"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorPrimary" /> android:textColor="?android:attr/textColorPrimary" />
@ -93,7 +88,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:textSize="12sp" android:textSize="12sp"
android:text="@string/profile_vpn_type_label" /> android:text="@string/profile_vpn_type_label" />
@ -103,7 +97,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="4dp" android:layout_marginBottom="4dp"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorPrimary" /> android:textColor="?android:attr/textColorPrimary" />
@ -162,7 +155,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:textSize="12sp" android:textSize="12sp"
android:text="@string/profile_user_certificate_label" /> android:text="@string/profile_user_certificate_label" />
@ -174,8 +167,8 @@
android:id="@+id/import_user_certificate" android:id="@+id/import_user_certificate"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:layout_marginRight="4dp" android:layout_marginEnd="4dp"
android:text="@string/profile_cert_import" /> android:text="@string/profile_cert_import" />
</LinearLayout> </LinearLayout>
@ -190,7 +183,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:textSize="12sp" android:textSize="12sp"
android:text="@string/profile_ca_label" /> android:text="@string/profile_ca_label" />

6
src/frontends/android/app/src/main/res/layout/profile_list_fragment.xml
View File

@ -19,8 +19,8 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingTop="10dp" android:paddingTop="10dp"
android:paddingLeft="5dp" android:paddingStart="5dp"
android:paddingRight="5dp" > android:paddingEnd="5dp" >
<ListView <ListView
android:id="@+id/profile_list" android:id="@+id/profile_list"
@ -33,7 +33,7 @@
<TextView android:id="@+id/profile_list_empty" <TextView android:id="@+id/profile_list_empty"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="15dp" android:layout_marginStart="15dp"
android:text="@string/no_profiles"/> android:text="@string/no_profiles"/>
</FrameLayout> </FrameLayout>

6
src/frontends/android/app/src/main/res/layout/remediation_instruction.xml
View File

@ -24,7 +24,7 @@
android:id="@+id/title" android:id="@+id/title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10dp" android:layout_marginStart="10dp"
android:textIsSelectable="true" android:textIsSelectable="true"
android:textAppearance="?android:attr/textAppearanceLarge" /> android:textAppearance="?android:attr/textAppearanceLarge" />
@ -32,7 +32,7 @@
android:id="@+id/description" android:id="@+id/description"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10dp" android:layout_marginStart="10dp"
android:textIsSelectable="true" android:textIsSelectable="true"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -41,7 +41,7 @@
android:id="@+id/list_header" android:id="@+id/list_header"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10dp" android:layout_marginStart="10dp"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:textIsSelectable="true" android:textIsSelectable="true"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />

8
src/frontends/android/app/src/main/res/layout/remediation_instruction_item.xml
View File

@ -27,8 +27,8 @@
android:id="@android:id/text1" android:id="@android:id/text1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="15dp" android:layout_marginStart="15dp"
android:layout_marginRight="15dp" android:layout_marginEnd="15dp"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textIsSelectable="false" /> android:textIsSelectable="false" />
@ -37,8 +37,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@android:id/text1" android:layout_below="@android:id/text1"
android:layout_alignLeft="@android:id/text1" android:layout_alignStart="@android:id/text1"
android:layout_alignRight="@android:id/text1" android:layout_alignEnd="@android:id/text1"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:singleLine="true" android:singleLine="true"

6
src/frontends/android/app/src/main/res/layout/selected_application_item.xml
View File

@ -19,8 +19,8 @@
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingLeft="8dp" android:paddingStart="8dp"
android:paddingRight="8dp" android:paddingEnd="8dp"
android:minHeight="?android:listPreferredItemHeight" android:minHeight="?android:listPreferredItemHeight"
android:background="@drawable/activated_background" android:background="@drawable/activated_background"
android:gravity="center_vertical" > android:gravity="center_vertical" >
@ -29,7 +29,6 @@
android:duplicateParentState="true" android:duplicateParentState="true"
android:layout_width="@android:dimen/app_icon_size" android:layout_width="@android:dimen/app_icon_size"
android:layout_height="@android:dimen/app_icon_size" android:layout_height="@android:dimen/app_icon_size"
android:layout_marginRight="8dip"
android:layout_marginEnd="8dip" android:layout_marginEnd="8dip"
android:scaleType="centerInside" /> android:scaleType="centerInside" />
@ -47,7 +46,6 @@
android:duplicateParentState="true" android:duplicateParentState="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp" /> android:layout_marginStart="16dp" />
</org.strongswan.android.ui.widget.CheckableLinearLayout> </org.strongswan.android.ui.widget.CheckableLinearLayout>

2
src/frontends/android/app/src/main/res/layout/trusted_certificates_item.xml
View File

@ -30,7 +30,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/subject_primary" android:layout_below="@id/subject_primary"
android:layout_alignLeft="@id/subject_primary" android:layout_alignStart="@id/subject_primary"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary" /> android:textColor="?android:attr/textColorSecondary" />

2
src/frontends/android/app/src/main/res/layout/two_line_button.xml
View File

@ -34,7 +34,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@android:id/text1" android:layout_below="@android:id/text1"
android:layout_alignLeft="@android:id/text1" android:layout_alignStart="@android:id/text1"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary" /> android:textColor="?android:attr/textColorSecondary" />

22
src/frontends/android/app/src/main/res/layout/vpn_state_fragment.xml
View File

@ -34,8 +34,8 @@
android:id="@+id/vpn_error_text" android:id="@+id/vpn_error_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="20dp" android:layout_marginStart="20dp"
android:layout_marginRight="20dp" android:layout_marginEnd="20dp"
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
android:text="Failed to establish VPN: Server is unreachable" android:text="Failed to establish VPN: Server is unreachable"
@ -53,7 +53,7 @@
android:id="@+id/show_log" android:id="@+id/show_log"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
android:text="@string/show_log" android:text="@string/show_log"
android:textColor="@color/primary" android:textColor="@color/primary"
android:textSize="14sp" android:textSize="14sp"
@ -84,8 +84,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:layout_marginLeft="20dp" android:layout_marginStart="20dp"
android:layout_marginRight="20dp" android:layout_marginEnd="20dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:columnCount="2" android:columnCount="2"
android:rowCount="2" > android:rowCount="2" >
@ -93,7 +93,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="5dp" android:layout_marginEnd="5dp"
android:gravity="top" android:gravity="top"
android:text="@string/state_label" android:text="@string/state_label"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
@ -112,7 +112,7 @@
android:id="@+id/vpn_profile_label" android:id="@+id/vpn_profile_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="5dp" android:layout_marginEnd="5dp"
android:gravity="top" android:gravity="top"
android:text="@string/profile_label" android:text="@string/profile_label"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
@ -135,8 +135,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:layout_marginLeft="20dp" android:layout_marginStart="20dp"
android:layout_marginRight="20dp" android:layout_marginEnd="20dp"
android:indeterminate="true" android:indeterminate="true"
android:visibility="gone" android:visibility="gone"
style="@style/Widget.AppCompat.ProgressBar.Horizontal" /> style="@style/Widget.AppCompat.ProgressBar.Horizontal" />
@ -146,8 +146,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:layout_marginLeft="20dp" android:layout_marginStart="20dp"
android:layout_marginRight="20dp" android:layout_marginEnd="20dp"
android:text="@string/disconnect" android:text="@string/disconnect"
style="?android:attr/borderlessButtonStyle" > style="?android:attr/borderlessButtonStyle" >
</Button> </Button>