Browse Source

Changed the home fragment ui

Alexander Brakowski 10 years ago
parent
commit
dc7ac812dc

+ 27 - 0
res/drawable/panel_bg.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- Bottom 3dp Shadow -->
+    <item>
+        <shape android:shape="rectangle">
+
+            <solid android:color="#C7C6C5" />
+            <corners android:radius="4dp" />
+
+        </shape>
+    </item>
+
+    <!-- White Top color -->
+    <item android:bottom="4px">
+
+        <shape android:shape="rectangle">
+
+            <solid android:color="#FFFFFF" />
+            <corners android:radius="4dp" />
+
+
+        </shape>
+
+    </item>
+
+</layer-list>

+ 104 - 53
res/layout/fragment_home.xml

@@ -16,17 +16,45 @@
             android:layout_height="match_parent" />
     </FrameLayout>
 
-    <TextView
-        android:id="@+id/textView"
-        android:layout_width="match_parent"
+    <RelativeLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="5dp"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp"
-        android:layout_marginTop="5dp"
-        android:layout_weight="0"
-        android:text="Current connection"
-        android:textStyle="bold" />
+        android:weightSum="1"
+        android:baselineAligned="false">
+
+        <TextView
+            android:id="@+id/textView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Current connection"
+            android:textStyle="bold"
+            android:layout_centerVertical="true"
+            android:layout_alignParentRight="false"
+            android:layout_alignParentEnd="true"
+            android:layout_gravity="center_horizontal"
+            android:layout_weight="1"
+            android:layout_alignParentLeft="true"
+            android:layout_marginLeft="15dp" />
+
+        <Switch
+            android:id="@+id/switch1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_alignParentLeft="false"
+            android:layout_marginLeft="0dp"
+            android:layout_alignParentTop="false"
+            android:layout_marginTop="0dp"
+            android:layout_gravity="right"
+            android:layout_alignParentEnd="false"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentBottom="false"
+            android:layout_marginRight="15dp"
+            android:textSize="10sp"
+            android:checked="true" />
+
+    </RelativeLayout>
 
     <View
         android:layout_width="fill_parent"
@@ -37,21 +65,59 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="171dp"
         android:layout_marginLeft="15dp"
         android:layout_marginRight="15dp"
         android:orientation="vertical"
-        android:weightSum="1" >
+        android:weightSum="1"
+        android:layout_gravity="bottom">
 
-        <TextView
-            android:id="@+id/textView2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="20dp"
-            android:text="Eduroam"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textSize="26sp" />
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/textView5"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="This network is monitored by HosTaGe"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="@color/holo_dark_green"
+                android:textSize="11sp"
+                android:layout_gravity="center"
+                android:layout_below="@+id/textView2"
+                android:layout_centerHorizontal="true" />
+
+            <TextView
+                android:id="@+id/textView2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:text="Eduroam"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:textSize="26sp"
+                android:layout_alignParentTop="true"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="21dp" />
+
+            <ImageView
+                android:id="@+id/imageView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@android:drawable/presence_online"
+                android:layout_marginRight="10dp"
+                android:layout_alignBottom="@+id/textView5"
+                android:layout_toLeftOf="@+id/textView5" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/imageView2"
+                android:src="@android:drawable/ic_menu_info_details"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true" />
+        </RelativeLayout>
 
         <TextView
             android:id="@+id/textView3"
@@ -61,7 +127,8 @@
             android:text="Insecure"
             android:textAppearance="@android:style/TextAppearance.Holo.Small"
             android:textColor="@color/holo_red"
-            android:textSize="13sp" />
+            android:textSize="13sp"
+            android:layout_marginTop="10dp" />
 
         <TextView
             android:id="@+id/textView4"
@@ -73,47 +140,31 @@
             android:textSize="11sp" />
 
         <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="79dp"
-            android:layout_weight="0.32" >
+            android:layout_width="fill_parent"
+            android:layout_height="match_parent">
 
             <TextView
-                android:id="@+id/textView5"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:text="Active profile: "
+                android:id="@+id/textView6"
+                android:textStyle="bold"
+                android:textSize="11sp"
+                android:layout_alignParentTop="true"
                 android:layout_centerHorizontal="true"
-                android:layout_centerVertical="true"
-                android:text="This network is monitored by HosTaGe"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="@color/holo_dark_green"
-                android:textSize="11sp" />
+                android:layout_marginTop="10dp" />
 
-            <ImageView
-                android:id="@+id/imageView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="19dp"
-                android:layout_toLeftOf="@+id/textView5"
-                android:src="@android:drawable/presence_online" />
-
-            <Switch
-                android:id="@+id/switch1"
+            <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_centerHorizontal="true"
-                android:text="Monitoring:" />
+                android:text="Windows 7"
+                android:id="@+id/textView7"
+                android:textSize="11sp"
+                android:layout_below="@+id/textView6"
+                android:layout_centerHorizontal="true" />
 
         </RelativeLayout>
-    </LinearLayout>
 
-    <View
-        android:layout_width="fill_parent"
-        android:layout_height="1dp"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp"
-        android:layout_marginTop="10dp"
-        android:background="@android:color/darker_gray" />
+    </LinearLayout>
 
 </LinearLayout>

+ 27 - 0
src/de/tudarmstadt/informatik/hostage/ui2/fragment/ProfileManagerFragment.java

@@ -0,0 +1,27 @@
+package de.tudarmstadt.informatik.hostage.ui2.fragment;
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import de.tudarmstadt.informatik.hostage.R;
+
+/**
+ * @author Alexander Brakowski
+ * @created 14.01.14 15:05
+ */
+public class ProfileManagerFragment extends Fragment {
+
+    public ProfileManagerFragment(){}
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+
+        View rootView = inflater.inflate(R.layout.fragment_home, container, false);
+
+        return rootView;
+    }
+}