Bläddra i källkod

polished connection info layout

Fabio Arnold 10 år sedan
förälder
incheckning
a11aa5bcb1

+ 15 - 18
res/layout/fragment_connectioninfo_dialog.xml

@@ -3,11 +3,12 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 			  android:orientation="vertical"
 			  android:layout_width="fill_parent"
-			  android:layout_height="fill_parent">
+			  android:layout_height="fill_parent"
+			  android:gravity="center_horizontal">
 	<TableLayout
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			>
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="16dp" android:layout_marginBottom="16dp">
 		<TableRow
 				android:layout_width="fill_parent"
 				android:layout_height="fill_parent">
@@ -18,15 +19,14 @@
 					android:text="@string/ssid"
 					android:id="@+id/textView1" android:layout_column="0"
 					android:layout_margin="4dp"
-					android:textStyle="bold" android:textColor="@android:color/white"/>
+					android:textStyle="bold"/>
 			<TextView
-					android:layout_width="wrap_content"
+					android:layout_width="fill_parent"
 					android:layout_height="wrap_content"
 					android:textAppearance="?android:attr/textAppearanceMedium"
 					android:text="undefined"
-					android:textColor="@android:color/white"
 					android:id="@+id/connectioninfo_ssid_value" android:layout_column="1"
-					android:layout_margin="4dp" android:layout_weight="0.5"/>
+					android:layout_margin="4dp" android:gravity="right"/>
 		</TableRow>
 		<TableRow
 				android:layout_width="fill_parent"
@@ -38,15 +38,14 @@
 					android:text="@string/bssid"
 					android:id="@+id/textView2" android:layout_column="0"
 					android:layout_margin="4dp"
-					android:textStyle="bold" android:textColor="@android:color/white"/>
+					android:textStyle="bold"/>
 			<TextView
-					android:layout_width="wrap_content"
+					android:layout_width="fill_parent"
 					android:layout_height="wrap_content"
 					android:textAppearance="?android:attr/textAppearanceMedium"
 					android:text="undefined"
-					android:textColor="@android:color/white"
 					android:id="@+id/connectioninfo_bssid_value" android:layout_column="1"
-					android:layout_margin="4dp"/>
+					android:layout_margin="4dp" android:gravity="right"/>
 		</TableRow>
 		<TableRow
 				android:layout_width="fill_parent"
@@ -58,15 +57,14 @@
 					android:text="@string/internal_ip"
 					android:id="@+id/textView3" android:layout_column="0"
 					android:layout_margin="4dp"
-					android:textStyle="bold" android:textColor="@android:color/white"/>
+					android:textStyle="bold"/>
 			<TextView
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:textAppearance="?android:attr/textAppearanceMedium"
 					android:text="undefined"
-					android:textColor="@android:color/white"
 					android:id="@+id/connectioninfo_internalip_value" android:layout_column="1"
-					android:layout_margin="4dp"/>
+					android:layout_margin="4dp" android:gravity="right"/>
 		</TableRow>
 		<TableRow
 				android:layout_width="fill_parent"
@@ -78,15 +76,14 @@
 					android:text="@string/external_ip"
 					android:id="@+id/textView4" android:layout_column="0"
 					android:layout_margin="4dp"
-					android:textStyle="bold" android:textColor="@android:color/white"/>
+					android:textStyle="bold"/>
 			<TextView
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:textAppearance="?android:attr/textAppearanceMedium"
 					android:text="undefined"
-					android:textColor="@android:color/white"
 					android:id="@+id/connectioninfo_externalip_value" android:layout_column="1"
-					android:layout_margin="4dp"/>
+					android:layout_margin="4dp" android:gravity="right"/>
 		</TableRow>
 	</TableLayout>
 </LinearLayout>

+ 1 - 0
res/values/strings.xml

@@ -25,6 +25,7 @@
 	<string name="delete">Delete</string>
 	<string name="cancel">Cancel</string>
 	<string name="close">Close</string>
+	<string name="show_records">Show records</string>
 	<string name="dialog_clear_database">Clear all data?</string>	
 	<string name="export_dialog_title">Choose Export Format</string>		
 	<string name="delete_dialog_title">Delete data sets by:</string>	

+ 7 - 3
src/de/tudarmstadt/informatik/hostage/ui2/fragment/ConnectionInfoDialogFragment.java

@@ -6,6 +6,7 @@ import android.app.DialogFragment;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
@@ -23,17 +24,20 @@ public class ConnectionInfoDialogFragment extends DialogFragment {
 		String internalIP = sharedPreferences.getString(getString(R.string.connection_info_internal_ip), "");
 		String externalIP = sharedPreferences.getString(getString(R.string.connection_info_external_ip), "");
 
-		LayoutInflater inflater = getActivity().getLayoutInflater();
+		Context context = new ContextThemeWrapper(getActivity(), android.R.style.Theme_Holo);
+		LayoutInflater localInflater = getActivity().getLayoutInflater().cloneInContext(context);
 
 		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), AlertDialog.THEME_HOLO_DARK);
-		View view = inflater.inflate(R.layout.fragment_connectioninfo_dialog, null);
+		View view = localInflater.inflate(R.layout.fragment_connectioninfo_dialog, null);
+
 		((TextView)view.findViewById(R.id.connectioninfo_ssid_value)).setText(ssid);
 		((TextView)view.findViewById(R.id.connectioninfo_bssid_value)).setText(bssid);
 		((TextView)view.findViewById(R.id.connectioninfo_internalip_value)).setText(internalIP);
 		((TextView)view.findViewById(R.id.connectioninfo_externalip_value)).setText(externalIP);
 		builder.setView(view);
 		builder.setTitle(R.string.title_connection_info);
-		builder.setNeutralButton(R.string.close, null);
+		builder.setPositiveButton(R.string.show_records, null);
+		builder.setNegativeButton(R.string.close, null);
 		return builder.create();
 	}
 }