diff options
| author | cyberta <cyberta@riseup.net> | 2018-03-06 10:08:49 -0800 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2018-03-06 10:08:49 -0800 |
| commit | a95567b4bbb2319636a79cc5e8d6a7921df9f4d1 (patch) | |
| tree | 7d5c7c36b141aa98e909f6b99baed769de5cf923 /app/src/main/res/layout-sw600dp-port | |
| parent | fda23fc8c5aa916bce4ce985fcdf0aa08b21f1e6 (diff) | |
| parent | 54e95a61bc553d985f6c55823da20985b6103aa0 (diff) | |
Merge branch 'cleanup' into 'master'
cleanup - rename layout files
See merge request leap/bitmask_android!64
Diffstat (limited to 'app/src/main/res/layout-sw600dp-port')
| -rw-r--r-- | app/src/main/res/layout-sw600dp-port/a_provider_credentials.xml | 6 | ||||
| -rw-r--r-- | app/src/main/res/layout-sw600dp-port/a_provider_detail.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/layout-sw600dp-port/a_provider_list.xml (renamed from app/src/main/res/layout-sw600dp-port/provider_list_activity.xml) | 4 | ||||
| -rw-r--r-- | app/src/main/res/layout-sw600dp-port/f_log.xml | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/app/src/main/res/layout-sw600dp-port/a_provider_credentials.xml b/app/src/main/res/layout-sw600dp-port/a_provider_credentials.xml index 0cbb08f6..1d689db6 100644 --- a/app/src/main/res/layout-sw600dp-port/a_provider_credentials.xml +++ b/app/src/main/res/layout-sw600dp-port/a_provider_credentials.xml @@ -58,7 +58,7 @@ app:layout_constraintWidth_min="731dp" > - <include layout="@layout/loading_screen" /> + <include layout="@layout/v_loading_screen" /> <LinearLayout android:layout_width="match_parent" @@ -67,7 +67,7 @@ android:orientation="vertical"> <include - layout="@layout/provider_header" + layout="@layout/v_provider_header" android:layout_width="match_parent" android:layout_height="wrap_content" /> @@ -83,7 +83,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> <include - layout="@layout/provider_credentials" + layout="@layout/v_provider_credentials" android:layout_width="match_parent" android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout-sw600dp-port/a_provider_detail.xml b/app/src/main/res/layout-sw600dp-port/a_provider_detail.xml index bdafa45a..6d7c97ae 100644 --- a/app/src/main/res/layout-sw600dp-port/a_provider_detail.xml +++ b/app/src/main/res/layout-sw600dp-port/a_provider_detail.xml @@ -58,7 +58,7 @@ app:layout_constraintTop_toTopOf="@+id/guideline_top" app:layout_constraintWidth_min="731dp"> - <include layout="@layout/loading_screen" /> + <include layout="@layout/v_loading_screen" /> <LinearLayout android:id="@+id/content" @@ -67,7 +67,7 @@ android:layout_height="wrap_content"> <include - layout="@layout/provider_header" + layout="@layout/v_provider_header" android:layout_width="match_parent" android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout-sw600dp-port/provider_list_activity.xml b/app/src/main/res/layout-sw600dp-port/a_provider_list.xml index f02398c5..818ce864 100644 --- a/app/src/main/res/layout-sw600dp-port/provider_list_activity.xml +++ b/app/src/main/res/layout-sw600dp-port/a_provider_list.xml @@ -58,7 +58,7 @@ app:layout_constraintTop_toTopOf="@+id/guideline_top" app:layout_constraintWidth_min="731dp"> - <include layout="@layout/loading_screen" /> + <include layout="@layout/v_loading_screen" /> <LinearLayout android:id="@+id/content" @@ -66,7 +66,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - <include layout="@layout/provider_header" + <include layout="@layout/v_provider_header" android:layout_width="match_parent" android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout-sw600dp-port/f_log.xml b/app/src/main/res/layout-sw600dp-port/f_log.xml index 78dc4c62..ebadeb74 100644 --- a/app/src/main/res/layout-sw600dp-port/f_log.xml +++ b/app/src/main/res/layout-sw600dp-port/f_log.xml @@ -22,7 +22,7 @@ <include layout="@layout/f_log_sliders"/> - <include layout="@layout/vpnstatus"/> + <include layout="@layout/v_vpn_status"/> </LinearLayout> <ListView |