mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Layout improvement

This commit is contained in:
M66B 2016-01-08 17:21:50 +01:00
parent 2c2922b94f
commit 6f7c19ec15
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/java/eu/faircode/netguard/LogAdapter.java
View File

@ -58,14 +58,29 @@ public class LogAdapter extends CursorAdapter {
final String whois = (ip.length() > 1 && ip.charAt(0) == '/' ? ip.substring(1) : ip);
// Get views
ImageView ivIcon = (ImageView) view.findViewById(R.id.ivIcon);
TextView tvTime = (TextView) view.findViewById(R.id.tvTime);
TextView tvIP = (TextView) view.findViewById(R.id.tvIP);
TextView tvProtocol = (TextView) view.findViewById(R.id.tvProtocol);
TextView tvPort = (TextView) view.findViewById(R.id.tvPort);
TextView tvFlags = (TextView) view.findViewById(R.id.tvFlags);
ImageView ivIcon = (ImageView) view.findViewById(R.id.ivIcon);
TextView tvUid = (TextView) view.findViewById(R.id.tvUid);
ImageView ivConnection = (ImageView) view.findViewById(R.id.ivConnection);
TextView tvIP = (TextView) view.findViewById(R.id.tvIP);
// Set values
tvTime.setText(new SimpleDateFormat("dd HH:mm:ss").format(time));
if (protocol == Packet.Protocol.ICMP)
tvProtocol.setText("I");
else if (protocol == Packet.Protocol.TCP)
tvProtocol.setText("T");
else if (protocol == Packet.Protocol.UDP)
tvProtocol.setText("U");
else
tvProtocol.setText(protocol < 0 ? "" : Integer.toString(protocol));
tvPort.setText(port < 0 ? "" : Integer.toString(port));
tvFlags.setText(flags);
// Application icon
ApplicationInfo info = null;
@ -83,26 +98,13 @@ public class LogAdapter extends CursorAdapter {
Picasso.with(context).load(uri).into(ivIcon);
}
// Set values
tvTime.setText(new SimpleDateFormat("dd HH:mm:ss").format(time));
tvIP.setText(whois);
if (protocol == Packet.Protocol.ICMP)
tvProtocol.setText("I");
else if (protocol == Packet.Protocol.TCP)
tvProtocol.setText("T");
else if (protocol == Packet.Protocol.UDP)
tvProtocol.setText("U");
else
tvProtocol.setText(protocol < 0 ? "" : Integer.toString(protocol));
tvPort.setText(port < 0 ? "" : Integer.toString(port));
tvFlags.setText(flags);
tvUid.setText(uid < 0 ? "" : uid == 0 ? "root" : Integer.toString(uid % 100000));
if (connection == 0)
ivConnection.setImageDrawable(null);
else
ivConnection.setImageResource(connection == 1 ? R.drawable.wifi : R.drawable.other);
tvIP.setText(whois);
}
}

12
app/src/main/res/layout/log.xml
View File

@ -6,12 +6,6 @@
android:orientation="horizontal"
tools:context=".ActivityLog">
<ImageView
android:id="@+id/ivIcon"
android:layout_width="16dip"
android:layout_height="16dip"
android:layout_gravity="center_vertical" />
<TextView
android:id="@+id/tvTime"
android:layout_width="80dp"
@ -44,6 +38,12 @@
android:layout_marginStart="4dp"
android:textAppearance="@android:style/TextAppearance.Material.Small" />
<ImageView
android:id="@+id/ivIcon"
android:layout_width="16dip"
android:layout_height="16dip"
android:layout_gravity="center_vertical" />
<TextView
android:id="@+id/tvUid"
android:layout_width="44dp"