Skip to content

Commit

Permalink
intro view
Browse files Browse the repository at this point in the history
  • Loading branch information
@narseo
narseo committed Jul 31, 2012
1 parent d109820 commit a909195
Show file tree
Hide file tree
Showing 19 changed files with 285 additions and 126 deletions.
16 changes: 14 additions & 2 deletions SigcommDemoAndroid/AndroidManifest.xml
View file
Expand Up @@ -14,14 +14,26 @@
android:icon="@drawable/ic_launcher"
android:label="@string/app_name" >
<activity
android:name=".SigcommDemoAndroidActivity"
android:label="@string/app_name" >
android:name=".IntroView"
android:label="@string/app_name"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".SigcommDemoAndroidActivity"
android:label="@string/app_name"
android:screenOrientation="portrait">
<!-- <intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
-->
</activity>
<service android:label="BackgroundService" android:name="SigcommDemoAndroidService"></service>
</application>

Expand Down
Binary file added SigcommDemoAndroid/res/drawable-hdpi/cuni.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added SigcommDemoAndroid/res/drawable-hdpi/nots.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added SigcommDemoAndroid/res/drawable-hdpi/signpostlogo.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added SigcommDemoAndroid/res/drawable-ldpi/cuni.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added SigcommDemoAndroid/res/drawable-ldpi/nots.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added SigcommDemoAndroid/res/drawable-ldpi/signpostlogo.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added SigcommDemoAndroid/res/drawable-mdpi/cuni.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added SigcommDemoAndroid/res/drawable-mdpi/nots.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added SigcommDemoAndroid/res/drawable-mdpi/signpostlogo.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added SigcommDemoAndroid/res/drawable-xhdpi/cuni.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added SigcommDemoAndroid/res/drawable-xhdpi/nots.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added SigcommDemoAndroid/res/drawable-xhdpi/signpostlogo.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
176 changes: 55 additions & 121 deletions SigcommDemoAndroid/res/layout/main.xml
View file
Expand Up @@ -2,143 +2,77 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="#FFFFFFFF"
android:orientation="vertical" >


<!--
<EditText
android:id="@+id/latencyTextboxDownstream"
<TextView
android:id="@+id/textView3"
android:layout_width="match_parent"
android:layout_height="31dp"
android:layout_weight="0.16"
android:ems="10" />
android:layout_height="wrap_content"
android:height="36dp"
android:text=""
android:textAppearance="?android:attr/textAppearanceLarge" />

<EditText
android:id="@+id/latencyTextboxUpstream"
<TextView
android:id="@+id/textView1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10" />
android:text="Enter your (DNS) name:"
android:height="46dp"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="#000000" />

<EditText
android:id="@+id/goodputTextboxDownstream"
android:id="@+id/editText1"
android:layout_width="match_parent"
android:layout_height="28dp"
android:layout_weight="0.29"
android:ems="10" />
android:layout_height="wrap_content"
android:ems="10"
android:text=".signpo.st" />

<EditText
android:id="@+id/goodputTextboxUpstream"
<TextView
android:id="@+id/textView2"
android:layout_width="match_parent"
android:layout_height="28dp"
android:layout_weight="0.17"
android:ems="10" />
-->

<!--
<Button
android:id="@+id/startTest"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:layout_weight="0.25"
android:text="Start Test" />
<Button
android:id="@+id/stopTest"
android:layout_width="79dp"
android:layout_height="20dp"
android:layout_weight="0.26"
android:text="Stop Test" />
-->

<TableLayout
android:id="@+id/tableLayout1"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:stretchColumns="0,1">


<TableRow
android:id="@+id/tableRow2"
android:layout_width="fill_parent"
android:layout_height="wrap_content" >

<uk.ac.cam.cl.dtg.snowdon.AreaGraphView android:layout_width="wrap_content"
android:layout_height="120dp" android:id="@+id/graphGoodput"
android:layout_weight="1"/>

</TableRow>
android:layout_height="wrap_content"
android:text=""
android:textColor="#FF0000"
android:textAppearance="?android:attr/textAppearanceLarge" />

<TableRow
android:id="@+id/tableRow1"
android:layout_width="fill_parent"
android:layout_height="wrap_content" >

<uk.ac.cam.cl.dtg.snowdon.AreaGraphView android:layout_width="wrap_content"
android:layout_height="120dp" android:id="@+id/graphLatency"
android:layout_weight="1"/>

</TableRow>



<ImageButton
android:id="@+id/imageButton2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#FFFFFFFF"
android:src="@drawable/signpostlogo"
android:layout_gravity="center"/>



<TableRow
android:id="@+id/tableRow3"
android:layout_width="fill_parent"
android:layout_height="wrap_content" >

<uk.ac.cam.cl.dtg.snowdon.AreaGraphView android:layout_width="wrap_content"
android:layout_height="120dp" android:id="@+id/graphJitter"
android:layout_weight="1"/>

</TableRow>

<TableRow
android:id="@+id/tableRow1"
android:layout_width="fill_parent"
android:layout_height="wrap_content" >
<TextView
android:id="@+id/textView4"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:height="36dp"
android:text=""
android:textAppearance="?android:attr/textAppearanceLarge" />

<TextView
android:id="@+id/editText1"
android:layout_height="50dp"
android:layout_width="wrap_content"
android:text=""
android:textColor="#FFFFFF"
android:textAppearance="?android:attr/textAppearanceSmall" />

</TableRow>

</TableLayout>


<TableLayout
android:id="@+id/tableLayout2"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:stretchColumns="0,1">

<TableRow
android:id="@+id/tableRow4"
android:layout_width="fill_parent"
android:layout_height="wrap_content" >

<Button
android:id="@+id/startTest"
android:layout_column="0"
android:text="Start Test" />
<ImageView
android:id="@+id/imageView1"
android:layout_width="match_parent"
android:layout_height="30dp"
android:src="@drawable/cuni"/>

<Button
android:id="@+id/stopTest"
android:layout_column="1"
android:text="Stop Test" />
<TextView
android:id="@+id/textView5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:height="5dp"
android:text=""
android:textAppearance="?android:attr/textAppearanceLarge" />


</TableRow>

</TableLayout>

<ImageView
android:id="@+id/imageView2"
android:layout_width="match_parent"
android:layout_height="41dp"
android:src="@drawable/nots"
android:gravity="bottom"/>

</LinearLayout>
139 changes: 139 additions & 0 deletions SigcommDemoAndroid/res/layout/main2.xml
View file
@@ -0,0 +1,139 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">


<!--
<EditText
android:id="@+id/latencyTextboxDownstream"
android:layout_width="match_parent"
android:layout_height="31dp"
android:layout_weight="0.16"
android:ems="10" />
<EditText
android:id="@+id/latencyTextboxUpstream"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10" />
<EditText
android:id="@+id/goodputTextboxDownstream"
android:layout_width="match_parent"
android:layout_height="28dp"
android:layout_weight="0.29"
android:ems="10" />
<EditText
android:id="@+id/goodputTextboxUpstream"
android:layout_width="match_parent"
android:layout_height="28dp"
android:layout_weight="0.17"
android:ems="10" />
-->

<!--
<Button
android:id="@+id/startTest"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:layout_weight="0.25"
android:text="Start Test" />
<Button
android:id="@+id/stopTest"
android:layout_width="79dp"
android:layout_height="20dp"
android:layout_weight="0.26"
android:text="Stop Test" />
-->

<TableLayout
android:id="@+id/tableLayout1"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:stretchColumns="0,1">


<TableRow
android:id="@+id/tableRow1"
android:layout_width="fill_parent"
android:layout_height="wrap_content" >

<uk.ac.cam.cl.dtg.snowdon.AreaGraphView android:layout_width="wrap_content"
android:layout_height="120dp" android:id="@+id/graphGoodput"
android:layout_weight="1"/>

</TableRow>

<TableRow
android:id="@+id/tableRow2"
android:layout_width="fill_parent"
android:layout_height="wrap_content" >

<uk.ac.cam.cl.dtg.snowdon.AreaGraphView android:layout_width="wrap_content"
android:layout_height="120dp" android:id="@+id/graphLatency"
android:layout_weight="1"/>

</TableRow>

<TableRow
android:id="@+id/tableRow3"
android:layout_width="fill_parent"
android:layout_height="wrap_content" >

<uk.ac.cam.cl.dtg.snowdon.AreaGraphView android:layout_width="wrap_content"
android:layout_height="120dp" android:id="@+id/graphJitter"
android:layout_weight="1"/>

</TableRow>

<TableRow
android:id="@+id/tableRow1"
android:layout_width="fill_parent"
android:layout_height="wrap_content" >

<TextView
android:id="@+id/editText1"
android:layout_height="50dp"
android:layout_width="wrap_content"
android:text=""
android:textColor="#FFFFFF"
android:textAppearance="?android:attr/textAppearanceSmall" />

</TableRow>

</TableLayout>


<TableLayout
android:id="@+id/tableLayout2"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:stretchColumns="0,1">

<TableRow
android:id="@+id/tableRow4"
android:layout_width="fill_parent"
android:layout_height="wrap_content" >

<Button
android:id="@+id/startTest"
android:layout_column="0"
android:text="Start Test" />

<Button
android:id="@+id/stopTest"
android:layout_column="1"
android:text="Stop Test" />


</TableRow>

</TableLayout>


</LinearLayout>
2 changes: 1 addition & 1 deletion SigcommDemoAndroid/res/values/strings.xml
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="hello">Hello World, SigcommDemoAndroidActivity!</string>
<string name="app_name">Signpost Diagnosis</string>
<string name="app_name">Signpost Diagnosis Tool</string>
<string name="NS">http://schemas.android.com/apk/res/net.snowdon</string>
</resources>

0 comments on commit a909195

Please sign in to comment.