Forráskód Böngészése

improved the alignment of text in the record detail view

Alexander Brakowski 10 éve
szülő
commit
1da3d1bc89
1 módosított fájl, 33 hozzáadás és 39 törlés
  1. 33 39
      res/layout/fragment_record_overview.xml

+ 33 - 39
res/layout/fragment_record_overview.xml

@@ -4,15 +4,14 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:id="@+id/scrollView"
-            android:fillViewport="false">
+            android:fillViewport="true">
 
 	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	              android:orientation="vertical"
 	              android:layout_width="match_parent"
 	              android:layout_height="wrap_content"
-	              android:weightSum="1"
 	              android:measureWithLargestChild="false"
-	              android:baselineAligned="false"
+	              android:baselineAligned="true"
 	              android:id="@+id/record_overview_conversation">
 
 		<RelativeLayout
@@ -21,36 +20,32 @@
 				android:background="@drawable/panel_bg_selector"
 				android:layout_margin="5dp"
 				android:paddingBottom="10dp"
-				android:paddingLeft="5dp"
+				android:paddingLeft="10dp"
 				android:paddingTop="5dp"
-				android:paddingRight="5dp"
+				android:paddingRight="10dp"
 				>
 
 			<TextView
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:text='-'
+					android:text="-"
 					android:id="@+id/record_details_text_ssid"
-					android:layout_marginLeft="55dp"
-					android:layout_alignParentTop="true"
-					android:layout_toRightOf="@+id/textView2"
-					android:layout_toLeftOf="@+id/textView5"/>
+					android:layout_toRightOf="@+id/textView7"
+					android:layout_marginLeft="27dp"/>
 
 			<TextView
 					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
+					android:layout_height="match_parent"
 					android:textAppearance="?android:attr/textAppearanceSmall"
 					android:text="@string/RecordSSID"
 					android:textAllCaps="true"
 					android:id="@+id/textView2"
-					android:layout_alignParentLeft="true"
-					android:layout_alignParentStart="false"
 					android:gravity="center"
-					android:layout_marginLeft="10dp"
-					android:layout_marginRight="10dp"
 					android:layout_alignParentTop="true"
-					android:layout_above="@+id/record_details_text_bssid"/>
+					android:layout_alignParentLeft="true"
+					android:layout_alignParentStart="true"
+					android:layout_alignBottom="@+id/record_details_text_ssid"/>
 
 			<TextView
 					android:layout_width="wrap_content"
@@ -59,10 +54,11 @@
 					android:text="@string/RecordBSSID"
 					android:textAllCaps="true"
 					android:id="@+id/textView3"
-					android:gravity="center"
-					android:layout_below="@+id/record_details_text_ssid"
-					android:layout_toLeftOf="@+id/record_details_text_ssid"
-					android:layout_above="@+id/record_details_text_remoteip"/>
+					android:layout_alignTop="@+id/record_details_text_bssid"
+					android:layout_alignParentLeft="true"
+					android:layout_alignParentStart="true"
+					android:layout_alignBottom="@+id/record_details_text_bssid"
+					android:gravity="center"/>
 
 			<TextView
 					android:id="@+id/record_details_text_bssid"
@@ -70,11 +66,9 @@
 					android:layout_height="wrap_content"
 					android:textAppearance="?android:attr/textAppearanceMedium"
 					android:text="-"
-					android:layout_alignLeft="@+id/record_details_text_ssid"
-					android:layout_alignStart="@+id/record_details_text_ssid"
 					android:layout_below="@+id/record_details_text_ssid"
-					android:layout_alignRight="@+id/record_details_text_ssid"
-					android:layout_alignEnd="@+id/record_details_text_ssid"/>
+					android:layout_alignLeft="@+id/record_details_text_ssid"
+					android:layout_alignStart="@+id/record_details_text_ssid"/>
 
 			<TextView
 					android:layout_width="wrap_content"
@@ -85,9 +79,7 @@
 					android:id="@+id/textView7"
 					android:gravity="center"
 					android:layout_alignTop="@+id/record_details_text_remoteip"
-					android:layout_alignLeft="@+id/textView2"
-					android:layout_alignStart="@+id/textView2"
-					android:layout_marginTop="2dp"/>
+					android:layout_alignBottom="@+id/record_details_text_remoteip"/>
 
 			<TextView
 					android:id="@+id/record_details_text_remoteip"
@@ -98,33 +90,35 @@
 					android:layout_alignLeft="@+id/record_details_text_bssid"
 					android:layout_alignStart="@+id/record_details_text_bssid"
 					android:layout_below="@+id/record_details_text_bssid"
-					android:layout_alignRight="@+id/record_details_text_bssid"
-					android:layout_alignEnd="@+id/record_details_text_bssid"/>
+					android:layout_alignParentRight="true"
+					android:layout_alignParentEnd="true"/>
 
 			<TextView
 					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
+					android:layout_height="match_parent"
 					android:textAppearance="?android:attr/textAppearanceSmall"
 					android:text="@string/RecordProtocol"
 					android:id="@+id/textView5"
 					android:textAllCaps="true"
-					android:gravity="center|center_horizontal"
-					android:layout_above="@+id/record_details_text_protocol"
-					android:layout_alignParentRight="true"
-					android:layout_alignParentEnd="true"
-					android:layout_marginRight="10dp"/>
+					android:layout_gravity="right|center"
+					android:textAlignment="gravity"
+					android:gravity="center_vertical"
+					android:layout_alignTop="@+id/record_details_text_protocol"
+					android:layout_alignParentLeft="true"
+					android:layout_alignParentStart="true"
+					android:layout_alignBottom="@+id/record_details_text_protocol"/>
 
 			<TextView
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:textAppearance="?android:attr/textAppearanceLarge"
+					android:textAppearance="?android:attr/textAppearanceMedium"
 					android:text="-"
 					android:textAllCaps="true"
 					android:id="@+id/record_details_text_protocol"
 					android:gravity="center_horizontal"
-					android:layout_below="@+id/record_details_text_ssid"
-					android:layout_alignRight="@+id/textView5"
-					android:layout_alignEnd="@+id/textView5"/>
+					android:layout_below="@+id/record_details_text_remoteip"
+					android:layout_alignLeft="@+id/record_details_text_remoteip"
+					android:layout_alignStart="@+id/record_details_text_remoteip"/>
 
 		</RelativeLayout>