Skip to content

Commit

Permalink
Merge pull request #64 from RedCarrottt/developing-android
Browse files Browse the repository at this point in the history 
Update companion-side sensor UI and fix Wi-fi direct problem
  • Loading branch information
@RedCarrottt
RedCarrottt authored Dec 1, 2017
2 parents 5e9e41f + d034932 commit 10d7dd3
Show file tree
Hide file tree
Showing 9 changed files with 462 additions and 320 deletions.
2 changes: 1 addition & 1 deletion Ant-Manager/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
<activity android:name="com.ant.ant_manager.view.remoteui.RemoteNotiUIActivity"/>
<activity android:name="com.ant.ant_manager.view.AppManagerActivity"/>
<activity android:name="com.ant.ant_manager.view.remoteui.RemoteConfigUIActivity"/>
<activity android:name="com.ant.ant_manager.view.BasicSensorViewerActivity"/>
<activity android:name="com.ant.ant_manager.view.MotionClassifierActivity"/>
<activity android:name="com.ant.ant_manager.view.SensorViewerActivity"/>
<activity
android:name="com.ant.ant_manager.view.ImageClassifierActivity"
android:label="@string/app_name"
Expand Down
289 changes: 103 additions & 186 deletions Ant-Manager/res/layout/activity_motion_classifier.xml
View file
Original file line number Diff line number Diff line change
@@ -1,188 +1,105 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="match_parent"

tools:context="com.ant.graphtest.MainActivity" >

<ScrollView
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#f6f792"
android:orientation="vertical">

<TextView
android:id="@+id/textView11"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="TextView"
android:textSize="18sp"
android:textColor="#000000"/>

<com.jjoe64.graphview.GraphView
android:id="@+id/graph1"
android:layout_width="match_parent"
android:layout_height="100dip"

android:layout_marginLeft="0dp" />

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#a0e0a9"
android:orientation="vertical" >

<TextView
android:id="@+id/textView22"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#000000"
android:text="TextView"
android:textSize="18sp"/>

<TextView
android:id="@+id/textViewClassified"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="Result: "
android:textSize="36sp"
android:textColor="#000000"/>

<com.jjoe64.graphview.GraphView
android:id="@+id/graph2"
android:layout_width="match_parent"
android:layout_height="100dip"
android:layout_marginTop="5dp"
android:paddingTop="0dp" />

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#ed7b76"
android:orientation="vertical" >

<TextView
android:id="@+id/textView33"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="TextView"
android:textSize="18sp"
android:textColor="#000000"/>

<com.jjoe64.graphview.GraphView
android:id="@+id/graph3"
android:layout_width="match_parent"
android:layout_height="100dip"
android:layout_marginTop="5dp"
android:paddingTop="0dp" />

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#f8bf7b"
android:orientation="vertical" >

<TextView
android:id="@+id/textView4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="TextView"
android:textSize="18sp"
android:textColor="#000000"/>

<com.jjoe64.graphview.GraphView
android:id="@+id/graph4"
android:layout_width="match_parent"
android:layout_height="100dip"
android:layout_marginTop="5dp"
android:paddingTop="0dp" />

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#5ea0a4"
android:orientation="vertical" >

<TextView
android:id="@+id/textView5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="TextView"
android:textSize="18sp"
android:textColor="#000000"/>

<com.jjoe64.graphview.GraphView
android:id="@+id/graph5"
android:layout_width="match_parent"
android:layout_height="100dip"
android:layout_marginTop="5dp"
android:paddingTop="0dp" />

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#ff4f5c"
android:orientation="vertical" >

<TextView
android:id="@+id/textView6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="TextView"
android:textSize="18sp"
android:textColor="#000000"/>

<com.jjoe64.graphview.GraphView
android:id="@+id/graph6"
android:layout_width="match_parent"
android:layout_height="100dip"
android:layout_marginTop="5dp"
android:paddingTop="0dp" />

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#00ada7"
android:orientation="vertical" >

<TextView
android:id="@+id/textView7"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="TextView"
android:textSize="18sp"
android:textColor="#000000"/>

<com.jjoe64.graphview.GraphView
android:id="@+id/graph7"
android:layout_width="match_parent"
android:layout_height="100dip"
android:layout_marginTop="5dp"
android:paddingTop="0dp" />

</LinearLayout>
</LinearLayout>
</ScrollView>
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="match_parent"

tools:context="com.ant.graphtest.MainActivity">

<ScrollView
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="#f8bf7b">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#f6f792"
android:orientation="vertical">

<TextView
android:id="@+id/accXTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textColor="#000000"
android:textSize="18sp"/>

<com.jjoe64.graphview.GraphView
android:id="@+id/accXGraphView"
android:layout_width="match_parent"
android:layout_height="100dip"

android:layout_marginLeft="0dp"/>

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#a0e0a9"
android:orientation="vertical">

<TextView
android:id="@+id/accYTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#000000"
android:textSize="18sp"/>


<com.jjoe64.graphview.GraphView
android:id="@+id/accYGraphView"
android:layout_width="match_parent"
android:layout_height="100dip"
android:layout_marginTop="5dp"
android:paddingTop="0dp"/>

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#ed7b76"
android:orientation="vertical">

<TextView
android:id="@+id/accZTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="TextView"
android:textColor="#000000"
android:textSize="18sp"/>

<com.jjoe64.graphview.GraphView
android:id="@+id/accZGraphView"
android:layout_width="match_parent"
android:layout_height="100dip"
android:layout_marginTop="5dp"
android:paddingTop="0dp"/>

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#f8bf7b"
android:orientation="vertical">

<TextView
android:id="@+id/textViewClassified"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="Loading..."
android:textColor="#000000"
android:textSize="72sp"/>
</LinearLayout>

</LinearLayout>
</ScrollView>
</RelativeLayout>
Loading

0 comments on commit 10d7dd3

Please sign in to comment.