diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-06-19 16:43:12 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-06-19 16:43:12 +0200 |
| commit | 3825bb15d7ff41b8c4266a4f601668e60d54ab29 (patch) | |
| tree | ef01f71d82eeb1ffca6411827a7cc548d80537d5 /app/src/main | |
| parent | a9ee33a76bd0d49608fae352ef9bb64d5b1b0302 (diff) | |
| parent | f721df21a6fd1f3bb2588e67298ae33993041779 (diff) | |
Merge branch 'bug/long-provider-names-get-cut-off-on-smaller-screens-#5606' into develop
Diffstat (limited to 'app/src/main')
| -rw-r--r-- | app/src/main/res/layout/client_dashboard.xml | 58 | ||||
| -rw-r--r-- | app/src/main/res/values/untranslatable.xml | 3 |
2 files changed, 23 insertions, 38 deletions
diff --git a/app/src/main/res/layout/client_dashboard.xml b/app/src/main/res/layout/client_dashboard.xml index a5387efd..f33ac285 100644 --- a/app/src/main/res/layout/client_dashboard.xml +++ b/app/src/main/res/layout/client_dashboard.xml @@ -10,44 +10,28 @@ android:layout_width="match_parent" android:layout_height="40dp" android:background="?android:attr/selectableItemBackground" > - - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:gravity="center_vertical" - android:orientation="vertical" - android:paddingLeft="10dp" > - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:ellipsize="marquee" - android:fadingEdge="horizontal" - android:singleLine="true" - android:text="@string/provider_label" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="24sp" /> - - </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:gravity="center_vertical" - android:orientation="vertical" - android:paddingLeft="15dp" > - - <TextView - android:id="@+id/providerName" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:ellipsize="marquee" - android:fadingEdge="horizontal" - android:singleLine="true" - android:text="@string/provider_label_none" - android:textAppearance="?android:attr/textAppearanceMedium" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="5dp" + android:ellipsize="marquee" + android:fadingEdge="horizontal" + android:singleLine="true" + android:text="@string/provider_label" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <TextView + android:id="@+id/providerName" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="10dp" + android:ellipsize="marquee" + android:fadingEdge="horizontal" + android:singleLine="true" + android:text="@string/provider_label_none" + android:textAppearance="?android:attr/textAppearanceMedium" /> - </LinearLayout> </LinearLayout> <View diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml index 4212cec2..de355720 100644 --- a/app/src/main/res/values/untranslatable.xml +++ b/app/src/main/res/values/untranslatable.xml @@ -853,4 +853,5 @@ -</resources> + +</resources>
\ No newline at end of file |