Skip to content

Commit

Permalink
[Android] change welcome page. (#792)
Browse files Browse the repository at this point in the history 
* Remove redundant code for segmentation.

* Classification Documentation and example improvement.

* Ocr Documentation and example improvement.

* 1.detection、face、seg module add "svPreview.enableCamera();".
2.java/android add fastdepolyUi module.

* examples/vision/ to add OCRv3.

* Modify UI directory name.

* Refresh examples\vision,change OCR README.md

* Update ui module

* Update ui module

* [Android] add enableCamera method.

* [Android] add welcome page.

* [Android] add text：“Power by EasyEdge”.

* [Android] change welcome page.

Co-authored-by: DefTruth <31974251+DefTruth@users.noreply.github.com>
  • Loading branch information
@WinterGeng @DefTruth
WinterGeng and DefTruth authored Dec 5, 2022
1 parent ea0bac4 commit 8b2f231
Show file tree
Hide file tree
Showing 7 changed files with 91 additions and 42 deletions.
Binary file added java/android/app/src/main/res/drawable/paddle_logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 15 additions & 7 deletions java/android/app/src/main/res/layout/classification_welcome.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
android:layout_marginTop="120dp"
android:background="@color/colorStartBtn"
android:gravity="center"
android:text="FastDeploy-Classification"
android:text="Classification"
android:textColor="@color/colorTextWrite"
android:textSize="25sp" />
android:textSize="30sp" />

<TextView
android:id="@+id/baidu"
Expand All @@ -35,7 +35,7 @@
android:layout_below="@id/model_text"
android:layout_centerHorizontal="true"
android:layout_marginTop="20dp"
android:text="百度"
android:text="百度FastDeploy"
android:textColor="@color/colorTextWrite"
android:textSize="22sp" />

Expand All @@ -45,9 +45,9 @@
android:layout_below="@id/baidu"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:text="Power by EasyEdge"
android:text="Powered by EasyEdge"
android:textColor="@color/colorTextWrite"
android:textSize="22sp" />
android:textSize="18sp" />

<Button

Expand All @@ -56,14 +56,22 @@
android:layout_height="50dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="50dp"
android:layout_marginBottom="70dp"
android:background="@drawable/round_corner_btn"
android:text="@string/start_ui_activity"
android:textColor="@color/colorTextWrite"
android:textSize="22sp"
android:onClick="startActivity"/>


<ImageView
android:id="@+id/logo"
android:layout_width="95dp"
android:layout_height="30dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="10dp"
android:background="@drawable/paddle_logo"
android:scaleType="centerCrop" />
</RelativeLayout>
</FrameLayout>

Expand Down
23 changes: 16 additions & 7 deletions java/android/app/src/main/res/layout/detection_welcome.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
android:layout_marginTop="120dp"
android:background="@color/colorStartBtn"
android:gravity="center"
android:text="FastDeploy-Detection"
android:text="Detection"
android:textColor="@color/colorTextWrite"
android:textSize="25sp" />
android:textSize="30sp" />

<TextView
android:id="@+id/baidu"
Expand All @@ -35,7 +35,7 @@
android:layout_below="@id/model_text"
android:layout_centerHorizontal="true"
android:layout_marginTop="20dp"
android:text="百度"
android:text="百度FastDeploy"
android:textColor="@color/colorTextWrite"
android:textSize="22sp" />

Expand All @@ -45,24 +45,33 @@
android:layout_below="@id/baidu"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:text="Power by EasyEdge"
android:text="Powered by EasyEdge"
android:textColor="@color/colorTextWrite"
android:textSize="22sp" />
android:textSize="18sp" />

<Button

android:id="@+id/start_ui_activity"
android:layout_width="200dp"
android:layout_height="50dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="50dp"
android:layout_marginBottom="70dp"
android:background="@drawable/round_corner_btn"
android:text="@string/start_ui_activity"
android:textColor="@color/colorTextWrite"
android:textSize="22sp"
android:onClick="startActivity"/>


<ImageView
android:id="@+id/logo"
android:layout_width="95dp"
android:layout_height="30dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="10dp"
android:background="@drawable/paddle_logo"
android:scaleType="centerCrop" />
</RelativeLayout>
</FrameLayout>

Expand Down
22 changes: 15 additions & 7 deletions java/android/app/src/main/res/layout/facedet_welcome.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
android:layout_marginTop="120dp"
android:background="@color/colorStartBtn"
android:gravity="center"
android:text="FastDeploy-FaceDet"
android:text="FaceDet"
android:textColor="@color/colorTextWrite"
android:textSize="25sp" />
android:textSize="30sp" />

<TextView
android:id="@+id/baidu"
Expand All @@ -35,7 +35,7 @@
android:layout_below="@id/model_text"
android:layout_centerHorizontal="true"
android:layout_marginTop="20dp"
android:text="百度"
android:text="百度FastDeploy"
android:textColor="@color/colorTextWrite"
android:textSize="22sp" />

Expand All @@ -45,9 +45,9 @@
android:layout_below="@id/baidu"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:text="Power by EasyEdge"
android:text="Powered by EasyEdge"
android:textColor="@color/colorTextWrite"
android:textSize="22sp" />
android:textSize="18sp" />

<Button

Expand All @@ -56,14 +56,22 @@
android:layout_height="50dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="50dp"
android:layout_marginBottom="70dp"
android:background="@drawable/round_corner_btn"
android:text="@string/start_ui_activity"
android:textColor="@color/colorTextWrite"
android:textSize="22sp"
android:onClick="startActivity"/>


<ImageView
android:id="@+id/logo"
android:layout_width="95dp"
android:layout_height="30dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="10dp"
android:background="@drawable/paddle_logo"
android:scaleType="centerCrop" />
</RelativeLayout>
</FrameLayout>

Expand Down
22 changes: 15 additions & 7 deletions java/android/app/src/main/res/layout/keypointdetection_welcome.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
android:layout_marginTop="120dp"
android:background="@color/colorStartBtn"
android:gravity="center"
android:text="FastDeploy-KeyPointDetection"
android:text="KeyPointDetection"
android:textColor="@color/colorTextWrite"
android:textSize="23sp" />
android:textSize="30sp" />

<TextView
android:id="@+id/baidu"
Expand All @@ -35,7 +35,7 @@
android:layout_below="@id/model_text"
android:layout_centerHorizontal="true"
android:layout_marginTop="20dp"
android:text="百度"
android:text="百度FastDeploy"
android:textColor="@color/colorTextWrite"
android:textSize="22sp" />

Expand All @@ -45,9 +45,9 @@
android:layout_below="@id/baidu"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:text="Power by EasyEdge"
android:text="Powered by EasyEdge"
android:textColor="@color/colorTextWrite"
android:textSize="22sp" />
android:textSize="18sp" />

<Button

Expand All @@ -56,14 +56,22 @@
android:layout_height="50dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="50dp"
android:layout_marginBottom="70dp"
android:background="@drawable/round_corner_btn"
android:text="@string/start_ui_activity"
android:textColor="@color/colorTextWrite"
android:textSize="22sp"
android:onClick="startActivity"/>


<ImageView
android:id="@+id/logo"
android:layout_width="95dp"
android:layout_height="30dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="10dp"
android:background="@drawable/paddle_logo"
android:scaleType="centerCrop" />
</RelativeLayout>
</FrameLayout>

Expand Down
22 changes: 15 additions & 7 deletions java/android/app/src/main/res/layout/ocr_welcome.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
android:layout_marginTop="120dp"
android:background="@color/colorStartBtn"
android:gravity="center"
android:text="FastDeploy-OCR"
android:text="OCR"
android:textColor="@color/colorTextWrite"
android:textSize="25sp" />
android:textSize="30sp" />

<TextView
android:id="@+id/baidu"
Expand All @@ -35,7 +35,7 @@
android:layout_below="@id/model_text"
android:layout_centerHorizontal="true"
android:layout_marginTop="20dp"
android:text="百度"
android:text="百度FastDeploy"
android:textColor="@color/colorTextWrite"
android:textSize="22sp" />

Expand All @@ -45,9 +45,9 @@
android:layout_below="@id/baidu"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:text="Power by EasyEdge"
android:text="Powered by EasyEdge"
android:textColor="@color/colorTextWrite"
android:textSize="22sp" />
android:textSize="18sp" />

<Button

Expand All @@ -56,14 +56,22 @@
android:layout_height="50dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="50dp"
android:layout_marginBottom="70dp"
android:background="@drawable/round_corner_btn"
android:text="@string/start_ui_activity"
android:textColor="@color/colorTextWrite"
android:textSize="22sp"
android:onClick="startActivity"/>


<ImageView
android:id="@+id/logo"
android:layout_width="95dp"
android:layout_height="30dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="10dp"
android:background="@drawable/paddle_logo"
android:scaleType="centerCrop" />
</RelativeLayout>
</FrameLayout>

Expand Down
22 changes: 15 additions & 7 deletions java/android/app/src/main/res/layout/segmentation_welcome.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
android:layout_marginTop="120dp"
android:background="@color/colorStartBtn"
android:gravity="center"
android:text="FastDeploy-Segmentation"
android:text="Segmentation"
android:textColor="@color/colorTextWrite"
android:textSize="25sp" />
android:textSize="30sp" />

<TextView
android:id="@+id/baidu"
Expand All @@ -35,7 +35,7 @@
android:layout_below="@id/model_text"
android:layout_centerHorizontal="true"
android:layout_marginTop="20dp"
android:text="百度"
android:text="百度FastDeploy"
android:textColor="@color/colorTextWrite"
android:textSize="22sp" />

Expand All @@ -45,9 +45,9 @@
android:layout_below="@id/baidu"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:text="Power by EasyEdge"
android:text="Powered by EasyEdge"
android:textColor="@color/colorTextWrite"
android:textSize="22sp" />
android:textSize="18sp" />

<Button

Expand All @@ -56,14 +56,22 @@
android:layout_height="50dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="50dp"
android:layout_marginBottom="70dp"
android:background="@drawable/round_corner_btn"
android:text="@string/start_ui_activity"
android:textColor="@color/colorTextWrite"
android:textSize="22sp"
android:onClick="startActivity"/>


<ImageView
android:id="@+id/logo"
android:layout_width="95dp"
android:layout_height="30dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="10dp"
android:background="@drawable/paddle_logo"
android:scaleType="centerCrop" />
</RelativeLayout>
</FrameLayout>

Expand Down

0 comments on commit 8b2f231

Please sign in to comment.