diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout-xlarge/dashboard.xml (renamed from app/src/main/res/layout-xlarge/client_dashboard.xml) | 0 | ||||
| -rw-r--r-- | app/src/main/res/layout-xlarge/eip_service_fragment.xml | 35 | ||||
| -rw-r--r-- | app/src/main/res/layout-xlarge/provider_list_fragment.xml | 16 | ||||
| -rw-r--r-- | app/src/main/res/layout-xlarge/session_dialog.xml (renamed from app/src/main/res/layout-xlarge/log_in_dialog.xml) | 0 | ||||
| -rw-r--r-- | app/src/main/res/layout/dashboard.xml (renamed from app/src/main/res/layout/client_dashboard.xml) | 1 | ||||
| -rw-r--r-- | app/src/main/res/layout/eip_service_fragment.xml | 40 | ||||
| -rw-r--r-- | app/src/main/res/layout/provider_list_fragment.xml | 15 | ||||
| -rw-r--r-- | app/src/main/res/layout/session_dialog.xml (renamed from app/src/main/res/layout/log_in_dialog.xml) | 3 |
8 files changed, 21 insertions, 89 deletions
diff --git a/app/src/main/res/layout-xlarge/client_dashboard.xml b/app/src/main/res/layout-xlarge/dashboard.xml index bd644e1e..bd644e1e 100644 --- a/app/src/main/res/layout-xlarge/client_dashboard.xml +++ b/app/src/main/res/layout-xlarge/dashboard.xml 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 d217e1a1..38b6aca3 100644 --- a/app/src/main/res/layout-xlarge/eip_service_fragment.xml +++ b/app/src/main/res/layout-xlarge/eip_service_fragment.xml @@ -37,39 +37,20 @@ android:layout_marginLeft="15dp" android:layout_marginRight="15dp" /> - <RelativeLayout - android:id="@+id/eipDetail" - android:layout_width="match_parent" + <TextView + android:id="@+id/status_message" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentRight="true" android:layout_below="@+id/eipLabel" android:paddingBottom="10dp" android:paddingLeft="10dp" android:paddingRight="10dp" android:paddingTop="10dp" - android:visibility="gone" > - - <ImageView - android:id="@+id/eipSettings" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:layout_margin="10dp" - android:contentDescription="@string/eip_settings_button_description" - android:src="@drawable/ic_sysbar_quicksettings" /> - - <TextView - android:id="@+id/status_message" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_centerVertical="true" - android:clickable="true" - android:text="@string/eip_state_not_connected" - android:textSize="16sp" /> + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:clickable="true" + android:text="@string/eip_state_not_connected" + android:textSize="16sp" /> - </RelativeLayout> </RelativeLayout> diff --git a/app/src/main/res/layout-xlarge/provider_list_fragment.xml b/app/src/main/res/layout-xlarge/provider_list_fragment.xml deleted file mode 100644 index 59dd37d1..00000000 --- a/app/src/main/res/layout-xlarge/provider_list_fragment.xml +++ /dev/null @@ -1,16 +0,0 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:paddingLeft="12dp"
- android:paddingRight="12dp"
- android:paddingTop="12dp" >
-
- <ListView
- android:id="@id/android:list"
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1"
- android:drawSelectorOnTop="false" />
-
-</LinearLayout> diff --git a/app/src/main/res/layout-xlarge/log_in_dialog.xml b/app/src/main/res/layout-xlarge/session_dialog.xml index 3a9eebb8..3a9eebb8 100644 --- a/app/src/main/res/layout-xlarge/log_in_dialog.xml +++ b/app/src/main/res/layout-xlarge/session_dialog.xml diff --git a/app/src/main/res/layout/client_dashboard.xml b/app/src/main/res/layout/dashboard.xml index f33ac285..67a1122f 100644 --- a/app/src/main/res/layout/client_dashboard.xml +++ b/app/src/main/res/layout/dashboard.xml @@ -25,6 +25,7 @@ android:id="@+id/providerName" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:textSize="28sp" android:layout_marginLeft="10dp" android:ellipsize="marquee" android:fadingEdge="horizontal" diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml index be2aa791..64d22147 100644 --- a/app/src/main/res/layout/eip_service_fragment.xml +++ b/app/src/main/res/layout/eip_service_fragment.xml @@ -22,8 +22,8 @@ android:layout_alignParentRight="true" android:layout_alignParentTop="true" android:layout_marginRight="10dp" /> - - <ProgressBar + + <ProgressBar android:id="@+id/eipProgress" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -34,38 +34,18 @@ android:layout_marginLeft="15dp" android:layout_marginRight="15dp" /> - <RelativeLayout - android:id="@+id/eipDetail" - android:layout_width="match_parent" + <TextView + android:id="@+id/status_message" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" - android:layout_alignParentRight="true" - android:layout_below="@+id/eipLabel" + android:layout_below="@id/eipProgress" + android:layout_centerVertical="true" + android:paddingTop="5dp" android:paddingBottom="10dp" android:paddingLeft="10dp" android:paddingRight="10dp" - android:paddingTop="10dp" - android:visibility="gone" > - - <ImageView - android:id="@+id/eipSettings" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:layout_margin="10dp" - android:contentDescription="@string/eip_settings_button_description" - android:src="@drawable/ic_sysbar_quicksettings" /> - - <TextView - android:id="@+id/status_message" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_centerVertical="true" - android:clickable="true" - android:text="@string/eip_state_not_connected" /> - - </RelativeLayout> + android:clickable="true" + android:text="@string/eip_state_not_connected" /> </RelativeLayout> diff --git a/app/src/main/res/layout/provider_list_fragment.xml b/app/src/main/res/layout/provider_list_fragment.xml deleted file mode 100644 index 70dbae0d..00000000 --- a/app/src/main/res/layout/provider_list_fragment.xml +++ /dev/null @@ -1,15 +0,0 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:paddingLeft="8dp"
- android:paddingRight="8dp" >
-
- <ListView
- android:id="@id/android:list"
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1"
- android:drawSelectorOnTop="false" />
-
-</LinearLayout> diff --git a/app/src/main/res/layout/log_in_dialog.xml b/app/src/main/res/layout/session_dialog.xml index c8a2f0a8..62215ae8 100644 --- a/app/src/main/res/layout/log_in_dialog.xml +++ b/app/src/main/res/layout/session_dialog.xml @@ -4,13 +4,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" - tools:context=".LogInDialog" > + tools:context=".SessionDialog" > <TextView android:id="@+id/user_message" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" + android:visibility="gone" android:textAppearance="?android:attr/textAppearanceMedium" /> <EditText |