Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Android] change welcome page. #792

Merged
merged 48 commits into from
Dec 5, 2022
Merged

[Android] change welcome page. #792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
7f339a4
Remove redundant code for segmentation.
WinterGeng Nov 18, 2022
48d2a1b
Merge branch 'PaddlePaddle:develop' into gbd_android
WinterGeng Nov 19, 2022
d1eaee0
Merge branch 'develop' into gbd_android
DefTruth Nov 20, 2022
d2974f6
Merge remote-tracking branch 'origin/gbd_android' into gbd_android
WinterGeng Nov 21, 2022
b5d07e3
Merge branch 'PaddlePaddle:develop' into gbd_android
WinterGeng Nov 21, 2022
3033096
Merge branch 'PaddlePaddle:develop' into gbd_android
WinterGeng Nov 21, 2022
6107d59
Merge branch 'PaddlePaddle:develop' into gbd_android
WinterGeng Nov 22, 2022
e77b79e
Merge branch 'PaddlePaddle:develop' into gbd_android
WinterGeng Nov 22, 2022
40da422
Merge branch 'PaddlePaddle:develop' into gbd_android
WinterGeng Nov 23, 2022
9d58f32
Merge branch 'PaddlePaddle:develop' into gbd_android
WinterGeng Nov 23, 2022
30d18c6
Classification Documentation and example improvement.
WinterGeng Nov 23, 2022
1851eb9
Ocr Documentation and example improvement.
WinterGeng Nov 23, 2022
8e1e776
Merge branch 'develop' into gbd_android
DefTruth Nov 23, 2022
4ebf2ff
Merge branch 'develop' into gbd_android
DefTruth Nov 23, 2022
791e140
Modify submitted code.
WinterGeng Nov 24, 2022
f2cacaf
Modify submitted code.
WinterGeng Nov 24, 2022
a195485
Merge branch 'PaddlePaddle:develop' into gbd_android
WinterGeng Nov 24, 2022
3a59510
Merge branch 'PaddlePaddle:develop' into gbd_android
WinterGeng Nov 25, 2022
9acc8f9
1.detection、face、seg module add "svPreview.enableCamera();".
WinterGeng Nov 25, 2022
d4c6bae
Merge branch 'PaddlePaddle:develop' into gbd_android
WinterGeng Nov 25, 2022
138b1fa
change pekage name.
WinterGeng Nov 25, 2022
c757cc4
Merge branch 'PaddlePaddle:develop' into gbd_android
WinterGeng Nov 28, 2022
59853cc
Merge branch 'PaddlePaddle:develop' into gbd_android
WinterGeng Nov 29, 2022
58f0ef2
Merge branch 'develop' into gbd_android
DefTruth Nov 29, 2022
043f14c
Merge branch 'PaddlePaddle:develop' into gbd_android
WinterGeng Nov 29, 2022
9063869
Merge branch 'PaddlePaddle:develop' into gbd_android
WinterGeng Nov 29, 2022
18720f2
examples/vision/ to add OCRv3.
WinterGeng Nov 29, 2022
f69d3a0
Merge branch 'PaddlePaddle:develop' into gbd_android
WinterGeng Nov 29, 2022
86987a2
Merge branch 'PaddlePaddle:develop' into gbd_android
WinterGeng Nov 29, 2022
b0b0b74
Modify UI directory name.
WinterGeng Nov 29, 2022
33ff536
Merge branch 'develop' into gbd_android
DefTruth Nov 29, 2022
712df08
Merge branch 'PaddlePaddle:develop' into gbd_android
WinterGeng Nov 29, 2022
5416541
Merge branch 'PaddlePaddle:develop' into gbd_android
WinterGeng Nov 29, 2022
0306489
Refresh examples\vision,change OCR README.md
WinterGeng Nov 29, 2022
888577c
Update ui module
WinterGeng Nov 29, 2022
ddf3556
Update ui module
WinterGeng Nov 29, 2022
c1081ef
Merge branch 'develop' into gbd_android
WinterGeng Nov 29, 2022
64320ae
Merge branch 'PaddlePaddle:develop' into gbd_android
WinterGeng Nov 30, 2022
b285bfd
[Android] add enableCamera method.
WinterGeng Nov 30, 2022
93f888f
Merge branch 'PaddlePaddle:develop' into gbd_android
WinterGeng Nov 30, 2022
7262123
Merge branch 'PaddlePaddle:develop' into gbd_android
WinterGeng Dec 1, 2022
78ad3d7
[Android] add welcome page.
WinterGeng Dec 1, 2022
1417bfa
Merge branch 'PaddlePaddle:develop' into gbd_android
WinterGeng Dec 1, 2022
0eb643d
[Android] add text：“Power by EasyEdge”.
WinterGeng Dec 1, 2022
5668b02
Merge branch 'PaddlePaddle:develop' into gbd_android
WinterGeng Dec 1, 2022
dc90276
Merge branch 'PaddlePaddle:develop' into gbd_android
WinterGeng Dec 5, 2022
a2ea4d3
[Android] change welcome page.
WinterGeng Dec 5, 2022
155a30c
Merge branch 'develop' into gbd_android
DefTruth Dec 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added java/android/app/src/main/res/drawable/paddle_logo.png
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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