diff --git a/ID-Photo-DIY/README.md b/ID-Photo-DIY/README.md
index e461eeb..41d482d 100644
--- a/ID-Photo-DIY/README.md
+++ b/ID-Photo-DIY/README.md
@@ -18,8 +18,8 @@ It uses image segmentation function of Huawei Machine Learning SDK. It uses stil
 ## Configuration
 To use functions provided by packages in examples, You need to add the dependencies to the build.gradle file as follows:
 
-    implementation 'com.huawei.hms:ml-computer-vision-image-segmentation-body-model:1.0.2.301'
-    implementation 'com.huawei.hms:ml-computer-vision:1.0.2.300'
+    implementation 'com.huawei.hms:ml-computer-vision-image-segmentation-body-model:1.0.3.300'
+    implementation 'com.huawei.hms:ml-computer-vision-segmentation:1.0.3.300'
 
 ## Supported Environments
 android 4.4 or a later version is recommended.
diff --git a/ID-Photo-DIY/app/build.gradle b/ID-Photo-DIY/app/build.gradle
index fb6ca0c..53199e8 100644
--- a/ID-Photo-DIY/app/build.gradle
+++ b/ID-Photo-DIY/app/build.gradle
@@ -32,6 +32,6 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.huawei.hms:ml-computer-vision:1.0.2.300'
-    implementation 'com.huawei.hms:ml-computer-vision-image-segmentation-body-model:1.0.2.301'
+    implementation 'com.huawei.hms:ml-computer-vision-segmentation:1.0.3.300'
+    implementation 'com.huawei.hms:ml-computer-vision-image-segmentation-body-model:1.0.3.300'
 }
diff --git a/MLKit-Sample/README.md b/MLKit-Sample/README.md
index 988333e..1b708e8 100644
--- a/MLKit-Sample/README.md
+++ b/MLKit-Sample/README.md
@@ -47,26 +47,24 @@ You only need to modify the applicationId in app HUAWEI-HMS-MLKit-Sample
 
 
 ## Installation
-You can find the app-release.apk in code->releases->app-release.apk, you can download the APK, copy it to your phone, install and experience it. if you have installed adb on your computer, open the cmd window and install the application on your phone through adb install app-release. apk.
-
 Download the HUAWEI-HMS-MLKit-Sample code and open in Android Studio, after ensuring that your device is connected to the network, obtain the apk through build.
 
 
 ## Configuration
 To use functions provided by packages in examples, You need to add the dependencies to the build.gradle file as follows:
 
-    implementation 'com.huawei.hms:ml-computer-vision-ocr-cn-model:1.0.2.300'
-    implementation 'com.huawei.hms:ml-computer-vision-ocr-jk-model:1.0.2.300'
-    implementation 'com.huawei.hms:ml-computer-vision-ocr-latin-model:1.0.2.300'
-    implementation 'com.huawei.hms:ml-computer-vision-image-classification-model:1.0.2.300'
-    implementation 'com.huawei.hms:ml-computer-vision-object-detection-model:1.0.2.300'
-    implementation 'com.huawei.hms:ml-computer-vision-face-recognition-model:1.0.2.300'
-    implementation 'com.huawei.hms:ml-computer-card-icr-cn-model:1.0.2.300'
-    implementation 'com.huawei.hms:ml-computer-vision-image-segmentation-model:1.0.2.300'
-    implementation 'com.huawei.hms:ml-computer-vision:1.0.2.300'
-    implementation 'com.huawei.hms:ml-computer-translate:1.0.2.300'
-    implementation 'com.huawei.hms:ml-computer-card-icr-cn-plugin:1.0.2.300'
-    implementation 'com.huawei.hms:ml-computer-language-detection:1.0.2.300'
+    implementation 'com.huawei.hms:ml-computer-vision-ocr-cn-model:1.0.3.300'
+    implementation 'com.huawei.hms:ml-computer-vision-ocr-jk-model:1.0.3.300'
+    implementation 'com.huawei.hms:ml-computer-vision-ocr-latin-model:1.0.3.300'
+    implementation 'com.huawei.hms:ml-computer-vision-image-classification-model:1.0.3.300'
+    implementation 'com.huawei.hms:ml-computer-vision-object-detection-model:1.0.3.300'
+    implementation 'com.huawei.hms:ml-computer-vision-face-recognition-model:1.0.3.300'
+    implementation 'com.huawei.hms:ml-computer-card-icr-cn-model:1.0.3.300'
+    implementation 'com.huawei.hms:ml-computer-vision-image-segmentation-model:1.0.3.300'
+    implementation 'com.huawei.hms:ml-computer-vision:1.0.3.300'
+    implementation 'com.huawei.hms:ml-computer-translate:1.0.3.300'
+    implementation 'com.huawei.hms:ml-computer-card-icr-cn-plugin:1.0.3.300'
+    implementation 'com.huawei.hms:ml-computer-language-detection:1.0.3.300'
 
 ## Supported Environments
 android 4.4 or a later version is recommended.
@@ -81,26 +79,24 @@ Sample code majors activitys as follows:
    2. Choose LoadPhotoActivity to see a demo of the following:
 	  - Image Segmentation(Segments the pixels representing specific elements (such as human body, plant, and sky) from an image)
    3. Choose IDCardRecognitionActivity to see a demo of the following:
-      - Product Visual Search(Recognizes product information such as the product category in an image)
-   4. Choose IDIdentificationActivity to see a demo of the following:
       - Chinese IDCard Recognition(Recognizes text in images of second-generation ID cards of Chinese mainland residents)
-   5. Choose ObjectDetectionActivity to see a demo of the following:
+   4. Choose ObjectDetectionActivity to see a demo of the following:
       - Object detection (Detects and tracks an object in images or video streams)
-   6. Choose ImageClassificationActivity to see a demo of the following:
+   5. Choose ImageClassificationActivity to see a demo of the following:
       - Image Classification(Classifies entities in images, such as people, objects, environments, activities, or artwork to define image themes and application scenarios)
-   7. Choose FaceDetectionActivity to see a demo of the following:
+   6. Choose FaceDetectionActivity to see a demo of the following:
       - Face detection (Detects and tracks faces)
       - Camera front and back flip
-   8. Choose TranslatorActivity to see a demo of the following:
+   7. Choose TranslatorActivity to see a demo of the following:
       - Language translation function
       - Automatic language monitoring for input text
       - Multi language support
-   9. Choose TextRecognitionActivity to see a demo of the following:
+   8. Choose TextRecognitionActivity to see a demo of the following:
       - Dynamic and real-time text recognition
       - Take photos after identifying words
       - Generated photos can be zoomed
       - It can load photos in the local album and parse the text in the photos (Cloud)
-   10. Choose CloudDetectionActivity to see a demo of the following:
+   9. Choose CloudDetectionActivity to see a demo of the following:
       - Document text recognition (Cloud)
       - Landmark recognition (Cloud)
 
diff --git a/MLKit-Sample/app/.gitignore b/MLKit-Sample/app/.gitignore
deleted file mode 100644
index e8091cc..0000000
--- a/MLKit-Sample/app/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/build
-/gradle
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/AllFunctionActivity.java b/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/AllFunctionActivity.java
deleted file mode 100644
index 2ca738f..0000000
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/AllFunctionActivity.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package com.mlkit.sample.activity;
-
-import android.graphics.Color;
-import android.os.Bundle;
-import android.view.View;
-
-import android.widget.TextView;
-
-import com.mlkit.sample.R;
-import com.mlkit.sample.activity.adapter.TabFragmentAdapter;
-import com.mlkit.sample.activity.fragment.LanguageCategoryFragment;
-import com.mlkit.sample.activity.fragment.OtherCategoryFragment;
-import com.mlkit.sample.activity.fragment.PictureCategoryFragment;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import androidx.fragment.app.Fragment;
-import androidx.viewpager.widget.ViewPager;
-
-public class AllFunctionActivity extends BaseActivity implements View.OnClickListener {
-
-    private List<Fragment> mFragmentList;
-    private TextView mBgChangeTv;
-    private TextView mCaptureImgTv;
-    private TextView mSliceTv;
-    private ViewPager mViewPager;
-    private View mBgChangeLine;
-    private View mCaptureImgLine;
-    private View mSliceLine;
-    private TabFragmentAdapter mAdapter;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        this.setContentView(R.layout.activity_all_function);
-        this.initView();
-        this.setStatusBar();
-        this.setStatusBarFontColor();
-    }
-
-    private void initView() {
-        this.findViewById(R.id.back).setOnClickListener(this);
-        this.mBgChangeTv = this.findViewById(R.id.fragment_one);
-        this.mCaptureImgTv = this.findViewById(R.id.fragment_two);
-        this.mSliceTv = this.findViewById(R.id.fragment_three);
-        this.mBgChangeLine = this.findViewById(R.id.line_one);
-        this.mCaptureImgLine = this.findViewById(R.id.line_two);
-        this.mSliceLine = this.findViewById(R.id.line_three);
-        this.mBgChangeTv.setOnClickListener(this);
-        this.mCaptureImgTv.setOnClickListener(this);
-        this.mSliceTv.setOnClickListener(this);
-        this.mViewPager = this.findViewById(R.id.view_pager);
-        // Bind click event.
-        this.mViewPager.setOnPageChangeListener(new PagerChangeListener());
-        // Add fragment to the collection list.
-        this.mFragmentList = new ArrayList<>();
-        this.mFragmentList.add(new PictureCategoryFragment());
-        this.mFragmentList.add(new LanguageCategoryFragment());
-        this.mFragmentList.add(new OtherCategoryFragment());
-
-        this.mAdapter = new TabFragmentAdapter(this.getSupportFragmentManager(), this.mFragmentList);
-        this.mViewPager.setAdapter(this.mAdapter);
-        this.mViewPager.setCurrentItem(0);
-
-    }
-
-    @Override
-    public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.fragment_one:
-                this.mViewPager.setCurrentItem(0);
-                this.setBgChangeView();
-                break;
-            case R.id.fragment_two:
-                this.mViewPager.setCurrentItem(1);
-                this.setCaptureImageView();
-                break;
-            case R.id.fragment_three:
-                this.mViewPager.setCurrentItem(2);
-                this.setSliceImageView();
-                break;
-            case R.id.back:
-                this.finish();
-                break;
-            default:
-                break;
-        }
-    }
-
-    private void setBgChangeView() {
-        this.mBgChangeTv.setTextColor(this.getResources().getColor(R.color.button_background));
-        this.mCaptureImgTv.setTextColor(Color.BLACK);
-        this.mSliceTv.setTextColor(Color.BLACK);
-        this.mBgChangeLine.setVisibility(View.VISIBLE);
-        this.mCaptureImgLine.setVisibility(View.GONE);
-        this.mSliceLine.setVisibility(View.GONE);
-    }
-
-    private void setCaptureImageView() {
-        this.mBgChangeTv.setTextColor(Color.BLACK);
-        this.mCaptureImgTv.setTextColor(this.getResources().getColor(R.color.button_background));
-        this.mSliceTv.setTextColor(Color.BLACK);
-        this.mBgChangeLine.setVisibility(View.GONE);
-        this.mCaptureImgLine.setVisibility(View.VISIBLE);
-        this.mSliceLine.setVisibility(View.GONE);
-    }
-
-    private void setSliceImageView() {
-        this.mBgChangeTv.setTextColor(Color.BLACK);
-        this.mCaptureImgTv.setTextColor(Color.BLACK);
-        this.mSliceTv.setTextColor(this.getResources().getColor(R.color.button_background));
-        this.mBgChangeLine.setVisibility(View.GONE);
-        this.mCaptureImgLine.setVisibility(View.GONE);
-        this.mSliceLine.setVisibility(View.VISIBLE);
-    }
-
-    /**
-     * Set a ViewPager listening event. When the ViewPager is swiped left or right, the menu bar selected state changes accordingly.
-     */
-    public class PagerChangeListener implements ViewPager.OnPageChangeListener {
-
-        @Override
-        public void onPageScrollStateChanged(int arg0) {
-        }
-
-        @Override
-        public void onPageScrolled(int arg0, float arg1, int arg2) {
-        }
-
-        @Override
-        public void onPageSelected(int position) {
-            switch (position) {
-                case 0:
-                    AllFunctionActivity.this.setBgChangeView();
-                    break;
-                case 1:
-                    AllFunctionActivity.this.setCaptureImageView();
-                    break;
-                case 2:
-                    AllFunctionActivity.this.setSliceImageView();
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-
-    public void onBackPressed(View view) {
-        this.finish();
-    }
-}
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/fragment/BaseFragment.java b/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/fragment/BaseFragment.java
deleted file mode 100644
index fbd1f05..0000000
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/fragment/BaseFragment.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package com.mlkit.sample.activity.fragment;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.GridView;
-
-import com.mlkit.sample.R;
-import com.mlkit.sample.activity.adapter.GridViewAdapter;
-import com.mlkit.sample.activity.entity.GridViewItem;
-
-
-import java.util.ArrayList;
-
-import androidx.fragment.app.Fragment;
-
-public abstract class BaseFragment extends Fragment {
-
-    protected GridView mGridView;
-    private GridViewAdapter mAdapter;
-    protected ArrayList<GridViewItem> mDataList;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_picture, container, false);
-        this.initData();
-        this.mGridView = view.findViewById(R.id.gridview);
-        this.mAdapter = new GridViewAdapter(this.mDataList, this.getContext());
-        this.mGridView.setAdapter(this.mAdapter);
-        this.initClickEvent(view);
-        return view;
-    }
-
-    protected abstract void initClickEvent(View view);
-
-    protected abstract void initData();
-}
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/fragment/LanguageCategoryFragment.java b/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/fragment/LanguageCategoryFragment.java
deleted file mode 100644
index c47cda2..0000000
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/fragment/LanguageCategoryFragment.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package com.mlkit.sample.activity.fragment;
-
-import android.content.Intent;
-import android.view.View;
-import android.widget.AdapterView;
-
-import com.mlkit.sample.R;
-import com.mlkit.sample.activity.TranslatorActivity;
-import com.mlkit.sample.activity.entity.GridViewItem;
-
-import java.util.ArrayList;
-
-public class LanguageCategoryFragment extends BaseFragment {
-
-    private static final int[] language_icons = {R.drawable.icon_translate};
-
-    private static final int[] language_titles = {R.string.translate};
-
-    @Override
-    protected void initClickEvent(View view) {
-        if (this.mGridView == null) {
-            return;
-        }
-        this.mGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                switch (position) {
-                    case 0:
-                        LanguageCategoryFragment.this.startActivity(new Intent(LanguageCategoryFragment.this.getActivity(), TranslatorActivity.class));
-                        break;
-                    default:
-                        break;
-                }
-            }
-        });
-    }
-
-    @Override
-    protected void initData() {
-        this.mDataList = new ArrayList<GridViewItem>();
-        GridViewItem item;
-        for (int i = 0; i < LanguageCategoryFragment.language_icons.length; i++) {
-            item = new GridViewItem(LanguageCategoryFragment.language_icons[i], LanguageCategoryFragment.language_titles[i]);
-            this.mDataList.add(item);
-        }
-    }
-}
-
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/fragment/PictureCategoryFragment.java b/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/fragment/PictureCategoryFragment.java
deleted file mode 100644
index 76d96ae..0000000
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/fragment/PictureCategoryFragment.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package com.mlkit.sample.activity.fragment;
-
-import android.content.Intent;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.Toast;
-
-import com.mlkit.sample.R;
-import com.mlkit.sample.activity.RemoteDetectionActivity;
-import com.mlkit.sample.activity.FaceDetectionActivity;
-import com.mlkit.sample.activity.IDCardRecognitionActivity;
-import com.mlkit.sample.activity.ImageClassificationActivity;
-import com.mlkit.sample.activity.ObjectDetectionActivity;
-import com.mlkit.sample.activity.TextRecognitionActivity;
-import com.mlkit.sample.activity.entity.GridViewItem;
-import com.mlkit.sample.activity.imgseg.ImageSegmentationActivity;
-import com.mlkit.sample.util.Constant;
-
-import java.util.ArrayList;
-
-public class PictureCategoryFragment extends BaseFragment {
-
-    private static final int[] image_icons = {R.drawable.icon_segmentation, R.drawable.icon_face,
-            R.drawable.icon_shopping, R.drawable.icon_object, R.drawable.icon_classification,
-            R.drawable.icon_landmark, R.drawable.icon_text, R.drawable.icon_idcard};
-
-    private static final int[] image_titles = {R.string.image_segmentation, R.string.face_detection,
-            R.string.photographed_shopping, R.string.object_detection, R.string.image_classification,
-            R.string.landmark, R.string.text_detection, R.string.idcard_recognition};
-
-    @Override
-    protected void initClickEvent(View view) {
-        if(this.mGridView == null){
-            return;
-        }
-        this.mGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            Intent intent = null;
-
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                switch (position) {
-                    case 0:
-                        // Image Segmentation
-                        PictureCategoryFragment.this.startActivity(
-                                new Intent(PictureCategoryFragment.this.getActivity(), ImageSegmentationActivity.class));
-                        break;
-                    case 1:
-                        // Face detection
-                        PictureCategoryFragment.this.startActivity(
-                                new Intent(PictureCategoryFragment.this.getActivity(), FaceDetectionActivity.class));
-                        break;
-                    case 2:
-                        // Product Visual Search
-                        Toast.makeText(PictureCategoryFragment.this.getActivity(), PictureCategoryFragment.this.getText(R.string.coming_soon), Toast.LENGTH_SHORT).show();
-                        break;
-                    case 3:
-                        // Object detection and tracking
-                        PictureCategoryFragment.this.startActivity(
-                                new Intent(PictureCategoryFragment.this.getActivity(), ObjectDetectionActivity.class));
-                        break;
-                    case 4:
-                        // Image classification
-                        PictureCategoryFragment.this.startActivity(
-                                new Intent(PictureCategoryFragment.this.getActivity(), ImageClassificationActivity.class));
-                        break;
-                    case 5:
-                        // Landmark recognition
-                        this.intent =
-                                new Intent(PictureCategoryFragment.this.getActivity(), RemoteDetectionActivity.class);
-                        this.intent.putExtra(Constant.MODEL_TYPE, Constant.CLOUD_LANDMARK_DETECTION);
-                        PictureCategoryFragment.this.startActivity(this.intent);
-                        break;
-                    case 6:
-                        // Text recognition
-                        PictureCategoryFragment.this.startActivity(
-                                new Intent(PictureCategoryFragment.this.getActivity(), TextRecognitionActivity.class));
-                        break;
-                    case 7:
-                        // Card recognition
-                        PictureCategoryFragment.this.startActivity(
-                                new Intent(PictureCategoryFragment.this.getActivity(), IDCardRecognitionActivity.class));
-                        break;
-                    default:
-                        break;
-                }
-            }
-        });
-    }
-
-    @Override
-    protected void initData() {
-        this.mDataList = new ArrayList<GridViewItem>();
-        GridViewItem item;
-        for (int i = 0; i < PictureCategoryFragment.image_icons.length; i++) {
-            item = new GridViewItem(PictureCategoryFragment.image_icons[i], PictureCategoryFragment.image_titles[i]);
-            this.mDataList.add(item);
-        }
-    }
-}
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/util/EdgeDetection.java b/MLKit-Sample/app/src/main/java/com/mlkit/sample/util/EdgeDetection.java
deleted file mode 100644
index 801015d..0000000
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/util/EdgeDetection.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**
- * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package com.mlkit.sample.util;
-
-public class EdgeDetection {
-    int label;
-    int[][] array;
-    boolean[][] isEdgeArray;
-
-    public EdgeDetection() {
-    }
-
-    public EdgeDetection(int[][] array, boolean[][] isEdgeArray) {
-        if (array != null) {
-            this.array = array.clone();
-        }
-        if (isEdgeArray != null) {
-            this.isEdgeArray = isEdgeArray.clone();
-        }
-    }
-
-    public void setArray(int[][] array) {
-        if (array != null) {
-            this.array = array.clone();
-        }
-    }
-
-    public int[][] getArray() {
-        return this.array.clone();
-    }
-
-    public boolean[][] getIsEdgeArray() {
-        return this.isEdgeArray.clone();
-    }
-
-    public void setIsEdgeArray(boolean[][] isEdgeArray) {
-        if (isEdgeArray != null) {
-            this.isEdgeArray = isEdgeArray.clone();
-        }
-    }
-
-    public int getLabel() {
-        return this.label;
-    }
-
-    public void setLabel(int label) {
-        this.label = label;
-    }
-
-    /**
-     * Detect all pixels and output the judgment result of each pixel.
-     */
-    public boolean[] detect() {
-        for (int row = 0; row < this.array.length; row++) {
-            for (int col = 0; col < this.array[0].length; col++) {
-                this.isEdgeArray[row][col] = this.isEdge(row, col);
-            }
-        }
-        return this.twoToOneArray();
-    }
-
-    /**
-     * Whether it is the edge point of the specified segmentation type.
-     * Condition 1: The current pixel is the category to be segmented.
-     * Condition 2: There are pixels of other segmentation types around.
-     */
-    public boolean isEdge(int row, int col) {
-        if (!this.isSelectedLabel(row, col)) {
-            return false;
-        }
-        return this.isOthersSurrouding(row, col);
-    }
-
-    /**
-     * Detection condition 1, detecting whether the current pixel is a segmentation type to be identified.
-     */
-    private boolean isSelectedLabel(int row, int col) {
-        int currentLabel = this.array[row][col];
-        return currentLabel == this.label;
-    }
-
-    /**
-     * Detection condition 2, traverse the surrounding pixels to check if there are other segmentation types.
-     */
-    private boolean isOthersSurrouding(int row, int col) {
-        int[] xInterval = {-1, -1, -1, 0, 0, 1, 1, 1};
-        int[] yInterval = {-1, 0, 1, -1, 1, -1, 0, 1};
-        for (int index = 0; index < xInterval.length; index++) {
-            int currentX = row + xInterval[index];
-            int currentY = col + yInterval[index];
-            if (currentX >= 0 && currentX < this.array.length && currentY >= 0 && currentY < this.array[0].length) {
-                if (!this.isSelectedLabel(currentX, currentY)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Convert two-dimensional array to one-dimensional array.
-     */
-    private boolean[] twoToOneArray() {
-        boolean[] result = new boolean[this.isEdgeArray.length * this.isEdgeArray[0].length];
-        int index = 0;
-        for (boolean[] tmp : this.isEdgeArray) {
-            for (boolean value : tmp) {
-                result[index++] = value;
-            }
-        }
-        return result;
-    }
-}
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxhdpi/icon_document.png b/MLKit-Sample/app/src/main/res/drawable-xxhdpi/icon_document.png
deleted file mode 100644
index 80ecbdf..0000000
Binary files a/MLKit-Sample/app/src/main/res/drawable-xxhdpi/icon_document.png and /dev/null differ
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxxhdpi/icon_document.png b/MLKit-Sample/app/src/main/res/drawable-xxxhdpi/icon_document.png
deleted file mode 100644
index 8da0ef4..0000000
Binary files a/MLKit-Sample/app/src/main/res/drawable-xxxhdpi/icon_document.png and /dev/null differ
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxxhdpi/icon_more.png b/MLKit-Sample/app/src/main/res/drawable-xxxhdpi/icon_more.png
deleted file mode 100644
index c75a547..0000000
Binary files a/MLKit-Sample/app/src/main/res/drawable-xxxhdpi/icon_more.png and /dev/null differ
diff --git a/MLKit-Sample/app/src/main/res/layout-land/activity_start.xml b/MLKit-Sample/app/src/main/res/layout-land/activity_start.xml
deleted file mode 100644
index 2d185ba..0000000
--- a/MLKit-Sample/app/src/main/res/layout-land/activity_start.xml
+++ /dev/null
@@ -1,399 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#f2f2f2"
-    android:fitsSystemWindows="true">
-
-    <RelativeLayout
-        android:id="@+id/logo"
-        android:layout_width="match_parent"
-        android:layout_height="80dp"
-        android:layout_alignParentTop="true"
-        android:background="#003853"
-        android:scaleType="fitXY">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="200dp"
-            android:text="MACHINE  LEARNING"
-            android:textColor="@android:color/white"
-            android:textSize="25sp"></TextView>
-
-        <ImageView
-            android:layout_width="80dp"
-            android:layout_height="80dp"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="50dp"
-            android:src="@drawable/icon_logo"></ImageView>
-    </RelativeLayout>
-
-    <ImageView
-        android:id="@+id/setting_img"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
-        android:layout_alignParentRight="true"
-        android:layout_marginTop="20dp"
-        android:layout_marginRight="20dp"
-        android:background="@mipmap/icon_setting" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/logo"
-        android:layout_marginLeft="30dp"
-        android:layout_marginTop="30dp"
-        android:layout_marginRight="30dp"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="80dp"
-            android:orientation="horizontal">
-
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <RelativeLayout
-                    android:id="@+id/layout_segmentation"
-                    android:layout_width="70dp"
-                    android:layout_height="70dp"
-                    android:layout_centerInParent="true"
-                    android:background="@color/white"
-                    android:orientation="vertical">
-
-                    <ImageView
-                        android:layout_width="@dimen/start_icon_width"
-                        android:layout_height="@dimen/start_icon_width"
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginTop="11dp"
-                        android:src="@drawable/icon_segmentation"></ImageView>
-
-                    <ImageView
-                        android:layout_width="@dimen/icon_new_width"
-                        android:layout_height="@dimen/icon_new_height"
-                        android:layout_alignParentEnd="true"
-                        android:background="@drawable/icon_new"></ImageView>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentBottom="true"
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginBottom="5dp"
-                        android:text="@string/image_segmentation"
-                        android:textColor="@color/secondary_text_color"
-                        android:textSize="11sp"></TextView>
-                </RelativeLayout>
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <RelativeLayout
-                    android:id="@+id/layout_translate"
-                    android:layout_width="70dp"
-                    android:layout_height="70dp"
-                    android:layout_centerInParent="true"
-                    android:background="@color/white"
-                    android:orientation="vertical">
-
-                    <ImageView
-                        android:layout_width="@dimen/start_icon_width"
-                        android:layout_height="@dimen/start_icon_width"
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginTop="11dp"
-                        android:src="@drawable/icon_translate"></ImageView>
-
-                    <ImageView
-                        android:layout_width="@dimen/icon_new_width"
-                        android:layout_height="@dimen/icon_new_height"
-                        android:layout_alignParentEnd="true"
-                        android:background="@drawable/icon_new"></ImageView>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentBottom="true"
-                        android:layout_centerHorizontal="true"
-                        android:padding="5dp"
-                        android:text="@string/translate"
-                        android:textColor="@color/secondary_text_color"
-                        android:textSize="11sp"></TextView>
-
-                </RelativeLayout>
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <RelativeLayout
-                    android:id="@+id/layout_shopping"
-                    android:layout_width="70dp"
-                    android:layout_height="70dp"
-                    android:layout_centerInParent="true"
-                    android:background="@color/white"
-                    android:orientation="vertical">
-
-                    <ImageView
-                        android:layout_width="@dimen/start_icon_width"
-                        android:layout_height="@dimen/start_icon_width"
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginTop="10dp"
-                        android:src="@drawable/icon_shopping"></ImageView>
-
-                    <ImageView
-                        android:layout_width="@dimen/icon_new_width"
-                        android:layout_height="@dimen/icon_new_height"
-                        android:layout_alignParentEnd="true"
-                        android:background="@drawable/icon_new"></ImageView>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentBottom="true"
-                        android:layout_centerHorizontal="true"
-                        android:padding="5dp"
-                        android:text="@string/photographed_shopping"
-                        android:textColor="@color/secondary_text_color"
-                        android:textSize="11sp"></TextView>
-
-                </RelativeLayout>
-
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <RelativeLayout
-                    android:id="@+id/layout_icr"
-                    android:layout_width="70dp"
-                    android:layout_height="70dp"
-                    android:layout_centerInParent="true"
-                    android:background="@color/white"
-                    android:orientation="vertical">
-
-                    <ImageView
-                        android:layout_width="@dimen/start_icon_width"
-                        android:layout_height="@dimen/start_icon_width"
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginTop="10dp"
-                        android:src="@drawable/icon_idcard"></ImageView>
-
-                    <ImageView
-                        android:layout_width="@dimen/icon_new_width"
-                        android:layout_height="@dimen/icon_new_height"
-                        android:layout_alignParentEnd="true"
-                        android:background="@drawable/icon_new"></ImageView>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentBottom="true"
-                        android:layout_centerHorizontal="true"
-                        android:layout_gravity="center_horizontal"
-                        android:gravity="center"
-                        android:paddingBottom="5dp"
-                        android:text="@string/idcard_recognition"
-                        android:textColor="@color/secondary_text_color"
-                        android:textSize="11sp"></TextView>
-
-                </RelativeLayout>
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <RelativeLayout
-                    android:id="@+id/layout_face"
-                    android:layout_width="70dp"
-                    android:layout_height="70dp"
-                    android:layout_centerInParent="true"
-                    android:background="@android:color/white"
-                    android:orientation="vertical"
-                    android:padding="5dp">
-
-                    <ImageView
-                        android:layout_width="@dimen/start_icon_width"
-                        android:layout_height="@dimen/start_icon_width"
-                        android:layout_marginTop="5dp"
-                        android:layout_centerHorizontal="true"
-                        android:src="@drawable/icon_face"></ImageView>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentBottom="true"
-                        android:layout_centerHorizontal="true"
-                        android:text="@string/face_detection"
-                        android:textColor="@color/secondary_text_color"
-                        android:textSize="11sp"></TextView>
-
-                </RelativeLayout>
-            </RelativeLayout>
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="80dp"
-            android:layout_marginTop="35dp"
-            android:orientation="horizontal">
-
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <RelativeLayout
-                    android:id="@+id/layout_object"
-                    android:layout_width="70dp"
-                    android:layout_height="70dp"
-                    android:layout_centerInParent="true"
-                    android:background="@android:color/white"
-                    android:orientation="vertical"
-                    android:padding="5dp">
-
-                    <ImageView
-                        android:layout_width="@dimen/start_icon_width"
-                        android:layout_height="@dimen/start_icon_width"
-                        android:layout_centerHorizontal="true"
-                        android:src="@drawable/icon_object"></ImageView>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentBottom="true"
-                        android:layout_centerHorizontal="true"
-                        android:layout_gravity="center_horizontal"
-                        android:gravity="center"
-                        android:text="@string/object_detection"
-                        android:textColor="@color/secondary_text_color"
-                        android:textSize="11sp"></TextView>
-                </RelativeLayout>
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <RelativeLayout
-                    android:id="@+id/layout_text"
-                    android:layout_width="70dp"
-                    android:layout_height="70dp"
-                    android:layout_centerInParent="true"
-                    android:background="@android:color/white"
-                    android:orientation="vertical"
-                    android:padding="5dp">
-
-                    <ImageView
-                        android:layout_width="@dimen/start_icon_width"
-                        android:layout_height="@dimen/start_icon_width"
-                        android:layout_centerHorizontal="true"
-                        android:src="@drawable/icon_text"></ImageView>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentBottom="true"
-                        android:layout_centerHorizontal="true"
-                        android:layout_gravity="center_horizontal"
-                        android:gravity="center"
-                        android:text="@string/text_detection"
-                        android:textColor="@color/secondary_text_color"
-                        android:textSize="11sp"></TextView>
-
-                </RelativeLayout>
-
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <RelativeLayout
-                    android:id="@+id/layout_classification"
-                    android:layout_width="70dp"
-                    android:layout_height="70dp"
-                    android:layout_centerInParent="true"
-                    android:background="@android:color/white"
-                    android:orientation="vertical"
-                    android:padding="5dp">
-
-                    <ImageView
-                        android:layout_width="@dimen/start_icon_width"
-                        android:layout_height="@dimen/start_icon_width"
-                        android:layout_centerHorizontal="true"
-                        android:src="@drawable/icon_classification"></ImageView>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentBottom="true"
-                        android:layout_centerHorizontal="true"
-                        android:layout_gravity="center_horizontal"
-                        android:gravity="center"
-                        android:text="@string/image_classification"
-                        android:textColor="@color/secondary_text_color"
-                        android:textSize="11sp"></TextView>
-
-                </RelativeLayout>
-
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <RelativeLayout
-                    android:id="@+id/layout_more"
-                    android:layout_width="70dp"
-                    android:layout_height="70dp"
-                    android:layout_centerInParent="true"
-                    android:background="@android:color/white"
-                    android:orientation="vertical"
-                    android:padding="5dp">
-
-                    <ImageView
-                        android:layout_width="@dimen/start_icon_width"
-                        android:layout_height="@dimen/start_icon_width"
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginTop="5dp"
-                        android:src="@drawable/icon_more"></ImageView>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentBottom="true"
-                        android:layout_centerHorizontal="true"
-                        android:text="@string/all"
-                        android:textColor="@color/secondary_text_color"
-                        android:textSize="11sp"></TextView>
-
-                </RelativeLayout>
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</RelativeLayout>
diff --git a/MLKit-Sample/app/src/main/res/layout/activity_all_function.xml b/MLKit-Sample/app/src/main/res/layout/activity_all_function.xml
deleted file mode 100644
index a25f507..0000000
--- a/MLKit-Sample/app/src/main/res/layout/activity_all_function.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:fitsSystemWindows="true"
-    android:orientation="vertical"
-    tools:context=".activity.AllFunctionActivity">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <TextView
-            android:id="@+id/back"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:drawableLeft="@drawable/black_back"
-            android:text="@string/back"
-            android:padding="15dp"
-            android:textColor="@color/secondary_text_color"
-            android:textSize="14sp" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:orientation="horizontal">
-
-        <RelativeLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:orientation="vertical">
-
-            <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true">
-
-                <TextView
-                    android:id="@+id/fragment_one"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:text="@string/image_category"
-                    android:textColor="@color/button_background"
-                    android:textSize="16sp" />
-
-                <View
-                    android:id="@+id/line_one"
-                    android:layout_width="wrap_content"
-                    android:layout_height="2dp"
-                    android:layout_below="@+id/fragment_one"
-                    android:layout_alignLeft="@+id/fragment_one"
-                    android:layout_alignRight="@+id/fragment_one"
-                    android:layout_marginTop="10dp"
-                    android:background="@color/button_background" />
-            </RelativeLayout>
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:orientation="vertical">
-
-            <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true">
-
-                <TextView
-                    android:id="@+id/fragment_two"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:text="@string/language_category"
-                    android:textColor="@color/secondary_text_color"
-                    android:textSize="16sp" />
-
-                <View
-                    android:id="@+id/line_two"
-                    android:layout_width="wrap_content"
-                    android:layout_height="2dp"
-                    android:layout_below="@+id/fragment_two"
-                    android:layout_alignLeft="@+id/fragment_two"
-                    android:layout_alignRight="@+id/fragment_two"
-                    android:layout_marginTop="10dp"
-                    android:background="@color/button_background"
-                    android:visibility="gone" />
-            </RelativeLayout>
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:orientation="vertical">
-
-            <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true">
-
-                <TextView
-                    android:id="@+id/fragment_three"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:text="@string/other_category"
-                    android:textColor="@color/secondary_text_color"
-                    android:textSize="16sp" />
-
-                <View
-                    android:id="@+id/line_three"
-                    android:layout_width="wrap_content"
-                    android:layout_height="2dp"
-                    android:layout_below="@+id/fragment_three"
-                    android:layout_alignLeft="@+id/fragment_three"
-                    android:layout_alignRight="@+id/fragment_three"
-                    android:layout_marginTop="10dp"
-                    android:background="@color/button_background"
-                    android:visibility="gone" />
-            </RelativeLayout>
-        </RelativeLayout>
-    </LinearLayout>
-
-    <androidx.viewpager.widget.ViewPager
-        android:id="@+id/view_pager"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-</LinearLayout>
\ No newline at end of file
diff --git a/MLKit-Sample/app/src/main/res/layout/activity_product_vision_search_dialog.xml b/MLKit-Sample/app/src/main/res/layout/activity_product_vision_search_dialog.xml
deleted file mode 100644
index 6c6d81d..0000000
--- a/MLKit-Sample/app/src/main/res/layout/activity_product_vision_search_dialog.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <RelativeLayout
-        android:id="@+id/top_layout"
-        android:layout_width="match_parent"
-        android:layout_height="90dp"
-        android:elevation="1dp"
-        tools:ignore="UnusedAttribute">
-
-        <androidx.cardview.widget.CardView
-            android:id="@+id/cardView"
-            android:layout_width="90dp"
-            android:layout_height="90dp"
-            android:layout_marginEnd="14dp"
-            android:layout_marginStart="20dp"
-            android:layout_marginBottom="5dp"
-            app:cardBackgroundColor="#ffffff"
-            app:cardCornerRadius="10dp"
-            app:cardElevation="2dp">
-
-            <ImageView
-                android:id="@+id/picture"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:scaleType="centerCrop"
-                android:src="#100000ff"
-                tools:ignore="ContentDescription" />
-        </androidx.cardview.widget.CardView>
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="66dp"
-            android:background="@android:color/white"
-            android:layout_alignParentBottom="true">
-
-            <TextView
-                android:id="@+id/tv_goods_no"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/similar_products"
-                android:layout_gravity="center_horizontal|bottom"
-                android:textSize="16sp"
-                android:textColor="@color/button_background"
-                tools:ignore="HardcodedText" />
-        </FrameLayout>
-    </RelativeLayout>
-
-    <FrameLayout
-        android:id="@+id/split"
-        android:layout_width="match_parent"
-        android:layout_height="20dp"
-        android:background="@color/white">
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="3dp"
-            android:layout_marginRight="3dp"
-            android:background="#20008577"
-            android:layout_height="1px" />
-    </FrameLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/white"
-        android:minHeight="240dp">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recycler"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="gone">
-
-        </androidx.recyclerview.widget.RecyclerView>
-
-        <TextView
-            android:id="@+id/empty"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/empty"
-            android:visibility="gone"
-            android:textSize="18sp"
-            android:textColor="#80008577"
-            android:elevation="1dp"
-            android:layout_centerInParent="true"/>
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/MLKit-Sample/app/src/main/res/layout/activity_product_vision_search_dialog_item.xml b/MLKit-Sample/app/src/main/res/layout/activity_product_vision_search_dialog_item.xml
deleted file mode 100644
index 2e11131..0000000
--- a/MLKit-Sample/app/src/main/res/layout/activity_product_vision_search_dialog_item.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="140dp"
-    android:orientation="vertical">
-
-    <androidx.cardview.widget.CardView
-        android:id="@+id/cardView"
-        android:layout_width="match_parent"
-        android:layout_height="115dp"
-        android:layout_marginLeft="10sp"
-        android:layout_marginRight="10sp"
-        app:cardBackgroundColor="#ffffff"
-        app:cardCornerRadius="10dp">
-
-        <ImageView
-            android:id="@+id/image"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="centerCrop"
-            android:src="#100000ff"
-            tools:ignore="ContentDescription" />
-    </androidx.cardview.widget.CardView>
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="25dp" >
-
-        <TextView
-            android:id="@+id/name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
-            android:text="..."
-            android:layout_gravity="center"
-            android:textSize="12sp"
-            android:textColor="@color/secondary_text_color"
-            android:lines="1"/>
-    </FrameLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/MLKit-Sample/app/src/main/res/layout/activity_start.xml b/MLKit-Sample/app/src/main/res/layout/activity_start.xml
deleted file mode 100644
index 6710d23..0000000
--- a/MLKit-Sample/app/src/main/res/layout/activity_start.xml
+++ /dev/null
@@ -1,418 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/primary_background"
-    android:fitsSystemWindows="true">
-
-    <RelativeLayout
-        android:id="@+id/logo"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/start_logo_height"
-        android:layout_alignParentTop="true"
-        android:background="@color/logo_background"
-        android:scaleType="fitXY">
-
-        <ImageView
-            android:layout_width="150dp"
-            android:layout_height="150dp"
-            android:layout_centerVertical="true"
-            android:layout_toRightOf="@id/title"
-            android:src="@drawable/icon_logo"></ImageView>
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="80dp"
-            android:layout_centerVertical="true"
-            android:text="MACHINE\n LEARNING"
-            android:textColor="@color/white"
-            android:textSize="22sp"></TextView>
-
-    </RelativeLayout>
-
-    <ImageView
-        android:layout_width="220dp"
-        android:layout_height="100dp"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="@dimen/start_logo_margin"
-        android:background="@drawable/logo_circle_background"></ImageView>
-
-    <ImageView
-        android:id="@+id/setting_img"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
-        android:layout_alignParentRight="true"
-        android:layout_marginTop="20dp"
-        android:layout_marginRight="20dp"
-        android:background="@mipmap/icon_setting" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/logo"
-        android:layout_marginLeft="30dp"
-        android:layout_marginTop="@dimen/start_margin_top"
-        android:layout_marginRight="30dp"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="80dp"
-            android:orientation="horizontal">
-
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <RelativeLayout
-                    android:id="@+id/layout_segmentation"
-                    android:layout_width="70dp"
-                    android:layout_height="70dp"
-                    android:layout_centerInParent="true"
-                    android:background="@color/white"
-                    android:orientation="vertical">
-
-                    <ImageView
-                        android:layout_width="@dimen/start_icon_width"
-                        android:layout_height="@dimen/start_icon_width"
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginTop="10dp"
-                        android:src="@drawable/icon_segmentation"></ImageView>
-
-                    <ImageView
-                        android:layout_width="@dimen/icon_new_width"
-                        android:layout_height="@dimen/icon_new_height"
-                        android:layout_alignParentEnd="true"
-                        android:background="@drawable/icon_new"></ImageView>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentBottom="true"
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginBottom="5dp"
-                        android:text="@string/image_segmentation"
-                        android:textColor="@color/secondary_text_color"
-                        android:textSize="11sp"></TextView>
-
-                </RelativeLayout>
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <RelativeLayout
-                    android:id="@+id/layout_translate"
-                    android:layout_width="70dp"
-                    android:layout_height="70dp"
-                    android:layout_centerInParent="true"
-                    android:background="@color/white"
-                    android:orientation="vertical">
-
-                    <ImageView
-                        android:layout_width="@dimen/start_icon_width"
-                        android:layout_height="@dimen/start_icon_width"
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginTop="11dp"
-                        android:src="@drawable/icon_translate"></ImageView>
-
-                    <ImageView
-                        android:layout_width="@dimen/icon_new_width"
-                        android:layout_height="@dimen/icon_new_height"
-                        android:layout_alignParentEnd="true"
-                        android:background="@drawable/icon_new"></ImageView>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentBottom="true"
-                        android:layout_centerHorizontal="true"
-                        android:padding="5dp"
-                        android:text="@string/translate"
-                        android:textColor="@color/secondary_text_color"
-                        android:textSize="11sp"></TextView>
-
-                </RelativeLayout>
-
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <RelativeLayout
-                    android:id="@+id/layout_shopping"
-                    android:layout_width="70dp"
-                    android:layout_height="70dp"
-                    android:layout_centerInParent="true"
-                    android:background="@color/white"
-                    android:orientation="vertical">
-
-                    <ImageView
-                        android:layout_width="@dimen/start_icon_width"
-                        android:layout_height="@dimen/start_icon_width"
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginTop="10dp"
-                        android:src="@drawable/icon_shopping"></ImageView>
-
-                    <ImageView
-                        android:layout_width="@dimen/icon_new_width"
-                        android:layout_height="@dimen/icon_new_height"
-                        android:layout_alignParentEnd="true"
-                        android:background="@drawable/icon_new"></ImageView>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentBottom="true"
-                        android:layout_centerHorizontal="true"
-                        android:padding="5dp"
-                        android:text="@string/photographed_shopping"
-                        android:textColor="@color/secondary_text_color"
-                        android:textSize="11sp"></TextView>
-
-                </RelativeLayout>
-
-            </RelativeLayout>
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="80dp"
-            android:layout_marginTop="25dp"
-            android:orientation="horizontal">
-
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <RelativeLayout
-                    android:id="@+id/layout_icr"
-                    android:layout_width="70dp"
-                    android:layout_height="70dp"
-                    android:layout_centerInParent="true"
-                    android:background="@color/white"
-                    android:orientation="vertical">
-
-                    <ImageView
-                        android:layout_width="@dimen/start_icon_width"
-                        android:layout_height="@dimen/start_icon_width"
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginTop="10dp"
-                        android:src="@drawable/icon_idcard"></ImageView>
-
-                    <ImageView
-                        android:layout_width="@dimen/icon_new_width"
-                        android:layout_height="@dimen/icon_new_height"
-                        android:layout_alignParentEnd="true"
-                        android:background="@drawable/icon_new"></ImageView>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentBottom="true"
-                        android:layout_centerHorizontal="true"
-                        android:layout_gravity="center_horizontal"
-                        android:gravity="center"
-                        android:paddingBottom="5dp"
-                        android:text="@string/idcard_recognition"
-                        android:textColor="@color/secondary_text_color"
-                        android:textSize="11sp"></TextView>
-
-                </RelativeLayout>
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <RelativeLayout
-                    android:id="@+id/layout_object"
-                    android:layout_width="70dp"
-                    android:layout_height="70dp"
-                    android:layout_centerInParent="true"
-                    android:background="@color/white"
-                    android:orientation="vertical"
-                    android:padding="5dp">
-
-                    <ImageView
-                        android:layout_width="@dimen/start_icon_width"
-                        android:layout_height="@dimen/start_icon_width"
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginTop="3dp"
-                        android:src="@drawable/icon_object"></ImageView>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentBottom="true"
-                        android:layout_centerHorizontal="true"
-                        android:layout_gravity="center_horizontal"
-                        android:gravity="center"
-                        android:text="@string/object_detection"
-                        android:textColor="@color/secondary_text_color"
-                        android:textSize="11sp"></TextView>
-
-                </RelativeLayout>
-
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <RelativeLayout
-                    android:id="@+id/layout_classification"
-                    android:layout_width="70dp"
-                    android:layout_height="70dp"
-                    android:layout_centerInParent="true"
-                    android:background="@color/white"
-                    android:orientation="vertical">
-
-                    <ImageView
-                        android:layout_width="@dimen/start_icon_width"
-                        android:layout_height="@dimen/start_icon_width"
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginTop="8dp"
-                        android:src="@drawable/icon_classification"></ImageView>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentBottom="true"
-                        android:layout_centerHorizontal="true"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginBottom="5dp"
-                        android:gravity="center"
-                        android:text="@string/image_classification"
-                        android:textColor="@color/secondary_text_color"
-                        android:textSize="11sp"></TextView>
-
-                </RelativeLayout>
-
-            </RelativeLayout>
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="80dp"
-            android:layout_marginTop="25dp"
-            android:orientation="horizontal">
-
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <RelativeLayout
-                    android:id="@+id/layout_face"
-                    android:layout_width="70dp"
-                    android:layout_height="70dp"
-                    android:layout_centerInParent="true"
-                    android:background="@color/white"
-                    android:orientation="vertical"
-                    android:padding="5dp">
-
-                    <ImageView
-                        android:layout_width="@dimen/start_icon_width"
-                        android:layout_height="@dimen/start_icon_width"
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginTop="3dp"
-                        android:src="@drawable/icon_face"></ImageView>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentBottom="true"
-                        android:layout_centerHorizontal="true"
-                        android:text="@string/face_detection"
-                        android:textColor="@color/secondary_text_color"
-                        android:textSize="11sp"></TextView>
-
-                </RelativeLayout>
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <RelativeLayout
-                    android:id="@+id/layout_text"
-                    android:layout_width="70dp"
-                    android:layout_height="70dp"
-                    android:layout_centerInParent="true"
-                    android:background="@color/white"
-                    android:orientation="vertical"
-                    android:padding="5dp">
-
-                    <ImageView
-                        android:layout_width="@dimen/start_icon_width"
-                        android:layout_height="@dimen/start_icon_width"
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginTop="2dp"
-                        android:src="@drawable/icon_text"></ImageView>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentBottom="true"
-                        android:layout_centerHorizontal="true"
-                        android:layout_gravity="center_horizontal"
-                        android:gravity="center"
-                        android:text="@string/text_detection"
-                        android:textColor="@color/secondary_text_color"
-                        android:textSize="11sp"></TextView>
-
-                </RelativeLayout>
-
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <RelativeLayout
-                    android:id="@+id/layout_more"
-                    android:layout_width="70dp"
-                    android:layout_height="70dp"
-                    android:layout_centerInParent="true"
-                    android:background="@color/white"
-                    android:orientation="vertical"
-                    android:padding="5dp">
-
-                    <ImageView
-                        android:layout_width="@dimen/start_icon_width"
-                        android:layout_height="@dimen/start_icon_width"
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginTop="3dp"
-                        android:src="@drawable/icon_more"></ImageView>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentBottom="true"
-                        android:layout_centerHorizontal="true"
-                        android:layout_gravity="center_horizontal"
-                        android:gravity="center"
-                        android:text="@string/all"
-                        android:textColor="@color/secondary_text_color"
-                        android:textSize="11sp"></TextView>
-
-                </RelativeLayout>
-            </RelativeLayout>
-        </LinearLayout>
-
-    </LinearLayout>
-
-</RelativeLayout>
diff --git a/MLKit-Sample/app/src/main/res/layout/fragment_picture.xml b/MLKit-Sample/app/src/main/res/layout/fragment_picture.xml
deleted file mode 100644
index 4758f8e..0000000
--- a/MLKit-Sample/app/src/main/res/layout/fragment_picture.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:background="@color/primary_background"
-    android:layout_height="match_parent">
-    <GridView
-        android:id="@+id/gridview"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp"
-        android:layout_marginTop="50dp"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:verticalSpacing="50dp"
-        android:listSelector="@android:color/transparent"
-        android:numColumns="3">
-    </GridView>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/MLKit-Sample/app/src/main/res/menu/camera_button_menu.xml b/MLKit-Sample/app/src/main/res/menu/camera_button_menu.xml
deleted file mode 100644
index ab57007..0000000
--- a/MLKit-Sample/app/src/main/res/menu/camera_button_menu.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-  <item android:id="@+id/load_local_images"
-      android:title="@string/select_from_album"
-      android:orderInCategory="100"
-      app:showAsAction="never" />
-  <item android:id="@+id/take_photo"
-      android:title="@string/take_photo"
-      android:orderInCategory="100"
-      app:showAsAction="never" />
-</menu>
diff --git a/MLKit-Sample/app/src/main/res/mipmap-xxxhdpi/right_arraw.png b/MLKit-Sample/app/src/main/res/mipmap-xxxhdpi/right_arraw.png
deleted file mode 100644
index 7873c67..0000000
Binary files a/MLKit-Sample/app/src/main/res/mipmap-xxxhdpi/right_arraw.png and /dev/null differ
diff --git a/MLKit-Sample/app/src/main/res/values-zh-rCN/strings.xml b/MLKit-Sample/app/src/main/res/values-zh-rCN/strings.xml
deleted file mode 100644
index e62d3b5..0000000
--- a/MLKit-Sample/app/src/main/res/values-zh-rCN/strings.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">ML Kit</string>
-    <string name="picture">图片</string>
-    <string name="help_text">
-      <b>HDR Viewfinder Demo:</b>\n\n
-
-      Tap viewfinder to switch modes.\n\n
-
-      <b>Normal:</b> Standard camera preview\n
-      <b>Split:</b> Manual exposure control\n
-      <b>HDR:</b> Fused HDR viewfinder\n\n
-
-      Swipe up/down in Split/HDR modes to change manual exposure
-      values.\n\n
-
-      The left half of the viewfinder controls exposure time for
-      even-numbered frames, and the right half of the viewfinder
-      controls exposure time for odd-numbered frames
-    </string>
-
-    <string name="info">信息</string>
-
-    <string name="camera_permission_rationale">示例应用需要相机和存储权限</string>
-    <string name="storage_permission_rationale">示例应用需要存储权限</string>
-    <string name="camera_no_good">没有可用的后置摄像头！</string>
-    <string name="camera_disabled">相机已通过设备策略禁用</string>
-    <string name="camera_disconnected">相机在打开前已断开连接</string>
-    <string name="camera_error">相机服务报告了错误</string>
-    <string name="camera_unknown">未知相机错误: %s</string>
-    <string name="camera_permission_denied_explanation">您已拒绝该应用需要其核心功能的权限。 如果您选择过不再询问，则需要使用“设置”重新启用权限。</string>
-
-    <string name="ok">OK</string>
-    <string name="settings">设置</string>
-    <string name="cancel">取消</string>
-    <string name="permission_camera_rationale">需要访问相机进行检测</string>
-    <string name="no_camera_permission">该应用程序没有摄像头权限，因此无法运行。 应用程序现在将退出。</string>
-    <string name="low_storage_error">由于设备存储空间不足，无法下载人脸检测器依赖性</string>
-    <string name="toggle_turn_on">前摄像头</string>
-    <string name="toggle_turn_off">后摄像头</string>
-    <string name="desc_camera_source_activity">视觉探测器演示与实时摄像机预览</string>
-    <string name="desc_still_image_activity">视觉检测器演示静态图像</string>
-
-    <string name="detector_live">实时检测</string>
-    <string name="detector_still">图像检测</string>
-
-    <string name="cloud_classification">云端图像分类</string>
-    <string name="cloud_text">云端文字识别</string>
-    <string name="select_from_album">从相册选择图像</string>
-    <string name="take_photo">拍照</string>
-    <string name="idcard_recognition">身份证识别</string>
-    <string name="detector_still_desc">云端图像识别</string>
-    <string name="detector_live_desc">相机实时连续识别</string>
-    <string name="more_face_datas">采集更多人脸数据</string>
-    <string name="versions">版本号：</string>
-    <string name="language_setting">语言</string>
-    <string name="language_notice">文字识别语言设置</string>
-    <string name="simplified_chinese">简体中文</string>
-    <string name="english_choose">英文</string>
-    <string name="japanese_choose">日文</string>
-    <string name="korean_choose">韩文</string>
-    <string name="latin_choose">拉丁文</string>
-    <string name="get_data_failed">获取数据失败</string>
-    <string name="loading_data">加载中…</string>
-    <string name="load_pictures">加载图片</string>
-
-    <string name="image_segmentation_s">图像分割</string>
-    <string name="document_recognition_s">文档识别</string>
-    <string name="photographed_shopping_s">拍照购</string>
-    <string name="face_detection_s">人脸检测</string>
-    <string name="object_detection_s">对象检测</string>
-    <string name="image_classification_s">图片分类</string>
-    <string name="landmark_s">地标识别</string>
-    <string name="text_detection_s">文字识别</string>
-    <string name="idcard_recognition_s">身份证识别</string>
-
-    <string name="image_segmentation">图像分割</string>
-    <string name="translate">翻译</string>
-    <string name="photographed_shopping">拍照购</string>
-    <string name="face_detection">人脸检测</string>
-    <string name="object_detection">对象检测</string>
-    <string name="image_classification">图片分类</string>
-    <string name="landmark">地标识别</string>
-    <string name="text_detection">文字识别</string>
-    <string name="document_recognition">文档识别</string>
-    <string name="all">所有</string>
-    <string name="coming_soon">敬请期待</string>
-    <string name="back">返回</string>
-    <string name="translate_v">翻译</string>
-    <string name="language_recognition">语种识别</string>
-    <string name="elapsed_time">耗时： </string>
-    <string name="zero_character"> 0 字符</string>
-    <string name="image_category">视觉类</string>
-    <string name="language_category">语言类</string>
-    <string name="other_category">其他类</string>
-    <string name="translate_text_hint">机器学习</string>
-    <string name="background_substitution">背景替换</string>
-    <string name="cutout">人像抠图</string>
-    <string name="select_picture">选择图片</string>
-    <string name="cut">剪切</string>
-    <string name="replace_background">背景</string>
-    <string name="save">保存</string>
-    <string name="cut_success">剪切成功</string>
-    <string name="save_success">保存成功</string>
-
-    <string name="please_select_picture">请选择一张要处理的图片~</string>
-    <string name="click_add_picture">点击添加图片~</string>
-    <string name="no_pic_neededSave">没有可保存的图片</string>
-    <string name="target_object">目标</string>
-    <string name="color">颜色</string>
-
-    <string name="rn_eid_upload_self_photo" priority="translator">"请上传本人身份证照片"</string>
-    <string name="rn_eid_upload_face" priority="translator">"上传人像面"</string>
-    <string name="rn_eid_upload_back" priority="translator">"上传国徽面"</string>
-    <string name="rn_eid_hint_upload_valid_photo" priority="translator">"请上传有效身份证照片"</string>
-    <string name="rn_eid_hint_image_not_complete" priority="translator">"智能检测识别到图片可能存在部分遮挡，如果清晰可见请忽略"</string>
-    <string name="rn_eid_hint_ensure_user_info_security" priority="translator">"我们将依法保护您的个人信息安全"</string>
-    <string name="rn_eid_take_origin_card" priority="translator">"检测结果"</string>
-    <string name="device_side">端侧</string>
-    <string name="cloud_side">云侧</string>
-
-    <string name="similar_products">相似商品</string>
-    <string name="empty">无</string>
-
-    <string name="idcard_mark">注：只用于中国大陆地区</string>
-</resources>
diff --git a/MLKit-Sample/app/src/main/res/values/colors.xml b/MLKit-Sample/app/src/main/res/values/colors.xml
deleted file mode 100644
index 7cb4589..0000000
--- a/MLKit-Sample/app/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="black">#000000</color>
-    <color name="common_line_color">#D9D9D9</color>
-    <color name="primary_text_color">#A9A9A9</color>
-    <color name="secondary_text_color">#626262</color>
-    <color name="logo_background">#003853</color>
-    <color name="primary_background">#f2f2f2</color>
-    <color name="button_background">#5CACEE</color>
-    <color name="white">#ffffff</color>
-    <color name="black_color">#1d1d1d</color>
-    <color name="color_gray_word">#cc696969</color>
-    <color name="white_color">#E3E7F0</color>
-    <!--Header background color-blue-->
-    <color name="blue_title_color">#2E5C8D</color>
-    <!--Dialog border color-->
-    <color name="frame_dialog_color">#646464</color>
-    <!--Light green-->
-    <color name="color_light_green">#BBE0E3</color>
-    <!--Green-->
-    <color name="color_green">#008000</color>
-    <!--Gray-->
-    <color name="color_gray">#c2c2c2</color>
-    <!--Red-->
-    <color name="color_red">#FF0000</color>
-    <color name="color_red_card">#FFFA2A2D</color>
-    <color name="color_red_cancel">#EE6A50</color>
-    <!--Yellow-->
-    <color name="color_yellow">#FFE557</color>
-    <!--Blue text-->
-    <color name="color_blue_text">#60B2BE</color>
-    <color name="blue_color">#182E46</color>
-
-</resources>
diff --git a/MLKit-Sample/app/src/main/res/values/dimens.xml b/MLKit-Sample/app/src/main/res/values/dimens.xml
deleted file mode 100644
index 76157d1..0000000
--- a/MLKit-Sample/app/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<resources>
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="list_margin">16dp</dimen>
-    <dimen name="icon_size">20dp</dimen>
-    <dimen name="setting_languagepad">10dp</dimen>
-    <dimen name="setting_languagesize">18sp</dimen>
-    <dimen name="setting_languagetitlesize">19sp</dimen>
-    <dimen name="setting_languagenoticesize">14sp</dimen>
-    <dimen name="setting_imgmarginright">35dp</dimen>
-    <dimen name="setting_imgweight">18dp</dimen>
-    <dimen name="setting_imgheight">18dp</dimen>
-    <dimen name="setting_ImageButtonheight">20dp</dimen>
-    <dimen name="setting_ImageButtonmarginLeft">15dp</dimen>
-    <dimen name="setting_textsize">24sp</dimen>
-    <dimen name="setting_languagetext_marginLeft">12dp</dimen>
-    <dimen name="setting_languagetext_size">13dp</dimen>
-    <dimen name="setting_versioncordsize">17sp</dimen>
-    <dimen name="setting_versionstext_height">45dp</dimen>
-    <dimen name="setting_versioncordmarginLeft">12dp</dimen>
-    <dimen name="setting_padding">5dp</dimen>
-    <dimen name="setting_language_notice_marginLeft">12dp</dimen>
-    <dimen name="setting_nextimgeheight">30dp</dimen>
-    <dimen name="setting_viewheight">1dp</dimen>
-    <dimen name="setting_viewmarginTop">7dp</dimen>
-    <dimen name="start_icon_width">45dp</dimen>
-    <dimen name="facing_switch_width">35dp</dimen>
-    <dimen name="icon_new_width">18dp</dimen>
-    <dimen name="icon_new_height">15dp</dimen>
-    <dimen name="toolbar_height">45dp</dimen>
-    <dimen name="sm_1">1.5999756px</dimen>
-    <dimen name="sm_5">8.0px</dimen>
-    <dimen name="idcard_margin">24dp</dimen>
-    <dimen name="idcard_result_margin">24dp</dimen>
-    <dimen name="circle_stroke_radius">65dp</dimen>
-
-    <dimen name="start_logo_height">250dp</dimen>
-    <dimen name="start_logo_margin">230dp</dimen>
-    <dimen name="start_margin_top">70dp</dimen>
-</resources>
diff --git a/MLKit-Sample/app/src/main/res/values/strings.xml b/MLKit-Sample/app/src/main/res/values/strings.xml
deleted file mode 100644
index fd4a570..0000000
--- a/MLKit-Sample/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">ML Kit</string>
-    <string name="picture">Picture</string>
-    <string name="help_text">
-      <b>HDR Viewfinder Demo:</b>\n\n
-
-      Tap viewfinder to switch modes.\n\n
-
-      <b>Normal:</b> Standard camera preview\n
-      <b>Split:</b> Manual exposure control\n
-      <b>HDR:</b> Fused HDR viewfinder\n\n
-
-      Swipe up/down in Split/HDR modes to change manual exposure
-      values.\n\n
-
-      The left half of the viewfinder controls exposure time for
-      even-numbered frames, and the right half of the viewfinder
-      controls exposure time for odd-numbered frames
-    </string>
-
-    <string name="info">Info</string>
-
-    <string name="camera_permission_rationale">This sample app requires camera and storage access in order to
-        demo the API.</string>
-    <string name="storage_permission_rationale">This sample app requires storage access in order to
-        demo the API.</string>
-    <string name="camera_no_good">No back-facing sufficiently capable camera available!</string>
-    <string name="camera_disabled">Camera is disabled by device policy</string>
-    <string name="camera_disconnected">Camera was disconnected before it was opened</string>
-    <string name="camera_error">Camera service reported an error</string>
-    <string name="camera_unknown">Unknown camera error: %s</string>
-    <string name="camera_permission_denied_explanation">You\'ve denied a permission that the app
-        needs for core functionality. If you selected &quot;don\'t ask again&quot; in the past then
-        you need to use Settings to re-enable the permission.</string>
-
-    <string name="ok">OK</string>
-    <string name="settings">Settings</string>
-    <string name="cancel">cancel</string>
-    <string name="permission_camera_rationale">Access to the camera is needed for detection</string>
-    <string name="no_camera_permission">This application cannot run because it does not have the camera permission.  The application will now exit.</string>
-    <string name="low_storage_error">Face detector dependencies cannot be downloaded due to low device storage</string>
-    <string name="toggle_turn_on">Front</string>
-    <string name="toggle_turn_off">Back</string>
-    <string name="desc_camera_source_activity">Vision detectors demo with live camera preview</string>
-    <string name="desc_still_image_activity">Vision detectors demo with a still image</string>
-
-    <string name="detector_live">Live</string>
-    <string name="detector_still">Still</string>
-
-
-    <string name="cloud_classification">Cloud Image Classification</string>
-    <string name="cloud_text">Cloud Text Recognition</string>
-
-    <string name="select_from_album">Select image from album</string>
-    <string name="take_photo">Take photo</string>
-    <string name="detector_still_desc">Cloud image recognition</string>
-    <string name="detector_live_desc">Camera real-time continuous recognition</string>
-    <string name="more_face_datas">More face data</string>
-    <string name="versions">Version：</string>
-    <string name="language_setting">Language settings</string>
-    <string name="language_notice">Text recognition language settings</string>
-    <string name="simplified_chinese">Simplified chinese</string>
-    <string name="english_choose">English</string>
-    <string name="japanese_choose">Japanese</string>
-    <string name="korean_choose">Korean</string>
-    <string name="latin_choose">Latin</string>
-    <string name="get_data_failed">Failed to get data.</string>
-    <string name="loading_data">Loading…</string>
-    <string name="load_pictures">Load pictures</string>
-
-    <string name="image_segmentation_s">Image Segmentation</string>
-    <string name="photographed_shopping_s">Product Visual Search</string>
-    <string name="face_detection_s">Face Detection</string>
-    <string name="object_detection_s">Object Detection and Tracking</string>
-    <string name="image_classification_s">Image Classification</string>
-    <string name="idcard_recognition_s">ID Card Recognition</string>
-    <string name="landmark_s">Landmark Recognition</string>
-    <string name="text_detection_s">Text Recognition</string>
-    <string name="document_recognition_s">Document Recognition</string>
-
-    <string name="image_segmentation">Segmentation</string>
-    <string name="document_recognition">Document</string>
-    <string name="translate">Translation</string>
-    <string name="photographed_shopping">Shopping</string>
-    <string name="face_detection">Face</string>
-    <string name="object_detection">Object</string>
-    <string name="image_classification">Classification</string>
-    <string name="idcard_recognition">ID Card</string>
-    <string name="landmark">Landmark</string>
-    <string name="text_detection">Text</string>
-    <string name="all">all</string>
-    <string name="coming_soon">coming soon</string>
-    <string name="back">back</string>
-    <string name="translate_v">Translate</string>
-    <string name="language_recognition">Language Recognition</string>
-    <string name="elapsed_time">Elapsed Time: </string>
-    <string name="zero_character"> 0 character</string>
-    <string name="image_category">Vision</string>
-    <string name="language_category">Language</string>
-    <string name="other_category">Other</string>
-    <string name="translate_text_hint">Machine Learning</string>
-
-    <string name="background_substitution">Substitution</string>
-    <string name="select_picture">Select Picture</string>
-    <string name="cutout">Cutout</string>
-    <string name="cut">Cut</string>
-    <string name="cut_success">Cut success</string>
-    <string name="save_success">Save success</string>
-
-    <string name="replace_background">Background</string>
-    <string name="save">Save</string>
-    <string name="please_select_picture">Please select a picture to process~</string>
-    <string name="click_add_picture">Click to add picture~</string>
-    <string name="no_pic_neededSave">Null Image needed to save</string>
-
-    <string name="target_object">Object</string>
-    <string name="color">Color</string>
-
-    <!--身份证识别-->
-    <string name="rn_eid_upload_self_photo" priority="translator">Upload photos of your ID card</string>
-    <string name="rn_eid_upload_face" priority="translator">Photo side</string>
-    <string name="rn_eid_upload_back" priority="translator">Other side</string>
-    <string name="rn_eid_hint_upload_valid_photo" priority="translator">Upload photos of your valid ID card.</string>
-    <string name="rn_eid_hint_image_not_complete" priority="translator">Something may be blocking important information in the photo. Retake the photo if needed.</string>
-    <string name="rn_eid_hint_ensure_user_info_security" priority="translator">Your personal information will be protected in accordance with the law.</string>
-    <string name="rn_eid_take_origin_card" priority="translator">Recognition results:</string>
-    <string name="device_side">Device Side</string>
-    <string name="cloud_side">Cloud Side</string>
-
-    <string name="similar_products">Similar Products</string>
-    <string name="empty">Empty</string>
-    <string name="idcard_mark">Note: For Mainland China Only</string>
-</resources>
diff --git a/MLKit-Sample/build.gradle b/MLKit-Sample/build.gradle
index ffd4523..456b006 100644
--- a/MLKit-Sample/build.gradle
+++ b/MLKit-Sample/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.3.2'
-        classpath 'com.huawei.agconnect:agcp:1.0.0.300'
+        classpath 'com.huawei.agconnect:agcp:1.2.1.301'
     }
 }
 
diff --git a/MLKit-Sample/module-text/.gitignore b/MLKit-Sample/module-text/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/MLKit-Sample/module-text/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/MLKit-Sample/app/build.gradle b/MLKit-Sample/module-text/build.gradle
similarity index 67%
rename from MLKit-Sample/app/build.gradle
rename to MLKit-Sample/module-text/build.gradle
index 868758c..21894d5 100644
--- a/MLKit-Sample/app/build.gradle
+++ b/MLKit-Sample/module-text/build.gradle
@@ -4,13 +4,16 @@ android {
     compileSdkVersion 28
     buildToolsVersion "28.0.3"
     defaultConfig {
-        applicationId "com.mlkit.sample"
+        applicationId "com.mlkit.sample.text"
         minSdkVersion 19
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
+    lintOptions{
+        abortOnError false
+    }
     // Support simulator.
     splits {
         abi {
@@ -32,21 +35,22 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.huawei.hms:ml-computer-vision:1.0.2.300'
-    implementation 'com.huawei.hms:ml-computer-translate:1.0.2.300'
-    implementation 'com.huawei.hms:ml-computer-language-detection:1.0.2.300'
+    implementation fileTree(dir: 'libs', include: ['*.aar'])
+    implementation 'com.huawei.hms:ml-computer-vision-cloud:1.0.3.300'
+    implementation 'com.huawei.hms:ml-computer-translate:1.0.3.300'
+    implementation 'com.huawei.hms:ml-computer-language-detection:1.0.3.300'
+
+    implementation 'com.huawei.hms:ml-computer-vision-ocr-cn-model:1.0.3.300'
+    implementation 'com.huawei.hms:ml-computer-vision-ocr-jk-model:1.0.3.300'
+    implementation 'com.huawei.hms:ml-computer-vision-ocr-latin-model:1.0.3.300'
+
+    implementation 'com.huawei.hms:ml-computer-card-icr-cn-model:1.0.3.300'
+    implementation 'com.huawei.hms:ml-computer-card-icr-cn-plugin:1.0.3.300'
+
+    implementation 'com.huawei.hms:ml-computer-card-bcr-plugin:1.0.3.300'
+    implementation 'com.huawei.hms:ml-computer-card-bcr-model:1.0.3.300'
 
-    implementation 'com.huawei.hms:ml-computer-vision-ocr-cn-model:1.0.2.300'
-    implementation 'com.huawei.hms:ml-computer-vision-ocr-jk-model:1.0.2.300'
-    implementation 'com.huawei.hms:ml-computer-vision-ocr-latin-model:1.0.2.300'
-    implementation 'com.huawei.hms:ml-computer-vision-image-segmentation-body-model:1.0.2.300'
-    implementation 'com.huawei.hms:ml-computer-vision-image-segmentation-multiclass-model:1.0.2.300'
-    implementation 'com.huawei.hms:ml-computer-vision-image-classification-model:1.0.2.300'
-    implementation 'com.huawei.hms:ml-computer-vision-object-detection-model:1.0.2.300'
-    implementation 'com.huawei.hms:ml-computer-vision-face-recognition-model:1.0.2.300'
-    implementation 'com.huawei.hms:ml-computer-card-icr-cn-model:1.0.2.300'
-    implementation 'com.huawei.hms:ml-computer-card-icr-cn-plugin:1.0.2.300'
+    implementation 'com.huawei.hms:ml-computer-card-gcr-plugin:1.0.3.300'
 
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
diff --git a/MLKit-Sample/module-text/gradlew b/MLKit-Sample/module-text/gradlew
new file mode 100644
index 0000000..cccdd3d
--- /dev/null
+++ b/MLKit-Sample/module-text/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/MLKit-Sample/app/gradlew.bat b/MLKit-Sample/module-text/gradlew.bat
similarity index 100%
rename from MLKit-Sample/app/gradlew.bat
rename to MLKit-Sample/module-text/gradlew.bat
diff --git a/MLKit-Sample/app/proguard-rules.pro b/MLKit-Sample/module-text/proguard-rules.pro
similarity index 100%
rename from MLKit-Sample/app/proguard-rules.pro
rename to MLKit-Sample/module-text/proguard-rules.pro
diff --git a/MLKit-Sample/app/sample-agconnect-services.json b/MLKit-Sample/module-text/sample-agconnect-services.json
similarity index 93%
rename from MLKit-Sample/app/sample-agconnect-services.json
rename to MLKit-Sample/module-text/sample-agconnect-services.json
index 1326374..57a99b8 100644
--- a/MLKit-Sample/app/sample-agconnect-services.json
+++ b/MLKit-Sample/module-text/sample-agconnect-services.json
@@ -9,7 +9,7 @@
 		"client_id":"268600551012363200",
 		"client_secret":"4819981CE7939A526B71AC3092D35C5CB77DF8341C6986559AA9211",
 		"app_id":"1015883",
-		"package_name":"com.mlkit.sample",
+		"package_name":"com.mlkit.sample.text",
 		"api_key":"CV46Xu0Y3+YFDS832xvOY69LHiAtZ2SviYUSZyELicm2NrxUesZE1TO"
 	},
 	"service":{
diff --git a/MLKit-Sample/module-text/src/main/AndroidManifest.xml b/MLKit-Sample/module-text/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..78a0bc4
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/AndroidManifest.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mlkit.sample">
+
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
+    <uses-feature android:name="android.hardware.camera" />
+    <uses-feature android:name="android.hardware.camera.autofocus" />
+
+    <application
+        android:allowBackup="false"
+        android:icon="@drawable/icon"
+        android:label="ML Text"
+        android:theme="@style/MaterialTheme">
+
+        <activity
+            android:name=".activity.StartActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".activity.TextRecognitionActivity"
+            android:exported="true" />
+        <activity
+            android:name=".activity.RemoteDetectionActivity"
+            android:exported="true" />
+        <activity
+            android:name=".activity.SettingActivity"
+            android:exported="true" />
+
+        <activity android:name=".activity.TranslatorActivity" />
+
+        <activity
+            android:name=".activity.IDCardRecognitionActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"></activity>
+
+        <activity
+            android:name=".activity.GeneralCardRecognitionActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"></activity>
+        <activity
+            android:name=".activity.BankCardRecognitionActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"></activity>
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/apk_file_provider" />
+        </provider>
+        <meta-data
+            android:name="com.huawei.hms.ml.DEPENDENCY"
+            android:value="object,ocr,face,label,icr,imgseg" />
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/BankCardRecognitionActivity.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/BankCardRecognitionActivity.java
new file mode 100644
index 0000000..cce76d3
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/BankCardRecognitionActivity.java
@@ -0,0 +1,159 @@
+/**
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.mlkit.sample.activity;
+
+import android.graphics.Bitmap;
+import android.os.Bundle;
+
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.huawei.hms.mlplugin.card.bcr.MLBcrCapture;
+import com.huawei.hms.mlplugin.card.bcr.MLBcrCaptureConfig;
+import com.huawei.hms.mlplugin.card.bcr.MLBcrCaptureFactory;
+import com.huawei.hms.mlplugin.card.bcr.MLBcrCaptureResult;
+import com.mlkit.sample.R;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+public class BankCardRecognitionActivity extends AppCompatActivity implements View.OnClickListener {
+    private ImageView frontImg;
+    private ImageView frontSimpleImg;
+    private ImageView frontDeleteImg;
+    private LinearLayout frontAddView;
+    private TextView showResult;
+    private String lastFrontResult = "";
+    private String lastBackResult = "";
+    private Bitmap currentImage;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_bank_card_recognition);
+
+        initComponent();
+    }
+
+    private void initComponent() {
+        frontImg = findViewById(R.id.avatar_img);
+        frontSimpleImg = findViewById(R.id.avatar_sample_img);
+        frontDeleteImg = findViewById(R.id.avatar_delete);
+        frontAddView = findViewById(R.id.avatar_add);
+        showResult = findViewById(R.id.show_result);
+
+        frontAddView.setOnClickListener(this);
+        frontDeleteImg.setOnClickListener(this);
+        findViewById(R.id.back).setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View view) {
+        int id = view.getId();
+        switch (id) {
+            case R.id.avatar_add:
+                startCaptureActivity();
+                break;
+            case R.id.avatar_delete:
+                showFrontDeleteImage();
+                lastFrontResult = "";
+                break;
+            case R.id.back:
+                finish();
+                break;
+            default:
+                break;
+        }
+    }
+
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (currentImage != null && !currentImage.isRecycled()) {
+            currentImage.recycle();
+            currentImage = null;
+        }
+    }
+
+    private void startCaptureActivity() {
+        MLBcrCaptureConfig config = new MLBcrCaptureConfig.Factory()
+                .setOrientation(MLBcrCaptureConfig.ORIENTATION_AUTO)
+                .create();
+        MLBcrCapture bcrCapture = MLBcrCaptureFactory.getInstance().getBcrCapture(config);
+
+        bcrCapture.captureFrame(this, this.callback);
+    }
+
+    private String formatIdCardResult(MLBcrCaptureResult result) {
+        StringBuilder resultBuilder = new StringBuilder();
+
+        resultBuilder.append("Number：");
+        resultBuilder.append(result.getNumber());
+        resultBuilder.append("\r\n");
+
+        return resultBuilder.toString();
+    }
+
+    private MLBcrCapture.Callback callback = new MLBcrCapture.Callback() {
+        @Override
+        public void onSuccess(MLBcrCaptureResult result) {
+            if (result == null) {
+                return;
+            }
+            Bitmap bitmap = result.getOriginalBitmap();
+            showSuccessResult(bitmap, result);
+        }
+
+        @Override
+        public void onCanceled() {
+        }
+
+        @Override
+        public void onFailure(int recCode, Bitmap bitmap) {
+            showResult.setText(" RecFailed ");
+        }
+
+        @Override
+        public void onDenied() {
+        }
+    };
+
+    private void showSuccessResult(Bitmap bitmap, MLBcrCaptureResult idCardResult) {
+        showFrontImage(bitmap);
+        lastFrontResult = formatIdCardResult(idCardResult);
+        showResult.setText(lastFrontResult);
+        showResult.append(lastBackResult);
+        ((ImageView) findViewById(R.id.number)).setImageBitmap(idCardResult.getNumberBitmap());
+    }
+
+    private void showFrontImage(Bitmap bitmap) {
+        frontImg.setVisibility(View.VISIBLE);
+        frontImg.setImageBitmap(bitmap);
+        frontSimpleImg.setVisibility(View.GONE);
+        frontAddView.setVisibility(View.GONE);
+        frontDeleteImg.setVisibility(View.VISIBLE);
+    }
+
+    private void showFrontDeleteImage() {
+        frontImg.setVisibility(View.GONE);
+        frontSimpleImg.setVisibility(View.VISIBLE);
+        frontAddView.setVisibility(View.VISIBLE);
+        frontDeleteImg.setVisibility(View.GONE);
+    }
+}
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/BaseActivity.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/BaseActivity.java
similarity index 100%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/BaseActivity.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/BaseActivity.java
diff --git a/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/GeneralCardRecognitionActivity.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/GeneralCardRecognitionActivity.java
new file mode 100644
index 0000000..1012e3d
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/GeneralCardRecognitionActivity.java
@@ -0,0 +1,310 @@
+/**
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.mlkit.sample.activity;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.os.Bundle;
+import android.provider.MediaStore;
+import android.util.Log;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RadioGroup;
+import android.widget.TextView;
+
+import com.mlkit.sample.R;
+import com.mlkit.sample.activity.dialog.AddPictureDialog;
+import com.mlkit.sample.activity.entity.GeneralCardResult;
+import com.mlkit.sample.processor.gcr.GeneralCardProcessor;
+import com.mlkit.sample.processor.gcr.homecard.HomeCardProcessor;
+import com.mlkit.sample.processor.gcr.hongkong.HKIdCardProcessor;
+import com.mlkit.sample.processor.gcr.passcard.PassCardProcessor;
+import com.huawei.hms.mlplugin.card.gcr.MLGcrCapture;
+import com.huawei.hms.mlplugin.card.gcr.MLGcrCaptureConfig;
+import com.huawei.hms.mlplugin.card.gcr.MLGcrCaptureFactory;
+import com.huawei.hms.mlplugin.card.gcr.MLGcrCaptureResult;
+import com.huawei.hms.mlplugin.card.gcr.MLGcrCaptureUIConfig;
+
+import java.io.IOException;
+
+public class GeneralCardRecognitionActivity extends Activity implements View.OnClickListener {
+    private static final String TAG = "GCRActivity";
+    private Uri mImageUri;
+    private static final int REQUEST_IMAGE_SELECT_FROM_ALBUM = 1000;
+    private static final int REQUEST_IMAGE_CAPTURE = 1001;
+    private Object object = false;
+    private ImageView frontImg;
+    private ImageView frontSimpleImg;
+    private ImageView frontDeleteImg;
+    private LinearLayout frontAddView;
+    private TextView showResult;
+    private RadioGroup cardType;
+    private CardType cardTypeEnum = CardType.PASSCARD;
+    private Bitmap imageBitmap;
+    RadioGroup.OnCheckedChangeListener radioListener = new RadioGroup.OnCheckedChangeListener() {
+        @Override
+        public void onCheckedChanged(RadioGroup group, int checkedId) {
+            switch (checkedId) {
+                case R.id.passCard:
+                    updateCardType(CardType.PASSCARD);
+                    break;
+                case R.id.HKIdCard:
+                    updateCardType(CardType.HKIDCARD);
+                    break;
+                case R.id.comeHomeCard:
+                    updateCardType(CardType.COMEHOMECARD);
+                    break;
+            }
+        }
+    };
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_general_card_recognition);
+        initComponent();
+    }
+
+    private void initComponent() {
+        frontImg = findViewById(R.id.avatar_img);
+        frontSimpleImg = findViewById(R.id.avatar_sample_img);
+        frontDeleteImg = findViewById(R.id.avatar_delete);
+        frontAddView = findViewById(R.id.avatar_add);
+        showResult = findViewById(R.id.show_result);
+
+        frontAddView.setOnClickListener(this);
+        frontDeleteImg.setOnClickListener(this);
+        cardType = findViewById(R.id.card_type);
+        cardType.setOnCheckedChangeListener(radioListener);
+        findViewById(R.id.back).setOnClickListener(this);
+    }
+
+    private void updateCardType(CardType type) {
+        if (cardTypeEnum != type) {
+            showResult.setText("");
+            showFrontDeleteImage();
+        }
+        cardTypeEnum = type;
+    }
+
+    @Override
+    public void onClick(View view) {
+        int id = view.getId();
+        switch (id) {
+            case R.id.avatar_add:
+                showChoosePicDialog();
+                break;
+            case R.id.avatar_delete:
+                showFrontDeleteImage();
+                break;
+            case R.id.back:
+                finish();
+            default:
+                break;
+        }
+    }
+
+    private void showChoosePicDialog() {
+        AddPictureDialog addPictureDialog = new AddPictureDialog(this, AddPictureDialog.TYPE_CUSTOM);
+        addPictureDialog.setClickListener(new AddPictureDialog.ClickListener() {
+            @Override
+            public void takePicture() {
+                detectPhoto(object, callback);
+            }
+
+            @Override
+            public void selectImage() {
+                startChooseImageIntentForResult();
+            }
+
+            @Override
+            public void doExtend() {
+                 detectPreview(object, callback);
+            }
+        });
+        addPictureDialog.show();
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        Log.d(TAG, "onConfigurationChanged");
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
+        super.onActivityResult(requestCode, resultCode, intent);
+        Log.i(TAG, "onActivityResult requestCode " + requestCode + ", resultCode " + resultCode);
+        if (requestCode == REQUEST_IMAGE_SELECT_FROM_ALBUM && resultCode == RESULT_OK) {
+            mImageUri = intent.getData();
+            tryReloadAndDetectInImage();
+        } else if (requestCode == REQUEST_IMAGE_CAPTURE && resultCode == RESULT_OK) {
+            tryReloadAndDetectInImage();
+        }
+    }
+
+    public enum CardType {
+        HKIDCARD, PASSCARD, COMEHOMECARD
+    }
+
+    // video stream
+    private void detectPreview(Object object, MLGcrCapture.Callback callback) {
+        MLGcrCaptureConfig cardConfig = new MLGcrCaptureConfig.Factory().setLanguage("en").create();
+        MLGcrCaptureUIConfig uiConfig = new MLGcrCaptureUIConfig.Factory()
+                .setTipText(getResources().getString(R.string.vedio_tip))
+                .setOrientation(MLGcrCaptureUIConfig.ORIENTATION_AUTO).create();
+        MLGcrCapture ocrManager = MLGcrCaptureFactory.getInstance().getGcrCapture(cardConfig, uiConfig);
+        ocrManager.capturePreview(this, object, callback);
+    }
+
+    // take a picture
+    private void detectPhoto(Object object, MLGcrCapture.Callback callback) {
+        MLGcrCaptureConfig cardConfig = new MLGcrCaptureConfig.Factory().setLanguage("en").create();
+        MLGcrCaptureUIConfig uiConfig = new MLGcrCaptureUIConfig.Factory()
+                .setTipText(getResources().getString(R.string.capture_tip))
+                .setOrientation(MLGcrCaptureUIConfig.ORIENTATION_AUTO).create();
+        MLGcrCapture ocrManager = MLGcrCaptureFactory.getInstance().getGcrCapture(cardConfig, uiConfig);
+
+        ocrManager.capturePhoto(this, object, callback);
+    }
+
+    // local image
+    private void detectLocalImage(Bitmap bitmap, Object object, MLGcrCapture.Callback callback) {
+        MLGcrCaptureConfig config = new MLGcrCaptureConfig.Factory().create();
+        MLGcrCapture ocrManager = MLGcrCaptureFactory.getInstance().getGcrCapture(config);
+        ocrManager.captureImage(bitmap, object, callback);
+    }
+
+    private MLGcrCapture.Callback callback = new MLGcrCapture.Callback() {
+        @Override
+        public int onResult(MLGcrCaptureResult result, Object object) {
+            Log.i(TAG, "callback onRecSuccess");
+            if (result == null) {
+                Log.e(TAG, "callback onRecSuccess result is null");
+                return MLGcrCaptureResult.CAPTURE_CONTINUE;
+            }
+
+            GeneralCardProcessor idCard = null;
+            GeneralCardResult cardResult = null;
+
+            if (cardTypeEnum == CardType.PASSCARD) {
+                idCard = new PassCardProcessor(result.text);
+            } else if (cardTypeEnum == CardType.HKIDCARD) {
+                idCard = new HKIdCardProcessor(result.text);
+            } else if (cardTypeEnum == CardType.COMEHOMECARD) {
+                idCard = new HomeCardProcessor(result.text);
+            }
+
+            if (idCard != null) {
+                cardResult = idCard.getResult();
+            }
+
+            showFrontImage(result.cardBitmap);
+            displayResult(cardResult);
+
+            // If the results don't match
+            if (cardResult == null || cardResult.valid.isEmpty() || cardResult.number.isEmpty()) {
+                return MLGcrCaptureResult.CAPTURE_CONTINUE;
+            }
+
+            displayResult(cardResult);
+            return MLGcrCaptureResult.CAPTURE_STOP;
+        }
+
+        @Override
+        public void onCanceled() {
+            Log.i(TAG, "callback onRecCanceled");
+        }
+
+        @Override
+        public void onFailure(int i, Bitmap bitmap) {
+
+        }
+
+        @Override
+        public void onDenied() {
+            Log.i(TAG, "callback onCameraDenied");
+        }
+    };
+
+    private void displayResult(GeneralCardResult result) {
+        if (result == null) {
+            return;
+        }
+        if (showResult.getText().length() != 0) {
+            showResult.setText("");
+        }
+        StringBuilder builder = new StringBuilder();
+        builder.append("valid: ");
+        builder.append(result.valid);
+        builder.append("\r\n");
+
+        builder.append("number: ");
+        builder.append(result.number);
+
+        showResult.setText(builder.toString());
+    }
+
+    private void showFrontImage(Bitmap bitmap) {
+        frontImg.setVisibility(View.VISIBLE);
+        frontImg.setImageBitmap(bitmap);
+        frontSimpleImg.setVisibility(View.GONE);
+        frontAddView.setVisibility(View.GONE);
+        frontDeleteImg.setVisibility(View.VISIBLE);
+    }
+
+    private void showFrontDeleteImage() {
+        frontImg.setVisibility(View.GONE);
+        frontSimpleImg.setVisibility(View.VISIBLE);
+        frontAddView.setVisibility(View.VISIBLE);
+        frontDeleteImg.setVisibility(View.GONE);
+    }
+
+    private void startChooseImageIntentForResult() {
+        Intent intent = new Intent(Intent.ACTION_PICK, null);
+        intent.setDataAndType(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, "image/*");
+        startActivityForResult(intent, REQUEST_IMAGE_SELECT_FROM_ALBUM);
+    }
+
+    private void tryReloadAndDetectInImage() {
+        if (mImageUri == null) {
+            return;
+        }
+        Bitmap imageBitmap = null;
+        try {
+            imageBitmap = MediaStore.Images.Media.getBitmap(getContentResolver(), mImageUri);
+        } catch (IOException error) {
+            error.printStackTrace();
+        }
+
+        detectLocalImage(imageBitmap, null, callback);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (imageBitmap != null && !imageBitmap.isRecycled()) {
+            imageBitmap.recycle();
+            imageBitmap = null;
+        }
+    }
+}
+
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/IDCardRecognitionActivity.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/IDCardRecognitionActivity.java
similarity index 92%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/IDCardRecognitionActivity.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/IDCardRecognitionActivity.java
index 00aa900..e7a3bf4 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/IDCardRecognitionActivity.java
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/IDCardRecognitionActivity.java
@@ -14,6 +14,8 @@
  *    limitations under the License.
  */
 
+
+
 package com.mlkit.sample.activity;
 
 import android.Manifest;
@@ -59,7 +61,6 @@ public class IDCardRecognitionActivity extends AppCompatActivity implements View
     private SwitchButton switchButton;
     private LinearLayout frontAddView;
     private LinearLayout backAddView;
-    private RadioGroup radioGroup;
     private TextView showResult;
     private String lastFrontResult = "";
     private String lastBackResult = "";
@@ -81,7 +82,6 @@ private void initComponent() {
         this.backDeleteImg = this.findViewById(R.id.emblem_delete);
         this.frontAddView = this.findViewById(R.id.avatar_add);
         this.backAddView = this.findViewById(R.id.emblem_add);
-        this.radioGroup = this.findViewById(R.id.local_or_remote);
         this.showResult = this.findViewById(R.id.show_result);
         this.switchButton = this.findViewById(R.id.switch_button_view);
         this.switchButton.setOnSwitchButtonStateChangeListener(this);
@@ -91,27 +91,8 @@ private void initComponent() {
         this.frontDeleteImg.setOnClickListener(this);
         this.backDeleteImg.setOnClickListener(this);
         this.findViewById(R.id.back).setOnClickListener(this);
-        this.radioGroup.setOnCheckedChangeListener(this.radioListener);
     }
 
-    RadioGroup.OnCheckedChangeListener radioListener = new RadioGroup.OnCheckedChangeListener() {
-        @Override
-        public void onCheckedChanged(RadioGroup group, int checkedId) {
-            switch (checkedId) {
-                case R.id.local:
-                    Log.i(IDCardRecognitionActivity.TAG, "local");
-                    IDCardRecognitionActivity.this.isRemote = false;
-                    break;
-                case R.id.remote:
-                    Log.i(IDCardRecognitionActivity.TAG, "remote");
-                    IDCardRecognitionActivity.this.isRemote = true;
-                    break;
-                default:
-                    break;
-            }
-        }
-    };
-
     @Override
     public void onClick(View view) {
         int id = view.getId();
@@ -180,10 +161,10 @@ public void onConfigurationChanged(Configuration newConfig) {
         Log.d(IDCardRecognitionActivity.TAG, "onConfigurationChanged");
     }
 
-    private void startCaptureActivity(MLCnIcrCapture.CallBack callBack, boolean isFront, boolean isLocal) {
+    private void startCaptureActivity(MLCnIcrCapture.CallBack callBack, boolean isFront, boolean isRemote) {
         Log.i(IDCardRecognitionActivity.TAG, "startCaptureActivity");
         MLCnIcrCaptureConfig config =
-                new MLCnIcrCaptureConfig.Factory().setFront(isFront).setRemote(isLocal).create();
+                new MLCnIcrCaptureConfig.Factory().setFront(isFront).setRemote(isRemote).create();
         MLCnIcrCapture icrCapture = MLCnIcrCaptureFactory.getInstance().getIcrCapture(config);
 
         icrCapture.capture(callBack, this);
@@ -267,7 +248,7 @@ public void onCanceled() {
         @Override
         public void onFailure(int recCode, Bitmap bitmap) {
             Toast.makeText(IDCardRecognitionActivity.this.getApplicationContext(), R.string.get_data_failed, Toast.LENGTH_SHORT).show();
-            Log.i(IDCardRecognitionActivity.TAG, "IdCallBack onRecFailed");
+            Log.i(IDCardRecognitionActivity.TAG, "IdCallBack onRecFailed: " + recCode);
         }
 
         @Override
@@ -306,4 +287,5 @@ private void showBackDeleteImage() {
         this.backSimpleImg.setVisibility(View.VISIBLE);
         this.backDeleteImg.setVisibility(View.GONE);
     }
-}
\ No newline at end of file
+}
+
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/RemoteDetectionActivity.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/RemoteDetectionActivity.java
similarity index 88%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/RemoteDetectionActivity.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/RemoteDetectionActivity.java
index d9bc908..db86eaf 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/RemoteDetectionActivity.java
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/RemoteDetectionActivity.java
@@ -41,21 +41,19 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.mlkit.sample.R;
+import com.huawei.hms.mlsdk.document.MLDocument;
+import com.huawei.hms.mlsdk.text.MLText;
 import com.mlkit.sample.activity.dialog.AddPictureDialog;
-import com.mlkit.sample.callback.CloudInfoResultCallBack;
-import com.mlkit.sample.manager.CloudDataManager;
+import com.mlkit.sample.callback.CouldInfoResultCallBack;
+import com.mlkit.sample.processor.CloudDataProcessor;
+import com.mlkit.sample.transactor.DocumentTextTransactor;
+import com.mlkit.sample.transactor.ImageTransactor;
+import com.mlkit.sample.transactor.RemoteTextTransactor;
 import com.mlkit.sample.util.BitmapUtils;
 import com.mlkit.sample.util.Constant;
-import com.mlkit.sample.views.overlay.ZoomImageView;
 import com.mlkit.sample.views.overlay.GraphicOverlay;
-import com.mlkit.sample.transactor.ImageTransactor;
-import com.mlkit.sample.transactor.RemoteImageClassificationTransactor;
-import com.mlkit.sample.transactor.RemoteLandmarkTransactor;
-import com.mlkit.sample.transactor.DocumentTextTransactor;
-import com.mlkit.sample.transactor.RemoteTextTransactor;
-import com.huawei.hms.mlsdk.document.MLDocument;
-import com.huawei.hms.mlsdk.text.MLText;
+import com.mlkit.sample.views.overlay.ZoomImageView;
+import com.mlkit.sample.R;
 
 import java.lang.ref.WeakReference;
 
@@ -77,7 +75,7 @@ public final class RemoteDetectionActivity extends BaseActivity implements OnCli
     private TextView title;
     private GraphicOverlay graphicOverlay;
     private ZoomImageView changeImageView;
-    private String selectedMode = Constant.CLOUD_IMAGE_CLASSIFICATION;
+    private String selectedMode = Constant.CLOUD_TEXT_DETECTION;
 
     boolean isLandScape;
 
@@ -94,11 +92,11 @@ public final class RemoteDetectionActivity extends BaseActivity implements OnCli
 
     private boolean flag = true;
 
-    private CloudDataManager cloudDataManager;
+    private CloudDataProcessor cloudDataProcessor;
 
     private AddPictureDialog addPictureDialog;
 
-    private CloudInfoResultCallBack textResultCallBack = new MyCloudInfoResultCallBack();
+    private CouldInfoResultCallBack textResultCallBack = new MyCouldInfoResultCallBack();
 
     private GestureDetector.OnDoubleTapListener onDoubleTapListener = new MyOnDoubleTapListener();
 
@@ -186,6 +184,7 @@ protected void onCreate(Bundle savedInstanceState) {
         this.getImageButton = this.findViewById(R.id.getImageButton);
         this.getImageButton.setOnClickListener(this);
         this.changeImageView.setOnDoubleTapListener(this.onDoubleTapListener);
+        this.cloudDataProcessor = new CloudDataProcessor();
         this.createImageTransactor();
         this.createDialog();
         this.isLandScape = (this.getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE);
@@ -205,10 +204,6 @@ private void initTitle() {
             this.title.setText(this.getResources().getText(R.string.cloud_text));
         } else if (this.selectedMode.equals(Constant.CLOUD_DOCUMENT_TEXT_DETECTION)) {
             this.title.setText(this.getResources().getText(R.string.document_recognition_s));
-        } else if (this.selectedMode.equals(Constant.CLOUD_IMAGE_CLASSIFICATION)) {
-            this.title.setText(this.getResources().getText(R.string.cloud_classification));
-        } else if (this.selectedMode.equals(Constant.CLOUD_LANDMARK_DETECTION)) {
-            this.title.setText(this.getResources().getText(R.string.landmark_s));
         }
     }
 
@@ -235,10 +230,8 @@ public void onClick(View view) {
         }
     }
 
-    private void createDialog(){
-        this.addPictureDialog = new AddPictureDialog(this);
-        final Intent intent = new Intent(RemoteDetectionActivity.this, RemoteDetectionActivity.class);
-        intent.putExtra(Constant.MODEL_TYPE, Constant.CLOUD_IMAGE_CLASSIFICATION);
+    private void createDialog() {
+        this.addPictureDialog = new AddPictureDialog(this, AddPictureDialog.TYPE_NORMAL);
         this.addPictureDialog.setClickListener(new AddPictureDialog.ClickListener() {
             @Override
             public void takePicture() {
@@ -249,6 +242,11 @@ public void takePicture() {
             public void selectImage() {
                 RemoteDetectionActivity.this.selectLocalImage();
             }
+
+            @Override
+            public void doExtend() {
+
+            }
         });
     }
 
@@ -271,16 +269,9 @@ public void onSaveInstanceState(Bundle outState) {
     @Override
     protected void onRestoreInstanceState(Bundle savedInstanceState) {
         super.onRestoreInstanceState(savedInstanceState);
-        if (this.selectedMode.equals(Constant.CLOUD_TEXT_DETECTION)
-                || this.selectedMode.equals(Constant.CLOUD_DOCUMENT_TEXT_DETECTION)) {
-            this.preview.setVisibility(View.GONE);
-            this.graphicOverlay.setVisibility(View.GONE);
-            this.changeImageView.setVisibility(View.VISIBLE);
-        } else {
-            this.preview.setVisibility(View.VISIBLE);
-            this.graphicOverlay.setVisibility(View.VISIBLE);
-            this.changeImageView.setVisibility(View.GONE);
-        }
+        this.preview.setVisibility(View.GONE);
+        this.graphicOverlay.setVisibility(View.GONE);
+        this.changeImageView.setVisibility(View.VISIBLE);
     }
 
     private void startCamera() {
@@ -357,12 +348,6 @@ private Integer getMaxHeightOfImage() {
 
     private void createImageTransactor() {
         switch (this.selectedMode) {
-            case Constant.CLOUD_IMAGE_CLASSIFICATION:
-                this.imageTransactor = new RemoteImageClassificationTransactor(this.getApplicationContext(), this.mHandler);
-                break;
-            case Constant.CLOUD_LANDMARK_DETECTION:
-                this.imageTransactor = new RemoteLandmarkTransactor(this.mHandler);
-                break;
             case Constant.CLOUD_TEXT_DETECTION:
                 this.imageTransactor = new RemoteTextTransactor(this.mHandler);
                 ((RemoteTextTransactor) this.imageTransactor).addCouldTextResultCallBack(this.textResultCallBack);
@@ -397,7 +382,7 @@ protected void onDestroy() {
         }
     }
 
-    class MyCloudInfoResultCallBack implements CloudInfoResultCallBack {
+    class MyCouldInfoResultCallBack implements CouldInfoResultCallBack {
         @Override
         public void onSuccessForText(Bitmap originalCameraImage, MLText text, GraphicOverlay graphicOverlay) {
             if (text == null) {
@@ -407,10 +392,12 @@ public void onSuccessForText(Bitmap originalCameraImage, MLText text, GraphicOve
             RemoteDetectionActivity.this.changeImageView.setVisibility(View.VISIBLE);
             RemoteDetectionActivity.this.bitmapCopy = Bitmap.createBitmap(originalCameraImage).copy(Bitmap.Config.ARGB_8888, true);
             RemoteDetectionActivity.this.bitmapCopyForTap = Bitmap.createBitmap(originalCameraImage).copy(Bitmap.Config.ARGB_8888, true);
-            RemoteDetectionActivity.this.cloudDataManager = new CloudDataManager(graphicOverlay, RemoteDetectionActivity.this.bitmapCopyForTap, text);
+            RemoteDetectionActivity.this.cloudDataProcessor.setGraphicOverlay(graphicOverlay);
+            RemoteDetectionActivity.this.cloudDataProcessor.setBitmap(RemoteDetectionActivity.this.bitmapCopyForTap);
+            RemoteDetectionActivity.this.cloudDataProcessor.setText(text);
             RemoteDetectionActivity.this.changeImageView.setImageBitmap(RemoteDetectionActivity.this.bitmapCopy);
             Canvas canvas = new Canvas(RemoteDetectionActivity.this.bitmapCopy);
-            RemoteDetectionActivity.this.cloudDataManager.drawView(canvas, true);
+            RemoteDetectionActivity.this.cloudDataProcessor.drawView(canvas, true);
         }
 
         @Override
@@ -420,7 +407,7 @@ public void onSuccessForDoc(Bitmap originalCameraImage, MLDocument text, Graphic
             Bitmap bitmap = Bitmap.createBitmap(originalCameraImage).copy(Bitmap.Config.ARGB_8888, true);
             RemoteDetectionActivity.this.changeImageView.setImageBitmap(bitmap);
             Canvas canvas = new Canvas(bitmap);
-            RemoteDetectionActivity.this.cloudDataManager.drawCloudDocText(text, canvas);
+            RemoteDetectionActivity.this.cloudDataProcessor.drawCloudDocText(text, canvas);
         }
     }
 
@@ -439,7 +426,7 @@ public boolean onSingleTapConfirmed(MotionEvent motionEvent) {
             TransitionDrawable transitionDrawable;
             if (RemoteDetectionActivity.this.flag) {
                 Canvas canvas = new Canvas(RemoteDetectionActivity.this.bitmapCopyForTap);
-                RemoteDetectionActivity.this.cloudDataManager.drawView(canvas, false);
+                RemoteDetectionActivity.this.cloudDataProcessor.drawView(canvas, false);
                 transitionDrawable = new TransitionDrawable(new Drawable[]{bitmap_drawable, bitmapcopy_drawable});
             } else {
                 transitionDrawable = new TransitionDrawable(new Drawable[]{bitmapcopy_drawable, bitmap_drawable});
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/SettingActivity.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/SettingActivity.java
similarity index 75%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/SettingActivity.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/SettingActivity.java
index fdafbf9..376ab5a 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/SettingActivity.java
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/SettingActivity.java
@@ -1,17 +1,17 @@
 /**
  * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package com.mlkit.sample.activity;
@@ -22,11 +22,10 @@
 import android.view.View;
 import android.widget.TextView;
 
-import androidx.annotation.Nullable;
-
-import com.mlkit.sample.R;
-import com.mlkit.sample.util.Constant;
 import com.huawei.hms.mlsdk.common.internal.client.SmartLog;
+import com.mlkit.sample.util.Constant;
+import com.mlkit.sample.R;
+import androidx.annotation.Nullable;
 
 public class SettingActivity extends BaseActivity implements View.OnClickListener {
     private static final String TAG = "SettingActivity";
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/StartActivity.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/StartActivity.java
similarity index 60%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/StartActivity.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/StartActivity.java
index 62a358e..0e19ac2 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/StartActivity.java
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/StartActivity.java
@@ -1,17 +1,17 @@
 /**
  * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package com.mlkit.sample.activity;
@@ -27,14 +27,19 @@
 import android.provider.Settings;
 import android.util.Log;
 import android.view.View;
+import android.widget.AdapterView;
+import android.widget.GridView;
 import android.widget.Toast;
 
-import com.mlkit.sample.R;
-import com.mlkit.sample.activity.imgseg.ImageSegmentationActivity;
+import com.mlkit.sample.activity.adapter.GridViewAdapter;
+import com.mlkit.sample.activity.entity.GridViewItem;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import com.mlkit.sample.R;
+import com.mlkit.sample.util.Constant;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
@@ -46,6 +51,13 @@ public final class StartActivity extends BaseActivity
         implements OnRequestPermissionsResultCallback, View.OnClickListener {
     private static final String TAG = "StartActivity";
     private static final int PERMISSION_REQUESTS = 1;
+    private static final int[] icons = {R.drawable.icon_bcr, R.drawable.icon_gcr, R.drawable.icon_text,
+            R.drawable.icon_icr, R.drawable.icon_document, R.drawable.icon_translate};
+
+    private static final int[] titles = {R.string.bcr, R.string.gcr, R.string.text_detection, R.string.icr,
+            R.string.document_recognition, R.string.translate};
+    private GridView mGridView;
+    private ArrayList<GridViewItem> mDataList;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -53,56 +65,70 @@ protected void onCreate(Bundle savedInstanceState) {
         BaseActivity.setStatusBarColor(this, R.color.logo_background);
         this.setContentView(R.layout.activity_start);
         this.findViewById(R.id.setting_img).setOnClickListener(this);
-        this.findViewById(R.id.layout_segmentation).setOnClickListener(this);
-        this.findViewById(R.id.layout_face).setOnClickListener(this);
-        this.findViewById(R.id.layout_object).setOnClickListener(this);
-        this.findViewById(R.id.layout_text).setOnClickListener(this);
-        this.findViewById(R.id.layout_classification).setOnClickListener(this);
-        this.findViewById(R.id.layout_icr).setOnClickListener(this);
-        this.findViewById(R.id.layout_shopping).setOnClickListener(this);
-        this.findViewById(R.id.layout_translate).setOnClickListener(this);
-        this.findViewById(R.id.layout_more).setOnClickListener(this);
+        initData();
+        this.mGridView = findViewById(R.id.gridview);
+        GridViewAdapter mAdapter = new GridViewAdapter(this.mDataList, getApplicationContext());
+        this.mGridView.setAdapter(mAdapter);
+        initClickEvent();
         if (!this.allPermissionsGranted()) {
             this.getRuntimePermissions();
         }
     }
 
+    private void initClickEvent() {
+        if (this.mGridView == null) {
+            return;
+        }
+        this.mGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                switch (position) {
+                    case 0:
+                        // BCR
+                        startActivity(new Intent(StartActivity.this, BankCardRecognitionActivity.class));
+                        break;
+                    case 1:
+                        // GCR
+                        startActivity(new Intent(StartActivity.this, GeneralCardRecognitionActivity.class));
+                        break;
+                    case 2:
+                        // Text recognition
+                        startActivity(new Intent(StartActivity.this, TextRecognitionActivity.class));
+                        break;
+                    case 3:
+                        // ICR
+                        startActivity(new Intent(StartActivity.this, IDCardRecognitionActivity.class));
+                        break;
+                    case 4:
+                        // Document recognition
+                        final Intent intent = new Intent(StartActivity.this, RemoteDetectionActivity.class);
+                        intent.putExtra(Constant.MODEL_TYPE, Constant.CLOUD_DOCUMENT_TEXT_DETECTION);
+                        startActivity(intent);
+                        break;
+                    case 5:
+                        startActivity(new Intent(StartActivity.this, TranslatorActivity.class));
+                        break;
+                    default:
+                        Toast.makeText(getApplicationContext(), R.string.coming_soon, Toast.LENGTH_SHORT).show();
+                        break;
+                }
+            }
+        });
+    }
+
     @Override
     public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.layout_face:
-                this.startActivity(new Intent(StartActivity.this, FaceDetectionActivity.class));
-                break;
-            case R.id.layout_object:
-                this.startActivity(new Intent(StartActivity.this, ObjectDetectionActivity.class));
-                break;
-            case R.id.layout_classification:
-                this.startActivity(new Intent(StartActivity.this, ImageClassificationActivity.class));
-                break;
-            case R.id.layout_text:
-                this.startActivity(new Intent(StartActivity.this, TextRecognitionActivity.class));
-                break;
-            case R.id.layout_shopping:
-                Toast.makeText(this.getApplicationContext(), this.getText(R.string.coming_soon), Toast.LENGTH_SHORT).show();
-                break;
-            case R.id.layout_translate:
-                this.startActivity(new Intent(StartActivity.this, TranslatorActivity.class));
-                break;
-            case R.id.layout_more:
-                this.startActivity(new Intent(StartActivity.this, AllFunctionActivity.class));
-                break;
-            case R.id.setting_img:
-                this.startActivity(new Intent(StartActivity.this, SettingActivity.class));
-                break;
-            case R.id.layout_segmentation:
-                this.startActivity(new Intent(StartActivity.this, ImageSegmentationActivity.class));
-                break;
-            case R.id.layout_icr:
-                this.startActivity(new Intent(StartActivity.this, IDCardRecognitionActivity.class));
-                break;
-            default:
-                Toast.makeText(this.getApplicationContext(), this.getText(R.string.coming_soon), Toast.LENGTH_SHORT).show();
+        if (view.getId() == R.id.setting_img) {
+            this.startActivity(new Intent(StartActivity.this, SettingActivity.class));
+        }
+    }
 
+    private void initData() {
+        this.mDataList = new ArrayList<GridViewItem>();
+        GridViewItem item;
+        for (int i = 0; i < icons.length; i++) {
+            item = new GridViewItem(icons[i], titles[i]);
+            this.mDataList.add(item);
         }
     }
 
@@ -180,7 +206,7 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
                             Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-							// Open the corresponding setting interface according to the package name.
+                            // Open the corresponding setting interface according to the package name.
                             intent.setData(Uri.parse("package:" + StartActivity.this.getPackageName()));
                             StartActivity.this.startActivityForResult(intent, 200);
                             StartActivity.this.startActivity(intent);
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/TextRecognitionActivity.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/TextRecognitionActivity.java
similarity index 91%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/TextRecognitionActivity.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/TextRecognitionActivity.java
index f9e2c94..14316a9 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/TextRecognitionActivity.java
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/TextRecognitionActivity.java
@@ -36,18 +36,18 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.mlkit.sample.R;
 import com.mlkit.sample.activity.dialog.AddPictureDialog;
 import com.mlkit.sample.camera.CameraConfiguration;
 import com.mlkit.sample.camera.LensEngine;
 import com.mlkit.sample.camera.LensEnginePreview;
-import com.mlkit.sample.util.BitmapUtils;
-import com.mlkit.sample.manager.LocalDataManager;
+import com.mlkit.sample.processor.LocalDataProcessor;
 import com.mlkit.sample.transactor.LocalTextTransactor;
+import com.mlkit.sample.util.BitmapUtils;
 import com.mlkit.sample.util.Constant;
 import com.mlkit.sample.util.SharedPreferencesUtil;
-import com.mlkit.sample.views.overlay.ZoomImageView;
 import com.mlkit.sample.views.overlay.GraphicOverlay;
+import com.mlkit.sample.views.overlay.ZoomImageView;
+import com.mlkit.sample.R;
 
 import java.io.IOException;
 import java.lang.ref.WeakReference;
@@ -76,7 +76,7 @@ public final class TextRecognitionActivity extends BaseActivity
     private AddPictureDialog addPictureDialog;
     private TextView textCN;
     private TextView textEN;
-    private TextView textJN ;
+    private TextView textJN;
     private TextView textKN;
     private TextView textLN;
     private String textType = Constant.POSITION_CN;
@@ -195,7 +195,7 @@ public void onClick(View view) {
     }
 
     private void restartLensEngine(String type) {
-        if(this.textType.equals(type)){
+        if (this.textType.equals(type)) {
             return;
         }
         this.lensEngine.release();
@@ -205,9 +205,7 @@ private void restartLensEngine(String type) {
         if (null != this.lensEngine) {
             this.mCamera = this.lensEngine.getCamera();
             try {
-                if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {
-                    this.mCamera.setPreviewDisplay(this.preview.getSurfaceHolder());
-                }
+                this.mCamera.setPreviewDisplay(this.preview.getSurfaceHolder());
             } catch (IOException e) {
                 Log.d(TextRecognitionActivity.TAG, "initViews IOException");
             }
@@ -224,7 +222,7 @@ public void onBackPressed() {
         }
     }
 
-    private void createLanguageDialog(){
+    private void createLanguageDialog() {
         this.languageDialog = new Dialog(this, R.style.MyDialogStyle);
         View view = View.inflate(this, R.layout.dialog_language_setting, null);
         // Set up a custom layout
@@ -254,8 +252,8 @@ private void showLanguageDialog() {
         this.languageDialog.show();
     }
 
-    private void createAddPictureDialog(){
-        this.addPictureDialog = new AddPictureDialog(this);
+    private void createAddPictureDialog() {
+        this.addPictureDialog = new AddPictureDialog(this, AddPictureDialog.TYPE_NORMAL);
         final Intent intent = new Intent(TextRecognitionActivity.this, RemoteDetectionActivity.class);
         intent.putExtra(Constant.MODEL_TYPE, Constant.CLOUD_TEXT_DETECTION);
         this.addPictureDialog.setClickListener(new AddPictureDialog.ClickListener() {
@@ -270,8 +268,14 @@ public void selectImage() {
                 intent.putExtra(Constant.ADD_PICTURE_TYPE, Constant.TYPE_SELECT_IMAGE);
                 TextRecognitionActivity.this.startActivity(intent);
             }
+
+            @Override
+            public void doExtend() {
+
+            }
         });
     }
+
     private void showAddPictureDialog() {
         this.addPictureDialog.show();
     }
@@ -375,15 +379,15 @@ private void recycleBitmap() {
 
     private void takePicture() {
         this.zoomImageLayout.setVisibility(View.VISIBLE);
-        LocalDataManager localDataManager = new LocalDataManager();
-        localDataManager.setLandScape(this.isLandScape);
+        LocalDataProcessor localDataProcessor = new LocalDataProcessor();
+        localDataProcessor.setLandScape(this.isLandScape);
         this.bitmap = BitmapUtils.getBitmap(this.localTextTransactor.getTransactingImage(), this.localTextTransactor.getTransactingMetaData());
 
-        float previewWidth = localDataManager.getMaxWidthOfImage(this.localTextTransactor.getTransactingMetaData());
-        float previewHeight = localDataManager.getMaxHeightOfImage(this.localTextTransactor.getTransactingMetaData());
+        float previewWidth = localDataProcessor.getMaxWidthOfImage(this.localTextTransactor.getTransactingMetaData());
+        float previewHeight = localDataProcessor.getMaxHeightOfImage(this.localTextTransactor.getTransactingMetaData());
         if (this.isLandScape) {
-            previewWidth = localDataManager.getMaxHeightOfImage(this.localTextTransactor.getTransactingMetaData());
-            previewHeight = localDataManager.getMaxWidthOfImage(this.localTextTransactor.getTransactingMetaData());
+            previewWidth = localDataProcessor.getMaxHeightOfImage(this.localTextTransactor.getTransactingMetaData());
+            previewHeight = localDataProcessor.getMaxWidthOfImage(this.localTextTransactor.getTransactingMetaData());
         }
         this.bitmapCopy = Bitmap.createBitmap(this.bitmap).copy(Bitmap.Config.ARGB_8888, true);
 
@@ -392,11 +396,11 @@ private void takePicture() {
         float max = Math.max(previewWidth, previewHeight);
 
         if (this.getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
-            localDataManager.setCameraInfo(this.graphicOverlay, canvas, min, max);
+            localDataProcessor.setCameraInfo(this.graphicOverlay, canvas, min, max);
         } else {
-            localDataManager.setCameraInfo(this.graphicOverlay, canvas, max, min);
+            localDataProcessor.setCameraInfo(this.graphicOverlay, canvas, max, min);
         }
-        localDataManager.drawHmsMLVisionText(canvas, this.localTextTransactor.getLastResults().getBlocks());
+        localDataProcessor.drawHmsMLVisionText(canvas, this.localTextTransactor.getLastResults().getBlocks());
         this.zoomImageView.setImageBitmap(this.bitmapCopy);
     }
 }
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/TranslatorActivity.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/TranslatorActivity.java
similarity index 98%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/TranslatorActivity.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/TranslatorActivity.java
index d8b23c3..9acf8dd 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/TranslatorActivity.java
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/TranslatorActivity.java
@@ -32,7 +32,6 @@
 import com.huawei.hmf.tasks.OnFailureListener;
 import com.huawei.hmf.tasks.OnSuccessListener;
 import com.huawei.hmf.tasks.Task;
-import com.mlkit.sample.R;
 import com.huawei.hms.mlsdk.langdetect.MLDetectedLang;
 import com.huawei.hms.mlsdk.langdetect.MLLangDetectorFactory;
 import com.huawei.hms.mlsdk.langdetect.cloud.MLRemoteLangDetector;
@@ -40,6 +39,7 @@
 import com.huawei.hms.mlsdk.translate.MLTranslatorFactory;
 import com.huawei.hms.mlsdk.translate.cloud.MLRemoteTranslateSetting;
 import com.huawei.hms.mlsdk.translate.cloud.MLRemoteTranslator;
+import com.mlkit.sample.R;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -88,7 +88,7 @@ public class TranslatorActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        this.setContentView(R.layout.activity_translator);
+        this.setContentView(R.layout.activity_translate);
         this.createComponent();
         this.createSpinner();
         this.bindEventListener();
@@ -226,7 +226,7 @@ private void updateOutputText(final String text) {
         this.runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                TranslatorActivity.this.tvOutputString.setText(String.format(Locale.ENGLISH, text));
+                TranslatorActivity.this.tvOutputString.setText(text);
                 TranslatorActivity.this.updateLength(TranslatorActivity.this.tvOutputLen, text.length());
             }
         });
@@ -241,7 +241,7 @@ private void updateInputText(final String text) {
         this.runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                TranslatorActivity.this.etInputString.setText(String.format(Locale.ENGLISH, text));
+                TranslatorActivity.this.etInputString.setText(text);
                 TranslatorActivity.this.updateLength(TranslatorActivity.this.tvInputLen, text.length());
             }
         });
@@ -365,7 +365,7 @@ public void onSuccess(List<MLDetectedLang> result) {
                 for (MLDetectedLang recognizedLang : result) {
                     String langCode = recognizedLang.getLangCode();
                     float probability = recognizedLang.getProbability();
-                    sb.append("Language=" + TranslatorActivity.this.getEnLanguageName(langCode) +"(" + langCode + "), score=" + probability);
+                    sb.append("Language=" + TranslatorActivity.this.getEnLanguageName(langCode) + "(" + langCode + "), score=" + probability);
                     sb.append(".");
                 }
                 TranslatorActivity.this.updateOutputText(sb.toString());
diff --git a/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/adapter/GridViewAdapter.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/adapter/GridViewAdapter.java
new file mode 100644
index 0000000..a670345
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/adapter/GridViewAdapter.java
@@ -0,0 +1,94 @@
+/**
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.mlkit.sample.activity.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.mlkit.sample.R;
+import com.mlkit.sample.activity.entity.GridViewItem;
+import com.huawei.hms.mlsdk.common.internal.client.SmartLog;
+
+import java.util.ArrayList;
+
+public class GridViewAdapter extends BaseAdapter {
+    private final static String TAG = GridViewAdapter.class.getName();
+
+    private Context mContext;
+
+    private ArrayList<GridViewItem> mDataList;
+
+    public GridViewAdapter(ArrayList<GridViewItem> dataList, Context mContext) {
+        super();
+        this.mDataList = dataList;
+        this.mContext = mContext;
+    }
+
+    @Override
+    public int getCount() {
+        return this.mDataList.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return this.mDataList.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        ViewHolder holder = null;
+        try {
+            if (convertView == null) {
+                convertView = LayoutInflater.from(this.mContext).inflate(R.layout.gridview_item, null);
+                holder = new ViewHolder();
+                holder.imageView = convertView.findViewById(R.id.image_item);
+                holder.textView = convertView.findViewById(R.id.text_item);
+                holder.imageNew = convertView.findViewById(R.id.icon_new);
+                convertView.setTag(holder);
+            } else {
+                holder = (ViewHolder) convertView.getTag();
+            }
+            GridViewItem item = this.mDataList.get(position);
+            if(position == 0 || position == 1){
+                holder.imageNew.setBackgroundResource(R.drawable.icon_new);
+            }
+            holder.imageView.setImageResource(item.getResourceId());
+            holder.textView.setText(item.getStringId());
+        } catch (Exception e) {
+            SmartLog.e("GridViewAdapter", e.getMessage());
+        }
+        return convertView;
+    }
+
+    static class ViewHolder {
+        ImageView imageView;
+
+        ImageView imageNew;
+
+        TextView textView;
+    }
+}
diff --git a/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/dialog/AddPictureDialog.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/dialog/AddPictureDialog.java
new file mode 100644
index 0000000..6adb377
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/dialog/AddPictureDialog.java
@@ -0,0 +1,106 @@
+/**
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.mlkit.sample.activity.dialog;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.TextView;
+import com.mlkit.sample.R;
+
+public class AddPictureDialog extends Dialog implements View.OnClickListener {
+    public static final int TYPE_NORMAL = 1;
+    public static final int TYPE_CUSTOM = 2;
+    private TextView tvTakePicture;
+    private TextView tvSelectImage;
+    private TextView tvExtend;
+    private Context context;
+    private ClickListener clickListener;
+    private int type;
+
+    public interface ClickListener {
+         void takePicture();
+
+        void selectImage();
+
+        void doExtend();
+    }
+
+    public AddPictureDialog(Context context, int type) {
+        super(context, R.style.MyDialogStyle);
+        this.context = context;
+        this.type = type;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        this.initViews();
+    }
+
+    private void initViews() {
+        LayoutInflater inflater = LayoutInflater.from(this.context);
+        View view = inflater.inflate(R.layout.dialog_add_picture, null);
+        this.setContentView(view);
+
+        this.tvTakePicture = view.findViewById(R.id.take_photo);
+        this.tvSelectImage = view.findViewById(R.id.select_image);
+        this.tvExtend = view.findViewById(R.id.extend);
+        if (type == TYPE_CUSTOM) {
+            this.tvExtend.setText(R.string.video_frame);
+        }
+        this.tvTakePicture.setOnClickListener(this);
+        this.tvSelectImage.setOnClickListener(this);
+        this.tvExtend.setOnClickListener(this);
+
+        this.setCanceledOnTouchOutside(true);
+        Window dialogWindow = this.getWindow();
+        WindowManager.LayoutParams layoutParams = dialogWindow.getAttributes();
+        layoutParams.width = WindowManager.LayoutParams.MATCH_PARENT;
+        layoutParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
+        layoutParams.gravity = Gravity.BOTTOM;
+        dialogWindow.setAttributes(layoutParams);
+    }
+
+    public void setClickListener(ClickListener clickListener) {
+        this.clickListener = clickListener;
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.take_photo:
+                this.dismiss();
+                this.clickListener.takePicture();
+                break;
+            case R.id.select_image:
+                this.dismiss();
+                this.clickListener.selectImage();
+                break;
+            case R.id.extend:
+                this.dismiss();
+                this.clickListener.doExtend();
+                break;
+        }
+    }
+}
+
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/fragment/OtherCategoryFragment.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/entity/BlockItem.java
similarity index 63%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/fragment/OtherCategoryFragment.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/entity/BlockItem.java
index 4cdc877..e74118a 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/fragment/OtherCategoryFragment.java
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/entity/BlockItem.java
@@ -14,22 +14,20 @@
  *    limitations under the License.
  */
 
-package com.mlkit.sample.activity.fragment;
+package com.mlkit.sample.activity.entity;
+import android.graphics.Rect;
 
-import android.view.View;
-
-import com.mlkit.sample.activity.entity.GridViewItem;
-
-
-import java.util.ArrayList;
-
-public class OtherCategoryFragment extends BaseFragment {
-    @Override
-    protected void initClickEvent(View view) {
-    }
+/**
+ * Re-encapsulate the return result of OCR in Block
+ *
+ * @since 2020-03-12
+ */
+public class BlockItem {
+    public final String text;
+    public final Rect rect;
 
-    @Override
-    protected void initData() {
-        this.mDataList = new ArrayList<GridViewItem>();
+    public BlockItem(String text, Rect rect) {
+        this.text = text;
+        this.rect = rect;
     }
 }
diff --git a/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/entity/GeneralCardResult.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/entity/GeneralCardResult.java
new file mode 100644
index 0000000..c94ee79
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/entity/GeneralCardResult.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.mlkit.sample.activity.entity;
+
+
+/**
+ * Return result class of post-processing plugin
+ *
+ * @since 2020-03-12
+ */
+public class GeneralCardResult {
+    public final String valid;
+    public final String number;
+
+    public GeneralCardResult(String valid, String number) {
+        this.valid = valid;
+        this.number = number;
+    }
+
+}
\ No newline at end of file
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/entity/GridViewItem.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/entity/GridViewItem.java
similarity index 100%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/entity/GridViewItem.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/activity/entity/GridViewItem.java
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/callback/CloudInfoResultCallBack.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/callback/CouldInfoResultCallBack.java
similarity index 96%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/callback/CloudInfoResultCallBack.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/callback/CouldInfoResultCallBack.java
index 6f9bff9..4077fb3 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/callback/CloudInfoResultCallBack.java
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/callback/CouldInfoResultCallBack.java
@@ -22,7 +22,7 @@
 import com.huawei.hms.mlsdk.document.MLDocument;
 import com.huawei.hms.mlsdk.text.MLText;
 
-public interface CloudInfoResultCallBack {
+public interface CouldInfoResultCallBack {
     void onSuccessForText(Bitmap originalCameraImage, MLText text, GraphicOverlay graphicOverlay);
 
     void onSuccessForDoc(Bitmap originalCameraImage, MLDocument text, GraphicOverlay graphicOverlay);
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/callback/ImageUtilCallBack.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/callback/ImageUtilCallBack.java
similarity index 95%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/callback/ImageUtilCallBack.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/callback/ImageUtilCallBack.java
index 8e87191..6a9a313 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/callback/ImageUtilCallBack.java
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/callback/ImageUtilCallBack.java
@@ -16,8 +16,6 @@
 
 package com.mlkit.sample.callback;
 
-import android.graphics.Bitmap;
-
 public interface ImageUtilCallBack {
     void callSavePath(String path);
 }
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/callback/OnDeviceTextResultCallBack.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/callback/OnDeviceTextResultCallBack.java
similarity index 100%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/callback/OnDeviceTextResultCallBack.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/callback/OnDeviceTextResultCallBack.java
diff --git a/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/camera/CameraConfiguration.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/camera/CameraConfiguration.java
new file mode 100644
index 0000000..1906819
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/camera/CameraConfiguration.java
@@ -0,0 +1,73 @@
+/**
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.mlkit.sample.camera;
+
+import android.hardware.Camera;
+
+public class CameraConfiguration {
+
+    public static final int CAMERA_FACING_BACK = Camera.CameraInfo.CAMERA_FACING_BACK;
+    public static final int CAMERA_FACING_FRONT = Camera.CameraInfo.CAMERA_FACING_FRONT;
+
+    public static final int MAX_WIDTH = 960;
+    public static final int MAX_HEIGHT = 720;
+    protected static int cameraFacing = CameraConfiguration.CAMERA_FACING_BACK;
+
+    private float fps = 20.0f;
+    private int previewWidth = CameraConfiguration.MAX_WIDTH;
+    private int previewHeight = CameraConfiguration.MAX_HEIGHT;
+    private boolean isAutoFocus = true;
+
+    public synchronized void setCameraFacing(int facing) {
+        if ((facing != CameraConfiguration.CAMERA_FACING_BACK) && (facing != CameraConfiguration.CAMERA_FACING_FRONT)) {
+            throw new IllegalArgumentException("Invalid camera: " + facing);
+        }
+        cameraFacing = facing;
+    }
+
+    public float getFps() {
+        return this.fps;
+    }
+
+    public void setFps(float fps) {
+        this.fps = fps;
+    }
+
+    public int getPreviewWidth() {
+        return this.previewWidth;
+    }
+
+    public void setPreviewWidth(int previewWidth) {
+        this.previewWidth = previewWidth;
+    }
+
+    public int getPreviewHeight() {
+        return this.previewHeight;
+    }
+
+    public void setPreviewHeight(int previewHeight) {
+        this.previewHeight = previewHeight;
+    }
+
+    public boolean isAutoFocus() {
+        return this.isAutoFocus;
+    }
+
+    public synchronized static int getCameraFacing() {
+        return cameraFacing;
+    }
+}
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/camera/CameraSelector.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/camera/CameraSelector.java
similarity index 100%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/camera/CameraSelector.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/camera/CameraSelector.java
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/camera/FrameMetadata.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/camera/FrameMetadata.java
similarity index 100%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/camera/FrameMetadata.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/camera/FrameMetadata.java
diff --git a/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/camera/LensEngine.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/camera/LensEngine.java
new file mode 100644
index 0000000..ed9863f
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/camera/LensEngine.java
@@ -0,0 +1,317 @@
+/**
+ *  Copyright 2018 Google LLC
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *  2020.2.21-Changed name from CameraSource to LensEngine, and adjusted the architecture, except for the classes: start and stop
+ *                  Huawei Technologies Co., Ltd.
+ */
+
+package com.mlkit.sample.camera;
+
+import android.Manifest;
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.res.Configuration;
+import android.graphics.ImageFormat;
+import android.graphics.SurfaceTexture;
+import android.hardware.Camera;
+import android.util.Log;
+
+import androidx.annotation.RequiresPermission;
+
+import com.huawei.hms.common.size.Size;
+import com.mlkit.sample.transactor.ImageTransactor;
+import com.mlkit.sample.views.overlay.GraphicOverlay;
+
+import java.io.IOException;
+import java.lang.Thread.State;
+import java.nio.ByteBuffer;
+import java.util.IdentityHashMap;
+import java.util.Map;
+
+/**
+ * Manages the camera and allows UI updates on top of it (e.g. overlaying extra Graphics or
+ * displaying extra information). This receives preview frames from the camera at a specified rate,
+ * sending those frames to child classes' detectors / classifiers as fast as it is able to process.
+ */
+@SuppressLint("MissingPermission")
+public class LensEngine {
+    private static final String TAG = "LensEngine";
+    protected Activity activity;
+    private Camera camera;
+    private Thread transactingThread;
+    private final FrameTransactingRunnable transactingRunnable;
+    private final Object transactorLock = new Object();
+    private ImageTransactor frameTransactor;
+    private CameraSelector selector;
+    private final Map<byte[], ByteBuffer> bytesToByteBuffer = new IdentityHashMap<>();
+    private GraphicOverlay overlay;
+
+    public LensEngine(Activity activity, CameraConfiguration configuration, GraphicOverlay graphicOverlay) {
+        this.activity = activity;
+        this.transactingRunnable = new FrameTransactingRunnable();
+        this.selector = new CameraSelector(activity, configuration);
+        this.overlay = graphicOverlay;
+        this.overlay.clear();
+    }
+
+    /**
+     * Stop the camera and release the resources of the camera and analyzer.
+     */
+    public void release() {
+        synchronized (this.transactorLock) {
+            this.stop();
+            this.transactingRunnable.release();
+            if (this.frameTransactor != null) {
+                this.frameTransactor.stop();
+                this.frameTransactor = null;
+            }
+        }
+    }
+
+    /**
+     * Turn on the camera and start sending preview frames to the analyzer for detection.
+     *
+     * @throws IOException IO Exception
+     */
+    @SuppressLint("MissingPermission")
+    @RequiresPermission(Manifest.permission.CAMERA)
+    public synchronized LensEngine run() throws IOException {
+        if (this.camera != null) {
+            return this;
+        }
+        this.camera = this.createCamera();
+        this.camera.startPreview();
+        this.initializeOverlay();
+        this.transactingThread = new Thread(this.transactingRunnable);
+        this.transactingRunnable.setActive(true);
+        this.transactingThread.start();
+        return this;
+    }
+
+    /**
+     * Take pictures.
+     *
+     * @param pictureCallback  Callback function after obtaining photo data.
+     */
+    public synchronized void takePicture(android.hardware.Camera.PictureCallback pictureCallback) {
+        synchronized(this.transactorLock) {
+            if (this.camera != null) {
+                this.camera.takePicture(null,null,null, pictureCallback);
+            }
+        }
+    }
+
+    public synchronized Camera getCamera() {
+        return this.camera;
+    }
+
+    private void initializeOverlay() {
+        if (this.overlay != null) {
+            int min;
+            int max;
+            Size size = this.getPreviewSize();
+            min = Math.min(size.getWidth(), size.getHeight());
+            max = Math.max(size.getWidth(), size.getHeight());
+
+            if (this.activity.getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
+                this.overlay.setCameraInfo(min, max, this.getFacing());
+            } else {
+                this.overlay.setCameraInfo(max, min, this.getFacing());
+            }
+            this.overlay.clear();
+        }
+    }
+
+    /**
+     * Get camera preview size.
+     *
+     * @return Size Size of camera preview.
+     */
+    public Size getPreviewSize() {
+        return this.selector.getPreviewSize();
+    }
+
+    public int getFacing() {
+        return this.selector.getFacing();
+    }
+
+    /**
+     * Turn off the camera and stop transmitting frames to the analyzer.
+     */
+    public synchronized void stop() {
+        this.transactingRunnable.setActive(false);
+        if (this.transactingThread != null) {
+            try {
+                this.transactingThread.join();
+            } catch (InterruptedException e) {
+                Log.d(LensEngine.TAG, "Frame transacting thread interrupted on release.");
+            }
+            this.transactingThread = null;
+        }
+        if (this.camera != null) {
+            this.camera.stopPreview();
+            this.camera.setPreviewCallbackWithBuffer(null);
+            try {
+                this.camera.setPreviewDisplay(null);
+            } catch (Exception e) {
+                Log.e(LensEngine.TAG, "Failed to clear camera preview: " + e);
+            }
+            this.camera.release();
+            this.camera = null;
+        }
+        this.bytesToByteBuffer.clear();
+    }
+
+    @SuppressLint("InlinedApi")
+    private Camera createCamera() throws IOException {
+        Camera camera = this.selector.createCamera();
+        camera.setPreviewCallbackWithBuffer(new CameraPreviewCallback());
+        camera.addCallbackBuffer(this.createPreviewBuffer(this.selector.getPreviewSize()));
+        camera.addCallbackBuffer(this.createPreviewBuffer(this.selector.getPreviewSize()));
+        camera.addCallbackBuffer(this.createPreviewBuffer(this.selector.getPreviewSize()));
+        camera.addCallbackBuffer(this.createPreviewBuffer(this.selector.getPreviewSize()));
+        return camera;
+    }
+
+    /**
+     * Create a buffer for the camera preview callback. The size of the buffer is based on the camera preview size and the camera image format.
+     *
+     * @param previewSize
+     * @return Image data from the camera
+     */
+    @SuppressLint("InlinedApi")
+    private byte[] createPreviewBuffer(Size previewSize) {
+        int bitsPerPixel = ImageFormat.getBitsPerPixel(ImageFormat.NV21);
+        long sizeInBits = (long) previewSize.getHeight() * previewSize.getWidth() * bitsPerPixel;
+        int bufferSize = (int) Math.ceil(sizeInBits / 8.0d) + 1;
+
+        byte[] byteArray = new byte[bufferSize];
+        ByteBuffer buffer = ByteBuffer.wrap(byteArray);
+        if (!buffer.hasArray() || (buffer.array() != byteArray)) {
+            throw new IllegalStateException("Failed to create valid buffer for lensEngine.");
+        }
+        this.bytesToByteBuffer.put(byteArray, buffer);
+        return byteArray;
+    }
+
+    private class CameraPreviewCallback implements Camera.PreviewCallback {
+        @Override
+        public void onPreviewFrame(byte[] data, Camera camera) {
+            LensEngine.this.transactingRunnable.setNextFrame(data, camera);
+        }
+    }
+
+    public void setMachineLearningFrameTransactor(ImageTransactor transactor) {
+        synchronized (this.transactorLock) {
+            if (this.frameTransactor != null) {
+                this.frameTransactor.stop();
+            }
+            this.frameTransactor = transactor;
+        }
+    }
+
+    /**
+     * It is used to receive the frame captured by the camera and pass it to the analyzer.
+     */
+    private class FrameTransactingRunnable implements Runnable {
+        private final Object lock = new Object();
+        private boolean active = true;
+        private ByteBuffer pendingFrameData;
+
+        FrameTransactingRunnable() {
+        }
+
+        /**
+         * Frees the transactor and can safely perform this operation only after the associated thread has completed.
+         */
+        @SuppressLint("Assert")
+        void release() {
+            synchronized (this.lock) {
+                assert (LensEngine.this.transactingThread.getState() == State.TERMINATED);
+            }
+        }
+
+        void setActive(boolean active) {
+            synchronized (this.lock) {
+                this.active = active;
+                this.lock.notifyAll();
+            }
+        }
+
+        /**
+         * Sets the frame data received from the camera. Adds a previously unused frame buffer (if exit) back to the camera.
+         */
+        void setNextFrame(byte[] data, Camera camera) {
+            synchronized (this.lock) {
+                if (this.pendingFrameData != null) {
+                    camera.addCallbackBuffer(this.pendingFrameData.array());
+                    this.pendingFrameData = null;
+                }
+                if (!LensEngine.this.bytesToByteBuffer.containsKey(data)) {
+                    Log.d(LensEngine.TAG, "Skipping frame. Could not find ByteBuffer associated with the image "
+                            + "data from the camera.");
+                    return;
+                }
+                this.pendingFrameData = LensEngine.this.bytesToByteBuffer.get(data);
+                this.lock.notifyAll();
+            }
+        }
+
+        @SuppressLint("InlinedApi")
+        @SuppressWarnings("GuardedBy")
+        @Override
+        public void run() {
+            ByteBuffer data;
+
+            while (true) {
+                synchronized (this.lock) {
+                    while (this.active && (this.pendingFrameData == null)) {
+                        try {
+                            // Waiting for next frame.
+                            this.lock.wait();
+                        } catch (InterruptedException e) {
+                            Log.w(LensEngine.TAG, "Frame transacting loop terminated.", e);
+                            return;
+                        }
+                    }
+                    if (!this.active) {
+                        this.pendingFrameData = null;
+                        return;
+                    }
+                    data = this.pendingFrameData;
+                    this.pendingFrameData = null;
+                }
+                try {
+                    synchronized (LensEngine.this.transactorLock) {
+                        Log.d(LensEngine.TAG, "Process an image");
+                        LensEngine.this.frameTransactor.process(
+                                data,
+                                new FrameMetadata.Builder()
+                                        .setWidth(LensEngine.this.selector.getPreviewSize().getWidth())
+                                        .setHeight(LensEngine.this.selector.getPreviewSize().getHeight())
+                                        .setRotation(LensEngine.this.selector.getRotation())
+                                        .setCameraFacing(LensEngine.this.selector.getFacing())
+                                        .build(),
+                                LensEngine.this.overlay
+                        );
+                    }
+                } catch (Throwable t) {
+                    Log.e(LensEngine.TAG, "Exception thrown from receiver.", t);
+                } finally {
+                    LensEngine.this.camera.addCallbackBuffer(data.array());
+                }
+            }
+        }
+    }
+}
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/camera/LensEnginePreview.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/camera/LensEnginePreview.java
similarity index 95%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/camera/LensEnginePreview.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/camera/LensEnginePreview.java
index 5b35ffe..2cf791a 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/camera/LensEnginePreview.java
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/camera/LensEnginePreview.java
@@ -123,15 +123,15 @@ public void surfaceDestroyed(SurfaceHolder surface) {
         @Override
         public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
             Log.d(LensEnginePreview.TAG, "surfaceChanged");
-            if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {
-                if (!LensEnginePreview.this.isSynchronous) {
-                    Camera camera = LensEnginePreview.this.lensEngine.getCamera();
-                    try {
-                        camera.setPreviewDisplay(LensEnginePreview.this.surfaceView.getHolder());
-                    } catch (IOException e) {
-                        Log.e(LensEnginePreview.TAG, "IOException", e);
-                    }
-                }
+
+            Camera camera = LensEnginePreview.this.lensEngine.getCamera();
+            if (camera == null) {
+                return;
+            }
+            try {
+                camera.setPreviewDisplay(LensEnginePreview.this.surfaceView.getHolder());
+            } catch (IOException e) {
+                Log.e(LensEnginePreview.TAG, "IOException", e);
             }
         }
     }
@@ -203,6 +203,9 @@ public boolean onTouchEvent(MotionEvent event) {
         if (CameraConfiguration.getCameraFacing() == CameraConfiguration.CAMERA_FACING_FRONT) {
             return true;
         }
+        if (this.lensEngine == null) {
+            return true;
+        }
         if (event.getPointerCount() == 1) {
             switch (event.getAction()) {
                 case MotionEvent.ACTION_UP:
diff --git a/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/parcel/NestParam.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/parcel/NestParam.java
new file mode 100644
index 0000000..926e595
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/parcel/NestParam.java
@@ -0,0 +1,84 @@
+/**
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.mlkit.sample.parcel;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.huawei.hms.ml.common.parcel.ParcelReader;
+import com.huawei.hms.ml.common.parcel.ParcelWriter;
+
+import androidx.annotation.NonNull;
+
+/**
+ * Custom nested parameters
+ *
+ * @since 2020-03-02
+ */
+public class NestParam implements Parcelable {
+    public int filed1;
+
+    public int filed2;
+
+    public NestParam() {
+
+    }
+
+    protected NestParam(Parcel in) {
+        final ParcelReader reader = new ParcelReader(in);
+        this.filed1 = reader.readInt(2, -1);
+        this.filed2 = reader.readInt(3, -1);
+        reader.finish(); // Key steps
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        final ParcelWriter writer = new ParcelWriter(dest);
+        final int pos = writer.beginObjectHeader();
+        writer.writeInt(2, this.filed1);
+        writer.writeInt(3, this.filed2);
+        writer.finishObjectHeader(pos);
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    public static final Creator<NestParam> CREATOR = new Creator<NestParam>() {
+        @Override
+        public NestParam createFromParcel(Parcel in) {
+            return new NestParam(in);
+        }
+
+        @Override
+        public NestParam[] newArray(int size) {
+            return new NestParam[size];
+        }
+    };
+
+    @NonNull
+    @Override
+    public String toString() {
+        StringBuffer buffer = new StringBuffer();
+        buffer.append("filed1 = " + this.filed1);
+        buffer.append(", ");
+        buffer.append("filed2 = " + this.filed2);
+
+        return buffer.toString();
+    }
+}
diff --git a/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/parcel/Parameter.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/parcel/Parameter.java
new file mode 100644
index 0000000..1602a42
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/parcel/Parameter.java
@@ -0,0 +1,112 @@
+/**
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.mlkit.sample.parcel;
+
+import android.graphics.Bitmap;
+import android.graphics.Rect;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.huawei.hms.ml.common.parcel.ParcelReader;
+import com.huawei.hms.ml.common.parcel.ParcelWriter;
+
+import androidx.annotation.NonNull;
+
+public class Parameter implements Parcelable {
+
+    public NestParam nestParam;
+
+    public int width;
+
+    public int height;
+
+    public Bitmap bitmap;
+
+    public byte[] bytes;
+
+    public Rect rect;
+
+    public String aString;
+
+    public Parameter() {
+
+    }
+
+    protected Parameter(Parcel in) {
+        final ParcelReader reader = new ParcelReader(in);
+        this.nestParam = reader.readParcelable(2, NestParam.CREATOR, null);
+        this.width = reader.readInt(3, -1);
+        this.height = reader.readInt(4, -1);
+        this.bitmap = reader.readParcelable(5, Bitmap.CREATOR, null);
+        this.bytes = reader.createByteArray(6, null);
+        this.rect = reader.readParcelable(7, Rect.CREATOR, null);
+        this.aString = reader.createString(8, null);
+        reader.finish(); // Key steps
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        final ParcelWriter writer = new ParcelWriter(dest);
+        final int pos = writer.beginObjectHeader();
+        writer.writeParcelable(2, this.nestParam, flags, false);
+        writer.writeInt(3, this.width);
+        writer.writeInt(4, this.height);
+        writer.writeParcelable(5, this.bitmap, flags, false);
+        writer.writeByteArray(6, this.bytes, false);
+        writer.writeParcelable(7, this.rect, flags, false);
+        writer.writeString(8, this.aString, false);
+        writer.finishObjectHeader(pos);
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    public static final Creator<Parameter> CREATOR = new Creator<Parameter>() {
+        @Override
+        public Parameter createFromParcel(Parcel in) {
+            return new Parameter(in);
+        }
+
+        @Override
+        public Parameter[] newArray(int size) {
+            return new Parameter[size];
+        }
+    };
+
+    @NonNull
+    @Override
+    public String toString() {
+        StringBuffer buffer = new StringBuffer();
+        buffer.append("nestParam = " + this.nestParam);
+        buffer.append(", ");
+        buffer.append("width = " + this.width);
+        buffer.append(", ");
+        buffer.append("height = " + this.height);
+        buffer.append(", ");
+        buffer.append("bitmap.size = " + (this.bitmap == null ? "NULL" : this.bitmap.getByteCount()));
+        buffer.append(", ");
+        buffer.append("bytes = " + (this.bytes == null ? "NULL" : this.bytes.length));
+        buffer.append(", ");
+        buffer.append("rect = " + (this.rect == null ? "NULL" : this.rect));
+        buffer.append(", ");
+        buffer.append("aString = " + (this.aString == null ? "NULL" : this.aString));
+
+        return buffer.toString();
+    }
+}
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/manager/CloudDataManager.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/processor/CloudDataProcessor.java
similarity index 93%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/manager/CloudDataManager.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/processor/CloudDataProcessor.java
index fe5b2ea..3ff7dc7 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/manager/CloudDataManager.java
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/processor/CloudDataProcessor.java
@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 
-package com.mlkit.sample.manager;
+package com.mlkit.sample.processor;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
@@ -24,14 +24,14 @@
 import android.graphics.Point;
 import android.graphics.Rect;
 
-import com.mlkit.sample.views.overlay.GraphicOverlay;
 import com.huawei.hms.mlsdk.common.LensEngine;
 import com.huawei.hms.mlsdk.document.MLDocument;
 import com.huawei.hms.mlsdk.text.MLText;
+import com.mlkit.sample.views.overlay.GraphicOverlay;
 
 import java.util.List;
 
-public class CloudDataManager {
+public class CloudDataProcessor {
 
     private GraphicOverlay mGraphicOverlay;
 
@@ -39,10 +39,16 @@ public class CloudDataManager {
 
     private MLText mHmsMLVisionText;
 
-    public CloudDataManager(GraphicOverlay mGraphicOverlay, Bitmap mBitmapCopyForTap, MLText mHmsMLVisionText) {
-        this.mGraphicOverlay = mGraphicOverlay;
-        this.mBitmapCopyForTap = mBitmapCopyForTap;
-        this.mHmsMLVisionText = mHmsMLVisionText;
+    public void setGraphicOverlay (GraphicOverlay graphicOverlay) {
+        this.mGraphicOverlay = graphicOverlay;
+    }
+
+    public void setBitmap(Bitmap bitmapCopyForTap) {
+        this.mBitmapCopyForTap = bitmapCopyForTap;
+    }
+
+    public void setText(MLText text) {
+        this.mHmsMLVisionText = text;
     }
 
     public void drawView(Canvas canvas, boolean flag) {
@@ -164,7 +170,7 @@ private float translateY(float y, GraphicOverlay graphicOverlay) {
 
     public void drawCloudDocText(MLDocument text, Canvas canvas) {
         Paint textPaint = new Paint();
-        textPaint.setColor(Color.WHITE);
+        textPaint.setColor(Color.parseColor("#EE6A50"));
 
         List<MLDocument.Block> blocks = text.getBlocks();
         for (int i = 0; i < blocks.size(); i++) {
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/manager/LocalDataManager.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/processor/LocalDataProcessor.java
similarity index 98%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/manager/LocalDataManager.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/processor/LocalDataProcessor.java
index 0b41c02..7237827 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/manager/LocalDataManager.java
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/processor/LocalDataProcessor.java
@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 
-package com.mlkit.sample.manager;
+package com.mlkit.sample.processor;
 
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -22,13 +22,13 @@
 import android.graphics.Path;
 import android.graphics.Point;
 
+import com.huawei.hms.mlsdk.text.MLText;
 import com.mlkit.sample.camera.FrameMetadata;
 import com.mlkit.sample.views.overlay.GraphicOverlay;
-import com.huawei.hms.mlsdk.text.MLText;
 
 import java.util.List;
 
-public class LocalDataManager {
+public class LocalDataProcessor {
     private float previewWidth;
     private float previewHeight;
     private float widthScaleValue = 1.0f;
diff --git a/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/processor/gcr/GeneralCardProcessor.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/processor/gcr/GeneralCardProcessor.java
new file mode 100644
index 0000000..4d8f37b
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/processor/gcr/GeneralCardProcessor.java
@@ -0,0 +1,28 @@
+/**
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.mlkit.sample.processor.gcr;
+
+import com.mlkit.sample.activity.entity.GeneralCardResult;
+
+/**
+ * Common interface for post-processing plugins
+ *
+ * @since 2020-03-12
+ */
+public interface GeneralCardProcessor {
+    GeneralCardResult getResult();
+}
\ No newline at end of file
diff --git a/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/processor/gcr/homecard/HomeCardProcessor.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/processor/gcr/homecard/HomeCardProcessor.java
new file mode 100644
index 0000000..94f50a0
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/processor/gcr/homecard/HomeCardProcessor.java
@@ -0,0 +1,113 @@
+/**
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.mlkit.sample.processor.gcr.homecard;
+
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.util.Log;
+
+import com.huawei.hms.mlsdk.text.MLText;
+import com.mlkit.sample.activity.entity.BlockItem;
+import com.mlkit.sample.activity.entity.GeneralCardResult;
+import com.mlkit.sample.processor.gcr.GeneralCardProcessor;
+import com.mlkit.sample.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Post processing plug-in of Mainland Travel Permit for Hong Kong、Macao and Taiwan residents
+ *
+ * @since 2020-03-12
+ */
+public class HomeCardProcessor implements GeneralCardProcessor {
+    private static final String TAG = "HomeCardProcessor";
+
+    private final MLText text;
+
+    public HomeCardProcessor(MLText text) {
+        this.text = text;
+    }
+
+    @Override
+    public GeneralCardResult getResult() {
+        List<MLText.Block> blocks = text.getBlocks();
+        if (blocks.isEmpty()) {
+            Log.i(TAG, "Result blocks is empty");
+            return null;
+        }
+
+        ArrayList<BlockItem> originItems = getOriginItems(blocks);
+
+        String valid = "";
+        String number = "";
+        boolean numberFlag = false;
+        boolean validFlag = false;
+
+        for (BlockItem item : originItems) {
+            String tempStr = item.text;
+
+            if (!validFlag) {
+                String result = tryGetValidDate(tempStr);
+                if (!result.isEmpty()) {
+                    valid = result;
+                    validFlag = true;
+                }
+            }
+
+            if (!numberFlag) {
+                String result = tryGetCardNumber(tempStr);
+                if (!result.isEmpty()) {
+                    number = result;
+                    numberFlag = true;
+                }
+            }
+        }
+
+        Log.i(TAG, "valid: " + valid);
+        Log.i(TAG, "number: " + number);
+
+        return new GeneralCardResult(valid, number);
+    }
+
+    private ArrayList<BlockItem> getOriginItems(List<MLText.Block> blocks) {
+        ArrayList<BlockItem> originItems = new ArrayList<>();
+
+        for (MLText.Block block : blocks) {
+            // Add in behavior units
+            List<MLText.TextLine> lines = block.getContents();
+            for (MLText.TextLine line : lines) {
+                String text = line.getStringValue();
+                text = StringUtils.filterString(text, "[^a-zA-Z0-9\\.\\-,<\\(\\)\\s]");
+                Log.d(TAG, "text: " + text);
+                Point[] points = line.getVertexes();
+                Rect rect = new Rect(points[0].x, points[0].y, points[2].x, points[2].y);
+                BlockItem item = new BlockItem(text, rect);
+                originItems.add(item);
+            }
+        }
+        return originItems;
+    }
+
+    private String tryGetValidDate(String originStr) {
+        return StringUtils.getCorrectValidDate(originStr);
+    }
+
+    private String tryGetCardNumber(String originStr) {
+        return StringUtils.getHomeCardNumber(originStr);
+    }
+}
\ No newline at end of file
diff --git a/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/processor/gcr/hongkong/HKIdCardProcessor.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/processor/gcr/hongkong/HKIdCardProcessor.java
new file mode 100644
index 0000000..f2c1bf5
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/processor/gcr/hongkong/HKIdCardProcessor.java
@@ -0,0 +1,115 @@
+/**
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.mlkit.sample.processor.gcr.hongkong;
+
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.util.Log;
+
+import com.huawei.hms.mlsdk.text.MLText;
+import com.mlkit.sample.activity.entity.BlockItem;
+import com.mlkit.sample.activity.entity.GeneralCardResult;
+import com.mlkit.sample.processor.gcr.GeneralCardProcessor;
+import com.mlkit.sample.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Post processing plug-in of Hong Kong permanent identity card recognition
+ *
+ * @since 2020-03-12
+ */
+public class HKIdCardProcessor implements GeneralCardProcessor {
+    private static final String TAG = "HKIdCardProcessor";
+
+    private final MLText text;
+
+    public HKIdCardProcessor(MLText text) {
+        this.text = text;
+    }
+
+    @Override
+    public GeneralCardResult getResult() {
+        List<MLText.Block> blocks = text.getBlocks();
+        if (blocks.isEmpty()) {
+            Log.i(TAG, "Result blocks is empty");
+            return null;
+        }
+
+        ArrayList<BlockItem> originItems = getOriginItems(blocks);
+
+        String valid = "";
+        String number = "";
+        boolean numberFlag = false;
+        boolean validFlag = false;
+
+        int location = 1;
+        for (BlockItem item : originItems) {
+            String tempStr = item.text;
+
+            if (!validFlag && (originItems.size() - location) < 3) {
+                String result = tryGetValidDate(tempStr);
+                if (!result.isEmpty()) {
+                    valid = result;
+                    validFlag = true;
+                }
+            }
+
+            if (!numberFlag) {
+                String result = tryGetCardNumber(tempStr);
+                if (!result.isEmpty()) {
+                    number = result;
+                    numberFlag = true;
+                }
+            }
+            location++;
+        }
+
+        Log.i(TAG, "valid: " + valid);
+        Log.i(TAG, "number: " + number);
+
+        return new GeneralCardResult(valid, number);
+    }
+
+    private String tryGetValidDate(String originStr) {
+        int[] formatter = {2, 2, 2};
+        return StringUtils.getCorrectDate(originStr, "\\-", formatter);
+    }
+
+    private String tryGetCardNumber(String originStr) {
+        return StringUtils.getHKIdCardNum(originStr);
+    }
+
+    private ArrayList<BlockItem> getOriginItems(List<MLText.Block> blocks) {
+        ArrayList<BlockItem> originItems = new ArrayList<>();
+        for (MLText.Block block : blocks) {
+            // Add in behavior units
+            List<MLText.TextLine> lines = block.getContents();
+            for (MLText.TextLine line : lines) {
+                String text = line.getStringValue();
+                text = StringUtils.filterString(text, "[^a-zA-Z0-9\\.\\-,<\\(\\)\\s]");
+                Log.d(TAG, "text: " + text);
+                Point[] points = line.getVertexes();
+                Rect rect = new Rect(points[0].x, points[0].y, points[2].x, points[2].y);
+                BlockItem item = new BlockItem(text, rect);
+                originItems.add(item);
+            }
+        }
+        return originItems;
+    }
+}
diff --git a/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/processor/gcr/passcard/PassCardProcessor.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/processor/gcr/passcard/PassCardProcessor.java
new file mode 100644
index 0000000..3e1d559
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/processor/gcr/passcard/PassCardProcessor.java
@@ -0,0 +1,119 @@
+/**
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.mlkit.sample.processor.gcr.passcard;
+
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.util.Log;
+
+import com.huawei.hms.mlsdk.text.MLText;
+import com.mlkit.sample.activity.entity.BlockItem;
+import com.mlkit.sample.activity.entity.GeneralCardResult;
+import com.mlkit.sample.processor.gcr.GeneralCardProcessor;
+import com.mlkit.sample.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * Post processing plug-in of Hong Kong, Macao and Taiwan pass recognition
+ *
+ * @since 2020-03-12
+ */
+public class PassCardProcessor implements GeneralCardProcessor {
+    private static final String TAG = "PassCardProcessor";
+
+    private final MLText text;
+
+    public PassCardProcessor(MLText text) {
+        this.text = text;
+    }
+
+    @Override
+    public GeneralCardResult getResult() {
+        List<MLText.Block> blocks = text.getBlocks();
+        if (blocks.isEmpty()) {
+            Log.i(TAG, "Result blocks is empty");
+            return null;
+        }
+
+        ArrayList<BlockItem> originItems = getOriginItems(blocks);
+
+        String valid = "";
+        String number = "";
+        boolean validFlag = false;
+        boolean numberFlag = false;
+
+        for (BlockItem item : originItems) {
+            String tempStr = item.text;
+
+            if (!validFlag) {
+                String result = tryGetValidDate(tempStr);
+                if (!result.isEmpty()) {
+                    valid = result;
+                    validFlag = true;
+                }
+            }
+
+            if (!numberFlag) {
+                String result = tryGetCardNumber(tempStr);
+                if (!result.isEmpty()) {
+                    number = result;
+                    numberFlag = true;
+                }
+            }
+        }
+
+        Log.i(TAG, "valid: " + valid);
+        Log.i(TAG, "number: " + number);
+
+        return new GeneralCardResult(valid, number);
+    }
+
+    private String tryGetValidDate(String originStr) {
+        return StringUtils.getCorrectValidDate(originStr);
+    }
+
+    private String tryGetCardNumber(String originStr) {
+        String result = StringUtils.getPassCardNumber(originStr);
+        if (!result.isEmpty()) {
+            result = result.toUpperCase(Locale.ENGLISH);
+            result = StringUtils.filterString(result, "[^0-9A-Z<]");
+        }
+        return result;
+    }
+
+    private ArrayList<BlockItem> getOriginItems(List<MLText.Block> blocks) {
+        ArrayList<BlockItem> originItems = new ArrayList<>();
+
+        for (MLText.Block block : blocks) {
+            // Add in behavior units
+            List<MLText.TextLine> lines = block.getContents();
+            for (MLText.TextLine line : lines) {
+                String text = line.getStringValue();
+                text = StringUtils.filterString(text, "[^a-zA-Z0-9\\.\\-,<\\(\\)\\s]");
+                Log.d(TAG, "text: " + text);
+                Point[] points = line.getVertexes();
+                Rect rect = new Rect(points[0].x, points[0].y, points[2].x, points[2].y);
+                BlockItem item = new BlockItem(text, rect);
+                originItems.add(item);
+            }
+        }
+        return originItems;
+    }
+}
diff --git a/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/transactor/BaseTransactor.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/transactor/BaseTransactor.java
new file mode 100644
index 0000000..da80bd6
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/transactor/BaseTransactor.java
@@ -0,0 +1,149 @@
+/**
+ *  Copyright 2018 Google LLC
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *  2020.2.21-Changed name from VisionProcessorBase to BaseTransactor.
+ *  2020.2.21-Deleted method: process(Bitmap bitmap, GraphicOverlay graphicOverlay,
+ *             String path,boolean flag);
+ *      process(Bitmap bitmap, GraphicOverlay graphicOverlay,String path);
+ *      onSuccess(
+ *             @Nullable Bitmap originalCameraImage,
+ *             @NonNull T results,
+ *             @NonNull FrameMetadata frameMetadata,
+ *             @NonNull GraphicOverlay graphicOverlay, String path, boolean flag);
+ *      onSuccess(
+ *             @Nullable Bitmap originalCameraImage,
+ *             @NonNull T results,
+ *             @NonNull FrameMetadata frameMetadata,
+ *             @NonNull GraphicOverlay graphicOverlay, String path);
+ *      writeFileSdcard(String message);
+ *                   Huawei Technologies Co., Ltd.
+ */
+
+package com.mlkit.sample.transactor;
+
+import android.graphics.Bitmap;
+import android.graphics.ImageFormat;
+
+import com.huawei.hmf.tasks.OnFailureListener;
+import com.huawei.hmf.tasks.OnSuccessListener;
+import com.huawei.hmf.tasks.Task;
+import com.mlkit.sample.camera.CameraConfiguration;
+import com.mlkit.sample.util.BitmapUtils;
+import com.mlkit.sample.camera.FrameMetadata;
+import com.mlkit.sample.util.CommonUtils;
+import com.mlkit.sample.views.overlay.GraphicOverlay;
+import com.huawei.hms.mlsdk.common.MLFrame;
+
+import java.nio.ByteBuffer;
+
+public abstract class BaseTransactor<T> implements ImageTransactor {
+
+    // To keep the latest images and its metadata.
+    private ByteBuffer latestImage;
+
+    private FrameMetadata latestImageMetaData;
+
+    // To keep the images and metadata in process.
+    private ByteBuffer transactingImage;
+
+    private FrameMetadata transactingMetaData;
+
+    public BaseTransactor() {
+    }
+
+    @Override
+    public synchronized void process(ByteBuffer data, final FrameMetadata frameMetadata, GraphicOverlay graphicOverlay) {
+        this.latestImage = data;
+        this.latestImageMetaData = frameMetadata;
+        if (this.transactingImage == null && this.transactingMetaData == null) {
+            this.processLatestImage(graphicOverlay);
+        }
+    }
+
+    @Override
+    public void process(Bitmap bitmap, GraphicOverlay graphicOverlay) {
+        MLFrame frame = new MLFrame.Creator().setBitmap(bitmap).create();
+        this.detectInVisionImage(bitmap, frame, null, graphicOverlay);
+    }
+
+    private synchronized void processLatestImage(GraphicOverlay graphicOverlay) {
+        this.transactingImage = this.latestImage;
+        this.transactingMetaData = this.latestImageMetaData;
+        this.latestImage = null;
+        this.latestImageMetaData = null;
+        if (this.transactingImage != null && this.transactingMetaData != null) {
+            int width;
+            int height;
+            width = this.transactingMetaData.getWidth();
+            height = this.transactingMetaData.getHeight();
+
+            MLFrame.Property metadata =
+                    new MLFrame.Property.Creator()
+                            .setFormatType(ImageFormat.NV21)
+                            .setWidth(width)
+                            .setHeight(height)
+                            .setQuadrant(this.transactingMetaData.getRotation())
+                            .create();
+            Bitmap bitmap = BitmapUtils.getBitmap(this.transactingImage, this.transactingMetaData);
+                this.detectInVisionImage(
+                        bitmap, MLFrame.fromByteBuffer(this.transactingImage, metadata), this.transactingMetaData, graphicOverlay);
+
+        }
+    }
+
+    private void detectInVisionImage(final Bitmap bitmap, MLFrame image, final FrameMetadata metadata,
+                                     final GraphicOverlay graphicOverlay) {
+        this.detectInImage(image)
+                .addOnSuccessListener(
+                        new OnSuccessListener<T>() {
+                            @Override
+                            public void onSuccess(T results) {
+                                if (metadata == null || metadata.getCameraFacing() == CameraConfiguration.getCameraFacing()) {
+                                    BaseTransactor.this.onSuccess(bitmap, results, metadata, graphicOverlay);
+                                }
+                                BaseTransactor.this.processLatestImage(graphicOverlay);
+                            }
+                        })
+                .addOnFailureListener(
+                        new OnFailureListener() {
+                            @Override
+                            public void onFailure(Exception e) {
+                                BaseTransactor.this.onFailure(e);
+                            }
+                        });
+    }
+
+    @Override
+    public void stop() {
+    }
+
+    protected abstract Task<T> detectInImage(MLFrame image);
+
+    /**
+     * Callback that executes with a successful detection result.
+     * @param originalCameraImage hold the original image from camera, used to draw the background
+     *                            image.
+     * @param results
+     * @param frameMetadata
+     * @param graphicOverlay
+     */
+
+    protected abstract void onSuccess(
+            Bitmap originalCameraImage,
+            T results,
+            FrameMetadata frameMetadata, GraphicOverlay graphicOverlay);
+
+    protected abstract void onFailure(Exception e);
+
+}
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/DocumentTextTransactor.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/transactor/DocumentTextTransactor.java
similarity index 93%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/DocumentTextTransactor.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/transactor/DocumentTextTransactor.java
index 9dd1f09..3af8ba2 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/DocumentTextTransactor.java
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/transactor/DocumentTextTransactor.java
@@ -24,7 +24,7 @@
 import androidx.annotation.Nullable;
 
 import com.huawei.hmf.tasks.Task;
-import com.mlkit.sample.callback.CloudInfoResultCallBack;
+import com.mlkit.sample.callback.CouldInfoResultCallBack;
 import com.mlkit.sample.camera.FrameMetadata;
 import com.mlkit.sample.util.Constant;
 import com.mlkit.sample.views.overlay.GraphicOverlay;
@@ -40,7 +40,7 @@ public class DocumentTextTransactor
 
     private final MLDocumentAnalyzer detector;
 
-    private CloudInfoResultCallBack callBack;
+    private CouldInfoResultCallBack callBack;
 
     private Handler handler;
 
@@ -49,7 +49,7 @@ public DocumentTextTransactor(Handler handler) {
         this.handler = handler;
     }
 
-    public void addCouldTextResultCallBack(CloudInfoResultCallBack callBack) {
+    public void addCouldTextResultCallBack(CouldInfoResultCallBack callBack) {
         this.callBack = callBack;
     }
 
diff --git a/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/transactor/ImageTransactor.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/transactor/ImageTransactor.java
new file mode 100644
index 0000000..c411409
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/transactor/ImageTransactor.java
@@ -0,0 +1,38 @@
+/**
+ *  Copyright 2018 Google LLC
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *  2020.2.21-Changed name from VisionImageProcessor to ImageTransactor.
+ *  2020.2.21-Deleted method: process(Bitmap bitmap, GraphicOverlay graphicOverlay,String path,boolean flag);
+ *      process(Bitmap bitmap, GraphicOverlay graphicOverlay,String path);
+ *                  Huawei Technologies Co., Ltd.
+ */
+
+package com.mlkit.sample.transactor;
+
+import android.graphics.Bitmap;
+
+
+import com.mlkit.sample.camera.FrameMetadata;
+import com.mlkit.sample.views.overlay.GraphicOverlay;
+
+import java.nio.ByteBuffer;
+
+public interface ImageTransactor {
+
+    void process(ByteBuffer data, FrameMetadata frameMetadata, GraphicOverlay graphicOverlay);
+
+    void process(Bitmap bitmap, GraphicOverlay graphicOverlay);
+
+    void stop();
+}
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/LocalTextTransactor.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/transactor/LocalTextTransactor.java
similarity index 98%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/LocalTextTransactor.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/transactor/LocalTextTransactor.java
index c6d4fd0..dddfcdb 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/LocalTextTransactor.java
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/transactor/LocalTextTransactor.java
@@ -67,7 +67,7 @@ public LocalTextTransactor(Handler handler, Context context) {
     }
 
     private String getLanguage() {
-        String position = SharedPreferencesUtil.getInstance(this.mContext).getStringValue(Constant.POSITION_KEY);
+        String position = SharedPreferencesUtil.getInstance(mContext).getStringValue(Constant.POSITION_KEY);
         Log.d(LocalTextTransactor.TAG, "position: " + position);
         String language = "";
         switch (position){
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/RemoteTextTransactor.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/transactor/RemoteTextTransactor.java
similarity index 94%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/RemoteTextTransactor.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/transactor/RemoteTextTransactor.java
index 5396d1f..99839e1 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/RemoteTextTransactor.java
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/transactor/RemoteTextTransactor.java
@@ -23,7 +23,7 @@
 import androidx.annotation.Nullable;
 
 import com.huawei.hmf.tasks.Task;
-import com.mlkit.sample.callback.CloudInfoResultCallBack;
+import com.mlkit.sample.callback.CouldInfoResultCallBack;
 import com.mlkit.sample.camera.FrameMetadata;
 import com.mlkit.sample.util.Constant;
 import com.mlkit.sample.views.overlay.GraphicOverlay;
@@ -39,7 +39,7 @@ public class RemoteTextTransactor extends BaseTransactor<MLText> {
 
     private final MLTextAnalyzer detector;
 
-    private CloudInfoResultCallBack callBack;
+    private CouldInfoResultCallBack callBack;
 
     private Handler handler;
 
@@ -56,7 +56,7 @@ protected Task<MLText> detectInImage(MLFrame image) {
         return this.detector.asyncAnalyseFrame(image);
     }
 
-    public void addCouldTextResultCallBack(CloudInfoResultCallBack callBack) {
+    public void addCouldTextResultCallBack(CouldInfoResultCallBack callBack) {
         this.callBack = callBack;
     }
 
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/util/BitmapUtils.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/util/BitmapUtils.java
similarity index 90%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/util/BitmapUtils.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/util/BitmapUtils.java
index b98a504..e6a31b9 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/util/BitmapUtils.java
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/util/BitmapUtils.java
@@ -62,9 +62,9 @@ public static Bitmap getBitmap(ByteBuffer data, FrameMetadata metadata) {
             yuvImage.compressToJpeg(new Rect(0, 0, metadata.getWidth(), metadata.getHeight()), 80, stream);
             Bitmap bitmap = BitmapFactory.decodeByteArray(stream.toByteArray(), 0, stream.size());
             stream.close();
-            return BitmapUtils.rotateBitmap(bitmap, metadata.getRotation(), metadata.getCameraFacing());
+            return rotateBitmap(bitmap, metadata.getRotation(), metadata.getCameraFacing());
         } catch (Exception e) {
-            Log.e(BitmapUtils.TAG, "Error: " + e.getMessage());
+            Log.e(TAG, "Error: " + e.getMessage());
         }
         return null;
     }
@@ -108,14 +108,14 @@ public static Bitmap loadFromPath(Activity activity, Uri uri, int width, int hei
         BitmapFactory.Options options = new BitmapFactory.Options();
         options.inJustDecodeBounds = true;
 
-        String path = BitmapUtils.getImagePath(activity, uri);
+        String path = getImagePath(activity, uri);
         BitmapFactory.decodeFile(path, options);
-        int sampleSize = BitmapUtils.calculateInSampleSize(options, width, height);
+        int sampleSize = calculateInSampleSize(options, width, height);
         options.inSampleSize = sampleSize;
         options.inJustDecodeBounds = false;
 
-        Bitmap bitmap = BitmapUtils.zoomImage(BitmapFactory.decodeFile(path, options), width, height);
-        return BitmapUtils.rotateBitmap(bitmap, BitmapUtils.getRotationAngle(path));
+        Bitmap bitmap = zoomImage(BitmapFactory.decodeFile(path, options), width, height);
+        return rotateBitmap(bitmap, getRotationAngle(path));
     }
 
     private static int calculateInSampleSize(BitmapFactory.Options options, int reqWidth, int reqHeight) {
@@ -173,7 +173,7 @@ public static int getRotationAngle(String path) {
                     break;
             }
         } catch (IOException e) {
-            SmartLog.e(BitmapUtils.TAG, "Failed to get rotation: " + e.getMessage());
+            SmartLog.e(TAG, "Failed to get rotation: " + e.getMessage());
         }
         return rotation;
     }
@@ -185,7 +185,7 @@ public static Bitmap rotateBitmap(Bitmap bitmap, int angle) {
         try {
             result = Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);
         } catch (OutOfMemoryError e) {
-            SmartLog.e(BitmapUtils.TAG, "Failed to rotate bitmap: " + e.getMessage());
+            SmartLog.e(TAG, "Failed to rotate bitmap: " + e.getMessage());
         }
         if (result == null) {
             return bitmap;
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/util/CommonUtils.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/util/CommonUtils.java
similarity index 92%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/util/CommonUtils.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/util/CommonUtils.java
index 798fc8c..60e27df 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/util/CommonUtils.java
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/util/CommonUtils.java
@@ -67,7 +67,7 @@ public static void handleByteBuffer(ByteBuffer src, ByteBuffer dst,
                 try {
                     dst.put((x + dst_y_slice), src.get(src_y_slice + srcx));
                 } catch (Exception e) {
-                    Log.d(CommonUtils.TAG, "nv12_Resize Exception1" + e.getMessage());
+                    Log.d(TAG, "nv12_Resize Exception1" + e.getMessage());
                 }
 
                 if ((y & 1) == 0) {
@@ -78,14 +78,14 @@ public static void handleByteBuffer(ByteBuffer src, ByteBuffer dst,
                         try {
                             dst.put(sp, src.get(dp));
                         } catch (Exception e) {
-                            Log.d(CommonUtils.TAG, "nv12_Resize Exception2" + e.getMessage());
+                            Log.d(TAG, "nv12_Resize Exception2" + e.getMessage());
                         }
                         ++sp;
                         ++dp;
                         try {
                             dst.put(sp, src.get(dp));
                         } catch (Exception e) {
-                            Log.d(CommonUtils.TAG, "nv12_Resize Exception3" + e.getMessage());
+                            Log.d(TAG, "nv12_Resize Exception3" + e.getMessage());
                         }
                     }
                 }
diff --git a/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/util/Constant.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/util/Constant.java
new file mode 100644
index 0000000..9c05e12
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/util/Constant.java
@@ -0,0 +1,58 @@
+/**
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.mlkit.sample.util;
+
+import android.graphics.Color;
+
+import com.mlkit.sample.R;
+
+public class Constant {
+
+    public static final String POSITION_KEY = "positionkey";
+
+    public static final String POSITION_CN = "0";
+
+    public static final String POSITION_EN = "1";
+
+    public static final String POSITION_JA = "2";
+
+    public static final String POSITION_KO = "3";
+
+    public static final String POSITION_LA = "4";
+
+    public static final int GET_DATA_SUCCESS = 100;
+
+    public static final int GET_DATA_FAILED = 101;
+
+    public static final int SHOW_TAKE_PHOTO_BUTTON = 102;
+
+    public static final int HIDE_TAKE_PHOTO_BUTTON = 103;
+
+    public static final String CAMERA_FACING = "facing";
+
+    public static final String CLOUD_TEXT_DETECTION = "Cloud Text";
+    public static final String CLOUD_DOCUMENT_TEXT_DETECTION = "Doc Text";
+    public static final String MODEL_TYPE = "model_type";
+
+    public static final String ADD_PICTURE_TYPE = "picture_type";
+    public static final String TYPE_TAKE_PHOTO = "take photo";
+    public static final String TYPE_SELECT_IMAGE = "select image";
+
+    public static final String DEFAULT_VERSION = "1.0.3.300";
+    public static final boolean IS_CHINESE = false;
+
+}
diff --git a/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/util/FileUtils.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/util/FileUtils.java
new file mode 100644
index 0000000..7fc6204
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/util/FileUtils.java
@@ -0,0 +1,115 @@
+/**
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.mlkit.sample.util;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.file.Files;
+
+public class FileUtils {
+
+    public static boolean isSymlink(final File file) throws IOException {
+        if (file == null) {
+            throw new NullPointerException("File must not be null");
+        }
+        return Files.isSymbolicLink(file.toPath());
+    }
+
+    public static void deleteDirectory(final File directory) throws IOException {
+        if (!directory.exists()) {
+            return;
+        }
+
+        if (!isSymlink(directory)) {
+            cleanDirectory(directory);
+        }
+
+        if (!directory.delete()) {
+            final String message = "Unable to delete directory " + directory + ".";
+            throw new IOException(message);
+        }
+    }
+
+    public static void forceDelete(final File file) throws IOException {
+        if (file.isDirectory()) {
+            deleteDirectory(file);
+        } else {
+            final boolean filePresent = file.exists();
+            if (!file.delete()) {
+                if (!filePresent) {
+                    throw new FileNotFoundException("File does not exist: " + file);
+                }
+                final String message = "Unable to delete file: " + file;
+                throw new IOException(message);
+            }
+        }
+    }
+
+    private static File[] verifiedListFiles(final File directory) throws IOException {
+        if (!directory.exists()) {
+            final String message = directory + " does not exist";
+            throw new IllegalArgumentException(message);
+        }
+
+        if (!directory.isDirectory()) {
+            final String message = directory + " is not a directory";
+            throw new IllegalArgumentException(message);
+        }
+
+        final File[] files = directory.listFiles();
+        if (files == null) {  // null if security restricted
+            throw new IOException("Failed to list contents of " + directory);
+        }
+        return files;
+    }
+
+    public static void cleanDirectory(final File directory) throws IOException {
+        final File[] files = verifiedListFiles(directory);
+
+        IOException exception = null;
+        for (final File file : files) {
+            try {
+                forceDelete(file);
+            } catch (final IOException ioe) {
+                exception = ioe;
+            }
+        }
+
+        if (null != exception) {
+            throw exception;
+        }
+    }
+
+    public static boolean deleteQuietly(final File file) {
+        if (file == null) {
+            return false;
+        }
+        try {
+            if (file.isDirectory()) {
+                cleanDirectory(file);
+            }
+        } catch (final Exception ignored) {
+        }
+
+        try {
+            return file.delete();
+        } catch (final Exception ignored) {
+            return false;
+        }
+    }
+}
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/util/ImageUtils.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/util/ImageUtils.java
similarity index 93%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/util/ImageUtils.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/util/ImageUtils.java
index 76b002a..c8752d2 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/util/ImageUtils.java
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/util/ImageUtils.java
@@ -62,23 +62,23 @@ public void saveToAlbum(Bitmap bitmap){
             os.flush();
 
         } catch (FileNotFoundException e) {
-            SmartLog.e(ImageUtils.TAG, e.getMessage());
+            SmartLog.e(TAG, e.getMessage());
         } catch (IOException e) {
-            SmartLog.e(ImageUtils.TAG, e.getMessage());
+            SmartLog.e(TAG, e.getMessage());
         }finally {
             try {
                 if(os != null) {
                     os.close();
                 }
             }catch (IOException e){
-                SmartLog.e(ImageUtils.TAG, e.getMessage());
+                SmartLog.e(TAG, e.getMessage());
             }
         }
         if(file == null){
             return;
         }
-        if(this.imageUtilCallBack != null) {
-            this.imageUtilCallBack.callSavePath(file.getAbsolutePath());
+        if(imageUtilCallBack != null) {
+            imageUtilCallBack.callSavePath(file.getAbsolutePath());
         }
         // Gallery refresh.
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
@@ -86,7 +86,7 @@ public void saveToAlbum(Bitmap bitmap){
             try {
                 path = file.getCanonicalPath();
             } catch (IOException e) {
-                SmartLog.e(ImageUtils.TAG, e.getMessage());
+                SmartLog.e(TAG, e.getMessage());
             }
             MediaScannerConnection.scanFile(this.context, new String[]{path}, null,
                     new MediaScannerConnection.OnScanCompletedListener() {
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/util/SharedPreferencesUtil.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/util/SharedPreferencesUtil.java
similarity index 67%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/util/SharedPreferencesUtil.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/util/SharedPreferencesUtil.java
index 554ea42..9f11466 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/util/SharedPreferencesUtil.java
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/util/SharedPreferencesUtil.java
@@ -27,36 +27,36 @@ public class SharedPreferencesUtil {
 
 
     public SharedPreferencesUtil(Context context) {
-        this.mPreferences = context.getSharedPreferences(SharedPreferencesUtil.TAG, Context.MODE_PRIVATE);
-        this.mEditor = this.mPreferences.edit();
+        mPreferences = context.getSharedPreferences(TAG, Context.MODE_PRIVATE);
+        mEditor = mPreferences.edit();
     }
 
     public static SharedPreferencesUtil getInstance(Context context) {
-        if (SharedPreferencesUtil.mSharedPreferencesUtil == null) {
+        if (mSharedPreferencesUtil == null) {
             synchronized (SharedPreferencesUtil.class) {
-                if(SharedPreferencesUtil.mSharedPreferencesUtil == null) {
-                    SharedPreferencesUtil.mSharedPreferencesUtil = new SharedPreferencesUtil(context);
+                if(mSharedPreferencesUtil == null) {
+                    mSharedPreferencesUtil = new SharedPreferencesUtil(context);
                 }
             }
         }
-        return SharedPreferencesUtil.mSharedPreferencesUtil;
+        return mSharedPreferencesUtil;
     }
 
     public void putStringValue(String key, String value) {
-        this.mEditor.putString(key, value);
-        this.mEditor.commit();
+        mEditor.putString(key, value);
+        mEditor.commit();
     }
 
     public String getStringValue(String key) {
-        return this.mPreferences.getString(key, Constant.POSITION_EN);
+        return mPreferences.getString(key, Constant.POSITION_EN);
     }
 
     public void putIntValue(String key, int value) {
-        this.mEditor.putInt(key, value);
-        this.mEditor.commit();
+        mEditor.putInt(key, value);
+        mEditor.commit();
     }
 
     public int getIntValue(String key) {
-        return this.mPreferences.getInt(key, -1);
+        return mPreferences.getInt(key, -1);
     }
 }
diff --git a/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/util/StringUtils.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/util/StringUtils.java
new file mode 100644
index 0000000..0f5e8c0
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/util/StringUtils.java
@@ -0,0 +1,381 @@
+/**
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.mlkit.sample.util;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class StringUtils {
+    private static Map<String, String> letterNumberMap = new HashMap<>();
+    private static Map<String, String> numberLetterMap = new HashMap<>();
+
+    static {
+        letterNumberMap.put("i", "1");
+        letterNumberMap.put("I", "1");
+        letterNumberMap.put("o", "0");
+        letterNumberMap.put("O", "0");
+        letterNumberMap.put("z", "2");
+        letterNumberMap.put("Z", "2");
+
+        numberLetterMap.put("1", "I");
+        numberLetterMap.put("0", "O");
+        numberLetterMap.put("2", "Z");
+        numberLetterMap.put("8", "B");
+    }
+
+    /**
+     * Filter strings based on regular expressions
+     */
+
+    public static String filterString(String origin, String filterStr) {
+        if (origin == null || origin.isEmpty()) {
+            return "";
+        }
+        if (filterStr == null || filterStr.isEmpty()) {
+            return origin;
+        }
+
+        Pattern pattern = Pattern.compile(filterStr);
+        Matcher matcher = pattern.matcher(origin);
+        return matcher.replaceAll("").trim();
+    }
+
+    /**
+     * Get date in specified date format.
+     */
+    public static String getCorrectDate(String origin, String splitter, int[] formatter) {
+        if (origin == null || origin.isEmpty()) {
+            return "";
+        }
+        if (splitter == null) {
+            return "";
+        }
+
+        int targetLength = 0;
+        for (int i : formatter) {
+            targetLength += i;
+        }
+
+        // Convert letters to numbers first.
+        String newStr = correctLetterToNumber(origin);
+
+        // Filter strings, keeping only numbers and separators.
+        newStr = filterString(newStr, "[^0-9,.-]");
+        // If the length is less than the minimum length of the date 8, return the empty string directly.
+        if (newStr.length() < targetLength) {
+            return "";
+        }
+
+        int length = formatter.length;
+        String[] strings = newStr.split(splitter);
+
+        if (strings.length < 2 || strings.length > 3) {
+            if (splitter.equals("\\.")) {
+                strings = newStr.split(",");
+                if (strings.length < 2 || strings.length > 3) {
+                    return "";
+                }
+            } else {
+                return "";
+            }
+        }
+
+        // If both the length and the number of delimiters are satisfied, the result is returned directly.
+        if (strings.length == length && newStr.length() == (targetLength + 2)) {
+            return newStr;
+        }
+
+        // Fill in the separator.
+        char target = splitter.toCharArray()[1];
+        return fixMissingDelimiter(newStr, target, formatter);
+    }
+
+    /**
+     * Completion of missing delimiters in the specified format.
+     */
+    public static String fixMissingDelimiter(String origin, char target, int[] format) {
+        if (origin == null || origin.isEmpty()) {
+            return "";
+        }
+        if (format == null ) {
+            return "";
+        }
+
+        int newCharsLen = 0;
+        for (int temp : format) {
+            newCharsLen += temp;
+        }
+
+        String temp = filterString(origin, "[^0-9a-zA-Z]");
+        if (temp.length() < newCharsLen) {
+            return "";
+        }
+
+        char[] oldChars = origin.toCharArray();
+        char[] newChars = new char[newCharsLen + (format.length - 1)];
+
+        if (oldChars.length < newCharsLen) {
+            return "";
+        }
+
+        int oldIndex = 0;
+        int newIndex = 0;
+
+        for (int i = 0; i < format.length; i++) {
+            int tmp = format[i];
+
+            while (tmp-- > 0) {
+                newChars[newIndex++] = oldChars[oldIndex++];
+            }
+            if (i != format.length - 1) {
+                if (blurMatchDelimiter(oldChars[oldIndex], target)) {
+                    oldIndex++;
+                    if (oldIndex >= oldChars.length) {
+                        return "";
+                    }
+                }
+                newChars[newIndex++] = target;
+            }
+        }
+        return String.valueOf(newChars);
+    }
+
+    /**
+     * Get a string of validity in the format xxxx.xx.xx-xxxx.xx.xx.
+     */
+    public static String getCorrectValidDate(String origin) {
+        if (origin == null || origin.isEmpty()) {
+            return "";
+        }
+
+        // Convert letters to numbers.
+        String newStr = correctLetterToNumber(origin);
+        newStr = newStr.replaceAll("\\s{1,}", " ");
+        String[] strings = null;
+
+        if (newStr.split("-").length == 2) {
+            // Standard case, with '-' split between validity periods.
+            newStr = filterString(newStr, "[^0-9,.-]");
+            if (newStr.length() < 18) {
+                return "";
+            }
+            strings = newStr.split("-");
+        }
+
+        if (newStr.split(" ").length == 2) {
+            // Exception, missing separator between validity periods.
+            strings = newStr.split(" ");
+        }
+
+        if (strings == null || strings.length != 2) {
+            return "";
+        }
+
+        int[] formatter = {4, 2, 2};
+        String startDate = getCorrectDate(strings[0], "\\.", formatter);
+        String endDate = getCorrectDate(strings[1], "\\.", formatter);
+        if (startDate.isEmpty() || endDate.isEmpty()) {
+            return "";
+        }
+        return startDate + " - " + endDate;
+    }
+
+    /**
+     * Get the ID number of Hong Kong, Macau, Taiwan Pass.
+     */
+    public static String getPassCardNumber(String origin) {
+        if (origin == null || origin.isEmpty()) {
+            return "";
+        }
+
+        String newStr = origin.trim();
+        newStr = newStr.toUpperCase(Locale.ENGLISH);
+        newStr = filterString(newStr, "[^0-9A-Z<]");
+
+        if (newStr.length() < 27 || newStr.length() > 30) {
+            return "";
+        }
+
+        String[] splits = newStr.split("[<]");
+        if (splits.length == 4) {
+            // Meet the requirements and return the results directly.
+            return newStr;
+        }
+
+        int[] formatter =  {12, 7, 7, 1};
+        return fixMissingDelimiter(newStr, '<', formatter);
+    }
+
+    /**
+     * Get the ID number of Hong Kong Resident Permanent Identity Card.
+     */
+    public static String getHKIdCardNum(String origin) {
+        if (origin == null || origin.isEmpty()) {
+            return "";
+        }
+
+        origin = filterString(origin, "[^0-9a-zA-Z()]");
+
+        if (origin.length() < 10) {
+            return "";
+        }
+
+        // The first letter must be a letter.
+        String firstChar = origin.substring(0, 1);
+        if (!Character.isLowerCase(firstChar.charAt(0)) && !Character.isUpperCase(firstChar.charAt(0))) {
+            if (firstChar.equalsIgnoreCase("2")) {
+                firstChar = "Z";
+            } else {
+                return "";
+            }
+        }
+
+        // 6 digits behind.
+        String number = origin.substring(1, 7);
+        number = correctLetterToNumber(number);
+
+        // Finally contains ().
+        String firstField = origin.substring(7, 8);
+        String middleField = origin.substring(8, 9);
+        String lastField = origin.substring(9, 10);
+
+        if (!firstField.equals("(") && !lastField.equals(")")) {
+            return "";
+        }
+        if (!firstField.equals("(")) {
+            if (firstField.equalsIgnoreCase("C") || firstField.equalsIgnoreCase("G")) {
+                firstField = "(";
+            } else {
+                return "";
+            }
+        }
+
+        String ret = firstChar + number + firstField + middleField + lastField;
+        return ret.toUpperCase(Locale.ENGLISH);
+    }
+
+    /**
+     * Get the ID number of the Homecoming Permit, Hong Kong, Macau and Taiwan have different rules.
+     */
+    public static String getHomeCardNumber(String origin) {
+        if (origin == null || origin.isEmpty()) {
+            return "";
+        }
+
+        // Remove blank space.
+        origin = filterString(origin, "[\\s]");
+        if (origin.length() != 8 && origin.length() != 9) {
+            return "";
+        }
+
+        // Determine whether the first character is a letter.
+        String firstLetter = origin.substring(0, 1);
+        if (Character.isLetter(firstLetter.charAt(0))) {
+            if (firstLetter.equalsIgnoreCase("H") || firstLetter.equalsIgnoreCase("M")) {
+                if (origin.length() < 9) {
+                    return "";
+                }
+                firstLetter = firstLetter.toUpperCase(Locale.ENGLISH);
+                String number = origin.substring(1, 9);
+                // Keep numbers only.
+                number = filterString(number, "[^0-9]");
+                number = correctLetterToNumber(number);
+                if (number.length() != 8) {
+                    return "";
+                }
+                return firstLetter + number;
+            } else {
+                return "";
+            }
+        }
+
+        // Taiwan cell card has no initial, only 8 digits.
+        if (origin.length() != 8) {
+            return "";
+        }
+
+        String number = origin.substring(0, 8);
+        number = filterString(number, "[^0-9]");
+        number = correctLetterToNumber(number);
+        if (number.length() != 8) {
+            return "";
+        }
+        return number;
+    }
+
+    /**
+     * Letters corrected to numbers.
+     */
+    public static String correctLetterToNumber(String str) {
+        if (str == null || str.isEmpty()) {
+            return "";
+        }
+        char[] chars = str.toCharArray();
+
+        int length = chars.length;
+        for (int index = 0; index < length; index++) {
+            String tmp = letterNumberMap.get(Character.toString(chars[index]));
+            if (tmp != null) {
+                char[] tempChars = tmp.toCharArray();
+                chars[index] = tempChars[0];
+            }
+        }
+
+        return String.valueOf(chars);
+    }
+
+    /**
+     * Numbers corrected to letters.
+     */
+    public static String correctNumberToLetter(String str) {
+        if (str == null || str.isEmpty()) {
+            return "";
+        }
+        char[] chars = str.toCharArray();
+
+        int length = chars.length;
+        for (int index = 0; index < length; index++) {
+            String tmp = numberLetterMap.get(Character.toString(chars[index]));
+            if (tmp != null) {
+                char[] tempChars = tmp.toCharArray();
+                chars[index] = tempChars[0];
+            }
+        }
+
+        return String.valueOf(chars);
+    }
+
+    /**
+     * Fuzzy match delimiter.
+     */
+    private static boolean blurMatchDelimiter(char origin, char target) {
+        if (target == '.') {
+            if (origin == '.' || origin == ',') {
+                return true;
+            }
+        }
+        if (target == '<') {
+            if (origin == 'K' || origin == 'X') {
+                return true;
+            }
+        }
+        return origin == target;
+    }
+}
\ No newline at end of file
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/views/SwitchButton.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/views/SwitchButton.java
similarity index 99%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/views/SwitchButton.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/views/SwitchButton.java
index 42dd4ca..11bb039 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/views/SwitchButton.java
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/views/SwitchButton.java
@@ -20,7 +20,6 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
-import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.RectF;
 import android.util.AttributeSet;
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/views/graphic/BaseGraphic.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/views/graphic/BaseGraphic.java
similarity index 100%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/views/graphic/BaseGraphic.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/views/graphic/BaseGraphic.java
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/views/graphic/CameraImageGraphic.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/views/graphic/CameraImageGraphic.java
similarity index 100%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/views/graphic/CameraImageGraphic.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/views/graphic/CameraImageGraphic.java
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/views/graphic/LocalTextGraphic.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/views/graphic/LocalTextGraphic.java
similarity index 100%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/views/graphic/LocalTextGraphic.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/views/graphic/LocalTextGraphic.java
index eb8aa12..fc6f38b 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/views/graphic/LocalTextGraphic.java
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/views/graphic/LocalTextGraphic.java
@@ -22,8 +22,8 @@
 import android.graphics.Path;
 import android.graphics.Point;
 
-import com.mlkit.sample.views.overlay.GraphicOverlay;
 import com.huawei.hms.mlsdk.text.MLText;
+import com.mlkit.sample.views.overlay.GraphicOverlay;
 
 public class LocalTextGraphic extends BaseGraphic {
 
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/views/overlay/GraphicOverlay.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/views/overlay/GraphicOverlay.java
similarity index 100%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/views/overlay/GraphicOverlay.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/views/overlay/GraphicOverlay.java
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/views/overlay/ZoomImageView.java b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/views/overlay/ZoomImageView.java
similarity index 99%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/views/overlay/ZoomImageView.java
rename to MLKit-Sample/module-text/src/main/java/com/mlkit/sample/views/overlay/ZoomImageView.java
index c66ac49..7f36597 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/views/overlay/ZoomImageView.java
+++ b/MLKit-Sample/module-text/src/main/java/com/mlkit/sample/views/overlay/ZoomImageView.java
@@ -37,7 +37,6 @@
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.ScaleGestureDetector;
diff --git a/MLKit-Sample/app/src/main/res/anim/anim_in.xml b/MLKit-Sample/module-text/src/main/res/anim/anim_in.xml
similarity index 81%
rename from MLKit-Sample/app/src/main/res/anim/anim_in.xml
rename to MLKit-Sample/module-text/src/main/res/anim/anim_in.xml
index 57dadb4..125637b 100644
--- a/MLKit-Sample/app/src/main/res/anim/anim_in.xml
+++ b/MLKit-Sample/module-text/src/main/res/anim/anim_in.xml
@@ -4,5 +4,6 @@
     <translate
         android:fromYDelta="100%"
         android:toYDelta="0"
-        android:duration="300"/>
+        android:duration="300"
+        />
 </set>
\ No newline at end of file
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxhdpi/add_image.png b/MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/add_image.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxhdpi/add_image.png
rename to MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/add_image.png
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxhdpi/black_back.png b/MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/black_back.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxhdpi/black_back.png
rename to MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/black_back.png
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxhdpi/close.png b/MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/close.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxhdpi/close.png
rename to MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/close.png
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxhdpi/facingswitch.png b/MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/facingswitch.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxhdpi/facingswitch.png
rename to MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/facingswitch.png
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxhdpi/facingswitch_stroke.png b/MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/facingswitch_stroke.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxhdpi/facingswitch_stroke.png
rename to MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/facingswitch_stroke.png
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxhdpi/icon.png b/MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/icon.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxhdpi/icon.png
rename to MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/icon.png
diff --git a/MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/icon_bcr_background.png b/MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/icon_bcr_background.png
new file mode 100644
index 0000000..e80b108
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/icon_bcr_background.png differ
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxhdpi/icon_idcard_addto.png b/MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/icon_card_add.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxhdpi/icon_idcard_addto.png
rename to MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/icon_card_add.png
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxhdpi/icon_idcard_off.png b/MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/icon_card_off.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxhdpi/icon_idcard_off.png
rename to MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/icon_card_off.png
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxhdpi/icon_cut.png b/MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/icon_cut.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxhdpi/icon_cut.png
rename to MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/icon_cut.png
diff --git a/MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/icon_gcr_background.png b/MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/icon_gcr_background.png
new file mode 100644
index 0000000..a75d9e9
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/icon_gcr_background.png differ
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxhdpi/icon_idcard_nationalemblem.png b/MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/icon_idcard_nationalemblem.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxhdpi/icon_idcard_nationalemblem.png
rename to MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/icon_idcard_nationalemblem.png
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxhdpi/icon_idcard_portrait.png b/MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/icon_idcard_portrait.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxhdpi/icon_idcard_portrait.png
rename to MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/icon_idcard_portrait.png
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxhdpi/icon_new.png b/MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/icon_new.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxhdpi/icon_new.png
rename to MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/icon_new.png
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxhdpi/icons_background.png b/MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/icons_background.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxhdpi/icons_background.png
rename to MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/icons_background.png
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxhdpi/take_picture.png b/MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/take_picture.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxhdpi/take_picture.png
rename to MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/take_picture.png
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxhdpi/take_picture_solid.png b/MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/take_picture_solid.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxhdpi/take_picture_solid.png
rename to MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/take_picture_solid.png
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxhdpi/take_picture_stroke.png b/MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/take_picture_stroke.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxhdpi/take_picture_stroke.png
rename to MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/take_picture_stroke.png
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxhdpi/translate_switch.png b/MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/translate_switch.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxhdpi/translate_switch.png
rename to MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/translate_switch.png
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxhdpi/white_back.png b/MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/white_back.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxhdpi/white_back.png
rename to MLKit-Sample/module-text/src/main/res/drawable-xxhdpi/white_back.png
diff --git a/MLKit-Sample/module-text/src/main/res/drawable-xxxhdpi/icon_aft.png b/MLKit-Sample/module-text/src/main/res/drawable-xxxhdpi/icon_aft.png
new file mode 100644
index 0000000..a9c320a
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/drawable-xxxhdpi/icon_aft.png differ
diff --git a/MLKit-Sample/module-text/src/main/res/drawable-xxxhdpi/icon_bcr.png b/MLKit-Sample/module-text/src/main/res/drawable-xxxhdpi/icon_bcr.png
new file mode 100644
index 0000000..8bcba91
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/drawable-xxxhdpi/icon_bcr.png differ
diff --git a/MLKit-Sample/module-text/src/main/res/drawable-xxxhdpi/icon_document.png b/MLKit-Sample/module-text/src/main/res/drawable-xxxhdpi/icon_document.png
new file mode 100644
index 0000000..ac4739c
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/drawable-xxxhdpi/icon_document.png differ
diff --git a/MLKit-Sample/module-text/src/main/res/drawable-xxxhdpi/icon_gcr.png b/MLKit-Sample/module-text/src/main/res/drawable-xxxhdpi/icon_gcr.png
new file mode 100644
index 0000000..1c699fe
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/drawable-xxxhdpi/icon_gcr.png differ
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxxhdpi/icon_idcard.png b/MLKit-Sample/module-text/src/main/res/drawable-xxxhdpi/icon_icr.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxxhdpi/icon_idcard.png
rename to MLKit-Sample/module-text/src/main/res/drawable-xxxhdpi/icon_icr.png
diff --git a/MLKit-Sample/module-text/src/main/res/drawable-xxxhdpi/icon_idcard.png b/MLKit-Sample/module-text/src/main/res/drawable-xxxhdpi/icon_idcard.png
new file mode 100644
index 0000000..a2e2865
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/drawable-xxxhdpi/icon_idcard.png differ
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxxhdpi/icon_logo.png b/MLKit-Sample/module-text/src/main/res/drawable-xxxhdpi/icon_logo.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxxhdpi/icon_logo.png
rename to MLKit-Sample/module-text/src/main/res/drawable-xxxhdpi/icon_logo.png
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxxhdpi/icon_text.png b/MLKit-Sample/module-text/src/main/res/drawable-xxxhdpi/icon_text.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxxhdpi/icon_text.png
rename to MLKit-Sample/module-text/src/main/res/drawable-xxxhdpi/icon_text.png
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxxhdpi/icon_translate.png b/MLKit-Sample/module-text/src/main/res/drawable-xxxhdpi/icon_translate.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxxhdpi/icon_translate.png
rename to MLKit-Sample/module-text/src/main/res/drawable-xxxhdpi/icon_translate.png
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxxhdpi/swich_slider_new.png b/MLKit-Sample/module-text/src/main/res/drawable-xxxhdpi/swich_slider_new.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxxhdpi/swich_slider_new.png
rename to MLKit-Sample/module-text/src/main/res/drawable-xxxhdpi/swich_slider_new.png
diff --git a/MLKit-Sample/app/src/main/res/drawable/app_loading001.webp b/MLKit-Sample/module-text/src/main/res/drawable/app_loading001.webp
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable/app_loading001.webp
rename to MLKit-Sample/module-text/src/main/res/drawable/app_loading001.webp
diff --git a/MLKit-Sample/app/src/main/res/drawable/app_loading002.webp b/MLKit-Sample/module-text/src/main/res/drawable/app_loading002.webp
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable/app_loading002.webp
rename to MLKit-Sample/module-text/src/main/res/drawable/app_loading002.webp
diff --git a/MLKit-Sample/app/src/main/res/drawable/app_loading003.webp b/MLKit-Sample/module-text/src/main/res/drawable/app_loading003.webp
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable/app_loading003.webp
rename to MLKit-Sample/module-text/src/main/res/drawable/app_loading003.webp
diff --git a/MLKit-Sample/app/src/main/res/drawable/app_loading004.webp b/MLKit-Sample/module-text/src/main/res/drawable/app_loading004.webp
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable/app_loading004.webp
rename to MLKit-Sample/module-text/src/main/res/drawable/app_loading004.webp
diff --git a/MLKit-Sample/app/src/main/res/drawable/app_loading005.webp b/MLKit-Sample/module-text/src/main/res/drawable/app_loading005.webp
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable/app_loading005.webp
rename to MLKit-Sample/module-text/src/main/res/drawable/app_loading005.webp
diff --git a/MLKit-Sample/app/src/main/res/drawable/app_loading006.webp b/MLKit-Sample/module-text/src/main/res/drawable/app_loading006.webp
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable/app_loading006.webp
rename to MLKit-Sample/module-text/src/main/res/drawable/app_loading006.webp
diff --git a/MLKit-Sample/app/src/main/res/drawable/app_loading007.webp b/MLKit-Sample/module-text/src/main/res/drawable/app_loading007.webp
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable/app_loading007.webp
rename to MLKit-Sample/module-text/src/main/res/drawable/app_loading007.webp
diff --git a/MLKit-Sample/app/src/main/res/drawable/app_loading008.webp b/MLKit-Sample/module-text/src/main/res/drawable/app_loading008.webp
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable/app_loading008.webp
rename to MLKit-Sample/module-text/src/main/res/drawable/app_loading008.webp
diff --git a/MLKit-Sample/app/src/main/res/drawable/app_loading009.webp b/MLKit-Sample/module-text/src/main/res/drawable/app_loading009.webp
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable/app_loading009.webp
rename to MLKit-Sample/module-text/src/main/res/drawable/app_loading009.webp
diff --git a/MLKit-Sample/app/src/main/res/drawable/app_loading010.webp b/MLKit-Sample/module-text/src/main/res/drawable/app_loading010.webp
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable/app_loading010.webp
rename to MLKit-Sample/module-text/src/main/res/drawable/app_loading010.webp
diff --git a/MLKit-Sample/app/src/main/res/drawable/app_loading011.webp b/MLKit-Sample/module-text/src/main/res/drawable/app_loading011.webp
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable/app_loading011.webp
rename to MLKit-Sample/module-text/src/main/res/drawable/app_loading011.webp
diff --git a/MLKit-Sample/app/src/main/res/drawable/app_loading012.webp b/MLKit-Sample/module-text/src/main/res/drawable/app_loading012.webp
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable/app_loading012.webp
rename to MLKit-Sample/module-text/src/main/res/drawable/app_loading012.webp
diff --git a/MLKit-Sample/app/src/main/res/drawable/app_loading013.webp b/MLKit-Sample/module-text/src/main/res/drawable/app_loading013.webp
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable/app_loading013.webp
rename to MLKit-Sample/module-text/src/main/res/drawable/app_loading013.webp
diff --git a/MLKit-Sample/app/src/main/res/drawable/app_loading014.webp b/MLKit-Sample/module-text/src/main/res/drawable/app_loading014.webp
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable/app_loading014.webp
rename to MLKit-Sample/module-text/src/main/res/drawable/app_loading014.webp
diff --git a/MLKit-Sample/app/src/main/res/drawable/bg_edit_text.xml b/MLKit-Sample/module-text/src/main/res/drawable/bg_edit_text.xml
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable/bg_edit_text.xml
rename to MLKit-Sample/module-text/src/main/res/drawable/bg_edit_text.xml
diff --git a/MLKit-Sample/app/src/main/res/drawable/btn_back.xml b/MLKit-Sample/module-text/src/main/res/drawable/btn_back.xml
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable/btn_back.xml
rename to MLKit-Sample/module-text/src/main/res/drawable/btn_back.xml
diff --git a/MLKit-Sample/module-text/src/main/res/drawable/btn_gray_back.xml b/MLKit-Sample/module-text/src/main/res/drawable/btn_gray_back.xml
new file mode 100644
index 0000000..9a75b95
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/res/drawable/btn_gray_back.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+    <!-- box color -->
+    <solid android:color="#F4F4F4"></solid>
+    <corners android:radius="5dp"></corners>
+
+</shape>
diff --git a/MLKit-Sample/app/src/main/res/drawable/button_circle_background.xml b/MLKit-Sample/module-text/src/main/res/drawable/button_circle_background.xml
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable/button_circle_background.xml
rename to MLKit-Sample/module-text/src/main/res/drawable/button_circle_background.xml
diff --git a/MLKit-Sample/app/src/main/res/drawable/dialog_background.xml b/MLKit-Sample/module-text/src/main/res/drawable/dialog_background.xml
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable/dialog_background.xml
rename to MLKit-Sample/module-text/src/main/res/drawable/dialog_background.xml
diff --git a/MLKit-Sample/app/src/main/res/drawable/logo_circle_background.xml b/MLKit-Sample/module-text/src/main/res/drawable/logo_circle_background.xml
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable/logo_circle_background.xml
rename to MLKit-Sample/module-text/src/main/res/drawable/logo_circle_background.xml
diff --git a/MLKit-Sample/module-text/src/main/res/drawable/progress_background.xml b/MLKit-Sample/module-text/src/main/res/drawable/progress_background.xml
new file mode 100644
index 0000000..a16afe5
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/res/drawable/progress_background.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animated-rotate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromDegrees="0"
+    android:pivotX="50%"
+    android:pivotY="50%"
+    android:toDegrees="360">
+    <shape
+        android:innerRadiusRatio="3"
+        android:shape="ring"
+        android:thicknessRatio="10"
+        android:useLevel="false">
+          
+        <gradient
+            android:centerColor="@color/primary_text_color"
+            android:centerY="0.5"
+            android:endColor="@color/white"
+            android:startColor="@color/white"
+            android:type="sweep"
+            android:useLevel="false" />
+    </shape>
+
+</animated-rotate>
diff --git a/MLKit-Sample/app/src/main/res/drawable/progress_drawable_white.xml b/MLKit-Sample/module-text/src/main/res/drawable/progress_drawable_white.xml
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable/progress_drawable_white.xml
rename to MLKit-Sample/module-text/src/main/res/drawable/progress_drawable_white.xml
diff --git a/MLKit-Sample/module-text/src/main/res/drawable/record_dailog_background.xml b/MLKit-Sample/module-text/src/main/res/drawable/record_dailog_background.xml
new file mode 100644
index 0000000..03e8612
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/res/drawable/record_dailog_background.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+    <!-- box color -->
+    <solid android:color="#Ffffff"></solid>
+    <corners android:radius="10dp"></corners>
+</shape>
diff --git a/MLKit-Sample/app/src/main/res/drawable/rn_dashed_box.xml b/MLKit-Sample/module-text/src/main/res/drawable/rn_dashed_box.xml
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable/rn_dashed_box.xml
rename to MLKit-Sample/module-text/src/main/res/drawable/rn_dashed_box.xml
diff --git a/MLKit-Sample/app/src/main/res/drawable/text_selector.xml b/MLKit-Sample/module-text/src/main/res/drawable/text_selector.xml
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable/text_selector.xml
rename to MLKit-Sample/module-text/src/main/res/drawable/text_selector.xml
diff --git a/MLKit-Sample/module-text/src/main/res/layout-land/activity_start.xml b/MLKit-Sample/module-text/src/main/res/layout-land/activity_start.xml
new file mode 100644
index 0000000..fa48ef5
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/res/layout-land/activity_start.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#f2f2f2"
+    android:fitsSystemWindows="true">
+
+    <RelativeLayout
+        android:id="@+id/logo"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:layout_alignParentTop="true"
+        android:background="#003853"
+        android:scaleType="fitXY">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="200dp"
+            android:text="MACHINE  LEARNING"
+            android:textColor="@android:color/white"
+            android:textSize="25sp"></TextView>
+
+        <ImageView
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="50dp"
+            android:src="@drawable/icon_logo"></ImageView>
+    </RelativeLayout>
+
+    <ImageView
+        android:id="@+id/setting_img"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="20dp"
+        android:layout_marginRight="20dp"
+        android:background="@mipmap/icon_setting" />
+
+    <GridView
+        android:id="@+id/gridview"
+        android:layout_marginLeft="50dp"
+        android:layout_marginRight="50dp"
+        android:layout_marginTop="30dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/logo"
+        android:verticalSpacing="40dp"
+        android:listSelector="@android:color/transparent"
+        android:numColumns="4">
+    </GridView>
+</RelativeLayout>
diff --git a/MLKit-Sample/app/src/main/res/layout-land/activity_text_recognition.xml b/MLKit-Sample/module-text/src/main/res/layout-land/activity_text_recognition.xml
similarity index 100%
rename from MLKit-Sample/app/src/main/res/layout-land/activity_text_recognition.xml
rename to MLKit-Sample/module-text/src/main/res/layout-land/activity_text_recognition.xml
diff --git a/MLKit-Sample/module-text/src/main/res/layout/activity_bank_card_recognition.xml b/MLKit-Sample/module-text/src/main/res/layout/activity_bank_card_recognition.xml
new file mode 100644
index 0000000..7ef3787
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/res/layout/activity_bank_card_recognition.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/currentview"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/primary_background"
+    android:orientation="vertical">
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/toolbar_height"
+        android:background="@color/white">
+
+        <TextView
+            android:id="@+id/back"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:drawableLeft="@drawable/black_back"
+            android:text="@string/back"
+            android:textColor="@color/secondary_text_color"
+            android:textSize="@dimen/toolbar_back_size" />
+
+        <TextView
+            android:id="@+id/text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/bcr_s"
+            android:textColor="@color/secondary_text_color"
+            android:textSize="@dimen/toolbar_title_size" />
+    </androidx.appcompat.widget.Toolbar>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/toolbar"
+        android:layout_marginTop="@dimen/common_margin_top"
+        android:background="@color/white"
+        android:fillViewport="true"
+        android:scrollbars="none">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginStart="@dimen/upload_card_tint_margin"
+                android:layout_marginTop="@dimen/upload_card_tint_margin"
+                android:layout_marginEnd="@dimen/upload_card_tint_margin"
+                android:fontFamily="HwChinese-regular"
+                android:gravity="center_horizontal"
+                android:text="@string/bcr_upload_self_photo"
+                android:textColor="@color/text_color"
+                android:textSize="@dimen/upload_card_tint_size" />
+
+
+            <RelativeLayout
+                android:layout_width="@dimen/upload_card_layout_width"
+                android:layout_height="@dimen/upload_card_layout_height"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="@dimen/upload_card_layout_margin_top"
+                android:background="@drawable/rn_dashed_box"
+                android:gravity="center_horizontal">
+
+                <ImageView
+                    android:id="@+id/avatar_sample_img"
+                    android:layout_width="@dimen/card_background_width"
+                    android:layout_height="@dimen/card_background_height"
+                    android:layout_marginStart="@dimen/card_background_margin_start"
+                    android:layout_marginLeft="@dimen/card_background_margin_start"
+                    android:layout_marginTop="@dimen/card_background_margin_top"
+                    android:adjustViewBounds="true"
+                    android:src="@drawable/icon_bcr_background" />
+
+
+                <ImageView
+                    android:id="@+id/avatar_img"
+                    android:layout_width="@dimen/card_image_width"
+                    android:layout_height="@dimen/card_image_height"
+                    android:layout_marginStart="@dimen/card_image_margin"
+                    android:layout_marginTop="@dimen/card_image_margin"
+                    android:adjustViewBounds="true"
+                    android:scaleType="fitXY"
+                    android:visibility="gone" />
+
+                <LinearLayout
+                    android:id="@+id/avatar_add"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:orientation="vertical">
+
+                    <ImageView
+                        android:layout_width="@dimen/icon_card_add_width"
+                        android:layout_height="@dimen/icon_card_add_height"
+                        android:layout_gravity="center_horizontal"
+                        android:gravity="center_horizontal"
+                        android:src="@drawable/icon_card_add" />
+
+                </LinearLayout>
+
+                <ImageView
+                    android:id="@+id/avatar_delete"
+                    android:layout_width="@dimen/icon_card_delete_width"
+                    android:layout_height="@dimen/icon_card_delete_height"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginTop="@dimen/card_image_margin"
+                    android:layout_marginEnd="@dimen/card_image_margin"
+                    android:layout_marginRight="@dimen/card_image_margin"
+                    android:src="@drawable/icon_card_off"
+                    android:visibility="gone" />
+            </RelativeLayout>
+
+            <TextView
+                android:id="@+id/rn_eid_hint_ensure_user_info_security_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginStart="@dimen/upload_text_margin_start"
+                android:layout_marginTop="@dimen/upload_text_margin_top"
+                android:layout_marginEnd="@dimen/upload_text_margin_start"
+                android:fontFamily="HwChinese-regular"
+                android:gravity="center_horizontal"
+                android:text="@string/icr_hint_ensure_user_info_security"
+                android:textColor="@color/secondary_text_color"
+                android:textSize="12sp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/card_result_margin_start"
+                android:layout_marginTop="@dimen/card_result_margin_top"
+                android:layout_marginEnd="@dimen/card_result_margin_start"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:id="@+id/number"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:scaleType="fitXY" />
+
+                <TextView
+                    android:id="@+id/show_result"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/card_result_margin_top"
+                    android:textColor="@color/text_color"
+                    android:textSize="@dimen/card_result_text_size"></TextView>
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+
+</RelativeLayout>
diff --git a/MLKit-Sample/module-text/src/main/res/layout/activity_general_card_recognition.xml b/MLKit-Sample/module-text/src/main/res/layout/activity_general_card_recognition.xml
new file mode 100644
index 0000000..711fbce
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/res/layout/activity_general_card_recognition.xml
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/primary_background"
+    android:orientation="vertical">
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/toolbar_height"
+        android:background="@color/white">
+
+        <TextView
+            android:id="@+id/back"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:drawableLeft="@drawable/black_back"
+            android:text="@string/back"
+            android:textColor="@color/secondary_text_color"
+            android:textSize="@dimen/toolbar_back_size" />
+
+        <TextView
+            android:id="@+id/text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/ucr_s"
+            android:textColor="@color/secondary_text_color"
+            android:textSize="@dimen/toolbar_title_size" />
+    </androidx.appcompat.widget.Toolbar>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/toolbar"
+        android:layout_marginTop="@dimen/common_margin_top"
+        android:fillViewport="true"
+        android:background="@color/white"
+        android:scrollbars="none">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/ucr_upload_photo_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginStart="@dimen/upload_card_tint_margin"
+                android:layout_marginTop="@dimen/upload_card_tint_margin"
+                android:layout_marginEnd="@dimen/upload_card_tint_margin"
+                android:fontFamily="HwChinese-regular"
+                android:gravity="center_horizontal"
+                android:text="@string/gcr_upload_self_photo"
+                android:textColor="@color/text_color"
+                android:textSize="@dimen/upload_card_tint_size" />
+
+
+            <RelativeLayout
+                android:layout_width="@dimen/upload_card_layout_width"
+                android:layout_height="@dimen/upload_card_layout_height"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="@dimen/upload_card_layout_margin_top"
+                android:background="@drawable/rn_dashed_box"
+                android:gravity="center_horizontal">
+
+                <ImageView
+                    android:id="@+id/avatar_sample_img"
+                    android:layout_width="@dimen/card_background_width"
+                    android:layout_height="@dimen/card_background_height"
+                    android:layout_marginStart="@dimen/card_background_margin_start"
+                    android:layout_marginTop="@dimen/card_background_margin_top"
+                    android:adjustViewBounds="true"
+                    android:background="@drawable/icon_gcr_background" />
+
+                <ImageView
+                    android:id="@+id/avatar_img"
+                    android:layout_width="@dimen/card_image_width"
+                    android:layout_height="@dimen/card_image_height"
+                    android:layout_marginStart="@dimen/card_image_margin"
+                    android:layout_marginTop="@dimen/card_image_margin"
+                    android:adjustViewBounds="true"
+                    android:scaleType="fitXY"
+                    android:visibility="gone" />
+
+                <LinearLayout
+                    android:id="@+id/avatar_add"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:orientation="vertical">
+
+                    <ImageView
+                        android:layout_width="@dimen/icon_card_add_width"
+                        android:layout_height="@dimen/icon_card_add_height"
+                        android:layout_gravity="center_horizontal"
+                        android:gravity="center_horizontal"
+                        android:src="@drawable/icon_card_add" />
+
+                    <TextView
+                        android:id="@+id/ucr_upload_text"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginStart="@dimen/upload_text_margin_start"
+                        android:layout_marginTop="@dimen/upload_text_margin_top"
+                        android:layout_marginEnd="@dimen/upload_text_margin_start"
+                        android:fontFamily="HwChinese-regular"
+                        android:gravity="center_horizontal"
+                        android:text="@string/gcr_upload"
+                        android:textColor="@color/text_color"
+                        android:textSize="13sp" />
+                </LinearLayout>
+
+                <ImageView
+                    android:id="@+id/avatar_delete"
+                    android:layout_width="@dimen/icon_card_delete_width"
+                    android:layout_height="@dimen/icon_card_delete_height"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginTop="@dimen/card_image_margin"
+                    android:layout_marginEnd="@dimen/card_image_margin"
+                    android:layout_marginRight="@dimen/card_image_margin"
+                    android:src="@drawable/icon_card_off"
+                    android:visibility="gone" />
+            </RelativeLayout>
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="@dimen/card_result_margin_top"
+                android:layout_marginStart="15dp"
+                android:layout_marginEnd="15dp"
+                android:gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+
+                <RadioGroup
+                    android:id="@+id/card_type"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+                    <RadioButton android:id="@+id/passCard"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:buttonTint="@color/secondary_text_color"
+                        android:checked="true"
+                        android:text="@string/hk_pass" />
+                    <RadioButton android:id="@+id/HKIdCard"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:buttonTint="@color/secondary_text_color"
+                        android:text="@string/hk_id_card" />
+                    <RadioButton android:id="@+id/comeHomeCard"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:buttonTint="@color/secondary_text_color"
+                        android:text="@string/home_card" />
+                </RadioGroup>
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/take_id_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginStart="@dimen/card_result_margin_start"
+                android:layout_marginTop="@dimen/card_result_margin_top"
+                android:layout_marginEnd="@dimen/card_result_margin_start"
+                android:fontFamily="HwChinese-medium"
+                android:text="@string/recognition_results"
+                android:textColor="@color/text_color"
+                android:textSize="16sp" />
+
+            <!-- Add by wfp -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/card_result_margin_start"
+                android:layout_marginTop="@dimen/card_result_margin_top"
+                android:layout_marginEnd="@dimen/card_result_margin_start">
+
+                <TextView
+                    android:id="@+id/show_result"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/text_color"
+                    android:textSize="@dimen/card_result_text_size"></TextView>
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+</RelativeLayout>
diff --git a/MLKit-Sample/app/src/main/res/layout/activity_idcard_recognition.xml b/MLKit-Sample/module-text/src/main/res/layout/activity_idcard_recognition.xml
similarity index 74%
rename from MLKit-Sample/app/src/main/res/layout/activity_idcard_recognition.xml
rename to MLKit-Sample/module-text/src/main/res/layout/activity_idcard_recognition.xml
index 457e031..8b3da29 100644
--- a/MLKit-Sample/app/src/main/res/layout/activity_idcard_recognition.xml
+++ b/MLKit-Sample/module-text/src/main/res/layout/activity_idcard_recognition.xml
@@ -26,7 +26,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:text="@string/idcard_recognition_s"
+            android:text="@string/icr_s"
             android:textColor="@color/secondary_text_color"
             android:textSize="17sp" />
 
@@ -35,7 +35,6 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="right"
-            android:visibility="gone"
             android:layout_marginRight="15dp"
             android:orientation="horizontal">
 
@@ -59,39 +58,14 @@
 
     <View
         android:layout_width="match_parent"
-        android:layout_height="10dp"
+        android:layout_height="@dimen/common_margin_top"
         android:layout_below="@id/toolbar"
         android:background="@color/primary_background"></View>
 
-    <RadioGroup
-        android:visibility="gone"
-        android:id="@+id/local_or_remote"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="@dimen/margin_l"
-        android:orientation="horizontal">
-
-        <RadioButton
-            android:id="@+id/local"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:checked="true"
-            android:text="@string/device_side" />
-
-        <RadioButton
-            android:id="@+id/remote"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:checked="false"
-            android:text="@string/cloud_side" />
-    </RadioGroup>
-
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_above="@+id/local_or_remote"
+        android:layout_above="@+id/tips"
         android:layout_below="@+id/toolbar"
         android:fillViewport="true"
         android:scrollbars="none">
@@ -107,14 +81,12 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginStart="@dimen/margin_l"
-                android:layout_marginLeft="@dimen/margin_l"
                 android:layout_marginTop="@dimen/margin_l"
                 android:layout_marginEnd="@dimen/margin_l"
-                android:layout_marginRight="@dimen/margin_l"
                 android:fontFamily="HwChinese-regular"
                 android:gravity="center_horizontal"
-                android:text="@string/rn_eid_upload_self_photo"
-                android:textColor="?android:attr/textColorPrimary"
+                android:text="@string/icr_upload_self_photo"
+                android:textColor="@color/text_color"
                 android:textSize="15sp" />
 
 
@@ -131,7 +103,6 @@
                     android:layout_width="170dp"
                     android:layout_height="108dp"
                     android:layout_marginStart="35dp"
-                    android:layout_marginLeft="35dp"
                     android:layout_marginTop="21dp"
                     android:adjustViewBounds="true"
                     android:src="@drawable/icon_idcard_portrait" />
@@ -160,7 +131,7 @@
                         android:layout_height="40dp"
                         android:layout_gravity="center_horizontal"
                         android:gravity="center_horizontal"
-                        android:src="@drawable/icon_idcard_addto" />
+                        android:src="@drawable/icon_card_add" />
 
                     <TextView
                         android:id="@+id/rn_eid_upload_face_text"
@@ -168,14 +139,12 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_horizontal"
                         android:layout_marginStart="@dimen/margin_l"
-                        android:layout_marginLeft="@dimen/margin_l"
                         android:layout_marginTop="@dimen/margin_m"
                         android:layout_marginEnd="@dimen/margin_l"
-                        android:layout_marginRight="@dimen/margin_l"
                         android:fontFamily="HwChinese-regular"
                         android:gravity="center_horizontal"
-                        android:text="@string/rn_eid_upload_face"
-                        android:textColor="?android:attr/textColorPrimary"
+                        android:text="@string/icr_upload_face"
+                        android:textColor="@color/text_color"
                         android:textSize="13sp" />
                 </LinearLayout>
 
@@ -186,12 +155,10 @@
                     android:layout_centerHorizontal="true"
                     android:layout_centerVertical="true"
                     android:layout_marginStart="12dp"
-                    android:layout_marginLeft="12dp"
                     android:layout_marginEnd="12dp"
-                    android:layout_marginRight="12dp"
                     android:fontFamily="HwChinese-regular"
                     android:gravity="center_horizontal"
-                    android:text="@string/rn_eid_hint_upload_valid_photo"
+                    android:text="@string/icr_hint_upload_valid_photo"
                     android:textColor="@color/color_red_card"
                     android:textSize="12sp"
                     android:visibility="gone" />
@@ -205,7 +172,7 @@
                     android:layout_marginTop="4dp"
                     android:layout_marginEnd="4dp"
                     android:layout_marginRight="4dp"
-                    android:src="@drawable/icon_idcard_off"
+                    android:src="@drawable/icon_card_off"
                     android:visibility="gone" />
             </RelativeLayout>
 
@@ -215,13 +182,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginStart="@dimen/margin_l"
-                android:layout_marginLeft="@dimen/margin_l"
                 android:layout_marginTop="@dimen/margin_m"
                 android:layout_marginEnd="@dimen/margin_l"
-                android:layout_marginRight="@dimen/margin_l"
                 android:fontFamily="HwChinese-regular"
                 android:gravity="center_horizontal"
-                android:text="@string/rn_eid_hint_image_not_complete"
+                android:text="@string/icr_hint_image_not_complete"
                 android:textColor="@color/color_red_card"
                 android:textSize="12sp"
                 android:visibility="gone" />
@@ -230,7 +195,7 @@
                 android:layout_width="240dp"
                 android:layout_height="151dp"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginTop="@dimen/idcard_result_margin"
+                android:layout_marginTop="@dimen/icr_result_margin"
                 android:background="@drawable/rn_dashed_box"
                 android:gravity="center_horizontal">
 
@@ -267,7 +232,7 @@
                         android:layout_height="40dp"
                         android:layout_gravity="center_horizontal"
                         android:gravity="center_horizontal"
-                        android:src="@drawable/icon_idcard_addto" />
+                        android:src="@drawable/icon_card_add" />
 
                     <TextView
                         android:id="@+id/rn_eid_upload_back_text"
@@ -275,14 +240,12 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_horizontal"
                         android:layout_marginStart="@dimen/margin_l"
-                        android:layout_marginLeft="@dimen/margin_l"
                         android:layout_marginTop="@dimen/margin_m"
                         android:layout_marginEnd="@dimen/margin_l"
-                        android:layout_marginRight="@dimen/margin_l"
                         android:fontFamily="HwChinese-regular"
                         android:gravity="center_horizontal"
-                        android:text="@string/rn_eid_upload_back"
-                        android:textColor="?android:attr/textColorPrimary"
+                        android:text="@string/icr_upload_back"
+                        android:textColor="@color/text_color"
                         android:textSize="13sp" />
                 </LinearLayout>
 
@@ -298,7 +261,7 @@
                     android:layout_marginRight="12dp"
                     android:fontFamily="HwChinese-regular"
                     android:gravity="center_horizontal"
-                    android:text="@string/rn_eid_hint_upload_valid_photo"
+                    android:text="@string/icr_hint_upload_valid_photo"
                     android:textColor="@color/color_red_card"
                     android:textSize="12sp"
                     android:visibility="gone" />
@@ -312,40 +275,21 @@
                     android:layout_marginTop="4dp"
                     android:layout_marginEnd="4dp"
                     android:layout_marginRight="4dp"
-                    android:src="@drawable/icon_idcard_off"
+                    android:src="@drawable/icon_card_off"
                     android:visibility="gone" />
             </RelativeLayout>
 
-            <TextView
-                android:id="@+id/rn_back_not_complete"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginStart="@dimen/margin_l"
-                android:layout_marginLeft="@dimen/margin_l"
-                android:layout_marginTop="@dimen/margin_m"
-                android:layout_marginEnd="@dimen/margin_l"
-                android:layout_marginRight="@dimen/margin_l"
-                android:fontFamily="HwChinese-regular"
-                android:gravity="center_horizontal"
-                android:text="@string/rn_eid_hint_image_not_complete"
-                android:textColor="#FFFA2A2D"
-                android:textSize="12sp"
-                android:visibility="gone" />
-
             <TextView
                 android:id="@+id/rn_eid_hint_ensure_user_info_security_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginStart="@dimen/margin_l"
-                android:layout_marginLeft="@dimen/margin_l"
                 android:layout_marginTop="@dimen/margin_m"
                 android:layout_marginEnd="@dimen/margin_l"
-                android:layout_marginRight="@dimen/margin_l"
                 android:fontFamily="HwChinese-regular"
                 android:gravity="center_horizontal"
-                android:text="@string/rn_eid_hint_ensure_user_info_security"
+                android:text="@string/icr_hint_ensure_user_info_security"
                 android:textColor="@color/secondary_text_color"
                 android:textSize="12sp" />
 
@@ -356,23 +300,20 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginStart="24dp"
-                android:layout_marginLeft="24dp"
-                android:layout_marginTop="@dimen/idcard_result_margin"
+                android:layout_marginTop="@dimen/icr_result_margin"
                 android:layout_marginEnd="24dp"
-                android:layout_marginRight="24dp"
                 android:fontFamily="HwChinese-medium"
-                android:text="@string/rn_eid_take_origin_card"
-                android:textColor="?android:attr/textColorPrimary"
+                android:text="@string/recognition_results"
+                android:textColor="@color/text_color"
                 android:textSize="16sp" />
-            <!-- Add by wfp -->
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/idcard_margin"
-                android:layout_marginLeft="@dimen/idcard_margin"
-                android:layout_marginTop="@dimen/idcard_result_margin"
-                android:layout_marginEnd="@dimen/idcard_margin"
-                android:layout_marginRight="@dimen/idcard_margin">
+                android:layout_marginStart="@dimen/icr_margin"
+                android:layout_marginTop="@dimen/icr_result_margin"
+                android:layout_marginEnd="@dimen/icr_margin"
+                android:layout_marginRight="@dimen/icr_margin">
 
                 <TextView
                     android:id="@+id/show_result"
@@ -385,15 +326,15 @@
     </ScrollView>
 
     <TextView
+        android:id="@+id/tips"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
         android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="5dp"
         android:layout_marginBottom="5dp"
-        android:text="@string/idcard_mark"
+        android:text="@string/icr_mark"
         android:textColor="@color/secondary_text_color"
-        android:textSize="12sp">
-
-    </TextView>
+        android:textSize="12sp"></TextView>
 
 </RelativeLayout>
diff --git a/MLKit-Sample/app/src/main/res/layout/activity_remote_detection.xml b/MLKit-Sample/module-text/src/main/res/layout/activity_remote_detection.xml
similarity index 96%
rename from MLKit-Sample/app/src/main/res/layout/activity_remote_detection.xml
rename to MLKit-Sample/module-text/src/main/res/layout/activity_remote_detection.xml
index a7e9377..311dc7c 100644
--- a/MLKit-Sample/app/src/main/res/layout/activity_remote_detection.xml
+++ b/MLKit-Sample/module-text/src/main/res/layout/activity_remote_detection.xml
@@ -9,8 +9,7 @@
     <RelativeLayout
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:background="#26000000">
+        android:layout_height="@dimen/toolbar_height">
 
         <ImageButton
             android:id="@+id/back"
diff --git a/MLKit-Sample/app/src/main/res/layout/activity_setting.xml b/MLKit-Sample/module-text/src/main/res/layout/activity_setting.xml
similarity index 88%
rename from MLKit-Sample/app/src/main/res/layout/activity_setting.xml
rename to MLKit-Sample/module-text/src/main/res/layout/activity_setting.xml
index f80e730..4470192 100644
--- a/MLKit-Sample/app/src/main/res/layout/activity_setting.xml
+++ b/MLKit-Sample/module-text/src/main/res/layout/activity_setting.xml
@@ -9,9 +9,7 @@
     <androidx.appcompat.widget.Toolbar
         android:layout_width="match_parent"
         android:layout_height="@dimen/toolbar_height"
-        android:background="@color/white"
-        android:minHeight="?attr/actionBarSize">
-
+        android:background="@color/white">
 
         <TextView
             android:id="@+id/back"
@@ -21,7 +19,7 @@
             android:drawableLeft="@drawable/black_back"
             android:text="@string/back"
             android:textColor="@color/secondary_text_color"
-            android:textSize="14sp" />
+            android:textSize="@dimen/toolbar_back_size" />
 
         <TextView
             android:id="@+id/text"
@@ -30,7 +28,7 @@
             android:layout_gravity="center"
             android:text="@string/settings"
             android:textColor="@color/secondary_text_color"
-            android:textSize="17sp" />
+            android:textSize="@dimen/toolbar_title_size" />
     </androidx.appcompat.widget.Toolbar>
 
 
@@ -55,7 +53,7 @@
                 android:text="@string/versions"
                 android:textColor="@color/secondary_text_color"
                 android:textSize="16sp" />
-s
+
             <TextView
                 android:id="@+id/version"
                 android:layout_width="wrap_content"
@@ -67,9 +65,11 @@ s
                 android:textSize="14sp" />
 
         </RelativeLayout>
-        <View style="@style/common_line"
-            android:layout_marginRight="16dp"
-            android:layout_marginLeft="16dp"/>
+
+        <View
+            style="@style/common_line"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp" />
     </LinearLayout>
 
 
diff --git a/MLKit-Sample/module-text/src/main/res/layout/activity_start.xml b/MLKit-Sample/module-text/src/main/res/layout/activity_start.xml
new file mode 100644
index 0000000..492b69c
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/res/layout/activity_start.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/primary_background"
+    android:fitsSystemWindows="true">
+
+    <RelativeLayout
+        android:id="@+id/logo"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/start_logo_height"
+        android:layout_alignParentTop="true"
+        android:background="@color/logo_background"
+        android:scaleType="fitXY">
+
+        <ImageView
+            android:layout_width="150dp"
+            android:layout_height="150dp"
+            android:layout_centerVertical="true"
+            android:layout_toRightOf="@id/title"
+            android:src="@drawable/icon_logo"></ImageView>
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="80dp"
+            android:text="MACHINE\n LEARNING"
+            android:textColor="@color/white"
+            android:textSize="22sp"></TextView>
+
+    </RelativeLayout>
+
+    <ImageView
+        android:layout_width="220dp"
+        android:layout_height="100dp"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="@dimen/start_logo_margin"
+        android:background="@drawable/logo_circle_background"></ImageView>
+
+    <ImageView
+        android:id="@+id/setting_img"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="20dp"
+        android:layout_marginRight="20dp"
+        android:background="@mipmap/icon_setting" />
+
+    <GridView
+        android:id="@+id/gridview"
+        android:layout_marginLeft="30dp"
+        android:layout_marginRight="30dp"
+        android:layout_marginTop="@dimen/start_margin_top"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/logo"
+        android:verticalSpacing="40dp"
+        android:listSelector="@android:color/transparent"
+        android:numColumns="3">
+    </GridView>
+</RelativeLayout>
diff --git a/MLKit-Sample/app/src/main/res/layout/activity_text_recognition.xml b/MLKit-Sample/module-text/src/main/res/layout/activity_text_recognition.xml
similarity index 71%
rename from MLKit-Sample/app/src/main/res/layout/activity_text_recognition.xml
rename to MLKit-Sample/module-text/src/main/res/layout/activity_text_recognition.xml
index 777007b..272f42c 100644
--- a/MLKit-Sample/app/src/main/res/layout/activity_text_recognition.xml
+++ b/MLKit-Sample/module-text/src/main/res/layout/activity_text_recognition.xml
@@ -24,45 +24,20 @@
             android:layout_alignParentBottom="true" />
     </com.mlkit.sample.camera.LensEnginePreview>
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/toolbar_height"
-        android:background="#26000000"
-        android:visibility="gone">
-
-        <ImageButton
-
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="15dp"
-            android:background="@drawable/white_back"></ImageButton>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:text="@string/text_detection_s"
-            android:textColor="@color/white"
-            android:textSize="17sp"></TextView>
-
-
-    </RelativeLayout>
-
     <ImageButton
         android:id="@+id/back"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_marginLeft="15dp"
-        android:layout_marginTop="15dp"
+        android:layout_width="@dimen/icon_back_width"
+        android:layout_height="@dimen/icon_back_height"
+        android:layout_marginLeft="@dimen/icon_back_margin"
+        android:layout_marginTop="@dimen/icon_back_margin"
         android:background="@drawable/button_circle_background"
         android:src="@drawable/black_back" />
 
     <ImageButton
         android:id="@+id/text_imageSwitch"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_marginTop="15dp"
+        android:layout_width="@dimen/icon_back_width"
+        android:layout_height="@dimen/icon_back_height"
+        android:layout_marginTop="@dimen/icon_back_margin"
         android:layout_marginRight="20dp"
         android:layout_toLeftOf="@+id/language_setting"
         android:background="@drawable/button_circle_background"
@@ -72,10 +47,10 @@
 
     <ImageButton
         android:id="@+id/language_setting"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
+        android:layout_width="@dimen/icon_back_width"
+        android:layout_height="@dimen/icon_back_height"
+        android:layout_marginTop="@dimen/icon_back_margin"
         android:layout_alignParentRight="true"
-        android:layout_marginTop="15dp"
         android:layout_marginRight="20dp"
         android:background="@drawable/button_circle_background"
         android:src="@mipmap/icon_language_setting" />
@@ -100,8 +75,8 @@
 
         <ImageButton
             android:id="@+id/zoomImageClose"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
+            android:layout_width="@dimen/icon_back_width"
+            android:layout_height="@dimen/icon_back_height"
             android:layout_alignParentRight="true"
             android:layout_marginTop="10dp"
             android:layout_marginRight="10dp"
diff --git a/MLKit-Sample/app/src/main/res/layout/activity_translator.xml b/MLKit-Sample/module-text/src/main/res/layout/activity_translate.xml
similarity index 99%
rename from MLKit-Sample/app/src/main/res/layout/activity_translator.xml
rename to MLKit-Sample/module-text/src/main/res/layout/activity_translate.xml
index 31dd805..c63d2ba 100644
--- a/MLKit-Sample/app/src/main/res/layout/activity_translator.xml
+++ b/MLKit-Sample/module-text/src/main/res/layout/activity_translate.xml
@@ -41,7 +41,7 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="10dp"
+            android:layout_height="@dimen/common_margin_top"
             android:background="@color/primary_background"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/toolbar"></View>
diff --git a/MLKit-Sample/app/src/main/res/layout/dialog.xml b/MLKit-Sample/module-text/src/main/res/layout/dialog.xml
similarity index 100%
rename from MLKit-Sample/app/src/main/res/layout/dialog.xml
rename to MLKit-Sample/module-text/src/main/res/layout/dialog.xml
diff --git a/MLKit-Sample/app/src/main/res/layout/dialog_add_picture.xml b/MLKit-Sample/module-text/src/main/res/layout/dialog_add_picture.xml
similarity index 83%
rename from MLKit-Sample/app/src/main/res/layout/dialog_add_picture.xml
rename to MLKit-Sample/module-text/src/main/res/layout/dialog_add_picture.xml
index 43913a5..4b5f59b 100644
--- a/MLKit-Sample/app/src/main/res/layout/dialog_add_picture.xml
+++ b/MLKit-Sample/module-text/src/main/res/layout/dialog_add_picture.xml
@@ -12,7 +12,7 @@
         android:gravity="center"
         android:text="@string/take_photo"
         android:textColor="@drawable/text_selector"
-        android:textSize="@dimen/setting_languagetext_size"></TextView>
+        android:textSize="@dimen/dialog_text_size"></TextView>
 
     <View style="@style/common_line"></View>
 
@@ -23,19 +23,19 @@
         android:gravity="center"
         android:text="@string/select_from_album"
         android:textColor="@drawable/text_selector"
-        android:textSize="@dimen/setting_languagetext_size"></TextView>
+        android:textSize="@dimen/dialog_text_size"></TextView>
 
     <View
         style="@style/common_line"
         android:layout_height="5dp"></View>
 
     <TextView
-        android:id="@+id/cancel"
+        android:id="@+id/extend"
         android:layout_width="match_parent"
         android:layout_height="@dimen/start_icon_width"
         android:gravity="center"
         android:text="@string/cancel"
         android:textColor="@color/color_red_cancel"
-        android:textSize="@dimen/setting_languagetext_size"></TextView>
+        android:textSize="@dimen/dialog_text_size"></TextView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/MLKit-Sample/app/src/main/res/layout/dialog_language_setting.xml b/MLKit-Sample/module-text/src/main/res/layout/dialog_language_setting.xml
similarity index 86%
rename from MLKit-Sample/app/src/main/res/layout/dialog_language_setting.xml
rename to MLKit-Sample/module-text/src/main/res/layout/dialog_language_setting.xml
index fa31052..e1ce679 100644
--- a/MLKit-Sample/app/src/main/res/layout/dialog_language_setting.xml
+++ b/MLKit-Sample/module-text/src/main/res/layout/dialog_language_setting.xml
@@ -7,7 +7,7 @@
         android:id="@+id/english"
         android:layout_width="match_parent"
         android:layout_height="@dimen/start_icon_width"
-        android:textSize="@dimen/setting_languagetext_size"
+        android:textSize="@dimen/dialog_text_size"
         android:gravity="center"
         android:textColor="@drawable/text_selector"
         android:text="@string/english_choose">
@@ -18,7 +18,7 @@
         android:id="@+id/simple_cn"
         android:layout_width="match_parent"
         android:layout_height="@dimen/start_icon_width"
-        android:textSize="@dimen/setting_languagetext_size"
+        android:textSize="@dimen/dialog_text_size"
         android:gravity="center"
         android:textColor="@drawable/text_selector"
         android:text="@string/simplified_chinese">
@@ -29,7 +29,7 @@
         android:id="@+id/japanese"
         android:layout_width="match_parent"
         android:layout_height="@dimen/start_icon_width"
-        android:textSize="@dimen/setting_languagetext_size"
+        android:textSize="@dimen/dialog_text_size"
         android:gravity="center"
         android:textColor="@drawable/text_selector"
         android:text="@string/japanese_choose">
@@ -40,7 +40,7 @@
         android:id="@+id/korean"
         android:layout_width="match_parent"
         android:layout_height="@dimen/start_icon_width"
-        android:textSize="@dimen/setting_languagetext_size"
+        android:textSize="@dimen/dialog_text_size"
         android:gravity="center"
         android:textColor="@drawable/text_selector"
         android:text="@string/korean_choose">
@@ -51,7 +51,7 @@
         android:id="@+id/latin"
         android:layout_width="match_parent"
         android:layout_height="@dimen/start_icon_width"
-        android:textSize="@dimen/setting_languagetext_size"
+        android:textSize="@dimen/dialog_text_size"
         android:gravity="center"
         android:textColor="@drawable/text_selector"
         android:text="@string/latin_choose">
diff --git a/MLKit-Sample/app/src/main/res/layout/gridview_item.xml b/MLKit-Sample/module-text/src/main/res/layout/gridview_item.xml
similarity index 81%
rename from MLKit-Sample/app/src/main/res/layout/gridview_item.xml
rename to MLKit-Sample/module-text/src/main/res/layout/gridview_item.xml
index 7f61656..ff1bc8d 100644
--- a/MLKit-Sample/app/src/main/res/layout/gridview_item.xml
+++ b/MLKit-Sample/module-text/src/main/res/layout/gridview_item.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_marginTop="100dp">
+    android:layout_marginTop="50dp">
 
     <RelativeLayout
         android:id="@+id/layout_translate"
@@ -19,7 +19,12 @@
             android:layout_centerHorizontal="true"
             android:layout_marginTop="10dp"
             android:src="@drawable/icon_translate"></ImageView>
-
+        <ImageView
+            android:id="@+id/icon_new"
+            android:layout_width="@dimen/icon_new_width"
+            android:layout_height="@dimen/icon_new_height"
+            android:layout_alignParentEnd="true"
+            android:background="@null"></ImageView>
         <TextView
             android:id="@+id/text_item"
             android:layout_width="wrap_content"
diff --git a/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_0.png b/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_0.png
new file mode 100644
index 0000000..0323859
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_0.png differ
diff --git a/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_1.png b/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_1.png
new file mode 100644
index 0000000..acd6988
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_1.png differ
diff --git a/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_10.png b/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_10.png
new file mode 100644
index 0000000..11a1629
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_10.png differ
diff --git a/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_11.png b/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_11.png
new file mode 100644
index 0000000..0434135
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_11.png differ
diff --git a/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_12.png b/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_12.png
new file mode 100644
index 0000000..368c239
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_12.png differ
diff --git a/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_2.png b/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_2.png
new file mode 100644
index 0000000..bd1651f
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_2.png differ
diff --git a/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_3.png b/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_3.png
new file mode 100644
index 0000000..b4a993d
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_3.png differ
diff --git a/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_4.png b/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_4.png
new file mode 100644
index 0000000..4617d6a
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_4.png differ
diff --git a/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_5.png b/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_5.png
new file mode 100644
index 0000000..30a81b0
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_5.png differ
diff --git a/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_6.png b/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_6.png
new file mode 100644
index 0000000..71ea4db
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_6.png differ
diff --git a/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_7.png b/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_7.png
new file mode 100644
index 0000000..9a9ff8f
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_7.png differ
diff --git a/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_8.png b/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_8.png
new file mode 100644
index 0000000..f16d755
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_8.png differ
diff --git a/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_9.png b/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_9.png
new file mode 100644
index 0000000..12e2677
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/mipmap-xxhdpi/volume_9.png differ
diff --git a/MLKit-Sample/app/src/main/res/mipmap-xxxhdpi/album_round.png b/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/album_round.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/mipmap-xxxhdpi/album_round.png
rename to MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/album_round.png
diff --git a/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/ic_audio.png b/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/ic_audio.png
new file mode 100644
index 0000000..9854782
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/ic_audio.png differ
diff --git a/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/ic_audio_amr.png b/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/ic_audio_amr.png
new file mode 100644
index 0000000..e8c7a30
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/ic_audio_amr.png differ
diff --git a/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/ic_audio_m4a.png b/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/ic_audio_m4a.png
new file mode 100644
index 0000000..fdeb433
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/ic_audio_m4a.png differ
diff --git a/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/ic_audio_mp3.png b/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/ic_audio_mp3.png
new file mode 100644
index 0000000..89248f1
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/ic_audio_mp3.png differ
diff --git a/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/ic_empty.png b/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/ic_empty.png
new file mode 100644
index 0000000..ab9c2da
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/ic_empty.png differ
diff --git a/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/icon_file.png b/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/icon_file.png
new file mode 100644
index 0000000..2122916
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/icon_file.png differ
diff --git a/MLKit-Sample/app/src/main/res/mipmap-xxxhdpi/icon_language_setting.png b/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/icon_language_setting.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/mipmap-xxxhdpi/icon_language_setting.png
rename to MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/icon_language_setting.png
diff --git a/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/icon_play.png b/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/icon_play.png
new file mode 100644
index 0000000..099b222
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/icon_play.png differ
diff --git a/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/icon_record.png b/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/icon_record.png
new file mode 100644
index 0000000..cb1f03e
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/icon_record.png differ
diff --git a/MLKit-Sample/app/src/main/res/mipmap-xxxhdpi/icon_setting.png b/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/icon_setting.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/mipmap-xxxhdpi/icon_setting.png
rename to MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/icon_setting.png
diff --git a/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/icon_stop.png b/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/icon_stop.png
new file mode 100644
index 0000000..344da50
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/icon_stop.png differ
diff --git a/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/microphone.png b/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/microphone.png
new file mode 100644
index 0000000..0ee557e
Binary files /dev/null and b/MLKit-Sample/module-text/src/main/res/mipmap-xxxhdpi/microphone.png differ
diff --git a/MLKit-Sample/app/src/main/res/values-1024x600/dimens.xml b/MLKit-Sample/module-text/src/main/res/values-1024x600/dimens.xml
similarity index 64%
rename from MLKit-Sample/app/src/main/res/values-1024x600/dimens.xml
rename to MLKit-Sample/module-text/src/main/res/values-1024x600/dimens.xml
index 1ca1169..5b10bd3 100644
--- a/MLKit-Sample/app/src/main/res/values-1024x600/dimens.xml
+++ b/MLKit-Sample/module-text/src/main/res/values-1024x600/dimens.xml
@@ -1,6 +1,6 @@
 <resources>
-    <dimen name="idcard_margin">24dp</dimen>
-    <dimen name="idcard_result_margin">8dp</dimen>
+    <dimen name="icr_margin">24dp</dimen>
+    <dimen name="icr_result_margin">8dp</dimen>
     <dimen name="start_logo_height">160dp</dimen>
     <dimen name="start_logo_margin">140dp</dimen>
     <dimen name="start_margin_top">30dp</dimen>
diff --git a/MLKit-Sample/app/src/main/res/values-1280x720/dimens.xml b/MLKit-Sample/module-text/src/main/res/values-1280x720/dimens.xml
similarity index 64%
rename from MLKit-Sample/app/src/main/res/values-1280x720/dimens.xml
rename to MLKit-Sample/module-text/src/main/res/values-1280x720/dimens.xml
index 2ae3544..b392dda 100644
--- a/MLKit-Sample/app/src/main/res/values-1280x720/dimens.xml
+++ b/MLKit-Sample/module-text/src/main/res/values-1280x720/dimens.xml
@@ -1,6 +1,6 @@
 <resources>
-    <dimen name="idcard_margin">24dp</dimen>
-    <dimen name="idcard_result_margin">10dp</dimen>
+    <dimen name="icr_margin">24dp</dimen>
+    <dimen name="icr_result_margin">10dp</dimen>
     <dimen name="start_logo_height">200dp</dimen>
     <dimen name="start_logo_margin">180dp</dimen>
     <dimen name="start_margin_top">50dp</dimen>
diff --git a/MLKit-Sample/app/src/main/res/values-1920x1080/dimens.xml b/MLKit-Sample/module-text/src/main/res/values-1920x1080/dimens.xml
similarity index 64%
rename from MLKit-Sample/app/src/main/res/values-1920x1080/dimens.xml
rename to MLKit-Sample/module-text/src/main/res/values-1920x1080/dimens.xml
index efbe52c..f8332eb 100644
--- a/MLKit-Sample/app/src/main/res/values-1920x1080/dimens.xml
+++ b/MLKit-Sample/module-text/src/main/res/values-1920x1080/dimens.xml
@@ -1,6 +1,6 @@
 <resources>
-    <dimen name="idcard_margin">24dp</dimen>
-    <dimen name="idcard_result_margin">24dp</dimen>
+    <dimen name="icr_margin">24dp</dimen>
+    <dimen name="icr_result_margin">24dp</dimen>
     <dimen name="start_logo_height">250dp</dimen>
     <dimen name="start_logo_margin">230dp</dimen>
     <dimen name="start_margin_top">70dp</dimen>
diff --git a/MLKit-Sample/module-text/src/main/res/values-zh-rCN/strings.xml b/MLKit-Sample/module-text/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..07bb051
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">ML Kit</string>
+    <string name="camera_permission_rationale">示例应用需要相机和存储权限</string>
+
+    <string name="ok">OK</string>
+    <string name="settings">设置</string>
+    <string name="cancel">取消</string>
+
+    <string name="cloud_text">云端文字识别</string>
+    <string name="select_from_album">从相册选择图片</string>
+    <string name="video_frame">视频流</string>
+    <string name="take_photo">拍照</string>
+    <string name="icr">身份证识别</string>
+
+    <string name="versions">版本号：</string>
+    <string name="simplified_chinese">简体中文</string>
+    <string name="english_choose">英文</string>
+    <string name="japanese_choose">日文</string>
+    <string name="korean_choose">韩文</string>
+    <string name="latin_choose">拉丁文</string>
+    <string name="get_data_failed">获取数据失败</string>
+    <string name="loading_data">加载中…</string>
+
+    <!--全称-->
+    <string name="document_recognition_s">文档识别</string>
+    <string name="text_detection_s">文字识别</string>
+    <string name="icr_s">身份证识别</string>
+    <string name="bcr_s">银行卡识别</string>
+    <string name="ucr_s">通用卡证识别</string>
+    <!--简写-->
+    <string name="translate">文本翻译</string>
+    <string name="bcr">银行卡识别</string>
+    <string name="gcr">通用卡证识别</string>
+    <string name="text_detection">文字识别</string>
+    <string name="document_recognition">文档识别</string>
+    <string name="all">所有</string>
+    <string name="coming_soon">敬请期待</string>
+    <string name="back">返回</string>
+    <string name="translate_v">翻译</string>
+    <string name="language_recognition">语种识别</string>
+    <string name="elapsed_time">耗时： </string>
+    <string name="zero_character"> 0 字符</string>
+    <string name="translate_text_hint">机器学习</string>
+
+
+    <string name="icr_upload_self_photo">"请上传本人身份证照片"</string>
+    <string name="icr_upload_face">"上传人像面"</string>
+    <string name="icr_upload_back">"上传国徽面"</string>
+    <string name="icr_hint_upload_valid_photo">"请上传有效身份证照片"</string>
+    <string name="icr_hint_image_not_complete">"智能检测识别到图片可能存在部分遮挡，如果清晰可见请忽略"</string>
+    <string name="icr_hint_ensure_user_info_security">"我们将依法保护您的个人信息安全"</string>
+    <string name="recognition_results">"检测结果"</string>
+    <string name="icr_mark">注：只用于中国大陆地区</string>
+    <string name="device_side">端侧</string>
+    <string name="cloud_side">云侧</string>
+
+    <string name="gcr_upload_self_photo">"请上传卡证"</string>
+    <string name="gcr_upload">"上传卡证"</string>
+    <string name="hk_pass">港澳台通行证</string>
+    <string name="hk_id_card">"香港身份证"</string>
+    <string name="home_card">港澳台居民来往大陆通行证</string>
+    <string name="click_to_switch"><u>点击切换</u></string>
+    <string name="vedio_tip">"正在识别，请对齐边缘"</string>
+    <string name="capture_tip">"正在拍照，请对齐边缘"</string>
+
+    <!--BCR-->
+    <string name="bcr_upload_self_photo">"请上传银行卡"</string>
+    <string name="bcr_upload">"上传银行卡"</string>
+
+</resources>
diff --git a/MLKit-Sample/app/src/main/res/values/attrs.xml b/MLKit-Sample/module-text/src/main/res/values/attrs.xml
similarity index 100%
rename from MLKit-Sample/app/src/main/res/values/attrs.xml
rename to MLKit-Sample/module-text/src/main/res/values/attrs.xml
diff --git a/MLKit-Sample/module-text/src/main/res/values/colors.xml b/MLKit-Sample/module-text/src/main/res/values/colors.xml
new file mode 100644
index 0000000..a8d8236
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/res/values/colors.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="black">#000000</color>
+    <color name="common_line_color">#D9D9D9</color>
+    <color name="primary_text_color">#A9A9A9</color>
+    <color name="secondary_text_color">#626262</color>
+    <color name="text_color">#1d1d1d</color>
+    <color name="logo_background">#003853</color>
+    <color name="primary_background">#f2f2f2</color>
+    <color name="button_background">#5CACEE</color>
+    <color name="white">#ffffff</color>
+
+    <color name="color_red_card">#FFFA2A2D</color>
+    <color name="color_red_cancel">#EE6A50</color>
+
+</resources>
diff --git a/MLKit-Sample/module-text/src/main/res/values/dimens.xml b/MLKit-Sample/module-text/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..6071d06
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/res/values/dimens.xml
@@ -0,0 +1,59 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+
+    <dimen name="start_icon_width">45dp</dimen>
+    <dimen name="facing_switch_width">35dp</dimen>
+    <dimen name="icon_new_width">18dp</dimen>
+    <dimen name="icon_new_height">15dp</dimen>
+    <dimen name="toolbar_height">45dp</dimen>
+
+    <dimen name="dialog_text_size">13sp</dimen>
+    <dimen name="toolbar_title_size">17sp</dimen>
+    <dimen name="toolbar_back_size">14sp</dimen>
+
+    <dimen name="upload_card_tint_size">15sp</dimen>
+    <dimen name="upload_card_tint_margin">16dp</dimen>
+
+    <dimen name="upload_card_layout_width">240dp</dimen>
+    <dimen name="upload_card_layout_height">150dp</dimen>
+    <dimen name="upload_card_layout_margin_top">16dp</dimen>
+
+    <dimen name="card_background_width">170dp</dimen>
+    <dimen name="card_background_height">108dp</dimen>
+    <dimen name="card_background_margin_start">35dp</dimen>
+    <dimen name="card_background_margin_top">21dp</dimen>
+
+    <dimen name="card_image_width">232dp</dimen>
+    <dimen name="card_image_height">142dp</dimen>
+    <dimen name="card_image_margin">4dp</dimen>
+
+    <dimen name="icon_card_add_width">38dp</dimen>
+    <dimen name="icon_card_add_height">38dp</dimen>
+
+    <dimen name="icon_card_delete_width">24dp</dimen>
+    <dimen name="icon_card_delete_height">24dp</dimen>
+
+    <dimen name="upload_text_margin_start">16dp</dimen>
+    <dimen name="upload_text_margin_top">8dp</dimen>
+    <dimen name="upload_text_size">13sp</dimen>
+
+    <dimen name="card_result_margin_start">24dp</dimen>
+    <dimen name="card_result_margin_top">20dp</dimen>
+    <dimen name="card_result_text_size">14sp</dimen>
+
+    <dimen name="icon_back_width">30dp</dimen>
+    <dimen name="icon_back_height">30dp</dimen>
+    <dimen name="icon_back_margin">15dp</dimen>
+
+    <dimen name="tab_title_text_size">16sp</dimen>
+
+    <dimen name="common_margin_top">5dp</dimen>
+
+    <dimen name="icr_margin">24dp</dimen>
+    <dimen name="icr_result_margin">24dp</dimen>
+    <dimen name="circle_stroke_radius">65dp</dimen>
+
+    <dimen name="start_logo_height">250dp</dimen>
+    <dimen name="start_logo_margin">230dp</dimen>
+    <dimen name="start_margin_top">70dp</dimen>
+</resources>
diff --git a/MLKit-Sample/module-text/src/main/res/values/strings.xml b/MLKit-Sample/module-text/src/main/res/values/strings.xml
new file mode 100644
index 0000000..ce7a6c8
--- /dev/null
+++ b/MLKit-Sample/module-text/src/main/res/values/strings.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">ML Kit</string>
+
+    <string name="camera_permission_rationale">This sample app requires camera and storage access in order to
+        demo the API.</string>
+
+    <string name="ok">OK</string>
+    <string name="settings">Settings</string>
+    <string name="cancel">cancel</string>
+
+    <string name="cloud_text">Cloud Text Recognition</string>
+
+    <string name="select_from_album">Select image from album</string>
+    <string name="take_photo">Take photo</string>
+    <string name="video_frame">Video stream</string>
+    <string name="versions">Version：</string>
+    <string name="simplified_chinese">Simplified chinese</string>
+    <string name="english_choose">English</string>
+    <string name="japanese_choose">Japanese</string>
+    <string name="korean_choose">Korean</string>
+    <string name="latin_choose">Latin</string>
+    <string name="get_data_failed">Failed to get data.</string>
+    <string name="loading_data">Loading…</string>
+
+    <!--full name-->
+    <string name="icr_s">ID Card Recognition</string>
+    <string name="text_detection_s">Text Recognition</string>
+    <string name="document_recognition_s">Document Recognition</string>
+    <string name="bcr_s">Bank Card Recognition</string>
+    <string name="ucr_s">General Card Recognition</string>
+
+    <!--Abbreviation-->
+    <string name="document_recognition">Document</string>
+    <string name="translate">Translation</string>
+    <string name="bcr">BCR</string>
+    <string name="gcr">GCR</string>
+    <string name="icr">ICR</string>
+    <string name="text_detection">Text</string>
+
+    <string name="all">all</string>
+    <string name="coming_soon">coming soon</string>
+    <string name="back">back</string>
+    <string name="translate_v">Translate</string>
+    <string name="language_recognition">Language Recognition</string>
+    <string name="elapsed_time">Elapsed Time: </string>
+    <string name="zero_character"> 0 character</string>
+    <string name="translate_text_hint">Machine Learning</string>
+
+    <!--ID card recognition-->
+    <string name="icr_upload_self_photo">Upload photos of your ID card</string>
+    <string name="icr_upload_face">Photo side</string>
+    <string name="icr_upload_back">Other side</string>
+    <string name="icr_hint_upload_valid_photo">Upload photos of your valid ID card.</string>
+    <string name="icr_hint_image_not_complete">Something may be blocking important information in the photo. Retake the photo if needed.</string>
+    <string name="icr_hint_ensure_user_info_security">Your personal information will be protected in accordance with the law.</string>
+    <string name="recognition_results">Recognition results:</string>
+    <string name="icr_mark">Note: For Mainland China Only</string>
+    <string name="device_side">Device Side</string>
+    <string name="cloud_side">Cloud</string>
+    <!--General card recognition-->
+    <string name="gcr_upload_self_photo">Upload photos of your card</string>
+    <string name="gcr_upload">Upload card</string>
+    <string name="hk_pass">Hong Kong, Macao and Taiwan pass</string>
+    <string name="hk_id_card">Hong Kong Identity Card</string>
+    <string name="home_card">Mainland Travel Permit for Hong Kong、Macao and Taiwan residents</string>
+    <string name="click_to_switch"><u>Click to switch</u></string>
+    <string name="vedio_tip">Recognizing, please align the edges.</string>
+    <string name="capture_tip">Taking a picture, please align the edge.</string>
+
+    <string name="bcr_upload_self_photo">"Please upload the bank card"</string>
+    <string name="bcr_upload">Upload card</string>
+
+</resources>
diff --git a/MLKit-Sample/app/src/main/res/values/styles.xml b/MLKit-Sample/module-text/src/main/res/values/styles.xml
similarity index 79%
rename from MLKit-Sample/app/src/main/res/values/styles.xml
rename to MLKit-Sample/module-text/src/main/res/values/styles.xml
index e3f977a..20314c0 100644
--- a/MLKit-Sample/app/src/main/res/values/styles.xml
+++ b/MLKit-Sample/module-text/src/main/res/values/styles.xml
@@ -2,6 +2,11 @@
 
     <style name="MaterialTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowFullscreen">false</item>
+        <item name="android:popupMenuStyle">@style/menuStyle</item>
+        <item name="android:dropDownListViewStyle">@style/menuStyle</item>
+        <item name="android:textAppearanceSmallPopupMenu">@style/menuStyle</item>
+        <item name="android:textAppearanceLargePopupMenu">@style/menuStyle</item>
+        <item name="buttonStyle">@style/Widget.AppCompat.Button.Borderless</item>
     </style>
     <!--text and image -->
     <style name="text_content">
@@ -30,6 +35,11 @@
         <item name="android:backgroundDimEnabled">false</item>
     </style>
 
+    <style name="menuStyle">
+        <item name="android:textColor">@color/secondary_text_color</item>
+        <item name="android:textSize">11sp</item>
+    </style>
+
     <style name="MyDialogStyle">
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowFrame">@null</item>
diff --git a/MLKit-Sample/app/src/main/res/xml/apk_file_provider.xml b/MLKit-Sample/module-text/src/main/res/xml/apk_file_provider.xml
similarity index 100%
rename from MLKit-Sample/app/src/main/res/xml/apk_file_provider.xml
rename to MLKit-Sample/module-text/src/main/res/xml/apk_file_provider.xml
diff --git a/MLKit-Sample/module-vision/.gitignore b/MLKit-Sample/module-vision/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/MLKit-Sample/module-vision/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/MLKit-Sample/module-vision/build.gradle b/MLKit-Sample/module-vision/build.gradle
new file mode 100644
index 0000000..b8d7a63
--- /dev/null
+++ b/MLKit-Sample/module-vision/build.gradle
@@ -0,0 +1,56 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
+    defaultConfig {
+        applicationId "com.mlkit.sample.vision"
+        minSdkVersion 19
+        targetSdkVersion 28
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+    lintOptions{
+        abortOnError false
+    }
+    // Support simulator.
+    splits {
+        abi {
+            enable true
+            reset()
+            include 'x86', 'armeabi-v7a','x86_64'
+            universalApk true
+        }
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    aaptOptions {
+        noCompress "mslite"
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.aar'])
+    implementation 'com.huawei.hms:ml-computer-vision-cloud:1.0.3.300'
+
+    implementation 'com.huawei.hms:ml-computer-vision-image-segmentation-body-model:1.0.3.300'
+    implementation 'com.huawei.hms:ml-computer-vision-image-segmentation-multiclass-model:1.0.3.300'
+    implementation 'com.huawei.hms:ml-computer-vision-image-classification-model:1.0.3.300'
+
+    implementation 'com.huawei.hms:ml-computer-vision-object-detection-model:1.0.3.300'
+
+    implementation 'com.huawei.hms:ml-computer-vision-face-recognition-model:1.0.3.300'
+
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'com.android.support:design:28.0.0'
+    implementation 'com.github.bumptech.glide:glide:4.11.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
+}
+apply plugin: 'com.huawei.agconnect'
diff --git a/MLKit-Sample/module-vision/gradlew b/MLKit-Sample/module-vision/gradlew
new file mode 100644
index 0000000..cccdd3d
--- /dev/null
+++ b/MLKit-Sample/module-vision/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/MLKit-Sample/module-vision/gradlew.bat b/MLKit-Sample/module-vision/gradlew.bat
new file mode 100644
index 0000000..f955316
--- /dev/null
+++ b/MLKit-Sample/module-vision/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/MLKit-Sample/module-vision/proguard-rules.pro b/MLKit-Sample/module-vision/proguard-rules.pro
new file mode 100644
index 0000000..f1b4245
--- /dev/null
+++ b/MLKit-Sample/module-vision/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/MLKit-Sample/module-vision/sample-agconnect-services.json b/MLKit-Sample/module-vision/sample-agconnect-services.json
new file mode 100644
index 0000000..940171c
--- /dev/null
+++ b/MLKit-Sample/module-vision/sample-agconnect-services.json
@@ -0,0 +1,27 @@
+{
+	"agcgw":{
+		"backurl":"hw-ml-cloud.cn",
+		"url":"connect.hicloud.com"
+	},
+	"client":{
+		"cp_id":"260086023420031456",
+		"product_id":"9105385868808379027",
+		"client_id":"268600551012363200",
+		"client_secret":"4819981CE7939A526B71AC3092D35C5CB77DF8341C6986559AA9211",
+		"app_id":"1015883",
+		"package_name":"com.mlkit.sample.vision",
+		"api_key":"CV46Xu0Y3+YFDS832xvOY69LHiAtZ2SviYUSZyELicm2NrxUesZE1TO"
+	},
+	"service":{
+		"analytics":{
+			"collector_url":"data.dtml.hicloud.com",
+			"resource_id":"p1",
+			"channel_id":""
+		},
+		"ml":{
+			"mlservice_url":"ml-kit.cloud.com"
+		}
+	},
+	"region":"CN",
+	"configuration_version":"1.0"
+}
diff --git a/MLKit-Sample/app/src/main/AndroidManifest.xml b/MLKit-Sample/module-vision/src/main/AndroidManifest.xml
similarity index 75%
rename from MLKit-Sample/app/src/main/AndroidManifest.xml
rename to MLKit-Sample/module-vision/src/main/AndroidManifest.xml
index 1906670..59638d5 100644
--- a/MLKit-Sample/app/src/main/AndroidManifest.xml
+++ b/MLKit-Sample/module-vision/src/main/AndroidManifest.xml
@@ -5,6 +5,7 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" />
@@ -12,9 +13,8 @@
     <application
         android:allowBackup="false"
         android:icon="@drawable/icon"
-        android:label="ML Kit"
+        android:label="ML Vision"
         android:theme="@style/MaterialTheme">
-        <activity android:name=".activity.AllFunctionActivity"></activity>
         <activity android:name=".activity.ImageClassificationActivity" />
         <activity android:name=".activity.ObjectDetectionActivity" />
         <activity android:name=".activity.FaceDetectionActivity" />
@@ -27,9 +27,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".activity.TextRecognitionActivity"
-            android:exported="true" />
         <activity
             android:name=".activity.RemoteDetectionActivity"
             android:exported="true" />
@@ -37,27 +34,22 @@
             android:name=".activity.SettingActivity"
             android:exported="true" />
 
-        <activity android:name=".activity.TranslatorActivity" />
-
         <activity
-            android:name=".activity.imgseg.ImageSegmentationActivity"
+            android:name=".activity.ImageSegmentationActivity"
             android:exported="true" />
 
         <activity
-            android:name=".activity.imgseg.LoadPhotoActivity"
+            android:name=".activity.LoadPhotoActivity"
             android:exported="true" />
 
         <activity
-            android:name=".activity.imgseg.TakePhotoActivity"
+            android:name=".activity.TakePhotoActivity"
             android:exported="true" />
 
         <activity
-            android:name=".activity.imgseg.StillCutPhotoActivity"
+            android:name=".activity.StillCutPhotoActivity"
             android:exported="true" />
 
-        <activity android:name=".activity.IDCardRecognitionActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"></activity>
-
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
diff --git a/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/BaseActivity.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/BaseActivity.java
new file mode 100644
index 0000000..47a38e0
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/BaseActivity.java
@@ -0,0 +1,80 @@
+/**
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.mlkit.sample.activity;
+
+import android.app.Activity;
+import android.graphics.Color;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+public class BaseActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    /**
+     * Set status bar immersion.
+     */
+    protected void setStatusBar() {
+        // SDK 21/Android 5.0.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            View decorView = this.getWindow().getDecorView();
+            int setting = View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE;
+            decorView.setSystemUiVisibility(setting);
+            // Set the status bar to transparent.
+            this.getWindow().setStatusBarColor(Color.TRANSPARENT);
+        }
+    }
+
+    /**
+     * Set the status bar font color to dark
+     */
+    public void setStatusBarFontColor() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            View decorView = this.getWindow().getDecorView();
+            int visibility = decorView.getSystemUiVisibility();
+            visibility |= View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
+            decorView.setSystemUiVisibility(visibility);
+        }
+    }
+
+    /**
+     * Set status bar's color.
+     * @param activity Activity of page.
+     * @param colorId Color ID.
+     */
+    protected static void setStatusBarColor(Activity activity, int colorId) {
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                Window window = activity.getWindow();
+                window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+                window.setStatusBarColor(activity.getResources().getColor(colorId));
+            }
+        } catch (Exception e) {
+            Log.e("BaseActivity", e.getMessage());
+        }
+    }
+}
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/FaceDetectionActivity.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/FaceDetectionActivity.java
similarity index 94%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/FaceDetectionActivity.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/FaceDetectionActivity.java
index 6610dfe..a188b8d 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/FaceDetectionActivity.java
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/FaceDetectionActivity.java
@@ -48,6 +48,7 @@ public final class FaceDetectionActivity extends BaseActivity
     private CameraConfiguration cameraConfiguration = null;
     private int facing = CameraConfiguration.CAMERA_FACING_BACK;
     private boolean isOpenStatus = false;
+    private Camera mCamera;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -83,6 +84,7 @@ private void setDetectorOptions(boolean isOpen) {
                     .setFeatureType(MLFaceAnalyzerSetting.TYPE_PRECISION)
                     .setShapeType(MLFaceAnalyzerSetting.TYPE_SHAPES)
                     .setKeyPointType(MLFaceAnalyzerSetting.TYPE_KEYPOINTS)
+                    .allowTracing()
                     .create();
 
         } else {
@@ -91,6 +93,7 @@ private void setDetectorOptions(boolean isOpen) {
                     .setPerformanceType(MLFaceAnalyzerSetting.TYPE_SPEED)
                     .setShapeType(MLFaceAnalyzerSetting.TYPE_SHAPES)
                     .setKeyPointType(MLFaceAnalyzerSetting.TYPE_KEYPOINTS)
+                    .allowTracing()
                     .create();
         }
         this.lensEngine.setMachineLearningFrameTransactor(new LocalFaceTransactor(detectorOptions, this.getApplicationContext(), isOpen));
@@ -122,6 +125,15 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         }
         this.preview.stop();
         this.startLensEngine();
+
+        if (null != this.lensEngine) {
+            this.mCamera = this.lensEngine.getCamera();
+            try {
+                this.mCamera.setPreviewTexture(this.preview.getSurfaceTexture());
+            } catch (IOException e) {
+                Log.d(TAG, "initViews IOException");
+            }
+        }
     }
 
 
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/ImageClassificationActivity.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/ImageClassificationActivity.java
similarity index 88%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/ImageClassificationActivity.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/ImageClassificationActivity.java
index c489119..03c4e73 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/ImageClassificationActivity.java
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/ImageClassificationActivity.java
@@ -1,17 +1,17 @@
 /**
  * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package com.mlkit.sample.activity;
@@ -75,7 +75,7 @@ protected void onCreate(Bundle savedInstanceState) {
         if (Camera.getNumberOfCameras() == 1) {
             this.facingSwitch.setVisibility(View.GONE);
         }
-        this.crateDialog();
+        this.createDialog();
         this.createLensEngine();
         this.startLensEngine();
         this.setStatusBar();
@@ -86,11 +86,11 @@ public void onClick(View view) {
         if (view.getId() == R.id.classification_back) {
             this.finish();
         } else if (view.getId() == R.id.imageSwitch) {
-            this.showDialog();
+            showDialog();
         }
     }
 
-    private void crateDialog(){
+    private void createDialog() {
         this.addPictureDialog = new AddPictureDialog(this);
         final Intent intent = new Intent(ImageClassificationActivity.this, RemoteDetectionActivity.class);
         intent.putExtra(Constant.MODEL_TYPE, Constant.CLOUD_IMAGE_CLASSIFICATION);
@@ -106,6 +106,11 @@ public void selectImage() {
                 intent.putExtra(Constant.ADD_PICTURE_TYPE, Constant.TYPE_SELECT_IMAGE);
                 ImageClassificationActivity.this.startActivity(intent);
             }
+
+            @Override
+            public void doExtend() {
+
+            }
         });
     }
 
@@ -130,9 +135,9 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         if (null != this.lensEngine) {
             this.mCamera = this.lensEngine.getCamera();
             try {
-                if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {
-                    this.mCamera.setPreviewDisplay(this.preview.getSurfaceHolder());
-                }
+
+                this.mCamera.setPreviewDisplay(this.preview.getSurfaceHolder());
+
             } catch (IOException e) {
                 Log.d(ImageClassificationActivity.TAG, "initViews IOException");
             }
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/imgseg/ImageSegmentationActivity.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/ImageSegmentationActivity.java
similarity index 95%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/imgseg/ImageSegmentationActivity.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/ImageSegmentationActivity.java
index 29fb814..97f0cd6 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/imgseg/ImageSegmentationActivity.java
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/ImageSegmentationActivity.java
@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 
-package com.mlkit.sample.activity.imgseg;
+package com.mlkit.sample.activity;
 
 import android.graphics.Color;
 import android.os.Bundle;
@@ -25,11 +25,10 @@
 import androidx.viewpager.widget.ViewPager;
 
 import com.mlkit.sample.R;
-import com.mlkit.sample.activity.BaseActivity;
 import com.mlkit.sample.activity.adapter.TabFragmentAdapter;
-import com.mlkit.sample.activity.fragment.imgseg.BackgroundChangeFragment;
-import com.mlkit.sample.activity.fragment.imgseg.CaptureImageFragment;
-import com.mlkit.sample.activity.fragment.imgseg.SliceImageFragment;
+import com.mlkit.sample.activity.fragment.BackgroundChangeFragment;
+import com.mlkit.sample.activity.fragment.CaptureImageFragment;
+import com.mlkit.sample.activity.fragment.SliceImageFragment;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/imgseg/LoadPhotoActivity.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/LoadPhotoActivity.java
similarity index 98%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/imgseg/LoadPhotoActivity.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/LoadPhotoActivity.java
index a9f3904..dac5d2a 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/imgseg/LoadPhotoActivity.java
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/LoadPhotoActivity.java
@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 
-package com.mlkit.sample.activity.imgseg;
+package com.mlkit.sample.activity;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -32,7 +32,6 @@
 import android.widget.TextView;
 
 import com.mlkit.sample.R;
-import com.mlkit.sample.activity.BaseActivity;
 import com.mlkit.sample.transactor.ImageTransactor;
 import com.mlkit.sample.transactor.StillImageSegmentationTransactor;
 import com.mlkit.sample.util.BitmapUtils;
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/ObjectDetectionActivity.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/ObjectDetectionActivity.java
similarity index 98%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/ObjectDetectionActivity.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/ObjectDetectionActivity.java
index c07ee3e..f75288b 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/ObjectDetectionActivity.java
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/ObjectDetectionActivity.java
@@ -94,9 +94,7 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         if (null != this.lensEngine) {
             this.mCamera = this.lensEngine.getCamera();
             try {
-                if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {
                     this.mCamera.setPreviewDisplay(this.preview.getSurfaceHolder());
-                }
             } catch (IOException e) {
                 Log.d(ObjectDetectionActivity.TAG, "initViews IOException");
             }
diff --git a/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/RemoteDetectionActivity.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/RemoteDetectionActivity.java
new file mode 100644
index 0000000..478e163
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/RemoteDetectionActivity.java
@@ -0,0 +1,359 @@
+/**
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.mlkit.sample.activity;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.ContentValues;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.provider.MediaStore;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.mlkit.sample.activity.dialog.AddPictureDialog;
+import com.mlkit.sample.transactor.ImageTransactor;
+import com.mlkit.sample.transactor.RemoteImageClassificationTransactor;
+import com.mlkit.sample.transactor.RemoteLandmarkTransactor;
+import com.mlkit.sample.util.BitmapUtils;
+import com.mlkit.sample.util.Constant;
+import com.mlkit.sample.views.overlay.GraphicOverlay;
+import com.mlkit.sample.R;
+
+import java.lang.ref.WeakReference;
+
+public final class RemoteDetectionActivity extends BaseActivity implements OnClickListener {
+    private static final String TAG = "RemoteDetectionActivity";
+
+    private static final String KEY_IMAGE_URI = "KEY_IMAGE_URI";
+    private static final String KEY_IMAGE_MAX_WIDTH =
+            "KEY_IMAGE_MAX_WIDTH";
+    private static final String KEY_IMAGE_MAX_HEIGHT =
+            "KEY_IMAGE_MAX_HEIGHT";
+
+    private static final int REQUEST_TAKE_PHOTO = 1;
+    private static final int REQUEST_SELECT_IMAGE = 2;
+
+    private static final int TIMEOUT = 20 * 1000;
+    private static final int DELAY_TIME = 600;
+    private Button getImageButton;
+    private ImageView preview;
+    private TextView title;
+    private GraphicOverlay graphicOverlay;
+    private String selectedMode = Constant.CLOUD_IMAGE_CLASSIFICATION;
+
+    boolean isLandScape;
+
+    private Uri imageUri;
+    private Integer maxWidthOfImage;
+    private Integer maxHeightOfImage;
+    private ImageTransactor imageTransactor;
+
+    private Bitmap imageBitmap;
+
+    private Dialog progressDialog;
+
+    private AddPictureDialog addPictureDialog;
+
+    private Handler mHandler = new MsgHandler(this);
+
+    private static class MsgHandler extends Handler {
+        WeakReference<RemoteDetectionActivity> mMainActivityWeakReference;
+
+        public MsgHandler(RemoteDetectionActivity mainActivity) {
+            this.mMainActivityWeakReference = new WeakReference<>(mainActivity);
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+            RemoteDetectionActivity mainActivity = this.mMainActivityWeakReference.get();
+            if (mainActivity == null) {
+                return;
+            }
+            Log.d(RemoteDetectionActivity.TAG, "msg what :" + msg.what);
+            if (msg.what == Constant.GET_DATA_SUCCESS) {
+                mainActivity.handleGetDataSuccess();
+            } else if (msg.what == Constant.GET_DATA_FAILED) {
+                mainActivity.handleGetDataFailed();
+            }
+        }
+    }
+    private void handleGetDataSuccess() {
+        if (this.progressDialog != null) {
+            this.progressDialog.dismiss();
+        }
+        this.mHandler.removeCallbacks(this.myRunnable);
+    }
+
+    private void handleGetDataFailed() {
+        if (this.progressDialog != null) {
+            this.progressDialog.dismiss();
+        }
+        this.mHandler.removeCallbacks(this.myRunnable);
+        Toast.makeText(this, this.getString(R.string.get_data_failed), Toast.LENGTH_SHORT).show();
+    }
+
+    private Runnable myRunnable = new Runnable() {
+        @Override
+        public void run() {
+            if (RemoteDetectionActivity.this.progressDialog != null) {
+                RemoteDetectionActivity.this.progressDialog.dismiss();
+            }
+            Toast.makeText(RemoteDetectionActivity.this.getApplicationContext(), RemoteDetectionActivity.this.getString(R.string.get_data_failed), Toast.LENGTH_SHORT).show();
+        }
+    };
+
+    private Runnable detectRunnable = new Runnable() {
+        @Override
+        public void run() {
+            RemoteDetectionActivity.this.loadImageAndSetTransactor();
+        }
+    };
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Intent intent = this.getIntent();
+        String type = null;
+        try {
+            this.selectedMode = intent.getStringExtra(Constant.MODEL_TYPE);
+            type = intent.getStringExtra(Constant.ADD_PICTURE_TYPE);
+        } catch (RuntimeException e) {
+            Log.e(RemoteDetectionActivity.TAG, "Get intent value failed: " + e.getMessage());
+        }
+        if (savedInstanceState != null) {
+            this.imageUri = savedInstanceState.getParcelable(RemoteDetectionActivity.KEY_IMAGE_URI);
+            if (this.imageUri != null) {
+                this.maxWidthOfImage = savedInstanceState.getInt(RemoteDetectionActivity.KEY_IMAGE_MAX_WIDTH);
+                this.maxHeightOfImage = savedInstanceState.getInt(RemoteDetectionActivity.KEY_IMAGE_MAX_HEIGHT);
+            }
+        }
+        this.setContentView(R.layout.activity_remote_detection);
+        this.initTitle();
+        this.findViewById(R.id.back).setOnClickListener(this);
+        this.preview = this.findViewById(R.id.still_preview);
+        this.graphicOverlay = this.findViewById(R.id.still_overlay);
+        this.getImageButton = this.findViewById(R.id.getImageButton);
+        this.getImageButton.setOnClickListener(this);
+        this.createImageTransactor();
+        this.createDialog();
+        this.isLandScape = (this.getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE);
+        this.setStatusBar();
+        if (type == null) {
+            this.selectLocalImage();
+        } else if (type.equals(Constant.TYPE_SELECT_IMAGE)) {
+            this.selectLocalImage();
+        } else {
+            this.startCamera();
+        }
+    }
+
+    private void initTitle() {
+        this.title = this.findViewById(R.id.page_title);
+        if (this.selectedMode.equals(Constant.CLOUD_IMAGE_CLASSIFICATION)) {
+            this.title.setText(this.getResources().getText(R.string.cloud_classification));
+        } else if (this.selectedMode.equals(Constant.CLOUD_LANDMARK_DETECTION)) {
+            this.title.setText(this.getResources().getText(R.string.landmark_s));
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+    }
+
+    @Override
+    public void onClick(View view) {
+        if (view.getId() == R.id.getImageButton) {
+            this.showDialog();
+        } else if (view.getId() == R.id.back) {
+            this.finish();
+        }
+    }
+
+    private void createDialog() {
+        this.addPictureDialog = new AddPictureDialog(this);
+        final Intent intent = new Intent(RemoteDetectionActivity.this, RemoteDetectionActivity.class);
+        intent.putExtra(Constant.MODEL_TYPE, Constant.CLOUD_IMAGE_CLASSIFICATION);
+        this.addPictureDialog.setClickListener(new AddPictureDialog.ClickListener() {
+            @Override
+            public void takePicture() {
+                RemoteDetectionActivity.this.startCamera();
+            }
+
+            @Override
+            public void selectImage() {
+                RemoteDetectionActivity.this.selectLocalImage();
+            }
+
+            @Override
+            public void doExtend() {
+
+            }
+        });
+    }
+
+    private void showDialog() {
+        this.addPictureDialog.show();
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putParcelable(RemoteDetectionActivity.KEY_IMAGE_URI, this.imageUri);
+        if (this.maxWidthOfImage != null) {
+            outState.putInt(RemoteDetectionActivity.KEY_IMAGE_MAX_WIDTH, this.maxWidthOfImage);
+        }
+        if (this.maxHeightOfImage != null) {
+            outState.putInt(RemoteDetectionActivity.KEY_IMAGE_MAX_HEIGHT, this.maxHeightOfImage);
+        }
+    }
+
+    private void reloadAndDetectImage() {
+        if (this.preview == null || this.maxHeightOfImage == null || (this.maxHeightOfImage == 0
+                && ((View) this.preview.getParent()).getHeight() == 0)) {
+            this.mHandler.postDelayed(this.detectRunnable, RemoteDetectionActivity.DELAY_TIME);
+        } else {
+            this.loadImageAndSetTransactor();
+        }
+    }
+
+    private void startCamera() {
+        this.imageUri = null;
+        this.preview.setImageBitmap(null);
+
+        Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+        if (takePictureIntent.resolveActivity(this.getPackageManager()) != null) {
+            ContentValues values = new ContentValues();
+            values.put(MediaStore.Images.Media.TITLE, "New Picture");
+            values.put(MediaStore.Images.Media.DESCRIPTION, "From Camera");
+            this.imageUri = this.getContentResolver().insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values);
+            takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, this.imageUri);
+            this.startActivityForResult(takePictureIntent, RemoteDetectionActivity.REQUEST_TAKE_PHOTO);
+        }
+    }
+
+    private void selectLocalImage() {
+        Intent intent = new Intent(Intent.ACTION_PICK, null);
+        intent.setDataAndType(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, "image/*");
+        this.startActivityForResult(intent, RemoteDetectionActivity.REQUEST_SELECT_IMAGE);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == RemoteDetectionActivity.REQUEST_TAKE_PHOTO && resultCode == Activity.RESULT_OK) {
+            this.reloadAndDetectImage();
+        } else if (requestCode == RemoteDetectionActivity.REQUEST_TAKE_PHOTO && resultCode == Activity.RESULT_CANCELED) {
+            this.finish();
+        } else if (requestCode == RemoteDetectionActivity.REQUEST_SELECT_IMAGE && resultCode == Activity.RESULT_OK) {
+            this.imageUri = data.getData();
+            this.reloadAndDetectImage();
+        } else if (requestCode == RemoteDetectionActivity.REQUEST_SELECT_IMAGE && resultCode == Activity.RESULT_CANCELED) {
+            this.finish();
+        }
+    }
+
+    private void loadImageAndSetTransactor() {
+        if (this.imageUri == null) {
+            return;
+        }
+        this.showLoadingDialog();
+        this.graphicOverlay.clear();
+        this.mHandler.postDelayed(this.myRunnable, RemoteDetectionActivity.TIMEOUT);
+        this.imageBitmap = BitmapUtils.loadFromPath(RemoteDetectionActivity.this, this.imageUri, this.getMaxWidthOfImage(), this.getMaxHeightOfImage());
+        this.preview.setImageBitmap(this.imageBitmap);
+        if (this.imageBitmap != null) {
+            this.imageTransactor.process(this.imageBitmap, this.graphicOverlay);
+        }
+    }
+
+    private Integer getMaxWidthOfImage() {
+        if (this.maxWidthOfImage == null || this.maxWidthOfImage == 0) {
+            if (this.isLandScape) {
+                this.maxWidthOfImage = ((View) this.preview.getParent()).getHeight();
+            } else {
+                this.maxWidthOfImage = ((View) this.preview.getParent()).getWidth();
+            }
+        }
+        return this.maxWidthOfImage;
+    }
+
+    private Integer getMaxHeightOfImage() {
+        if (this.maxHeightOfImage == null || this.maxHeightOfImage == 0) {
+            if (this.isLandScape) {
+                this.maxHeightOfImage = ((View) this.preview.getParent()).getWidth();
+            } else {
+                this.maxHeightOfImage = ((View) this.preview.getParent()).getHeight();
+            }
+        }
+        return this.maxHeightOfImage;
+    }
+
+    private void createImageTransactor() {
+        switch (this.selectedMode) {
+            case Constant.CLOUD_IMAGE_CLASSIFICATION:
+                this.imageTransactor = new RemoteImageClassificationTransactor(this.getApplicationContext(), mHandler);
+                break;
+            case Constant.CLOUD_LANDMARK_DETECTION:
+                this.imageTransactor = new RemoteLandmarkTransactor(mHandler);
+                break;
+            default:
+                throw new IllegalStateException("Unknown selectedMode: " + this.selectedMode);
+        }
+        Log.d(RemoteDetectionActivity.TAG, this.imageTransactor.getClass().getName());
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (this.imageTransactor != null) {
+            this.imageTransactor.stop();
+            this.imageTransactor = null;
+        }
+        this.imageUri = null;
+        if (this.progressDialog != null) {
+            if (this.progressDialog.isShowing()) {
+                this.progressDialog.dismiss();
+            }
+            this.progressDialog = null;
+        }
+    }
+
+    private void showLoadingDialog() {
+        if (this.progressDialog == null) {
+            this.progressDialog = new Dialog(RemoteDetectionActivity.this, R.style.progress_dialog);
+            this.progressDialog.setContentView(R.layout.dialog);
+            this.progressDialog.setCancelable(false);
+            this.progressDialog.getWindow().setBackgroundDrawableResource(android.R.color.transparent);
+            TextView msg = this.progressDialog.findViewById(R.id.id_tv_loadingmsg);
+            msg.setText(this.getString(R.string.loading_data));
+        }
+        this.progressDialog.show();
+    }
+}
diff --git a/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/SettingActivity.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/SettingActivity.java
new file mode 100644
index 0000000..376ab5a
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/SettingActivity.java
@@ -0,0 +1,72 @@
+/**
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mlkit.sample.activity;
+
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.TextView;
+
+import com.huawei.hms.mlsdk.common.internal.client.SmartLog;
+import com.mlkit.sample.util.Constant;
+import com.mlkit.sample.R;
+import androidx.annotation.Nullable;
+
+public class SettingActivity extends BaseActivity implements View.OnClickListener {
+    private static final String TAG = "SettingActivity";
+
+    private TextView mVersion;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        this.setContentView(R.layout.activity_setting);
+        this.mVersion = this.findViewById(R.id.version);
+        this.mVersion.setText(this.getVersionName());
+        this.findViewById(R.id.back).setOnClickListener(this);
+    }
+
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.back:
+                this.finish();
+                break;
+            default:
+                break;
+        }
+    }
+
+    /**
+     * get App versionName
+     *
+     * @return
+     */
+    public String getVersionName() {
+        PackageManager packageManager = this.getPackageManager();
+        try {
+            PackageInfo packageInfo = packageManager.getPackageInfo(this.getPackageName(), 0);
+            String mVersionName = packageInfo.versionName;
+            return mVersionName;
+        } catch (PackageManager.NameNotFoundException e) {
+            SmartLog.e(SettingActivity.TAG, "Failed to get package version: " + e.getMessage());
+        }
+        return Constant.DEFAULT_VERSION;
+    }
+}
diff --git a/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/StartActivity.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/StartActivity.java
new file mode 100644
index 0000000..8c7193c
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/StartActivity.java
@@ -0,0 +1,232 @@
+/**
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mlkit.sample.activity;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.util.Log;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.GridView;
+
+import com.mlkit.sample.activity.adapter.GridViewAdapter;
+import com.mlkit.sample.activity.entity.GridViewItem;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.mlkit.sample.R;
+import com.mlkit.sample.util.Constant;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.core.app.ActivityCompat;
+import androidx.core.app.ActivityCompat.OnRequestPermissionsResultCallback;
+import androidx.core.content.ContextCompat;
+
+public final class StartActivity extends BaseActivity
+        implements OnRequestPermissionsResultCallback, View.OnClickListener {
+    private static final String TAG = "StartActivity";
+    private static final int PERMISSION_REQUESTS = 1;
+    private static final int[] icons = {com.mlkit.sample.R.drawable.icon_segmentation, com.mlkit.sample.R.drawable.icon_face,
+            com.mlkit.sample.R.drawable.icon_object, com.mlkit.sample.R.drawable.icon_classification,
+            com.mlkit.sample.R.drawable.icon_landmark};
+
+    private static final int[] titles = {com.mlkit.sample.R.string.image_segmentation, com.mlkit.sample.R.string.face_detection,
+            com.mlkit.sample.R.string.object_detection, com.mlkit.sample.R.string.image_classification,
+            com.mlkit.sample.R.string.landmark};
+    private GridView mGridView;
+    private ArrayList<GridViewItem> mDataList;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        BaseActivity.setStatusBarColor(this, R.color.logo_background);
+        this.setContentView(R.layout.activity_start);
+        this.findViewById(R.id.setting_img).setOnClickListener(this);
+        initData();
+        this.mGridView = findViewById(R.id.gridview);
+        GridViewAdapter mAdapter = new GridViewAdapter(this.mDataList, getApplicationContext());
+        this.mGridView.setAdapter(mAdapter);
+        initClickEvent();
+        if (!this.allPermissionsGranted()) {
+            this.getRuntimePermissions();
+        }
+    }
+
+    private void initClickEvent() {
+        if (this.mGridView == null) {
+            return;
+        }
+        this.mGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                switch (position) {
+                    case 0:
+                        // Image Segmentation
+                        startActivity(new Intent(StartActivity.this, ImageSegmentationActivity.class));
+                        break;
+                    case 1:
+                        // Face detection
+                        startActivity(new Intent(StartActivity.this, FaceDetectionActivity.class));
+                        break;
+                    case 2:
+                        // Object detection and tracking
+                        startActivity(
+                                new Intent(StartActivity.this, ObjectDetectionActivity.class));
+                        break;
+                    case 3:
+                        // Image classification
+                        startActivity(new Intent(StartActivity.this, ImageClassificationActivity.class));
+                        break;
+                    case 4:
+                        // Landmark recognition
+                        Intent intent = new Intent(StartActivity.this, RemoteDetectionActivity.class);
+                        intent.putExtra(Constant.MODEL_TYPE, Constant.CLOUD_LANDMARK_DETECTION);
+                        startActivity(intent);
+                        break;
+                    default:
+                        break;
+                }
+            }
+        });
+    }
+
+    @Override
+    public void onClick(View view) {
+        if (view.getId() == R.id.setting_img) {
+            this.startActivity(new Intent(StartActivity.this, SettingActivity.class));
+        }
+    }
+
+    private void initData() {
+        this.mDataList = new ArrayList<GridViewItem>();
+        GridViewItem item;
+        for (int i = 0; i < icons.length; i++) {
+            item = new GridViewItem(icons[i], titles[i]);
+            this.mDataList.add(item);
+        }
+    }
+
+    private String[] getRequiredPermissions() {
+        try {
+            PackageInfo info =
+                    this.getPackageManager()
+                            .getPackageInfo(this.getPackageName(), PackageManager.GET_PERMISSIONS);
+            String[] ps = info.requestedPermissions;
+            if (ps != null && ps.length > 0) {
+                return ps;
+            } else {
+                return new String[0];
+            }
+        } catch (RuntimeException e) {
+            throw e;
+        } catch (Exception e) {
+            return new String[0];
+        }
+    }
+
+    private boolean allPermissionsGranted() {
+        for (String permission : this.getRequiredPermissions()) {
+            if (!StartActivity.isPermissionGranted(this, permission)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private void getRuntimePermissions() {
+        List<String> allNeededPermissions = new ArrayList<>();
+        for (String permission : this.getRequiredPermissions()) {
+            if (!StartActivity.isPermissionGranted(this, permission)) {
+                allNeededPermissions.add(permission);
+            }
+        }
+
+        if (!allNeededPermissions.isEmpty()) {
+            ActivityCompat.requestPermissions(
+                    this, allNeededPermissions.toArray(new String[0]), StartActivity.PERMISSION_REQUESTS);
+        }
+    }
+
+    private static boolean isPermissionGranted(Context context, String permission) {
+        if (ContextCompat.checkSelfPermission(context, permission)
+                == PackageManager.PERMISSION_GRANTED) {
+            Log.i(StartActivity.TAG, "Permission granted: " + permission);
+            return true;
+        }
+        Log.i(StartActivity.TAG, "Permission NOT granted: " + permission);
+        return false;
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
+                                           @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
+        if (requestCode != StartActivity.PERMISSION_REQUESTS) {
+            return;
+        }
+        boolean isNeedShowDiag = false;
+        for (int i = 0; i < permissions.length; i++) {
+            if ((permissions[i].equals(Manifest.permission.CAMERA) && grantResults[i] != PackageManager.PERMISSION_GRANTED)
+                    || (permissions[i].equals(Manifest.permission.READ_EXTERNAL_STORAGE) && grantResults[i] != PackageManager.PERMISSION_GRANTED)) {
+                // If the camera or storage permissions are not authorized, need to pop up an authorization prompt box.
+                isNeedShowDiag = true;
+            }
+        }
+        if (isNeedShowDiag && !ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.CALL_PHONE)) {
+            AlertDialog dialog = new AlertDialog.Builder(this)
+                    .setMessage(this.getString(R.string.camera_permission_rationale))
+                    .setPositiveButton(this.getString(R.string.settings), new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+                            // Open the corresponding setting interface according to the package name.
+                            intent.setData(Uri.parse("package:" + StartActivity.this.getPackageName()));
+                            StartActivity.this.startActivityForResult(intent, 200);
+                            StartActivity.this.startActivity(intent);
+                        }
+                    })
+                    .setNegativeButton(this.getString(R.string.cancel), new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            StartActivity.this.finish();
+                        }
+                    }).create();
+            dialog.show();
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 200) {
+            if (!this.allPermissionsGranted()) {
+                this.getRuntimePermissions();
+            }
+        }
+    }
+}
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/imgseg/StillCutPhotoActivity.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/StillCutPhotoActivity.java
similarity index 98%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/imgseg/StillCutPhotoActivity.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/StillCutPhotoActivity.java
index 85e6b26..dc30ffe 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/imgseg/StillCutPhotoActivity.java
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/StillCutPhotoActivity.java
@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 
-package com.mlkit.sample.activity.imgseg;
+package com.mlkit.sample.activity;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -35,7 +35,6 @@
 import com.huawei.hmf.tasks.OnSuccessListener;
 import com.huawei.hmf.tasks.Task;
 import com.mlkit.sample.R;
-import com.mlkit.sample.activity.BaseActivity;
 import com.mlkit.sample.callback.ImageSegmentationResultCallBack;
 import com.mlkit.sample.util.BitmapUtils;
 import com.mlkit.sample.util.ImageUtils;
@@ -301,7 +300,7 @@ public void onDestroy() {
             try {
                 this.analyzer.stop();
             } catch (IOException e) {
-                Log.e(StillCutPhotoActivity.TAG, "Stop analyzer failed: " + e.getMessage());
+                Log.e(TAG, "Stop analyzer failed: " + e.getMessage());
             }
         }
         this.imageUri = null;
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/imgseg/TakePhotoActivity.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/TakePhotoActivity.java
similarity index 94%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/imgseg/TakePhotoActivity.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/TakePhotoActivity.java
index 4fd5f50..d1c8a82 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/imgseg/TakePhotoActivity.java
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/TakePhotoActivity.java
@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 
-package com.mlkit.sample.activity.imgseg;
+package com.mlkit.sample.activity;
 
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -36,7 +36,6 @@
 import androidx.core.content.FileProvider;
 
 import com.mlkit.sample.R;
-import com.mlkit.sample.activity.BaseActivity;
 import com.mlkit.sample.callback.ImageSegmentationResultCallBack;
 import com.mlkit.sample.callback.ImageUtilCallBack;
 import com.mlkit.sample.camera.CameraConfiguration;
@@ -75,6 +74,7 @@ public class TakePhotoActivity extends BaseActivity implements CompoundButton.On
     private MLImageSegmentationSetting setting;
     private String imgPath;
     private ImageUtilCallBack imageUtilCallBack;
+    private Camera mCamera;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -87,7 +87,7 @@ protected void onCreate(Bundle savedInstanceState) {
         try {
             this.index = intent.getIntExtra(Constant.VALUE_KEY, -1);
         } catch (RuntimeException e) {
-            Log.e(TakePhotoActivity.TAG, "Get intent value failed:" + e.getMessage());
+            Log.e(TAG, "Get intent value failed:" + e.getMessage());
         }
         if (this.index < 0) {
             Toast.makeText(this.getApplicationContext(), R.string.please_select_picture, Toast.LENGTH_SHORT).show();
@@ -123,8 +123,8 @@ private void initView() {
 
     private void initAction() {
         this.facingSwitch.setOnCheckedChangeListener(this);
-        this.img_back.setOnClickListener(this);
-        this.img_pic.setOnClickListener(this);
+        img_back.setOnClickListener(this);
+        img_pic.setOnClickListener(this);
         // Set the display effect when the takePhoto button is clicked.
         this.img_takePhoto.setOnTouchListener(new View.OnTouchListener() {
             @Override
@@ -167,10 +167,10 @@ public void callSavePath(String path) {
     @Override
     public void onClick(View view) {
         if(view.getId() == R.id.back){
-            this.finish();
+            finish();
         }else if(view.getId() == R.id.img_pic) {
-            if (this.imgPath == null) {
-                Toast.makeText(this.getApplicationContext(), "please save a picture", Toast.LENGTH_SHORT).show();
+            if (imgPath == null) {
+                Toast.makeText(getApplicationContext(), "please save a picture", Toast.LENGTH_SHORT).show();
             } else {
                 Intent intent = new Intent();
                 File imgFile = new File(this.imgPath);
@@ -260,6 +260,14 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         }
         this.preview.stop();
         this.startLensEngine();
+        if (null != this.lensEngine) {
+            this.mCamera = this.lensEngine.getCamera();
+            try {
+                this.mCamera.setPreviewTexture(this.preview.getSurfaceTexture());
+            } catch (IOException e) {
+                Log.d(TAG, "initViews IOException");
+            }
+        }
     }
 
     public void onBackPressed(View view) {
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/adapter/GridViewAdapter.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/adapter/GridViewAdapter.java
similarity index 96%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/adapter/GridViewAdapter.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/adapter/GridViewAdapter.java
index 788d105..0b4a350 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/adapter/GridViewAdapter.java
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/adapter/GridViewAdapter.java
@@ -24,9 +24,9 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.huawei.hms.mlsdk.common.internal.client.SmartLog;
 import com.mlkit.sample.R;
 import com.mlkit.sample.activity.entity.GridViewItem;
-import com.huawei.hms.mlsdk.common.internal.client.SmartLog;
 
 import java.util.ArrayList;
 
@@ -67,6 +67,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
                 holder = new ViewHolder();
                 holder.imageView = convertView.findViewById(R.id.image_item);
                 holder.textView = convertView.findViewById(R.id.text_item);
+                holder.imageNew = convertView.findViewById(R.id.icon_new);
                 convertView.setTag(holder);
             } else {
                 holder = (ViewHolder) convertView.getTag();
@@ -83,6 +84,8 @@ public View getView(int position, View convertView, ViewGroup parent) {
     static class ViewHolder {
         ImageView imageView;
 
+        ImageView imageNew;
+
         TextView textView;
     }
 }
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/adapter/TabFragmentAdapter.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/adapter/TabFragmentAdapter.java
similarity index 100%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/adapter/TabFragmentAdapter.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/adapter/TabFragmentAdapter.java
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/adapter/imgseg/MyGridViewAdapter.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/adapter/imgseg/MyGridViewAdapter.java
similarity index 84%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/adapter/imgseg/MyGridViewAdapter.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/adapter/imgseg/MyGridViewAdapter.java
index 9bb4a1c..79aa2a9 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/adapter/imgseg/MyGridViewAdapter.java
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/adapter/imgseg/MyGridViewAdapter.java
@@ -40,34 +40,30 @@ public class MyGridViewAdapter extends BaseAdapter {
 
     public MyGridViewAdapter(ArrayList<Entity> dataList, Context mContext) {
         super();
-        this.mDataList = dataList;
+        mDataList = dataList;
         this.mContext = mContext;
     }
 
-    @Override
     public int getCount() {
-        return this.mDataList.size();
+        return mDataList.size();
     }
 
 
-    @Override
     public Object getItem(int position) {
-        return this.mDataList.get(position);
+        return mDataList.get(position);
     }
 
 
-    @Override
     public long getItemId(int position) {
         return position;
     }
 
 
-    @Override
     public View getView(int position, View convertView, ViewGroup parent) {
         ViewHolder holder = null;
         try {
             if(convertView == null){
-                convertView = LayoutInflater.from(this.mContext).inflate(R.layout.imageseg_gridview, null);
+                convertView = LayoutInflater.from(mContext).inflate(R.layout.imageseg_gridview, null);
                 holder = new ViewHolder();
                 holder.imageView = convertView.findViewById(R.id.image);
                 holder.selectIcon = convertView.findViewById(R.id.img_select);
@@ -76,14 +72,14 @@ public View getView(int position, View convertView, ViewGroup parent) {
                 holder = (ViewHolder) convertView.getTag();
             }
 
-            if(this.mDataList.get(position).isSelected()) {
+            if(mDataList.get(position).isSelected()) {
                 holder.selectIcon.setBackgroundResource(R.mipmap.seg_selected);
             } else {
                 holder.selectIcon.setBackground(null);
             }
 
-            int resourceId = this.mDataList.get(position).getResourceId();
-                    Glide.with(this.mContext)
+            int resourceId = mDataList.get(position).getResourceId();
+                    Glide.with(mContext)
             .load(resourceId)
             .error(R.drawable.icon_logo)
             .into(holder.imageView);
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/dialog/AddPictureDialog.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/dialog/AddPictureDialog.java
similarity index 91%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/dialog/AddPictureDialog.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/dialog/AddPictureDialog.java
index e9a716f..d37a687 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/dialog/AddPictureDialog.java
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/dialog/AddPictureDialog.java
@@ -25,20 +25,21 @@
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.TextView;
-
 import com.mlkit.sample.R;
 
 public class AddPictureDialog extends Dialog implements View.OnClickListener {
     private TextView tvTakePicture;
     private TextView tvSelectImage;
-    private TextView tvCancel;
+    private TextView tvExtend;
     private Context context;
     private ClickListener clickListener;
 
     public interface ClickListener {
-        void takePicture();
+         void takePicture();
 
         void selectImage();
+
+        void doExtend();
     }
 
     public AddPictureDialog(Context context) {
@@ -59,11 +60,10 @@ private void initViews() {
 
         this.tvTakePicture = view.findViewById(R.id.take_photo);
         this.tvSelectImage = view.findViewById(R.id.select_image);
-        this.tvCancel = view.findViewById(R.id.cancel);
-
+        this.tvExtend = view.findViewById(R.id.extend);
         this.tvTakePicture.setOnClickListener(this);
         this.tvSelectImage.setOnClickListener(this);
-        this.tvCancel.setOnClickListener(this);
+        this.tvExtend.setOnClickListener(this);
 
         this.setCanceledOnTouchOutside(true);
         Window dialogWindow = this.getWindow();
@@ -78,20 +78,20 @@ public void setClickListener(ClickListener clickListener) {
         this.clickListener = clickListener;
     }
 
-
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.take_photo:
-                this.clickListener.takePicture();
                 this.dismiss();
+                this.clickListener.takePicture();
                 break;
             case R.id.select_image:
-                this.clickListener.selectImage();
                 this.dismiss();
+                this.clickListener.selectImage();
                 break;
-            case R.id.cancel:
+            case R.id.extend:
                 this.dismiss();
+                this.clickListener.doExtend();
                 break;
         }
     }
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/entity/Entity.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/entity/Entity.java
similarity index 92%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/entity/Entity.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/entity/Entity.java
index 20ca856..319c592 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/entity/Entity.java
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/entity/Entity.java
@@ -26,7 +26,7 @@ public Entity(int resourceId, boolean isSelected) {
     }
 
     public int getResourceId() {
-        return this.resourceId;
+        return resourceId;
     }
 
     public void setResourceId(int resourceId) {
@@ -34,10 +34,10 @@ public void setResourceId(int resourceId) {
     }
 
     public boolean isSelected() {
-        return this.isSelected;
+        return isSelected;
     }
 
     public void setSelected(boolean selected) {
-        this.isSelected = selected;
+        isSelected = selected;
     }
 }
diff --git a/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/entity/GridViewItem.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/entity/GridViewItem.java
new file mode 100644
index 0000000..be620fd
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/entity/GridViewItem.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.mlkit.sample.activity.entity;
+
+public class GridViewItem {
+    private int resourceId;
+    private int stringId;
+
+    public GridViewItem(int resourceId, int stringId) {
+        this.resourceId = resourceId;
+        this.stringId = stringId;
+    }
+
+    public int getResourceId() {
+        return this.resourceId;
+    }
+
+    public void setResourceId(int resourceId) {
+        this.resourceId = resourceId;
+    }
+
+    public int getStringId() {
+        return this.stringId;
+    }
+
+    public void setStringId(int stringId) {
+        this.stringId = stringId;
+    }
+}
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/fragment/imgseg/BackgroundChangeFragment.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/fragment/BackgroundChangeFragment.java
similarity index 97%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/fragment/imgseg/BackgroundChangeFragment.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/fragment/BackgroundChangeFragment.java
index 759d83f..8ca2141 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/fragment/imgseg/BackgroundChangeFragment.java
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/fragment/BackgroundChangeFragment.java
@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 
-package com.mlkit.sample.activity.fragment.imgseg;
+package com.mlkit.sample.activity.fragment;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -30,7 +30,7 @@
 import com.mlkit.sample.R;
 
 import com.mlkit.sample.activity.adapter.imgseg.MyGridViewAdapter;
-import com.mlkit.sample.activity.imgseg.TakePhotoActivity;
+import com.mlkit.sample.activity.TakePhotoActivity;
 import com.mlkit.sample.activity.entity.Entity;
 import com.mlkit.sample.util.Constant;
 import com.mlkit.sample.util.SharedPreferencesUtil;
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/fragment/imgseg/CaptureImageFragment.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/fragment/CaptureImageFragment.java
similarity index 93%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/fragment/imgseg/CaptureImageFragment.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/fragment/CaptureImageFragment.java
index 0480276..d55d894 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/fragment/imgseg/CaptureImageFragment.java
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/fragment/CaptureImageFragment.java
@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 
-package com.mlkit.sample.activity.fragment.imgseg;
+package com.mlkit.sample.activity.fragment;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -26,7 +26,7 @@
 import androidx.fragment.app.Fragment;
 
 import com.mlkit.sample.R;
-import com.mlkit.sample.activity.imgseg.StillCutPhotoActivity;
+import com.mlkit.sample.activity.StillCutPhotoActivity;
 
 public class CaptureImageFragment extends Fragment {
     private ImageView mLoadPhoto;
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/fragment/imgseg/SliceImageFragment.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/fragment/SliceImageFragment.java
similarity index 93%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/fragment/imgseg/SliceImageFragment.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/fragment/SliceImageFragment.java
index 142ee7d..a76e053 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/activity/fragment/imgseg/SliceImageFragment.java
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/activity/fragment/SliceImageFragment.java
@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 
-package com.mlkit.sample.activity.fragment.imgseg;
+package com.mlkit.sample.activity.fragment;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -26,7 +26,7 @@
 import androidx.fragment.app.Fragment;
 
 import com.mlkit.sample.R;
-import com.mlkit.sample.activity.imgseg.LoadPhotoActivity;
+import com.mlkit.sample.activity.LoadPhotoActivity;
 
 public class SliceImageFragment extends Fragment {
 
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/callback/ImageSegmentationResultCallBack.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/callback/ImageSegmentationResultCallBack.java
similarity index 100%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/callback/ImageSegmentationResultCallBack.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/callback/ImageSegmentationResultCallBack.java
diff --git a/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/callback/ImageUtilCallBack.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/callback/ImageUtilCallBack.java
new file mode 100644
index 0000000..6a9a313
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/callback/ImageUtilCallBack.java
@@ -0,0 +1,21 @@
+/**
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.mlkit.sample.callback;
+
+public interface ImageUtilCallBack {
+    void callSavePath(String path);
+}
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/camera/CameraConfiguration.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/camera/CameraConfiguration.java
similarity index 95%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/camera/CameraConfiguration.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/camera/CameraConfiguration.java
index f55d45f..ca676e0 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/camera/CameraConfiguration.java
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/camera/CameraConfiguration.java
@@ -39,7 +39,7 @@ public synchronized void setCameraFacing(int facing) {
         if ((facing != CameraConfiguration.CAMERA_FACING_BACK) && (facing != CameraConfiguration.CAMERA_FACING_FRONT)) {
             throw new IllegalArgumentException("Invalid camera: " + facing);
         }
-        CameraConfiguration.cameraFacing = facing;
+        cameraFacing = facing;
     }
 
     public float getFps() {
@@ -71,6 +71,6 @@ public boolean isAutoFocus() {
     }
 
     public synchronized static int getCameraFacing() {
-        return CameraConfiguration.cameraFacing;
+        return cameraFacing;
     }
 }
diff --git a/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/camera/CameraSelector.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/camera/CameraSelector.java
new file mode 100644
index 0000000..52e4164
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/camera/CameraSelector.java
@@ -0,0 +1,299 @@
+/**
+ *  Copyright 2018 Google LLC
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *  2020.2.21-Changed the name from CameraSource to CameraSelector, CameraSelector was part of the original CameraSource.
+ *  2020.2.21-Changed method CameraSelector, change SizePair to CameraSize.
+ *                 Huawei Technologies Co., Ltd.
+ */
+
+package com.mlkit.sample.camera;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.ImageFormat;
+import android.hardware.Camera;
+import android.util.Log;
+import android.view.Surface;
+import android.view.WindowManager;
+
+import com.huawei.hms.common.size.Size;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.annotation.Nullable;
+
+public class CameraSelector {
+
+    private static final String TAG = "CameraSelector";
+
+    private CameraConfiguration configuration;
+
+    private static final float ASPECT_RATIO_TOLERANCE = 0.01f;
+
+    private Size previewSize;
+
+    protected Activity activity;
+
+    private int rotation;
+
+    public CameraSelector(Activity activity, CameraConfiguration configuration) {
+        this.activity = activity;
+        this.configuration = configuration;
+    }
+
+    /**
+     * Opens the camera and applies the user settings.
+     *
+     * @throws IOException if camera cannot be found or preview cannot be processed
+     */
+    public Camera createCamera() throws IOException {
+        int cameraId = CameraSelector.getIdForRequestedCamera(this.configuration.getCameraFacing());
+        if (cameraId == -1) {
+            throw new IOException("Could not find the requested camera.");
+        }
+        Camera camera = Camera.open(cameraId);
+        CameraSize cameraSize = CameraSelector.selectSizePair(camera, this.configuration.getPreviewWidth(), this.configuration.getPreviewHeight());
+        if (cameraSize == null) {
+            throw new IOException("Could not find suitable preview size.");
+        }
+        Size pictureSize = cameraSize.getPictureSize();
+        this.previewSize = cameraSize.getPreviewSize();
+        int[] previewFpsRange = CameraSelector.selectPreviewFpsRange(camera, this.configuration.getFps());
+        if (previewFpsRange == null) {
+            throw new IOException("Could not find suitable preview frames per second range.");
+        }
+        Camera.Parameters parameters = camera.getParameters();
+        parameters.setPreviewSize(this.previewSize.getWidth(), this.previewSize.getHeight());
+        if (pictureSize != null) {
+            parameters.setPictureSize(pictureSize.getWidth(), pictureSize.getHeight());
+        }
+        parameters.setPreviewFpsRange(
+                previewFpsRange[Camera.Parameters.PREVIEW_FPS_MIN_INDEX],
+                previewFpsRange[Camera.Parameters.PREVIEW_FPS_MAX_INDEX]);
+        parameters.setPreviewFormat(ImageFormat.NV21);
+
+        this.setRotation(camera, parameters, cameraId);
+
+        if (this.configuration.isAutoFocus()) {
+            if (parameters
+                    .getSupportedFocusModes()
+                    .contains(Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO)) {
+                parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO);
+            } else {
+                Log.i(CameraSelector.TAG, "Camera auto focus is not supported on this device.");
+            }
+        }
+        camera.setParameters(parameters);
+        return camera;
+    }
+
+    public Size getPreviewSize() {
+        return this.previewSize;
+    }
+
+    public int getFacing() {
+        return this.configuration.getCameraFacing();
+    }
+
+    /**
+     * Calculates the correct rotation for the given camera id and sets the rotation in the
+     * parameters. It also sets the camera's display orientation and rotation.
+     *
+     * @param parameters the camera parameters for which to set the rotation
+     * @param cameraId the camera id to set rotation based on
+     */
+    private void setRotation(Camera camera, Camera.Parameters parameters, int cameraId) {
+        WindowManager windowManager = (WindowManager) this.activity.getSystemService(Context.WINDOW_SERVICE);
+        int rotation = windowManager.getDefaultDisplay().getRotation();
+        int degrees = 0;
+        switch (rotation) {
+            case Surface.ROTATION_0:
+                degrees = 0;
+                break;
+            case Surface.ROTATION_90:
+                degrees = 90;
+                break;
+            case Surface.ROTATION_180:
+                degrees = 180;
+                break;
+            case Surface.ROTATION_270:
+                degrees = 270;
+                break;
+            default:
+                Log.e(CameraSelector.TAG, "Rotation value invaild: " + this.rotation);
+        }
+
+        Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
+        Camera.getCameraInfo(cameraId, cameraInfo);
+
+        int angle;
+        int displayAngle;
+        if (cameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
+            angle = (cameraInfo.orientation + degrees) % 360;
+            displayAngle = (360 - angle) % 360;
+        } else {
+            angle = (cameraInfo.orientation - degrees + 360) % 360;
+            displayAngle = angle;
+        }
+        this.rotation = angle / 90;
+
+        camera.setDisplayOrientation(displayAngle);
+        parameters.setRotation(angle);
+    }
+
+    /**
+     * Selects the most suitable preview and picture size, given the desired width and height.
+     *
+     * <p>Even though we only need to find the preview size, it's necessary to find both the preview
+     * size and the picture size of the camera together, because these need to have the same aspect
+     * ratio. On some hardware, if you would only set the preview size, you will get a distorted
+     * image.
+     *
+     * @param camera the camera to select a preview size from
+     * @param desiredWidth the desired width of the camera preview frames
+     * @param desiredHeight the desired height of the camera preview frames
+     * @return the selected preview and picture size pair
+     */
+    private static CameraSize selectSizePair(Camera camera, int desiredWidth, int desiredHeight) {
+        List<CameraSize> validPreviewSizes = CameraSelector.generateValidPreviewSizeList(camera);
+        CameraSize selectedPair = null;
+        int minDiff = Integer.MAX_VALUE;
+        for (CameraSize cameraSize : validPreviewSizes) {
+            Size size = cameraSize.getPreviewSize();
+            int diff =
+                    Math.abs(size.getWidth() - desiredWidth) + Math.abs(size.getHeight() - desiredHeight);
+            if (diff < minDiff) {
+                selectedPair = cameraSize;
+                minDiff = diff;
+            }
+        }
+        return selectedPair;
+    }
+
+    /**
+     * Selects the most suitable preview frames per second range, given the desired frames per second.
+     *
+     * @param camera the camera to select a frames per second range from
+     * @param desiredPreviewFps the desired frames per second for the camera preview frames
+     * @return the selected preview frames per second range
+     */
+    private static int[] selectPreviewFpsRange(Camera camera, float desiredPreviewFps) {
+        // The camera API uses integers scaled by a factor of 1000 instead of floating-point frame
+        // rates.
+        int desiredPreviewFpsScaled = (int) (desiredPreviewFps * 1000.0f);
+
+        // The method for selecting the best range is to minimize the sum of the differences between
+        // the desired value and the upper and lower bounds of the range.  This may select a range
+        // that the desired value is outside of, but this is often preferred.  For example, if the
+        // desired frame rate is 29.97, the range (30, 30) is probably more desirable than the
+        // range (15, 30).
+        int[] selectedFpsRange = null;
+        int minDiff = Integer.MAX_VALUE;
+        List<int[]> previewFpsRangeList = camera.getParameters().getSupportedPreviewFpsRange();
+        for (int[] range : previewFpsRangeList) {
+            int deltaMin = desiredPreviewFpsScaled - range[Camera.Parameters.PREVIEW_FPS_MIN_INDEX];
+            int deltaMax = desiredPreviewFpsScaled - range[Camera.Parameters.PREVIEW_FPS_MAX_INDEX];
+            int diff = Math.abs(deltaMin) + Math.abs(deltaMax);
+            if (diff < minDiff) {
+                selectedFpsRange = range;
+                minDiff = diff;
+            }
+        }
+        return selectedFpsRange;
+    }
+
+    public int getRotation() {
+        return this.rotation;
+    }
+
+    /**
+     * Generates a list of acceptable preview sizes. Preview sizes are not acceptable if there is not
+     * a corresponding picture size of the same aspect ratio. If there is a corresponding picture size
+     * of the same aspect ratio, the picture size is paired up with the preview size.
+     *
+     * <p>This is necessary because even if we don't use still pictures, the still picture size must
+     * be set to a size that is the same aspect ratio as the preview size we choose. Otherwise, the
+     * preview images may be distorted on some devices.
+     */
+    private static List<CameraSize> generateValidPreviewSizeList(Camera camera) {
+        Camera.Parameters parameters = camera.getParameters();
+        List<Camera.Size> supportedPreviewSizes =
+                parameters.getSupportedPreviewSizes();
+        List<Camera.Size> supportedPictureSizes =
+                parameters.getSupportedPictureSizes();
+        List<CameraSize> validPreviewSizes = new ArrayList<>();
+        for (android.hardware.Camera.Size previewSize : supportedPreviewSizes) {
+            float previewAspectRatio = (float) previewSize.width / (float) previewSize.height;
+
+            // By looping through the picture sizes in order, we favor the higher resolutions.
+            // We choose the highest resolution in order to support taking the full resolution
+            // picture later.
+            for (android.hardware.Camera.Size pictureSize : supportedPictureSizes) {
+                float pictureAspectRatio = (float) pictureSize.width / (float) pictureSize.height;
+                if (Math.abs(previewAspectRatio - pictureAspectRatio) < CameraSelector.ASPECT_RATIO_TOLERANCE) {
+                    validPreviewSizes.add(new CameraSize(previewSize, pictureSize));
+                    break;
+                }
+            }
+        }
+        if (validPreviewSizes.size() == 0) {
+            Log.w(CameraSelector.TAG, "No preview sizes have a corresponding same-aspect-ratio picture size");
+            for (android.hardware.Camera.Size previewSize : supportedPreviewSizes) {
+                // The null picture size will let us know that we shouldn't set a picture size.
+                validPreviewSizes.add(new CameraSize(previewSize, null));
+            }
+        }
+
+        return validPreviewSizes;
+    }
+
+    /**
+     * Gets the id for the camera specified by the direction it is facing. Returns -1 if no such
+     * camera was found.
+     *
+     * @param facing the desired camera (front-facing or rear-facing)
+     */
+    private static int getIdForRequestedCamera(int facing) {
+        Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
+        for (int i = 0; i < Camera.getNumberOfCameras(); i++) {
+            Camera.getCameraInfo(i, cameraInfo);
+            if (cameraInfo.facing == facing) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    private static class CameraSize {
+        private final Size previewSize;
+        private Size pictureSize;
+
+        CameraSize(android.hardware.Camera.Size preview, android.hardware.Camera.Size picture) {
+            this.previewSize = new Size(preview.width, preview.height);
+            if (picture != null) {
+                this.pictureSize = new Size(picture.width, picture.height);
+            }
+        }
+
+        Size getPreviewSize() {
+            return this.previewSize;
+        }
+
+        Size getPictureSize() {
+            return this.pictureSize;
+        }
+    }
+}
diff --git a/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/camera/FrameMetadata.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/camera/FrameMetadata.java
new file mode 100644
index 0000000..ea66c6e
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/camera/FrameMetadata.java
@@ -0,0 +1,78 @@
+/**
+ *  Copyright 2018 Google LLC
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.mlkit.sample.camera;
+
+public class FrameMetadata {
+  private final int width;
+  private final int height;
+  private final int rotation;
+  private final int cameraFacing;
+
+  public int getWidth() {
+    return this.width;
+  }
+
+  public int getHeight() {
+    return this.height;
+  }
+
+  public int getRotation() {
+    return this.rotation;
+  }
+
+  public int getCameraFacing() {
+    return this.cameraFacing;
+  }
+
+  private FrameMetadata(int width, int height, int rotation, int facing) {
+    this.width = width;
+    this.height = height;
+    this.rotation = rotation;
+    this.cameraFacing = facing;
+  }
+
+  public static class Builder {
+    private int width;
+    private int height;
+    private int rotation;
+    private int cameraFacing;
+
+    public Builder setWidth(int width) {
+      this.width = width;
+      return this;
+    }
+
+    public Builder setHeight(int height) {
+      this.height = height;
+      return this;
+    }
+
+    public Builder setRotation(int rotation) {
+      this.rotation = rotation;
+      return this;
+    }
+
+    public Builder setCameraFacing(int facing) {
+      this.cameraFacing = facing;
+      return this;
+    }
+
+    public FrameMetadata build() {
+      return new FrameMetadata(this.width, this.height, this.rotation, this.cameraFacing);
+    }
+  }
+}
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/camera/LensEngine.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/camera/LensEngine.java
similarity index 96%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/camera/LensEngine.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/camera/LensEngine.java
index 0f81585..18ccd60 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/camera/LensEngine.java
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/camera/LensEngine.java
@@ -47,8 +47,6 @@
 @SuppressLint("MissingPermission")
 public class LensEngine {
     private static final String TAG = "LensEngine";
-    private static final int TEXTURE_NAME = 100;
-
     protected Activity activity;
     private Camera camera;
     private Thread transactingThread;
@@ -59,9 +57,6 @@ public class LensEngine {
     private final Map<byte[], ByteBuffer> bytesToByteBuffer = new IdentityHashMap<>();
     private GraphicOverlay overlay;
 
-    private SurfaceTexture surfaceTexture;
-
-    private boolean usingSurfaceTexture;
 
     public LensEngine(Activity activity, CameraConfiguration configuration, GraphicOverlay graphicOverlay) {
         this.activity = activity;
@@ -97,9 +92,6 @@ public synchronized LensEngine run() throws IOException {
             return this;
         }
         this.camera = this.createCamera();
-        this.surfaceTexture = new SurfaceTexture(this.TEXTURE_NAME);
-        this.camera.setPreviewTexture(this.surfaceTexture);
-        this.usingSurfaceTexture = true;
         this.camera.startPreview();
         this.initializeOverlay();
         this.transactingThread = new Thread(this.transactingRunnable);
@@ -177,9 +169,7 @@ public synchronized void stop() {
             this.camera.setPreviewCallbackWithBuffer(null);
             try {
                 this.camera.setPreviewDisplay(null);
-                if (this.usingSurfaceTexture) {
-                    this.camera.setPreviewTexture(null);
-                }
+                this.camera.setPreviewTexture(null);
             } catch (Exception e) {
                 Log.e(LensEngine.TAG, "Failed to clear camera preview: " + e);
             }
diff --git a/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/camera/LensEnginePreview.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/camera/LensEnginePreview.java
new file mode 100644
index 0000000..b66b5ea
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/camera/LensEnginePreview.java
@@ -0,0 +1,331 @@
+/**
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.mlkit.sample.camera;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.graphics.SurfaceTexture;
+import android.hardware.Camera;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.MotionEvent;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.ViewGroup;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.huawei.hms.common.size.Size;
+
+public class LensEnginePreview extends ViewGroup {
+    private static final String TAG = "LensEnginePreview";
+
+    private static final int TEXTURE_NAME = 100;
+
+    private Context context;
+
+    private SurfaceView surfaceView;
+
+    private SurfaceTexture surfaceTexture;
+
+    private boolean startRequested;
+
+    private LensEngine lensEngine;
+
+    private float oldDist = 1f;
+
+    /**
+     * Determines whether the camera preview frame and detection result display frame are synchronous or asynchronous.
+     */
+    private boolean isSynchronous = false;
+
+    public LensEnginePreview(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        this.context = context;
+        this.startRequested = false;
+        this.surfaceView = new SurfaceView(context);
+        this.surfaceView.getHolder().addCallback(new SurfaceCallback());
+        this.addView(this.surfaceView);
+    }
+
+    public SurfaceHolder getSurfaceHolder() {
+        return this.surfaceView.getHolder();
+    }
+
+    public SurfaceTexture getSurfaceTexture(){
+        return this.surfaceTexture;
+    }
+
+    public void start(LensEngine lensEngine, boolean isSynchronous) throws IOException {
+        this.isSynchronous = isSynchronous;
+        if (lensEngine == null) {
+            this.stop();
+        }
+        this.lensEngine = lensEngine;
+        if (this.lensEngine != null) {
+            this.startRequested = true;
+            this.startLensEngine();
+        }
+    }
+
+    public void stop() {
+        if (this.lensEngine != null) {
+            this.lensEngine.stop();
+        }
+    }
+
+    public void release() {
+        if (this.lensEngine != null) {
+            this.lensEngine.release();
+            this.lensEngine = null;
+        }
+    }
+
+    @SuppressLint("MissingPermission")
+    private void startLensEngine() throws IOException {
+        if (this.startRequested) {
+            this.lensEngine.run();
+            this.startRequested = false;
+        }
+    }
+
+    public void takePicture(Camera.PictureCallback pictureCallback) {
+        if (this.lensEngine != null) {
+            this.lensEngine.takePicture(pictureCallback);
+        }
+    }
+
+    private class SurfaceCallback implements SurfaceHolder.Callback {
+        @Override
+        public void surfaceCreated(SurfaceHolder surface) {
+            try {
+                LensEnginePreview.this.startLensEngine();
+            } catch (IOException e) {
+                Log.e(LensEnginePreview.TAG, "Could not start lensEngine.", e);
+            }
+        }
+
+        @Override
+        public void surfaceDestroyed(SurfaceHolder surface) {
+        }
+
+        @Override
+        public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
+            Log.d(LensEnginePreview.TAG, "surfaceChanged");
+            Camera camera = LensEnginePreview.this.lensEngine.getCamera();
+            if (camera == null) {
+                return;
+            }
+            try {
+                if (isSynchronous) {
+                    surfaceTexture = new SurfaceTexture(TEXTURE_NAME);
+                    camera.setPreviewTexture(surfaceTexture);
+                } else {
+                    camera.setPreviewDisplay(surfaceView.getHolder());
+                }
+            } catch (IOException e) {
+                Log.e(LensEnginePreview.TAG, "IOException", e);
+
+            }
+        }
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        try {
+            this.startLensEngine();
+        } catch (IOException e) {
+            Log.e(LensEnginePreview.TAG, "Could not start LensEngine.", e);
+        }
+        if (this.lensEngine == null) {
+            return;
+        }
+        Size size = this.lensEngine.getPreviewSize();
+        if (size == null) {
+            return;
+        }
+        int width = size.getWidth();
+        int height = size.getHeight();
+
+
+        // When the phone is in portrait orientation, the width and height dimensions are interchangeable.
+        if (this.isVertical()) {
+            int tmp = width;
+            width = height;
+            height = tmp;
+        }
+
+        final int viewWidth = right - left;
+        final int viewHeight = bottom - top;
+
+        int childWidth;
+        int childHeight;
+        int childXOffset = 0;
+        int childYOffset = 0;
+        float widthRatio = (float) viewWidth / (float) width;
+        float heightRatio = (float) viewHeight / (float) height;
+
+        // To fill the view with the camera preview, while also preserving the correct aspect ratio,
+        // it is usually necessary to slightly oversize the child and to crop off portions along one
+        // of the dimensions. We scale up based on the dimension requiring the most correction, and
+        // compute a crop offset for the other dimension.
+        if (widthRatio > heightRatio) {
+            childWidth = viewWidth;
+            childHeight = (int) ((float) height * widthRatio);
+            childYOffset = (childHeight - viewHeight) / 2;
+        } else {
+            childWidth = (int) ((float) width * heightRatio);
+            childHeight = viewHeight;
+            childXOffset = (childWidth - viewWidth) / 2;
+        }
+
+        for (int i = 0; i < this.getChildCount(); ++i) {
+            // One dimension will be cropped. We shift child over or up by this offset and adjust
+            // the size to maintain the proper aspect ratio.
+            this.getChildAt(i)
+                    .layout(-1 * childXOffset, -1 * childYOffset, childWidth - childXOffset, childHeight - childYOffset);
+        }
+    }
+
+    private boolean isVertical() {
+        int orientation = this.context.getResources().getConfiguration().orientation;
+        return orientation == Configuration.ORIENTATION_PORTRAIT;
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        if (CameraConfiguration.getCameraFacing() == CameraConfiguration.CAMERA_FACING_FRONT) {
+            return true;
+        }
+        if (event.getPointerCount() == 1) {
+            switch (event.getAction()) {
+                case MotionEvent.ACTION_UP:
+                    this.handleFocusMetering(event, this.lensEngine.getCamera());
+                    break;
+            }
+        } else {
+            switch (event.getAction() & MotionEvent.ACTION_MASK) {
+                case MotionEvent.ACTION_POINTER_DOWN:
+                    this.oldDist = LensEnginePreview.getFingerSpacing(event);
+                    break;
+                case MotionEvent.ACTION_MOVE:
+                    Log.d(LensEnginePreview.TAG, "toby onTouch: ACTION_MOVE");
+                    float newDist = LensEnginePreview.getFingerSpacing(event);
+                    if (newDist > this.oldDist) {
+                        this.handleZoom(true, this.lensEngine.getCamera());
+                    } else if (newDist < this.oldDist) {
+                        this.handleZoom(false, this.lensEngine.getCamera());
+                    }
+                    this.oldDist = newDist;
+                    break;
+                default:
+                    break;
+            }
+        }
+        return true;
+    }
+
+    private void handleZoom(boolean isZoomIn, Camera camera) {
+        Camera.Parameters params = camera.getParameters();
+        if (params.isZoomSupported()) {
+            int maxZoom = params.getMaxZoom();
+            int zoom = params.getZoom();
+            if (isZoomIn && zoom < maxZoom) {
+                zoom++;
+            } else if (zoom > 0) {
+                zoom--;
+            }
+            params.setZoom(zoom);
+            camera.setParameters(params);
+        } else {
+            Log.i(LensEnginePreview.TAG, "zoom not supported");
+        }
+    }
+
+    private void handleFocusMetering(MotionEvent event, Camera camera) {
+        int viewWidth = this.getWidth();
+        int viewHeight = this.getHeight();
+        Rect focusRect = LensEnginePreview.calculateTapArea(event.getX(), event.getY(), 1f, viewWidth, viewHeight);
+        Rect meteringRect = LensEnginePreview.calculateTapArea(event.getX(), event.getY(), 1.5f, viewWidth, viewHeight);
+
+        camera.cancelAutoFocus();
+        Camera.Parameters params = camera.getParameters();
+        if (params.getMaxNumFocusAreas() > 0) {
+            List<Camera.Area> focusAreas = new ArrayList<>();
+            focusAreas.add(new Camera.Area(focusRect, 800));
+            params.setFocusAreas(focusAreas);
+        } else {
+            Log.i(LensEnginePreview.TAG, "focus areas not supported");
+        }
+        if (params.getMaxNumMeteringAreas() > 0) {
+            List<Camera.Area> meteringAreas = new ArrayList<>();
+            meteringAreas.add(new Camera.Area(meteringRect, 800));
+            params.setMeteringAreas(meteringAreas);
+        } else {
+            Log.i(LensEnginePreview.TAG, "metering areas not supported");
+        }
+        final String currentFocusMode = params.getFocusMode();
+        Log.d(LensEnginePreview.TAG, "toby onTouch:" + currentFocusMode);
+        params.setFocusMode(Camera.Parameters.FOCUS_MODE_AUTO);
+        camera.setParameters(params);
+
+        camera.autoFocus(new Camera.AutoFocusCallback() {
+            @Override
+            public void onAutoFocus(boolean success, Camera camera) {
+                Camera.Parameters params = camera.getParameters();
+                params.setFocusMode(currentFocusMode);
+                camera.setParameters(params);
+            }
+        });
+    }
+
+    private static float getFingerSpacing(MotionEvent event) {
+        float x = event.getX(0) - event.getX(1);
+        float y = event.getY(0) - event.getY(1);
+        return (float) Math.sqrt(x * x + y * y);
+    }
+
+    private static Rect calculateTapArea(float x, float y, float coefficient, int width, int height) {
+        float focusAreaSize = 300;
+        int areaSize = Float.valueOf(focusAreaSize * coefficient).intValue();
+        int centerX = (int) (x / width * 2000 - 1000);
+        int centerY = (int) (y / height * 2000 - 1000);
+
+        int halfAreaSize = areaSize / 2;
+        RectF rectF = new RectF(LensEnginePreview.clamp(centerX - halfAreaSize, -1000, 1000),
+                LensEnginePreview.clamp(centerY - halfAreaSize, -1000, 1000),
+                LensEnginePreview.clamp(centerX + halfAreaSize, -1000, 1000),
+                LensEnginePreview.clamp(centerY + halfAreaSize, -1000, 1000));
+        return new Rect(Math.round(rectF.left), Math.round(rectF.top), Math.round(rectF.right),
+                Math.round(rectF.bottom));
+    }
+
+    private static int clamp(int x, int min, int max) {
+        if (x > max) {
+            return max;
+        }
+        if (x < min) {
+            return min;
+        }
+        return x;
+    }
+}
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/BaseTransactor.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/transactor/BaseTransactor.java
similarity index 96%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/BaseTransactor.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/transactor/BaseTransactor.java
index 72f2ca2..170e5b9 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/BaseTransactor.java
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/transactor/BaseTransactor.java
@@ -74,7 +74,7 @@ public synchronized void process(ByteBuffer data, final FrameMetadata frameMetad
     @Override
     public void process(Bitmap bitmap, GraphicOverlay graphicOverlay) {
         MLFrame frame = new MLFrame.Creator().setBitmap(bitmap).create();
-        this.detectInVisionImage(bitmap, frame, null,graphicOverlay);
+        this.detectInVisionImage(bitmap, frame, null, graphicOverlay);
     }
 
     private synchronized void processLatestImage(GraphicOverlay graphicOverlay) {
@@ -103,8 +103,8 @@ private synchronized void processLatestImage(GraphicOverlay graphicOverlay) {
             if (this.isFaceDetection()) {
                 ByteBuffer resizeImage = ByteBuffer.allocate((CameraConfiguration.DEFAULT_WIDTH * CameraConfiguration.DEFAULT_HEIGHT * 3) / 2 + 1);
                 CommonUtils.handleByteBuffer(this.transactingImage, resizeImage,
-                        this.transactingMetaData.getWidth(), this.transactingMetaData.getHeight(),
-                        CameraConfiguration.DEFAULT_WIDTH,CameraConfiguration.DEFAULT_HEIGHT);
+                        transactingMetaData.getWidth(), transactingMetaData.getHeight(),
+                        CameraConfiguration.DEFAULT_WIDTH, CameraConfiguration.DEFAULT_HEIGHT);
                 this.detectInVisionImage(
                         bitmap, MLFrame.fromByteBuffer(resizeImage, metadata), this.transactingMetaData, graphicOverlay);
             } else {
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/ImageSegmentationTransactor.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/transactor/ImageSegmentationTransactor.java
similarity index 99%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/ImageSegmentationTransactor.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/transactor/ImageSegmentationTransactor.java
index af3c617..87297b3 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/ImageSegmentationTransactor.java
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/transactor/ImageSegmentationTransactor.java
@@ -115,7 +115,7 @@ protected void onSuccess(
         this.startTime = System.currentTimeMillis();
         graphicOverlay.clear();
         if (results == null || results.getMasks() == null) {
-            Log.i(ImageSegmentationTransactor.TAG, "detection failed");
+            Log.i(TAG, "detection failed");
             return;
         }
         byte[] masks = results.getMasks();
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/ImageTransactor.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/transactor/ImageTransactor.java
similarity index 100%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/ImageTransactor.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/transactor/ImageTransactor.java
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/LocalFaceTransactor.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/transactor/LocalFaceTransactor.java
similarity index 97%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/LocalFaceTransactor.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/transactor/LocalFaceTransactor.java
index 3b2d102..980862f 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/LocalFaceTransactor.java
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/transactor/LocalFaceTransactor.java
@@ -76,7 +76,7 @@ protected void onSuccess(
             CameraImageGraphic imageGraphic = new CameraImageGraphic(graphicOverlay, originalCameraImage);
             graphicOverlay.addGraphic(imageGraphic);
         }
-        LocalFaceGraphic hmsMLLocalFaceGraphic = new LocalFaceGraphic(graphicOverlay, faces, this.mContext, this.isOpenFeatures);
+        LocalFaceGraphic hmsMLLocalFaceGraphic = new LocalFaceGraphic(graphicOverlay, faces, mContext, this.isOpenFeatures);
         graphicOverlay.addGraphic(hmsMLLocalFaceGraphic);
         graphicOverlay.postInvalidate();
     }
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/LocalImageClassificationTransactor.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/transactor/LocalImageClassificationTransactor.java
similarity index 91%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/LocalImageClassificationTransactor.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/transactor/LocalImageClassificationTransactor.java
index 2a96c32..3eabaeb 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/LocalImageClassificationTransactor.java
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/transactor/LocalImageClassificationTransactor.java
@@ -74,12 +74,9 @@ protected void onSuccess(
             @NonNull FrameMetadata frameMetadata,
             @NonNull GraphicOverlay graphicOverlay) {
         graphicOverlay.clear();
-        if ((Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) && originalCameraImage != null) {
-            CameraImageGraphic imageGraphic = new CameraImageGraphic(graphicOverlay, originalCameraImage);
-            graphicOverlay.addGraphic(imageGraphic);
-        }
+
         LocalImageClassificationGraphic hmsMLLocalImageClassificationGraphic =
-                new LocalImageClassificationGraphic(graphicOverlay, this.mContext, classifications);
+                new LocalImageClassificationGraphic(graphicOverlay, mContext, classifications);
         graphicOverlay.addGraphic(hmsMLLocalImageClassificationGraphic);
         graphicOverlay.postInvalidate();
     }
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/LocalObjectTransactor.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/transactor/LocalObjectTransactor.java
similarity index 91%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/LocalObjectTransactor.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/transactor/LocalObjectTransactor.java
index c76e7e9..9a79993 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/LocalObjectTransactor.java
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/transactor/LocalObjectTransactor.java
@@ -69,10 +69,7 @@ protected void onSuccess(
             @NonNull FrameMetadata frameMetadata,
             @NonNull GraphicOverlay graphicOverlay) {
         graphicOverlay.clear();
-        if ((Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) && originalCameraImage != null) {
-            CameraImageGraphic imageGraphic = new CameraImageGraphic(graphicOverlay, originalCameraImage);
-            graphicOverlay.addGraphic(imageGraphic);
-        }
+
         for (MLObject object : results) {
             LocalObjectGraphic objectGraphic = new LocalObjectGraphic(graphicOverlay, object);
             graphicOverlay.addGraphic(objectGraphic);
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/RemoteImageClassificationTransactor.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/transactor/RemoteImageClassificationTransactor.java
similarity index 100%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/RemoteImageClassificationTransactor.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/transactor/RemoteImageClassificationTransactor.java
index d9b3221..410c426 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/RemoteImageClassificationTransactor.java
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/transactor/RemoteImageClassificationTransactor.java
@@ -22,15 +22,15 @@
 import android.util.Log;
 
 import com.huawei.hmf.tasks.Task;
-import com.mlkit.sample.camera.FrameMetadata;
-import com.mlkit.sample.util.Constant;
-import com.mlkit.sample.views.overlay.GraphicOverlay;
-import com.mlkit.sample.views.graphic.RemoteImageClassificationGraphic;
 import com.huawei.hms.mlsdk.MLAnalyzerFactory;
-import com.huawei.hms.mlsdk.common.MLFrame;
-import com.huawei.hms.mlsdk.classification.MLRemoteClassificationAnalyzerSetting;
 import com.huawei.hms.mlsdk.classification.MLImageClassification;
 import com.huawei.hms.mlsdk.classification.MLImageClassificationAnalyzer;
+import com.huawei.hms.mlsdk.classification.MLRemoteClassificationAnalyzerSetting;
+import com.huawei.hms.mlsdk.common.MLFrame;
+import com.mlkit.sample.camera.FrameMetadata;
+import com.mlkit.sample.util.Constant;
+import com.mlkit.sample.views.graphic.RemoteImageClassificationGraphic;
+import com.mlkit.sample.views.overlay.GraphicOverlay;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -41,10 +41,10 @@ public class RemoteImageClassificationTransactor extends BaseTransactor<List<MLI
 
     private final MLImageClassificationAnalyzer detector;
 
-    private Handler handler;
-
     private Context mContext;
 
+    private Handler handler;
+
     public RemoteImageClassificationTransactor(Context context, Handler handler) {
         super();
         MLRemoteClassificationAnalyzerSetting options = new MLRemoteClassificationAnalyzerSetting.Factory().setMinAcceptablePossibility(0f).create();
@@ -75,8 +75,8 @@ protected void onSuccess(
             List<MLImageClassification> classifications,
             FrameMetadata frameMetadata,
             GraphicOverlay graphicOverlay) {
-        this.handler.sendEmptyMessage(Constant.GET_DATA_SUCCESS);
         graphicOverlay.clear();
+        this.handler.sendEmptyMessage(Constant.GET_DATA_SUCCESS);
         List<String> classificationList = new ArrayList<>();
         for (int i = 0; i < classifications.size(); ++i) {
             MLImageClassification classification = classifications.get(i);
@@ -92,7 +92,7 @@ protected void onSuccess(
 
     @Override
     protected void onFailure(Exception e) {
-        Log.e(RemoteImageClassificationTransactor.TAG, "Remote image classification detection failed: " + e.getMessage());
         this.handler.sendEmptyMessage(Constant.GET_DATA_FAILED);
+        Log.e(RemoteImageClassificationTransactor.TAG, "Remote image classification detection failed: " + e.getMessage());
     }
 }
\ No newline at end of file
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/RemoteLandmarkTransactor.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/transactor/RemoteLandmarkTransactor.java
similarity index 100%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/RemoteLandmarkTransactor.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/transactor/RemoteLandmarkTransactor.java
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/StillImageSegmentationTransactor.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/transactor/StillImageSegmentationTransactor.java
similarity index 98%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/StillImageSegmentationTransactor.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/transactor/StillImageSegmentationTransactor.java
index 33bc3f5..f8d161f 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/transactor/StillImageSegmentationTransactor.java
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/transactor/StillImageSegmentationTransactor.java
@@ -27,6 +27,7 @@
 import androidx.annotation.Nullable;
 
 import com.huawei.hmf.tasks.Task;
+import com.huawei.hms.mlsdk.imgseg.MLImageSegmentationClassification;
 import com.mlkit.sample.callback.ImageSegmentationResultCallBack;
 import com.mlkit.sample.camera.FrameMetadata;
 import com.mlkit.sample.util.ImageUtils;
@@ -35,7 +36,6 @@
 import com.huawei.hms.mlsdk.common.MLFrame;
 import com.huawei.hms.mlsdk.imgseg.MLImageSegmentation;
 import com.huawei.hms.mlsdk.imgseg.MLImageSegmentationAnalyzer;
-import com.huawei.hms.mlsdk.imgseg.MLImageSegmentationClassification;
 import com.huawei.hms.mlsdk.imgseg.MLImageSegmentationSetting;
 
 import java.io.IOException;
@@ -130,11 +130,11 @@ protected void onSuccess(
         graphicOverlay.clear();
         int[] pixels;
         if (results == null) {
-            Log.i(StillImageSegmentationTransactor.TAG, "detection failed");
+            Log.i(TAG, "detection failed");
             return;
         }
         if (results.getMasks() == null) {
-            Log.i(StillImageSegmentationTransactor.TAG, "detection failed, none mask return");
+            Log.i(TAG, "detection failed, none mask return");
             return;
         }
         if (this.detectCategory == -1) {
diff --git a/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/util/BitmapUtils.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/util/BitmapUtils.java
new file mode 100644
index 0000000..e6a31b9
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/util/BitmapUtils.java
@@ -0,0 +1,196 @@
+/**
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.mlkit.sample.util;
+
+import android.app.Activity;
+import android.database.Cursor;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.ImageFormat;
+import android.graphics.Matrix;
+import android.graphics.Rect;
+import android.graphics.YuvImage;
+import android.hardware.Camera.CameraInfo;
+import android.media.ExifInterface;
+import android.net.Uri;
+import android.provider.MediaStore;
+import android.util.Log;
+
+import com.mlkit.sample.camera.FrameMetadata;
+import com.huawei.hms.mlsdk.common.MLFrame;
+import com.huawei.hms.mlsdk.common.internal.client.SmartLog;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+import androidx.annotation.Nullable;
+
+public class BitmapUtils {
+    private static final String TAG = "BitmapUtils";
+
+    /**
+     * Convert nv21 format byte buffer to bitmap
+     *
+     * @param data
+     * @param metadata
+     * @return Bitmap object
+     */
+    @Nullable
+    public static Bitmap getBitmap(ByteBuffer data, FrameMetadata metadata) {
+        data.rewind();
+        byte[] imageBuffer = new byte[data.limit()];
+        data.get(imageBuffer, 0, imageBuffer.length);
+        try {
+            YuvImage yuvImage = new YuvImage(imageBuffer, ImageFormat.NV21, metadata.getWidth(),
+                    metadata.getHeight(), null);
+            ByteArrayOutputStream stream = new ByteArrayOutputStream();
+            yuvImage.compressToJpeg(new Rect(0, 0, metadata.getWidth(), metadata.getHeight()), 80, stream);
+            Bitmap bitmap = BitmapFactory.decodeByteArray(stream.toByteArray(), 0, stream.size());
+            stream.close();
+            return rotateBitmap(bitmap, metadata.getRotation(), metadata.getCameraFacing());
+        } catch (Exception e) {
+            Log.e(TAG, "Error: " + e.getMessage());
+        }
+        return null;
+    }
+
+
+    public static Bitmap rotateBitmap(Bitmap bitmap, int rotation, int facing) {
+        Matrix matrix = new Matrix();
+        int rotationDegree = 0;
+        if (rotation == MLFrame.SCREEN_SECOND_QUADRANT) {
+            rotationDegree = 90;
+        } else if (rotation == MLFrame.SCREEN_THIRD_QUADRANT) {
+            rotationDegree = 180;
+        } else if (rotation == MLFrame.SCREEN_FOURTH_QUADRANT) {
+            rotationDegree = 270;
+        }
+        matrix.postRotate(rotationDegree);
+        if (facing != CameraInfo.CAMERA_FACING_BACK) {
+            matrix.postScale(-1.0f, 1.0f);
+        }
+        return Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);
+    }
+
+    public static void recycleBitmap(Bitmap... bitmaps) {
+        for (Bitmap bitmap : bitmaps) {
+            if (bitmap != null && !bitmap.isRecycled()) {
+                bitmap.recycle();
+                bitmap = null;
+            }
+        }
+    }
+
+    private static String getImagePath(Activity activity, Uri uri) {
+        String[] projection = {MediaStore.Images.Media.DATA};
+        Cursor cursor = activity.managedQuery(uri, projection, null, null, null);
+        int columnIndex = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
+        cursor.moveToFirst();
+        return cursor.getString(columnIndex);
+    }
+
+    public static Bitmap loadFromPath(Activity activity, Uri uri, int width, int height) {
+        BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inJustDecodeBounds = true;
+
+        String path = getImagePath(activity, uri);
+        BitmapFactory.decodeFile(path, options);
+        int sampleSize = calculateInSampleSize(options, width, height);
+        options.inSampleSize = sampleSize;
+        options.inJustDecodeBounds = false;
+
+        Bitmap bitmap = zoomImage(BitmapFactory.decodeFile(path, options), width, height);
+        return rotateBitmap(bitmap, getRotationAngle(path));
+    }
+
+    private static int calculateInSampleSize(BitmapFactory.Options options, int reqWidth, int reqHeight) {
+        final int width = options.outWidth;
+        final int height = options.outHeight;
+        int inSampleSize = 1;
+
+        if (height > reqHeight || width > reqWidth) {
+            // Calculate height and required height scale
+            final int heightRatio = Math.round((float) height / (float) reqHeight);
+            // Calculate width and required width scale
+            final int widthRatio = Math.round((float) width / (float) reqWidth);
+            // Take the larger of the values
+            inSampleSize = heightRatio > widthRatio ? heightRatio : widthRatio;
+        }
+        return inSampleSize;
+    }
+
+    // Scale pictures to screen width
+    private static Bitmap zoomImage(Bitmap imageBitmap, int targetWidth, int maxHeight) {
+        float scaleFactor =
+                Math.max(
+                        (float) imageBitmap.getWidth() / (float) targetWidth,
+                        (float) imageBitmap.getHeight() / (float) maxHeight);
+        Bitmap resizedBitmap =
+                Bitmap.createScaledBitmap(
+                        imageBitmap,
+                        (int) (imageBitmap.getWidth() / scaleFactor),
+                        (int) (imageBitmap.getHeight() / scaleFactor),
+                        true);
+
+        return resizedBitmap;
+    }
+
+    /**
+     * Get the rotation angle of the photo
+     *
+     * @param path photo path
+     * @return angle
+     */
+    public static int getRotationAngle(String path) {
+        int rotation = 0;
+        try {
+            ExifInterface exifInterface = new ExifInterface(path);
+            int orientation = exifInterface.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL);
+            switch (orientation) {
+                case ExifInterface.ORIENTATION_ROTATE_90:
+                    rotation = 90;
+                    break;
+                case ExifInterface.ORIENTATION_ROTATE_180:
+                    rotation = 180;
+                    break;
+                case ExifInterface.ORIENTATION_ROTATE_270:
+                    rotation = 270;
+                    break;
+            }
+        } catch (IOException e) {
+            SmartLog.e(TAG, "Failed to get rotation: " + e.getMessage());
+        }
+        return rotation;
+    }
+
+    public static Bitmap rotateBitmap(Bitmap bitmap, int angle) {
+        Matrix matrix = new Matrix();
+        matrix.postRotate(angle);
+        Bitmap result = null;
+        try {
+            result = Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);
+        } catch (OutOfMemoryError e) {
+            SmartLog.e(TAG, "Failed to rotate bitmap: " + e.getMessage());
+        }
+        if (result == null) {
+            return bitmap;
+        }
+        return result;
+    }
+}
+
diff --git a/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/util/CommonUtils.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/util/CommonUtils.java
new file mode 100644
index 0000000..60e27df
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/util/CommonUtils.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.mlkit.sample.util;
+
+import android.content.Context;
+import android.util.Log;
+
+import java.nio.ByteBuffer;
+
+public class CommonUtils {
+    private static final String TAG = "CommonUtils";
+    /**
+     * Handle ByteBuffer
+     *
+     * @param src High resolution ByteBuffer
+     * @param dst Low resolution ByteBuffer
+     * @param srcWidth High resolution wide
+     * @param srcHeight High resolution height
+     * @param dstWidth Low resolution wide
+     * @param dstHeight Low resolution height
+     */
+    public static void handleByteBuffer(ByteBuffer src, ByteBuffer dst,
+                                        int srcWidth, int srcHeight, int dstWidth, int dstHeight) {
+        int sw = srcWidth;
+        int sh = srcHeight;
+        int dw = dstWidth;
+        int dh = dstHeight;
+        int y, x;
+        int srcy, srcx, src_index;
+        int xrIntFloat_16 = (sw << 16) / dw + 1;
+        int yrIntFloat_16 = (sh << 16) / dh + 1;
+
+        int dst_uv = dh * dw;
+        int src_uv = sh * sw;
+        int dst_uv_yScanline = 0;
+        int src_uv_yScanline = 0;
+        int dst_y_slice = 0;
+        int src_y_slice;
+        int sp;
+        int dp;
+
+        for (y = 0; y < (dh & ~7); ++y) {
+            srcy = (y * yrIntFloat_16) >> 16;
+            src_y_slice = srcy * sw;
+
+            if ((y & 1) == 0) {
+                dst_uv_yScanline = dst_uv + (y / 2) * dw;
+                src_uv_yScanline = src_uv + (srcy / 2) * sw;
+            }
+
+            for (x = 0; x < (dw & ~7); ++x) {
+                srcx = (x * xrIntFloat_16) >> 16;
+                try {
+                    dst.put((x + dst_y_slice), src.get(src_y_slice + srcx));
+                } catch (Exception e) {
+                    Log.d(TAG, "nv12_Resize Exception1" + e.getMessage());
+                }
+
+                if ((y & 1) == 0) {
+                    if ((x & 1) == 0) {
+                        src_index = (srcx / 2) * 2;
+                        sp = dst_uv_yScanline + x;
+                        dp = src_uv_yScanline + src_index;
+                        try {
+                            dst.put(sp, src.get(dp));
+                        } catch (Exception e) {
+                            Log.d(TAG, "nv12_Resize Exception2" + e.getMessage());
+                        }
+                        ++sp;
+                        ++dp;
+                        try {
+                            dst.put(sp, src.get(dp));
+                        } catch (Exception e) {
+                            Log.d(TAG, "nv12_Resize Exception3" + e.getMessage());
+                        }
+                    }
+                }
+            }
+            dst_y_slice += dw;
+        }
+    }
+
+    public static float dp2px(Context context, float dipValue) {
+        return dipValue * context.getResources().getDisplayMetrics().density + 0.5f;
+    }
+}
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/util/Constant.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/util/Constant.java
similarity index 67%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/util/Constant.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/util/Constant.java
index 72c8038..82b449b 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/util/Constant.java
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/util/Constant.java
@@ -22,32 +22,14 @@
 
 public class Constant {
 
-    public static final String POSITION_KEY = "positionkey";
-
-    public static final String POSITION_CN = "0";
-
-    public static final String POSITION_EN = "1";
-
-    public static final String POSITION_JA = "2";
-
-    public static final String POSITION_KO = "3";
-
-    public static final String POSITION_LA = "4";
-
     public static final int GET_DATA_SUCCESS = 100;
 
     public static final int GET_DATA_FAILED = 101;
 
-    public static final int SHOW_TAKE_PHOTO_BUTTON = 102;
-
-    public static final int HIDE_TAKE_PHOTO_BUTTON = 103;
-
     public static final String CAMERA_FACING = "facing";
 
     public static final String CLOUD_IMAGE_CLASSIFICATION = "Cloud Classification";
     public static final String CLOUD_LANDMARK_DETECTION = "Landmark";
-    public static final String CLOUD_TEXT_DETECTION = "Cloud Text";
-    public static final String CLOUD_DOCUMENT_TEXT_DETECTION = "Doc Text";
     public static final String MODEL_TYPE = "model_type";
 
     public static final String ADD_PICTURE_TYPE = "picture_type";
@@ -55,7 +37,6 @@ public class Constant {
     public static final String TYPE_SELECT_IMAGE = "select image";
 
     public static final String DEFAULT_VERSION = "1.0.3.300";
-    public static final boolean IS_CHINESE = false;
 
     public static int[] IMAGES = {R.mipmap.img_001, R.mipmap.img_002, R.mipmap.img_003, R.mipmap.img_004,
             R.mipmap.img_005, R.mipmap.img_006, R.mipmap.img_007, R.mipmap.img_008, R.mipmap.img_009};
@@ -74,19 +55,4 @@ public class Constant {
      * Number of the background image used in the background replacement.
      */
     public static final String VALUE_KEY = "index_value";
-
-    public interface TYPE {
-        int TYPE_BACKGOURND = 0;
-        int TYPE_HUMAN = 1;
-        int TYPE_SKY = 2;
-        int TYPE_GRASS = 3;
-        int TYPE_FOOD = 4;
-        int TYPE_CAT = 5;
-        int TYPE_BUILD = 6;
-        int TYPE_FLOWER = 7;
-        int TYPE_WATER = 8;
-        int TYPE_SAND = 9;
-        int TYPE_MOUNTAIN = 10;
-        int TYPE_CATEGORY = -1;
-    }
 }
diff --git a/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/util/ImageUtils.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/util/ImageUtils.java
new file mode 100644
index 0000000..c8752d2
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/util/ImageUtils.java
@@ -0,0 +1,134 @@
+/**
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.mlkit.sample.util;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.Matrix;
+import android.media.MediaScannerConnection;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Environment;
+
+import com.mlkit.sample.callback.ImageUtilCallBack;
+import com.huawei.hms.mlsdk.common.internal.client.SmartLog;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+public class ImageUtils {
+    private static final String TAG = "ImageUtils";
+    private  Context context;
+    private ImageUtilCallBack imageUtilCallBack;
+
+    public ImageUtils(Context context){
+        this.context = context;
+    }
+
+    public void setImageUtilCallBack(ImageUtilCallBack imageUtilCallBack){
+        this.imageUtilCallBack = imageUtilCallBack;
+    }
+
+    // Save the picture to the system album and refresh it.
+    public void saveToAlbum(Bitmap bitmap){
+        File file = null;
+        String fileName = System.currentTimeMillis() +".jpg";
+        File root = new File(Environment.getExternalStorageDirectory().getAbsoluteFile(), this.context.getPackageName());
+        File dir = new File(root, "image");
+        if(dir.mkdirs() || dir.isDirectory()){
+            file = new File(dir, fileName);
+        }
+        FileOutputStream os = null;
+        try {
+            os = new FileOutputStream(file);
+            bitmap.compress(Bitmap.CompressFormat.JPEG, 100, os);
+            os.flush();
+
+        } catch (FileNotFoundException e) {
+            SmartLog.e(TAG, e.getMessage());
+        } catch (IOException e) {
+            SmartLog.e(TAG, e.getMessage());
+        }finally {
+            try {
+                if(os != null) {
+                    os.close();
+                }
+            }catch (IOException e){
+                SmartLog.e(TAG, e.getMessage());
+            }
+        }
+        if(file == null){
+            return;
+        }
+        if(imageUtilCallBack != null) {
+            imageUtilCallBack.callSavePath(file.getAbsolutePath());
+        }
+        // Gallery refresh.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            String path = null;
+            try {
+                path = file.getCanonicalPath();
+            } catch (IOException e) {
+                SmartLog.e(TAG, e.getMessage());
+            }
+            MediaScannerConnection.scanFile(this.context, new String[]{path}, null,
+                    new MediaScannerConnection.OnScanCompletedListener() {
+                        @Override
+                        public void onScanCompleted(String path, Uri uri) {
+                            Intent mediaScanIntent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
+                            mediaScanIntent.setData(uri);
+                            ImageUtils.this.context.sendBroadcast(mediaScanIntent);
+                        }
+                    });
+        } else {
+            String relationDir = file.getParent();
+            File file1 = new File(relationDir);
+            this.context.sendBroadcast(new Intent(Intent.ACTION_MEDIA_MOUNTED, Uri.fromFile(file1.getAbsoluteFile())));
+        }
+    }
+
+    /**
+     * Compare the size of the two pictures.
+     *
+     * @param foregroundBitmap the first bitmap
+     * @param backgroundBitmap the second bitmap
+     * @return true: same size; false: not.
+     */
+    public static boolean equalImageSize(Bitmap foregroundBitmap, Bitmap backgroundBitmap) {
+        return backgroundBitmap.getHeight() == foregroundBitmap.getHeight() && backgroundBitmap.getWidth() == foregroundBitmap.getWidth();
+    }
+
+    /**
+     * Scale background (background picture) size to foreground (foreground picture) size.
+     *
+     * @param foregroundBitmap foreground picture
+     * @param backgroundBitmap background picture
+     * @return A background image that is the same size as the foreground image.
+     */
+    public static Bitmap resizeImageToForegroundImage(Bitmap foregroundBitmap, Bitmap backgroundBitmap) {
+        float scaleWidth = ((float) foregroundBitmap.getWidth() / backgroundBitmap.getWidth());
+        float scaleHeight = ((float) foregroundBitmap.getHeight() / backgroundBitmap.getHeight());
+        Matrix matrix = new Matrix();
+        matrix.postScale(scaleWidth, scaleHeight);
+
+        backgroundBitmap = Bitmap.createBitmap(backgroundBitmap, 0, 0, backgroundBitmap.getWidth(), backgroundBitmap.getHeight(), matrix, true);
+        return backgroundBitmap;
+    }
+}
diff --git a/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/util/SharedPreferencesUtil.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/util/SharedPreferencesUtil.java
new file mode 100644
index 0000000..eedd7b9
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/util/SharedPreferencesUtil.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.mlkit.sample.util;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+public class SharedPreferencesUtil {
+    public static final String TAG = "SharedPreferencesUtil";
+    private SharedPreferences mPreferences;
+    private SharedPreferences.Editor mEditor;
+    private static SharedPreferencesUtil mSharedPreferencesUtil;
+
+
+    public SharedPreferencesUtil(Context context) {
+        mPreferences = context.getSharedPreferences(TAG, Context.MODE_PRIVATE);
+        mEditor = mPreferences.edit();
+    }
+
+    public static SharedPreferencesUtil getInstance(Context context) {
+        if (mSharedPreferencesUtil == null) {
+            synchronized (SharedPreferencesUtil.class) {
+                if(mSharedPreferencesUtil == null) {
+                    mSharedPreferencesUtil = new SharedPreferencesUtil(context);
+                }
+            }
+        }
+        return mSharedPreferencesUtil;
+    }
+
+    public void putIntValue(String key, int value) {
+        mEditor.putInt(key, value);
+        mEditor.commit();
+    }
+
+    public int getIntValue(String key) {
+        return mPreferences.getInt(key, -1);
+    }
+}
diff --git a/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/views/SwitchButton.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/views/SwitchButton.java
new file mode 100644
index 0000000..11bb039
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/views/SwitchButton.java
@@ -0,0 +1,116 @@
+/**
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.mlkit.sample.views;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+
+import com.mlkit.sample.R;
+
+/**
+ * Custom switch controls
+ */
+
+public class SwitchButton extends View {
+    private Bitmap mSwitchIcon;
+
+    private int mSwitchIconWidth;
+
+    private int mSwitchIconXPision;
+
+    private boolean mSwitchButtonCurrentState = false;
+
+    private Paint mPaint;
+
+    private OnSwitchButtonStateChangeListener mListener;
+
+    public SwitchButton(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        this.initView();
+    }
+
+    public void setCurrentState(boolean currentState) {
+        this.mSwitchButtonCurrentState = currentState;
+    }
+
+    private void initView() {
+        this.mSwitchIcon = BitmapFactory.decodeResource(this.getResources(), R.drawable.swich_slider_new);
+        this.mSwitchIconWidth = this.mSwitchIcon.getWidth();
+        this.mPaint = new Paint();
+        this.mPaint.setStyle(Paint.Style.FILL);
+        this.mPaint.setAntiAlias(true);
+        this.mPaint.setStrokeWidth(2);
+        // init value
+        this.mSwitchIconXPision = 0;
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        this.setMeasuredDimension(this.mSwitchIconWidth * 2, this.mSwitchIconWidth);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        RectF re3 = new RectF(0, 0, this.mSwitchIconWidth * 2, this.mSwitchIconWidth);
+        if (this.mSwitchButtonCurrentState) {
+            this.mPaint.setColor(this.getResources().getColor(R.color.button_background));
+            this.mSwitchIconXPision = this.mSwitchIconWidth - 1;
+        } else {
+            this.mPaint.setColor(this.getResources().getColor(R.color.white));
+            this.mSwitchIconXPision = 0;
+        }
+        canvas.drawRoundRect(re3, this.mSwitchIconWidth / 2.0f, this.mSwitchIconWidth / 2.0f, this.mPaint);
+        canvas.drawBitmap(this.mSwitchIcon, this.mSwitchIconXPision, 1.5f, null);
+    }
+
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        if (event.getAction() == MotionEvent.ACTION_UP) {
+            this.mSwitchButtonCurrentState = !this.mSwitchButtonCurrentState;
+            this.mListener.onSwitchButtonStateChange(this.mSwitchButtonCurrentState);
+        }
+        this.invalidate();
+        return true;
+
+    }
+
+    /**
+     * Set up listener
+     *
+     * @param listener
+     */
+    public void setOnSwitchButtonStateChangeListener(OnSwitchButtonStateChangeListener listener) {
+        this.mListener = listener;
+    }
+
+    public interface OnSwitchButtonStateChangeListener {
+        /**
+         * Switch state change callback method
+         */
+        void onSwitchButtonStateChange(boolean state);
+    }
+}
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/views/color/ColorSelector.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/views/color/ColorSelector.java
similarity index 98%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/views/color/ColorSelector.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/views/color/ColorSelector.java
index 17b2f31..1a7aca4 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/views/color/ColorSelector.java
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/views/color/ColorSelector.java
@@ -118,8 +118,8 @@ public ColorSelector(Context context, @Nullable AttributeSet attrs, int defStyle
 
         this.mCurrentX = this.mCurrentY = Integer.MAX_VALUE;
 
-        final TypedArray array = context.getTheme().obtainStyledAttributes(attrs, R.styleable.ColorSelector, defStyleAttr, 0);
-        this.mIndicatorColor = array.getColor(R.styleable.ColorSelector_indicatorColor, Color.WHITE);
+        final TypedArray array = context.getTheme().obtainStyledAttributes(attrs, com.mlkit.sample.R.styleable.ColorSelector, defStyleAttr, 0);
+        this.mIndicatorColor = array.getColor(com.mlkit.sample.R.styleable.ColorSelector_indicatorColor, Color.WHITE);
         array.recycle();
     }
 
diff --git a/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/views/graphic/BaseGraphic.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/views/graphic/BaseGraphic.java
new file mode 100644
index 0000000..bdd59d2
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/views/graphic/BaseGraphic.java
@@ -0,0 +1,52 @@
+/**
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.mlkit.sample.views.graphic;
+
+import android.graphics.Canvas;
+
+import com.mlkit.sample.views.overlay.GraphicOverlay;
+import com.huawei.hms.mlsdk.common.LensEngine;
+
+public abstract class BaseGraphic {
+    private GraphicOverlay graphicOverlay;
+
+    public BaseGraphic(GraphicOverlay overlay) {
+        this.graphicOverlay = overlay;
+    }
+
+    public abstract void draw(Canvas canvas);
+
+    public float scaleX(float x) {
+        return x * this.graphicOverlay.getWidthScaleValue();
+    }
+
+    public float scaleY(float y) {
+        return y * this.graphicOverlay.getHeightScaleValue();
+    }
+
+    public float translateX(float x) {
+        if (this.graphicOverlay.getCameraFacing() == LensEngine.FRONT_LENS) {
+            return this.graphicOverlay.getWidth() - this.scaleX(x);
+        } else {
+            return this.scaleX(x);
+        }
+    }
+
+    public float translateY(float y) {
+        return this.scaleY(y);
+    }
+}
diff --git a/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/views/graphic/CameraImageGraphic.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/views/graphic/CameraImageGraphic.java
new file mode 100644
index 0000000..a01d11d
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/views/graphic/CameraImageGraphic.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.mlkit.sample.views.graphic;
+
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+
+import com.mlkit.sample.views.overlay.GraphicOverlay;
+
+public class CameraImageGraphic extends BaseGraphic {
+
+    private final Bitmap bitmap;
+
+    private boolean isFill = true;
+
+    public CameraImageGraphic(GraphicOverlay overlay, Bitmap bitmap) {
+        super(overlay);
+        this.bitmap = bitmap;
+    }
+
+    public CameraImageGraphic(GraphicOverlay overlay, Bitmap bitmap, boolean isFill) {
+        super(overlay);
+        this.bitmap = bitmap;
+        this.isFill = isFill;
+    }
+
+    @Override
+    public void draw(Canvas canvas) {
+        int width;
+        int height;
+        if (this.isFill) {
+            width = canvas.getWidth();
+            height = canvas.getHeight();
+        } else {
+            width = this.bitmap.getWidth();
+            height = this.bitmap.getHeight();
+        }
+        canvas.drawBitmap(this.bitmap, null, new Rect(0, 0, width, height), null);
+    }
+}
+
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/views/graphic/LocalFaceGraphic.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/views/graphic/LocalFaceGraphic.java
similarity index 100%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/views/graphic/LocalFaceGraphic.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/views/graphic/LocalFaceGraphic.java
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/views/graphic/LocalImageClassificationGraphic.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/views/graphic/LocalImageClassificationGraphic.java
similarity index 100%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/views/graphic/LocalImageClassificationGraphic.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/views/graphic/LocalImageClassificationGraphic.java
index a44cb5d..9f75261 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/views/graphic/LocalImageClassificationGraphic.java
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/views/graphic/LocalImageClassificationGraphic.java
@@ -21,9 +21,9 @@
 import android.graphics.Color;
 import android.graphics.Paint;
 
+import com.huawei.hms.mlsdk.classification.MLImageClassification;
 import com.mlkit.sample.util.CommonUtils;
 import com.mlkit.sample.views.overlay.GraphicOverlay;
-import com.huawei.hms.mlsdk.classification.MLImageClassification;
 
 import java.util.List;
 
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/views/graphic/LocalObjectGraphic.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/views/graphic/LocalObjectGraphic.java
similarity index 100%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/views/graphic/LocalObjectGraphic.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/views/graphic/LocalObjectGraphic.java
index 06c0742..3ab339e 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/views/graphic/LocalObjectGraphic.java
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/views/graphic/LocalObjectGraphic.java
@@ -22,8 +22,8 @@
 import android.graphics.Paint.Style;
 import android.graphics.RectF;
 
-import com.mlkit.sample.views.overlay.GraphicOverlay;
 import com.huawei.hms.mlsdk.objects.MLObject;
+import com.mlkit.sample.views.overlay.GraphicOverlay;
 
 public class LocalObjectGraphic extends BaseGraphic {
 
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/views/graphic/RemoteImageClassificationGraphic.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/views/graphic/RemoteImageClassificationGraphic.java
similarity index 100%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/views/graphic/RemoteImageClassificationGraphic.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/views/graphic/RemoteImageClassificationGraphic.java
diff --git a/MLKit-Sample/app/src/main/java/com/mlkit/sample/views/graphic/RemoteLandmarkGraphic.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/views/graphic/RemoteLandmarkGraphic.java
similarity index 100%
rename from MLKit-Sample/app/src/main/java/com/mlkit/sample/views/graphic/RemoteLandmarkGraphic.java
rename to MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/views/graphic/RemoteLandmarkGraphic.java
index 1a0c2a1..1f8553a 100644
--- a/MLKit-Sample/app/src/main/java/com/mlkit/sample/views/graphic/RemoteLandmarkGraphic.java
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/views/graphic/RemoteLandmarkGraphic.java
@@ -23,9 +23,9 @@
 import android.graphics.Rect;
 import android.graphics.RectF;
 
-import com.mlkit.sample.views.overlay.GraphicOverlay;
 import com.huawei.hms.mlsdk.common.MLCoordinate;
 import com.huawei.hms.mlsdk.landmark.MLRemoteLandmark;
+import com.mlkit.sample.views.overlay.GraphicOverlay;
 
 public class RemoteLandmarkGraphic extends BaseGraphic {
 
diff --git a/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/views/overlay/GraphicOverlay.java b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/views/overlay/GraphicOverlay.java
new file mode 100644
index 0000000..74a1507
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/java/com/mlkit/sample/views/overlay/GraphicOverlay.java
@@ -0,0 +1,97 @@
+/**
+ *  Copyright 2018 Google LLC
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.mlkit.sample.views.overlay;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.util.AttributeSet;
+import android.view.View;
+
+import com.mlkit.sample.camera.CameraConfiguration;
+import com.mlkit.sample.views.graphic.BaseGraphic;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class GraphicOverlay extends View {
+    private final Object lock = new Object();
+    private int previewWidth;
+    private int previewHeight;
+    private float widthScaleValue = 1.0f;
+    private float heightScaleValue = 1.0f;
+    private int cameraFacing = CameraConfiguration.CAMERA_FACING_BACK;
+    private final List<BaseGraphic> graphics = new ArrayList<>();
+
+    public GraphicOverlay(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public void clear() {
+        synchronized (this.lock) {
+            this.graphics.clear();
+        }
+        this.postInvalidate();
+    }
+
+    public void addGraphic(BaseGraphic graphic) {
+        synchronized (this.lock) {
+            this.graphics.add(graphic);
+        }
+    }
+
+    public void removeGraphic(BaseGraphic graphic) {
+        synchronized (this.lock) {
+            this.graphics.remove(graphic);
+        }
+        this.postInvalidate();
+    }
+
+    public void setCameraInfo(int width, int height, int facing) {
+        synchronized (this.lock) {
+            this.previewWidth = width;
+            this.previewHeight = height;
+            this.cameraFacing = facing;
+        }
+        this.postInvalidate();
+    }
+
+    public int getCameraFacing() {
+        return this.cameraFacing;
+    }
+
+    public float getWidthScaleValue() {
+        return this.widthScaleValue;
+    }
+
+    public float getHeightScaleValue() {
+        return this.heightScaleValue;
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        synchronized (this.lock) {
+            if ((this.previewWidth != 0) && (this.previewHeight != 0)) {
+                this.widthScaleValue = (float) canvas.getWidth() / (float) this.previewWidth;
+                this.heightScaleValue = (float) canvas.getHeight() / (float) this.previewHeight;
+            }
+            for (BaseGraphic graphic : this.graphics) {
+                graphic.draw(canvas);
+            }
+        }
+    }
+}
diff --git a/MLKit-Sample/module-vision/src/main/res/anim/anim_in.xml b/MLKit-Sample/module-vision/src/main/res/anim/anim_in.xml
new file mode 100644
index 0000000..125637b
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/res/anim/anim_in.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:fromYDelta="100%"
+        android:toYDelta="0"
+        android:duration="300"
+        />
+</set>
\ No newline at end of file
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/add_image.png b/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/add_image.png
new file mode 100644
index 0000000..3dc1e52
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/add_image.png differ
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/black_back.png b/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/black_back.png
new file mode 100644
index 0000000..7fca54c
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/black_back.png differ
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/facingswitch.png b/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/facingswitch.png
new file mode 100644
index 0000000..fa661dd
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/facingswitch.png differ
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/facingswitch_stroke.png b/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/facingswitch_stroke.png
new file mode 100644
index 0000000..fd36298
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/facingswitch_stroke.png differ
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/icon.png b/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/icon.png
new file mode 100644
index 0000000..0c863b1
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/icon.png differ
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/icon_cut.png b/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/icon_cut.png
new file mode 100644
index 0000000..ba23212
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/icon_cut.png differ
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/icon_new.png b/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/icon_new.png
new file mode 100644
index 0000000..4d43248
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/icon_new.png differ
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/icons_background.png b/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/icons_background.png
new file mode 100644
index 0000000..76f1bdd
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/icons_background.png differ
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/take_picture_solid.png b/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/take_picture_solid.png
new file mode 100644
index 0000000..0672a10
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/take_picture_solid.png differ
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/take_picture_stroke.png b/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/take_picture_stroke.png
new file mode 100644
index 0000000..97f9536
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/take_picture_stroke.png differ
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/white_back.png b/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/white_back.png
new file mode 100644
index 0000000..86903b2
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/drawable-xxhdpi/white_back.png differ
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxxhdpi/icon_classification.png b/MLKit-Sample/module-vision/src/main/res/drawable-xxxhdpi/icon_classification.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxxhdpi/icon_classification.png
rename to MLKit-Sample/module-vision/src/main/res/drawable-xxxhdpi/icon_classification.png
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxxhdpi/icon_face.png b/MLKit-Sample/module-vision/src/main/res/drawable-xxxhdpi/icon_face.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxxhdpi/icon_face.png
rename to MLKit-Sample/module-vision/src/main/res/drawable-xxxhdpi/icon_face.png
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxxhdpi/icon_landmark.png b/MLKit-Sample/module-vision/src/main/res/drawable-xxxhdpi/icon_landmark.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxxhdpi/icon_landmark.png
rename to MLKit-Sample/module-vision/src/main/res/drawable-xxxhdpi/icon_landmark.png
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable-xxxhdpi/icon_logo.png b/MLKit-Sample/module-vision/src/main/res/drawable-xxxhdpi/icon_logo.png
new file mode 100644
index 0000000..f41e9ea
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/drawable-xxxhdpi/icon_logo.png differ
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxxhdpi/icon_object.png b/MLKit-Sample/module-vision/src/main/res/drawable-xxxhdpi/icon_object.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxxhdpi/icon_object.png
rename to MLKit-Sample/module-vision/src/main/res/drawable-xxxhdpi/icon_object.png
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxxhdpi/icon_segmentation.png b/MLKit-Sample/module-vision/src/main/res/drawable-xxxhdpi/icon_segmentation.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxxhdpi/icon_segmentation.png
rename to MLKit-Sample/module-vision/src/main/res/drawable-xxxhdpi/icon_segmentation.png
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxxhdpi/icon_shopping.png b/MLKit-Sample/module-vision/src/main/res/drawable-xxxhdpi/icon_shopping.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxxhdpi/icon_shopping.png
rename to MLKit-Sample/module-vision/src/main/res/drawable-xxxhdpi/icon_shopping.png
diff --git a/MLKit-Sample/app/src/main/res/drawable-xxxhdpi/icons_save.png b/MLKit-Sample/module-vision/src/main/res/drawable-xxxhdpi/icons_save.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable-xxxhdpi/icons_save.png
rename to MLKit-Sample/module-vision/src/main/res/drawable-xxxhdpi/icons_save.png
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable-xxxhdpi/swich_slider_new.png b/MLKit-Sample/module-vision/src/main/res/drawable-xxxhdpi/swich_slider_new.png
new file mode 100644
index 0000000..a298200
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/drawable-xxxhdpi/swich_slider_new.png differ
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable/app_loading001.webp b/MLKit-Sample/module-vision/src/main/res/drawable/app_loading001.webp
new file mode 100644
index 0000000..ba32b9f
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/drawable/app_loading001.webp differ
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable/app_loading002.webp b/MLKit-Sample/module-vision/src/main/res/drawable/app_loading002.webp
new file mode 100644
index 0000000..e1c63d4
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/drawable/app_loading002.webp differ
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable/app_loading003.webp b/MLKit-Sample/module-vision/src/main/res/drawable/app_loading003.webp
new file mode 100644
index 0000000..c9d9f51
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/drawable/app_loading003.webp differ
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable/app_loading004.webp b/MLKit-Sample/module-vision/src/main/res/drawable/app_loading004.webp
new file mode 100644
index 0000000..6e1abe3
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/drawable/app_loading004.webp differ
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable/app_loading005.webp b/MLKit-Sample/module-vision/src/main/res/drawable/app_loading005.webp
new file mode 100644
index 0000000..58f4b34
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/drawable/app_loading005.webp differ
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable/app_loading006.webp b/MLKit-Sample/module-vision/src/main/res/drawable/app_loading006.webp
new file mode 100644
index 0000000..27d3907
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/drawable/app_loading006.webp differ
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable/app_loading007.webp b/MLKit-Sample/module-vision/src/main/res/drawable/app_loading007.webp
new file mode 100644
index 0000000..b8988cc
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/drawable/app_loading007.webp differ
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable/app_loading008.webp b/MLKit-Sample/module-vision/src/main/res/drawable/app_loading008.webp
new file mode 100644
index 0000000..ccd36b4
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/drawable/app_loading008.webp differ
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable/app_loading009.webp b/MLKit-Sample/module-vision/src/main/res/drawable/app_loading009.webp
new file mode 100644
index 0000000..f27ce24
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/drawable/app_loading009.webp differ
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable/app_loading010.webp b/MLKit-Sample/module-vision/src/main/res/drawable/app_loading010.webp
new file mode 100644
index 0000000..46d7cfe
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/drawable/app_loading010.webp differ
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable/app_loading011.webp b/MLKit-Sample/module-vision/src/main/res/drawable/app_loading011.webp
new file mode 100644
index 0000000..4db54c2
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/drawable/app_loading011.webp differ
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable/app_loading012.webp b/MLKit-Sample/module-vision/src/main/res/drawable/app_loading012.webp
new file mode 100644
index 0000000..850df44
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/drawable/app_loading012.webp differ
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable/app_loading013.webp b/MLKit-Sample/module-vision/src/main/res/drawable/app_loading013.webp
new file mode 100644
index 0000000..6645005
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/drawable/app_loading013.webp differ
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable/app_loading014.webp b/MLKit-Sample/module-vision/src/main/res/drawable/app_loading014.webp
new file mode 100644
index 0000000..033d0aa
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/drawable/app_loading014.webp differ
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable/button_circle_background.xml b/MLKit-Sample/module-vision/src/main/res/drawable/button_circle_background.xml
new file mode 100644
index 0000000..70f7fc5
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/res/drawable/button_circle_background.xml
@@ -0,0 +1,9 @@
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid
+        android:color="@color/white"/>
+    <size
+        android:width="30dp"
+        android:height="30dp"/>
+</shape>
\ No newline at end of file
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable/dialog_background.xml b/MLKit-Sample/module-vision/src/main/res/drawable/dialog_background.xml
new file mode 100644
index 0000000..c6cf2ee
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/res/drawable/dialog_background.xml
@@ -0,0 +1,9 @@
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid
+        android:color="@color/primary_background"/>
+    <corners
+        android:topLeftRadius="10dp"
+        android:topRightRadius="10dp"></corners>
+</shape>
\ No newline at end of file
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable/logo_circle_background.xml b/MLKit-Sample/module-vision/src/main/res/drawable/logo_circle_background.xml
new file mode 100644
index 0000000..2a385d9
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/res/drawable/logo_circle_background.xml
@@ -0,0 +1,9 @@
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid
+        android:color="@color/primary_background"/>
+    <size
+        android:width="200dp"
+        android:height="200dp"/>
+</shape>
\ No newline at end of file
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable/progress_drawable_white.xml b/MLKit-Sample/module-vision/src/main/res/drawable/progress_drawable_white.xml
new file mode 100644
index 0000000..e33a948
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/res/drawable/progress_drawable_white.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animation-list android:oneshot="false"
+                xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:duration="83" android:drawable="@drawable/app_loading001" />
+    <item android:duration="83" android:drawable="@drawable/app_loading002" />
+    <item android:duration="83" android:drawable="@drawable/app_loading003" />
+    <item android:duration="83" android:drawable="@drawable/app_loading004" />
+    <item android:duration="83" android:drawable="@drawable/app_loading005" />
+    <item android:duration="83" android:drawable="@drawable/app_loading006" />
+    <item android:duration="83" android:drawable="@drawable/app_loading007" />
+    <item android:duration="83" android:drawable="@drawable/app_loading008" />
+    <item android:duration="83" android:drawable="@drawable/app_loading009" />
+    <item android:duration="83" android:drawable="@drawable/app_loading010" />
+    <item android:duration="83" android:drawable="@drawable/app_loading011" />
+    <item android:duration="83" android:drawable="@drawable/app_loading012" />
+    <item android:duration="83" android:drawable="@drawable/app_loading013" />
+    <item android:duration="83" android:drawable="@drawable/app_loading014" />
+</animation-list>
diff --git a/MLKit-Sample/app/src/main/res/drawable/roundbutton.xml b/MLKit-Sample/module-vision/src/main/res/drawable/roundbutton.xml
similarity index 100%
rename from MLKit-Sample/app/src/main/res/drawable/roundbutton.xml
rename to MLKit-Sample/module-vision/src/main/res/drawable/roundbutton.xml
diff --git a/MLKit-Sample/module-vision/src/main/res/drawable/text_selector.xml b/MLKit-Sample/module-vision/src/main/res/drawable/text_selector.xml
new file mode 100644
index 0000000..8eac501
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/res/drawable/text_selector.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_selected="true" android:color="@color/button_background">
+    </item>
+
+    <item
+        android:state_pressed="true" android:color="@color/button_background">
+    </item>
+
+    <item
+        android:color="@color/secondary_text_color">
+    </item>
+
+</selector>
\ No newline at end of file
diff --git a/MLKit-Sample/app/src/main/res/layout-land/activity_face_detection.xml b/MLKit-Sample/module-vision/src/main/res/layout-land/activity_face_detection.xml
similarity index 98%
rename from MLKit-Sample/app/src/main/res/layout-land/activity_face_detection.xml
rename to MLKit-Sample/module-vision/src/main/res/layout-land/activity_face_detection.xml
index 33a5c53..4ec424c 100644
--- a/MLKit-Sample/app/src/main/res/layout-land/activity_face_detection.xml
+++ b/MLKit-Sample/module-vision/src/main/res/layout-land/activity_face_detection.xml
@@ -45,7 +45,7 @@
             android:layout_height="wrap_content"
             android:gravity="center"
             android:layout_toLeftOf="@+id/switch_button_view"
-            android:text="@string/more_face_datas"
+            android:text="@string/more_face_data"
             android:layout_centerVertical="true"
             android:textColor="@color/white"
             android:layout_marginRight="10dp"
diff --git a/MLKit-Sample/app/src/main/res/layout-land/activity_image_classification.xml b/MLKit-Sample/module-vision/src/main/res/layout-land/activity_image_classification.xml
similarity index 100%
rename from MLKit-Sample/app/src/main/res/layout-land/activity_image_classification.xml
rename to MLKit-Sample/module-vision/src/main/res/layout-land/activity_image_classification.xml
diff --git a/MLKit-Sample/app/src/main/res/layout-land/activity_object_detection.xml b/MLKit-Sample/module-vision/src/main/res/layout-land/activity_object_detection.xml
similarity index 100%
rename from MLKit-Sample/app/src/main/res/layout-land/activity_object_detection.xml
rename to MLKit-Sample/module-vision/src/main/res/layout-land/activity_object_detection.xml
diff --git a/MLKit-Sample/module-vision/src/main/res/layout-land/activity_start.xml b/MLKit-Sample/module-vision/src/main/res/layout-land/activity_start.xml
new file mode 100644
index 0000000..17b4f16
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/res/layout-land/activity_start.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#f2f2f2"
+    android:fitsSystemWindows="true">
+
+    <RelativeLayout
+        android:id="@+id/logo"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:layout_alignParentTop="true"
+        android:background="#003853"
+        android:scaleType="fitXY">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="200dp"
+            android:text="MACHINE  LEARNING"
+            android:textColor="@android:color/white"
+            android:textSize="25sp"></TextView>
+
+        <ImageView
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="50dp"
+            android:src="@drawable/icon_logo"></ImageView>
+    </RelativeLayout>
+
+    <ImageView
+        android:id="@+id/setting_img"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="20dp"
+        android:layout_marginRight="20dp"
+        android:background="@mipmap/icon_setting" />
+
+    <GridView
+        android:id="@+id/gridview"
+        android:layout_marginLeft="60dp"
+        android:layout_marginRight="60dp"
+        android:layout_marginTop="30dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/logo"
+        android:verticalSpacing="40dp"
+        android:listSelector="@android:color/transparent"
+        android:numColumns="4">
+    </GridView>
+
+</RelativeLayout>
diff --git a/MLKit-Sample/app/src/main/res/layout-land/activity_take_photo.xml b/MLKit-Sample/module-vision/src/main/res/layout-land/activity_take_photo.xml
similarity index 100%
rename from MLKit-Sample/app/src/main/res/layout-land/activity_take_photo.xml
rename to MLKit-Sample/module-vision/src/main/res/layout-land/activity_take_photo.xml
diff --git a/MLKit-Sample/app/src/main/res/layout/activity_face_detection.xml b/MLKit-Sample/module-vision/src/main/res/layout/activity_face_detection.xml
similarity index 83%
rename from MLKit-Sample/app/src/main/res/layout/activity_face_detection.xml
rename to MLKit-Sample/module-vision/src/main/res/layout/activity_face_detection.xml
index edb8f7d..1cf86e0 100644
--- a/MLKit-Sample/app/src/main/res/layout/activity_face_detection.xml
+++ b/MLKit-Sample/module-vision/src/main/res/layout/activity_face_detection.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#000"
+    android:background="@color/black"
     android:fitsSystemWindows="true"
     android:keepScreenOn="true"
     android:orientation="vertical">
@@ -12,8 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginBottom="0dp">
+        android:layout_alignParentTop="true">
 
         <com.mlkit.sample.views.overlay.GraphicOverlay
             android:id="@+id/face_overlay"
@@ -26,10 +25,10 @@
 
     <ImageButton
         android:id="@+id/face_back"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_marginLeft="15dp"
-        android:layout_marginTop="15dp"
+        android:layout_width="@dimen/icon_back_width"
+        android:layout_height="@dimen/icon_back_height"
+        android:layout_marginLeft="@dimen/icon_back_margin"
+        android:layout_marginTop="@dimen/icon_back_margin"
         android:background="@drawable/button_circle_background"
         android:src="@drawable/black_back" />
 
@@ -45,7 +44,7 @@
             android:layout_height="wrap_content"
             android:gravity="center"
             android:layout_toLeftOf="@+id/switch_button_view"
-            android:text="@string/more_face_datas"
+            android:text="@string/more_face_data"
             android:layout_centerVertical="true"
             android:textColor="@color/white"
             android:layout_marginRight="10dp"
@@ -53,8 +52,8 @@
 
         <com.mlkit.sample.views.SwitchButton
             android:id="@+id/switch_button_view"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true" />
 
diff --git a/MLKit-Sample/app/src/main/res/layout/activity_image_classification.xml b/MLKit-Sample/module-vision/src/main/res/layout/activity_image_classification.xml
similarity index 83%
rename from MLKit-Sample/app/src/main/res/layout/activity_image_classification.xml
rename to MLKit-Sample/module-vision/src/main/res/layout/activity_image_classification.xml
index 5354747..6730a76 100644
--- a/MLKit-Sample/app/src/main/res/layout/activity_image_classification.xml
+++ b/MLKit-Sample/module-vision/src/main/res/layout/activity_image_classification.xml
@@ -25,20 +25,20 @@
 
     <ImageButton
         android:id="@+id/classification_back"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_marginLeft="15dp"
-        android:layout_marginTop="15dp"
+        android:layout_width="@dimen/icon_back_width"
+        android:layout_height="@dimen/icon_back_height"
+        android:layout_marginLeft="@dimen/icon_back_margin"
+        android:layout_marginTop="@dimen/icon_back_margin"
         android:background="@drawable/button_circle_background"
         android:src="@drawable/black_back" />
 
     <ImageButton
         android:id="@+id/imageSwitch"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
+        android:layout_width="@dimen/icon_back_width"
+        android:layout_height="@dimen/icon_back_height"
         android:layout_marginRight="20dp"
         android:layout_alignParentRight="true"
-        android:layout_marginTop="15dp"
+        android:layout_marginTop="@dimen/icon_back_margin"
         android:background="@drawable/button_circle_background"
         android:tint="@color/secondary_text_color"
         android:src="@mipmap/album_round" />
diff --git a/MLKit-Sample/app/src/main/res/layout/activity_image_segmentation.xml b/MLKit-Sample/module-vision/src/main/res/layout/activity_image_segmentation.xml
similarity index 87%
rename from MLKit-Sample/app/src/main/res/layout/activity_image_segmentation.xml
rename to MLKit-Sample/module-vision/src/main/res/layout/activity_image_segmentation.xml
index 9e6db86..e7ce673 100644
--- a/MLKit-Sample/app/src/main/res/layout/activity_image_segmentation.xml
+++ b/MLKit-Sample/module-vision/src/main/res/layout/activity_image_segmentation.xml
@@ -6,9 +6,8 @@
     android:orientation="vertical"
     android:fitsSystemWindows="true"
     android:background="#ffffff"
-    tools:context=".activity.imgseg.ImageSegmentationActivity">
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
+    tools:context=".activity.ImageSegmentationActivity">
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/toolbar_height"
         android:minHeight="?attr/actionBarSize">
@@ -20,19 +19,10 @@
             android:layout_centerVertical="true"
             android:drawableLeft="@drawable/black_back"
             android:text="@string/back"
+            android:padding="@dimen/icon_back_margin"
             android:textColor="@color/secondary_text_color"
-            android:textSize="14sp" />
-
-        <TextView
-            android:id="@+id/text"
-            android:visibility="gone"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="@string/image_segmentation_s"
-            android:textColor="@color/secondary_text_color"
-            android:textSize="17sp" />
-    </androidx.appcompat.widget.Toolbar>
+            android:textSize="@dimen/toolbar_back_size" />
+    </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -52,7 +42,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/background_substitution"
-                    android:textSize="15sp"
+                    android:textSize="@dimen/tab_title_text_size"
                     android:textColor="@color/button_background"
                     android:layout_centerInParent="true"
                     />
@@ -82,7 +72,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/cutout"
-                    android:textSize="15sp"
+                    android:textSize="@dimen/tab_title_text_size"
                     android:textColor="@color/secondary_text_color"
                     android:layout_centerInParent="true"
                     />
@@ -114,7 +104,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/image_segmentation"
-                    android:textSize="15sp"
+                    android:textSize="@dimen/tab_title_text_size"
                     android:textColor="@color/secondary_text_color"
                     android:layout_centerInParent="true"
                     />
diff --git a/MLKit-Sample/app/src/main/res/layout/activity_load_photo.xml b/MLKit-Sample/module-vision/src/main/res/layout/activity_load_photo.xml
similarity index 64%
rename from MLKit-Sample/app/src/main/res/layout/activity_load_photo.xml
rename to MLKit-Sample/module-vision/src/main/res/layout/activity_load_photo.xml
index 40f45b6..db28a6b 100644
--- a/MLKit-Sample/app/src/main/res/layout/activity_load_photo.xml
+++ b/MLKit-Sample/module-vision/src/main/res/layout/activity_load_photo.xml
@@ -7,31 +7,12 @@
     android:fitsSystemWindows="true"
     android:keepScreenOn="true">
 
-
-    <!--    <LinearLayout-->
-    <!--        android:layout_width="45dp"-->
-    <!--        android:layout_height="45dp"-->
-    <!--        android:layout_below="@+id/toolbar"-->
-    <!--        android:id="@+id/linear_save"-->
-    <!--        android:layout_alignParentRight="true"-->
-    <!--        android:background="@color/white">-->
-    <!--ImageView
-        android:layout_width="35dp"
-        android:layout_height="35dp"
-        android:layout_gravity="center"
-        android:src="@drawable/icons_save"
-        android:layout_below="@+id/toolbar"
-        android:layout_alignParentRight="true"
-        android:tint="@color/black">
-    </ImageView-->
-    <!--    </LinearLayout>-->
-
-
     <RelativeLayout
-        android:layout_alignParentTop="true"
-        android:layout_above="@+id/linear_views"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:layout_above="@+id/linear_views"
+        android:layout_alignParentTop="true">
+
         <ImageView
             android:id="@+id/image_preview"
             android:layout_width="wrap_content"
@@ -53,47 +34,21 @@
 
     <ImageButton
         android:id="@+id/back"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
+        android:layout_width="@dimen/icon_back_width"
+        android:layout_height="@dimen/icon_back_height"
+        android:layout_marginLeft="@dimen/icon_back_margin"
+        android:layout_marginTop="@dimen/icon_back_margin"
         android:background="@drawable/button_circle_background"
-        android:layout_marginTop="15dp"
-        android:layout_marginLeft="15dp"
         android:src="@drawable/black_back" />
 
-
     <LinearLayout
         android:id="@+id/linear_views"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:background="#66ffffff"
+        android:background="@color/white"
         android:orientation="vertical">
 
-        <RelativeLayout
-            android:id="@+id/imageChooser"
-            android:layout_width="match_parent"
-            android:layout_height="35dp"
-            android:layout_above="@+id/line4"
-            android:visibility="gone">
-
-            <ImageView
-                android:layout_width="25dp"
-                android:layout_height="25dp"
-                android:layout_centerVertical="true"
-                android:layout_marginStart="15dp"
-                android:src="@mipmap/album_black"></ImageView>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_marginStart="45dp"
-                android:gravity="center"
-                android:text="选择图片"
-                android:textColor="@color/secondary_text_color"
-                android:textSize="11sp"></TextView>
-        </RelativeLayout>
-
         <RelativeLayout
             android:id="@+id/objectChooser"
             android:layout_width="match_parent"
@@ -107,8 +62,8 @@
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="15dp"
                 android:text="@string/target_object"
-                android:textColor="@color/black_color"
-                android:textSize="13sp" />
+                android:textColor="@color/text_color"
+                android:textSize="@dimen/dialog_text_size" />
 
             <HorizontalScrollView
                 android:id="@+id/scroll_objects"
@@ -141,8 +96,8 @@
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="15dp"
                 android:text="@string/color"
-                android:textColor="@color/black_color"
-                android:textSize="13sp" />
+                android:textColor="@color/text_color"
+                android:textSize="@dimen/dialog_text_size" />
 
             <com.mlkit.sample.views.color.ColorSelector
                 android:id="@+id/color_selector"
diff --git a/MLKit-Sample/app/src/main/res/layout/activity_object_detection.xml b/MLKit-Sample/module-vision/src/main/res/layout/activity_object_detection.xml
similarity index 85%
rename from MLKit-Sample/app/src/main/res/layout/activity_object_detection.xml
rename to MLKit-Sample/module-vision/src/main/res/layout/activity_object_detection.xml
index 9efe1e4..b62f68d 100644
--- a/MLKit-Sample/app/src/main/res/layout/activity_object_detection.xml
+++ b/MLKit-Sample/module-vision/src/main/res/layout/activity_object_detection.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#000"
+    android:background="@color/black"
     android:fitsSystemWindows="true"
     android:keepScreenOn="true"
     android:orientation="vertical">
@@ -26,10 +26,10 @@
 
     <ImageButton
         android:id="@+id/object_back"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_marginLeft="15dp"
-        android:layout_marginTop="15dp"
+        android:layout_width="@dimen/icon_back_width"
+        android:layout_height="@dimen/icon_back_height"
+        android:layout_marginLeft="@dimen/icon_back_margin"
+        android:layout_marginTop="@dimen/icon_back_margin"
         android:background="@drawable/button_circle_background"
         android:src="@drawable/black_back" />
 
diff --git a/MLKit-Sample/module-vision/src/main/res/layout/activity_remote_detection.xml b/MLKit-Sample/module-vision/src/main/res/layout/activity_remote_detection.xml
new file mode 100644
index 0000000..7dc2d2b
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/res/layout/activity_remote_detection.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/black"
+    android:fitsSystemWindows="true"
+    android:keepScreenOn="true">
+
+    <RelativeLayout
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/toolbar_height">
+
+        <ImageButton
+            android:id="@+id/back"
+            android:layout_width="23dp"
+            android:layout_height="23dp"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="15dp"
+            android:background="@drawable/white_back"></ImageButton>
+
+        <TextView
+            android:id="@+id/page_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text="ML Kit"
+            android:textColor="@color/white"
+            android:textSize="17sp"></TextView>
+
+        <Button
+            android:id="@+id/getImageButton"
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="10dp"
+            android:background="@drawable/add_image" />
+    </RelativeLayout>
+
+    <ImageView
+        android:id="@+id/still_preview"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/toolbar"
+        android:layout_centerHorizontal="true"
+        android:scaleType="fitXY"></ImageView>
+
+    <com.mlkit.sample.views.overlay.GraphicOverlay
+        android:id="@+id/still_overlay"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_below="@id/toolbar"
+        android:layout_alignParentBottom="true" />
+</RelativeLayout>
diff --git a/MLKit-Sample/module-vision/src/main/res/layout/activity_setting.xml b/MLKit-Sample/module-vision/src/main/res/layout/activity_setting.xml
new file mode 100644
index 0000000..4470192
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/res/layout/activity_setting.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/primary_background"
+    android:fitsSystemWindows="true"
+    android:orientation="vertical">
+
+    <androidx.appcompat.widget.Toolbar
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/toolbar_height"
+        android:background="@color/white">
+
+        <TextView
+            android:id="@+id/back"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:drawableLeft="@drawable/black_back"
+            android:text="@string/back"
+            android:textColor="@color/secondary_text_color"
+            android:textSize="@dimen/toolbar_back_size" />
+
+        <TextView
+            android:id="@+id/text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/settings"
+            android:textColor="@color/secondary_text_color"
+            android:textSize="@dimen/toolbar_title_size" />
+    </androidx.appcompat.widget.Toolbar>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="10dp"
+        android:background="@color/white"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp">
+
+            <TextView
+                android:id="@+id/versions_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:text="@string/versions"
+                android:textColor="@color/secondary_text_color"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/version"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:text="2.0.0.101"
+                android:textColor="@color/secondary_text_color"
+                android:textSize="14sp" />
+
+        </RelativeLayout>
+
+        <View
+            style="@style/common_line"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp" />
+    </LinearLayout>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/MLKit-Sample/module-vision/src/main/res/layout/activity_start.xml b/MLKit-Sample/module-vision/src/main/res/layout/activity_start.xml
new file mode 100644
index 0000000..2f6c0ec
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/res/layout/activity_start.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/primary_background"
+    android:fitsSystemWindows="true">
+
+    <RelativeLayout
+        android:id="@+id/logo"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/start_logo_height"
+        android:layout_alignParentTop="true"
+        android:background="@color/logo_background"
+        android:scaleType="fitXY">
+
+        <ImageView
+            android:layout_width="150dp"
+            android:layout_height="150dp"
+            android:layout_centerVertical="true"
+            android:layout_toRightOf="@id/title"
+            android:src="@drawable/icon_logo"></ImageView>
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="80dp"
+            android:text="MACHINE\n LEARNING"
+            android:textColor="@color/white"
+            android:textSize="22sp"></TextView>
+
+    </RelativeLayout>
+
+    <ImageView
+        android:layout_width="220dp"
+        android:layout_height="100dp"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="@dimen/start_logo_margin"
+        android:background="@drawable/logo_circle_background"></ImageView>
+
+    <ImageView
+        android:id="@+id/setting_img"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="20dp"
+        android:layout_marginRight="20dp"
+        android:background="@mipmap/icon_setting" />
+
+    <GridView
+        android:id="@+id/gridview"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/logo"
+        android:layout_marginLeft="30dp"
+        android:layout_marginTop="@dimen/start_margin_top"
+        android:layout_marginRight="30dp"
+        android:listSelector="@android:color/transparent"
+        android:numColumns="3"
+        android:verticalSpacing="40dp"></GridView>
+
+</RelativeLayout>
diff --git a/MLKit-Sample/app/src/main/res/layout/activity_still_cut.xml b/MLKit-Sample/module-vision/src/main/res/layout/activity_still_cut.xml
similarity index 97%
rename from MLKit-Sample/app/src/main/res/layout/activity_still_cut.xml
rename to MLKit-Sample/module-vision/src/main/res/layout/activity_still_cut.xml
index 2cd40a7..99a53f9 100644
--- a/MLKit-Sample/app/src/main/res/layout/activity_still_cut.xml
+++ b/MLKit-Sample/module-vision/src/main/res/layout/activity_still_cut.xml
@@ -31,11 +31,11 @@
 
     <ImageButton
         android:id="@+id/back"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
+        android:layout_width="@dimen/icon_back_width"
+        android:layout_height="@dimen/icon_back_height"
         android:background="@drawable/button_circle_background"
-        android:layout_marginTop="15dp"
-        android:layout_marginLeft="15dp"
+        android:layout_marginTop="@dimen/icon_back_margin"
+        android:layout_marginLeft="@dimen/icon_back_margin"
         android:src="@drawable/black_back" />
 
     <LinearLayout
diff --git a/MLKit-Sample/app/src/main/res/layout/activity_take_photo.xml b/MLKit-Sample/module-vision/src/main/res/layout/activity_take_photo.xml
similarity index 93%
rename from MLKit-Sample/app/src/main/res/layout/activity_take_photo.xml
rename to MLKit-Sample/module-vision/src/main/res/layout/activity_take_photo.xml
index 586ce76..1f07405 100644
--- a/MLKit-Sample/app/src/main/res/layout/activity_take_photo.xml
+++ b/MLKit-Sample/module-vision/src/main/res/layout/activity_take_photo.xml
@@ -24,10 +24,10 @@
 
     <ImageButton
         android:id="@+id/back"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_marginLeft="15dp"
-        android:layout_marginTop="15dp"
+        android:layout_width="@dimen/icon_back_width"
+        android:layout_height="@dimen/icon_back_height"
+        android:layout_marginLeft="@dimen/icon_back_margin"
+        android:layout_marginTop="@dimen/icon_back_margin"
         android:background="@drawable/button_circle_background"
         android:src="@drawable/black_back" />
 
diff --git a/MLKit-Sample/module-vision/src/main/res/layout/dialog.xml b/MLKit-Sample/module-vision/src/main/res/layout/dialog.xml
new file mode 100644
index 0000000..22088ab
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/res/layout/dialog.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:gravity="center"
+              android:orientation="vertical"
+              android:padding="16.0dip" >
+
+    <ProgressBar
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:indeterminateDrawable="@drawable/progress_drawable_white" />
+
+    <TextView
+            android:id="@+id/id_tv_loadingmsg"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginTop="8.0dip"
+            android:textColor="@color/secondary_text_color"
+            android:textSize="16.0dip" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/MLKit-Sample/module-vision/src/main/res/layout/dialog_add_picture.xml b/MLKit-Sample/module-vision/src/main/res/layout/dialog_add_picture.xml
new file mode 100644
index 0000000..4b5f59b
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/res/layout/dialog_add_picture.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/dialog_background"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/take_photo"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/start_icon_width"
+        android:gravity="center"
+        android:text="@string/take_photo"
+        android:textColor="@drawable/text_selector"
+        android:textSize="@dimen/dialog_text_size"></TextView>
+
+    <View style="@style/common_line"></View>
+
+    <TextView
+        android:id="@+id/select_image"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/start_icon_width"
+        android:gravity="center"
+        android:text="@string/select_from_album"
+        android:textColor="@drawable/text_selector"
+        android:textSize="@dimen/dialog_text_size"></TextView>
+
+    <View
+        style="@style/common_line"
+        android:layout_height="5dp"></View>
+
+    <TextView
+        android:id="@+id/extend"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/start_icon_width"
+        android:gravity="center"
+        android:text="@string/cancel"
+        android:textColor="@color/color_red_cancel"
+        android:textSize="@dimen/dialog_text_size"></TextView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/MLKit-Sample/app/src/main/res/layout/fragment_bg_change.xml b/MLKit-Sample/module-vision/src/main/res/layout/fragment_bg_change.xml
similarity index 100%
rename from MLKit-Sample/app/src/main/res/layout/fragment_bg_change.xml
rename to MLKit-Sample/module-vision/src/main/res/layout/fragment_bg_change.xml
diff --git a/MLKit-Sample/app/src/main/res/layout/fragment_capture_image.xml b/MLKit-Sample/module-vision/src/main/res/layout/fragment_capture_image.xml
similarity index 95%
rename from MLKit-Sample/app/src/main/res/layout/fragment_capture_image.xml
rename to MLKit-Sample/module-vision/src/main/res/layout/fragment_capture_image.xml
index 49b9194..13e5d71 100644
--- a/MLKit-Sample/app/src/main/res/layout/fragment_capture_image.xml
+++ b/MLKit-Sample/module-vision/src/main/res/layout/fragment_capture_image.xml
@@ -23,7 +23,7 @@
             android:layout_centerHorizontal="true"
             android:layout_marginTop="10dp"
             android:text="@string/click_add_picture"
-            android:textColor="#99000000"
+            android:textColor="@color/text_color"
             android:textSize="14sp" />
     </RelativeLayout>
 </RelativeLayout>
diff --git a/MLKit-Sample/app/src/main/res/layout/fragment_slice_image.xml b/MLKit-Sample/module-vision/src/main/res/layout/fragment_slice_image.xml
similarity index 100%
rename from MLKit-Sample/app/src/main/res/layout/fragment_slice_image.xml
rename to MLKit-Sample/module-vision/src/main/res/layout/fragment_slice_image.xml
diff --git a/MLKit-Sample/module-vision/src/main/res/layout/gridview_item.xml b/MLKit-Sample/module-vision/src/main/res/layout/gridview_item.xml
new file mode 100644
index 0000000..39e6750
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/res/layout/gridview_item.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginTop="100dp">
+
+    <RelativeLayout
+        android:id="@+id/layout_translate"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_centerInParent="true"
+        android:background="@android:color/white"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/image_item"
+            android:layout_width="@dimen/start_icon_width"
+            android:layout_height="@dimen/start_icon_width"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="10dp"
+            android:src="@drawable/icon_face"></ImageView>
+
+        <ImageView
+            android:id="@+id/icon_new"
+            android:layout_width="@dimen/icon_new_width"
+            android:layout_height="@dimen/icon_new_height"
+            android:layout_alignParentEnd="true"
+            android:background="@null"></ImageView>
+
+        <TextView
+            android:id="@+id/text_item"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="5dp"
+            android:gravity="center"
+            android:text="@string/face_detection"
+            android:textColor="@color/secondary_text_color"
+            android:textSize="11sp"></TextView>
+
+    </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/MLKit-Sample/app/src/main/res/layout/imageseg_gridview.xml b/MLKit-Sample/module-vision/src/main/res/layout/imageseg_gridview.xml
similarity index 100%
rename from MLKit-Sample/app/src/main/res/layout/imageseg_gridview.xml
rename to MLKit-Sample/module-vision/src/main/res/layout/imageseg_gridview.xml
diff --git a/MLKit-Sample/app/src/main/res/layout/layout.xml b/MLKit-Sample/module-vision/src/main/res/layout/layout.xml
similarity index 100%
rename from MLKit-Sample/app/src/main/res/layout/layout.xml
rename to MLKit-Sample/module-vision/src/main/res/layout/layout.xml
diff --git a/MLKit-Sample/app/src/main/res/mipmap-xxhdpi/img_001.jpg b/MLKit-Sample/module-vision/src/main/res/mipmap-xxhdpi/img_001.jpg
similarity index 100%
rename from MLKit-Sample/app/src/main/res/mipmap-xxhdpi/img_001.jpg
rename to MLKit-Sample/module-vision/src/main/res/mipmap-xxhdpi/img_001.jpg
diff --git a/MLKit-Sample/app/src/main/res/mipmap-xxhdpi/img_002.jpg b/MLKit-Sample/module-vision/src/main/res/mipmap-xxhdpi/img_002.jpg
similarity index 100%
rename from MLKit-Sample/app/src/main/res/mipmap-xxhdpi/img_002.jpg
rename to MLKit-Sample/module-vision/src/main/res/mipmap-xxhdpi/img_002.jpg
diff --git a/MLKit-Sample/app/src/main/res/mipmap-xxhdpi/img_003.jpg b/MLKit-Sample/module-vision/src/main/res/mipmap-xxhdpi/img_003.jpg
similarity index 100%
rename from MLKit-Sample/app/src/main/res/mipmap-xxhdpi/img_003.jpg
rename to MLKit-Sample/module-vision/src/main/res/mipmap-xxhdpi/img_003.jpg
diff --git a/MLKit-Sample/app/src/main/res/mipmap-xxhdpi/img_004.jpg b/MLKit-Sample/module-vision/src/main/res/mipmap-xxhdpi/img_004.jpg
similarity index 100%
rename from MLKit-Sample/app/src/main/res/mipmap-xxhdpi/img_004.jpg
rename to MLKit-Sample/module-vision/src/main/res/mipmap-xxhdpi/img_004.jpg
diff --git a/MLKit-Sample/app/src/main/res/mipmap-xxhdpi/img_005.jpg b/MLKit-Sample/module-vision/src/main/res/mipmap-xxhdpi/img_005.jpg
similarity index 100%
rename from MLKit-Sample/app/src/main/res/mipmap-xxhdpi/img_005.jpg
rename to MLKit-Sample/module-vision/src/main/res/mipmap-xxhdpi/img_005.jpg
diff --git a/MLKit-Sample/app/src/main/res/mipmap-xxhdpi/img_006.jpg b/MLKit-Sample/module-vision/src/main/res/mipmap-xxhdpi/img_006.jpg
similarity index 100%
rename from MLKit-Sample/app/src/main/res/mipmap-xxhdpi/img_006.jpg
rename to MLKit-Sample/module-vision/src/main/res/mipmap-xxhdpi/img_006.jpg
diff --git a/MLKit-Sample/app/src/main/res/mipmap-xxhdpi/img_007.jpg b/MLKit-Sample/module-vision/src/main/res/mipmap-xxhdpi/img_007.jpg
similarity index 100%
rename from MLKit-Sample/app/src/main/res/mipmap-xxhdpi/img_007.jpg
rename to MLKit-Sample/module-vision/src/main/res/mipmap-xxhdpi/img_007.jpg
diff --git a/MLKit-Sample/app/src/main/res/mipmap-xxhdpi/img_008.jpg b/MLKit-Sample/module-vision/src/main/res/mipmap-xxhdpi/img_008.jpg
similarity index 100%
rename from MLKit-Sample/app/src/main/res/mipmap-xxhdpi/img_008.jpg
rename to MLKit-Sample/module-vision/src/main/res/mipmap-xxhdpi/img_008.jpg
diff --git a/MLKit-Sample/app/src/main/res/mipmap-xxhdpi/img_009.jpg b/MLKit-Sample/module-vision/src/main/res/mipmap-xxhdpi/img_009.jpg
similarity index 100%
rename from MLKit-Sample/app/src/main/res/mipmap-xxhdpi/img_009.jpg
rename to MLKit-Sample/module-vision/src/main/res/mipmap-xxhdpi/img_009.jpg
diff --git a/MLKit-Sample/app/src/main/res/mipmap-xxxhdpi/album_black.png b/MLKit-Sample/module-vision/src/main/res/mipmap-xxxhdpi/album_black.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/mipmap-xxxhdpi/album_black.png
rename to MLKit-Sample/module-vision/src/main/res/mipmap-xxxhdpi/album_black.png
diff --git a/MLKit-Sample/module-vision/src/main/res/mipmap-xxxhdpi/album_round.png b/MLKit-Sample/module-vision/src/main/res/mipmap-xxxhdpi/album_round.png
new file mode 100644
index 0000000..7f227d8
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/mipmap-xxxhdpi/album_round.png differ
diff --git a/MLKit-Sample/app/src/main/res/mipmap-xxxhdpi/album_white.png b/MLKit-Sample/module-vision/src/main/res/mipmap-xxxhdpi/album_white.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/mipmap-xxxhdpi/album_white.png
rename to MLKit-Sample/module-vision/src/main/res/mipmap-xxxhdpi/album_white.png
diff --git a/MLKit-Sample/module-vision/src/main/res/mipmap-xxxhdpi/icon_result.png b/MLKit-Sample/module-vision/src/main/res/mipmap-xxxhdpi/icon_result.png
new file mode 100644
index 0000000..6443266
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/mipmap-xxxhdpi/icon_result.png differ
diff --git a/MLKit-Sample/module-vision/src/main/res/mipmap-xxxhdpi/icon_setting.png b/MLKit-Sample/module-vision/src/main/res/mipmap-xxxhdpi/icon_setting.png
new file mode 100644
index 0000000..94ac369
Binary files /dev/null and b/MLKit-Sample/module-vision/src/main/res/mipmap-xxxhdpi/icon_setting.png differ
diff --git a/MLKit-Sample/app/src/main/res/mipmap-xxxhdpi/load_photo.png b/MLKit-Sample/module-vision/src/main/res/mipmap-xxxhdpi/load_photo.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/mipmap-xxxhdpi/load_photo.png
rename to MLKit-Sample/module-vision/src/main/res/mipmap-xxxhdpi/load_photo.png
diff --git a/MLKit-Sample/app/src/main/res/mipmap-xxxhdpi/seg_selected.png b/MLKit-Sample/module-vision/src/main/res/mipmap-xxxhdpi/seg_selected.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/mipmap-xxxhdpi/seg_selected.png
rename to MLKit-Sample/module-vision/src/main/res/mipmap-xxxhdpi/seg_selected.png
diff --git a/MLKit-Sample/app/src/main/res/mipmap-xxxhdpi/take_photo.png b/MLKit-Sample/module-vision/src/main/res/mipmap-xxxhdpi/take_photo.png
similarity index 100%
rename from MLKit-Sample/app/src/main/res/mipmap-xxxhdpi/take_photo.png
rename to MLKit-Sample/module-vision/src/main/res/mipmap-xxxhdpi/take_photo.png
diff --git a/MLKit-Sample/module-vision/src/main/res/values-1024x600/dimens.xml b/MLKit-Sample/module-vision/src/main/res/values-1024x600/dimens.xml
new file mode 100644
index 0000000..037e1fd
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/res/values-1024x600/dimens.xml
@@ -0,0 +1,5 @@
+<resources>
+    <dimen name="start_logo_height">160dp</dimen>
+    <dimen name="start_logo_margin">140dp</dimen>
+    <dimen name="start_margin_top">30dp</dimen>
+</resources>
diff --git a/MLKit-Sample/module-vision/src/main/res/values-1280x720/dimens.xml b/MLKit-Sample/module-vision/src/main/res/values-1280x720/dimens.xml
new file mode 100644
index 0000000..404fa71
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/res/values-1280x720/dimens.xml
@@ -0,0 +1,5 @@
+<resources>
+    <dimen name="start_logo_height">200dp</dimen>
+    <dimen name="start_logo_margin">180dp</dimen>
+    <dimen name="start_margin_top">50dp</dimen>
+</resources>
diff --git a/MLKit-Sample/module-vision/src/main/res/values-1920x1080/dimens.xml b/MLKit-Sample/module-vision/src/main/res/values-1920x1080/dimens.xml
new file mode 100644
index 0000000..57b4de4
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/res/values-1920x1080/dimens.xml
@@ -0,0 +1,5 @@
+<resources>
+    <dimen name="start_logo_height">250dp</dimen>
+    <dimen name="start_logo_margin">230dp</dimen>
+    <dimen name="start_margin_top">70dp</dimen>
+</resources>
diff --git a/MLKit-Sample/module-vision/src/main/res/values-zh-rCN/strings.xml b/MLKit-Sample/module-vision/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..4196f45
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">ML Kit</string>
+
+    <string name="camera_permission_rationale">示例应用需要相机和存储权限</string>
+
+    <string name="ok">OK</string>
+    <string name="settings">设置</string>
+    <string name="cancel">取消</string>
+
+    <string name="cloud_classification">云端图像分类</string>
+
+    <string name="select_from_album">从相册选择图片</string>
+    <string name="take_photo">拍照</string>
+    <string name="more_face_data">采集更多人脸数据</string>
+    <string name="versions">版本号：</string>
+
+    <string name="get_data_failed">获取数据失败</string>
+    <string name="loading_data">加载中…</string>
+    <string name="load_pictures">加载图片</string>
+
+    <!--全称-->
+    <string name="image_segmentation_s">图像分割</string>
+    <string name="face_detection_s">人脸识别</string>
+    <string name="object_detection_s">对象检测</string>
+    <string name="image_classification_s">图片分类</string>
+    <string name="landmark_s">地标识别</string>
+    <!--简写-->
+    <string name="image_segmentation">图像分割</string>
+    <string name="face_detection">人脸检测</string>
+    <string name="object_detection">对象检测</string>
+    <string name="image_classification">图像分类</string>
+    <string name="landmark">地标识别</string>
+
+    <string name="all">所有</string>
+    <string name="coming_soon">敬请期待</string>
+    <string name="back">返回</string>
+
+    <string name="background_substitution">背景替换</string>
+    <string name="cutout">人像抠图</string>
+    <string name="select_picture">选择图片</string>
+    <string name="cut">剪切</string>
+    <string name="replace_background">背景</string>
+    <string name="save">保存</string>
+    <string name="cut_success">剪切成功</string>
+    <string name="save_success">保存成功</string>
+
+    <string name="please_select_picture">请选择一张要处理的图片~</string>
+    <string name="click_add_picture">点击添加图片~</string>
+    <string name="no_pic_neededSave">没有可保存的图片</string>
+    <string name="target_object">目标</string>
+    <string name="color">颜色</string>
+
+    <string name="empty">无</string>
+</resources>
diff --git a/MLKit-Sample/module-vision/src/main/res/values/attrs.xml b/MLKit-Sample/module-vision/src/main/res/values/attrs.xml
new file mode 100644
index 0000000..bcbffb8
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/res/values/attrs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="ColorSelector">
+        <attr name="indicatorColor" format="color" />
+    </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/MLKit-Sample/module-vision/src/main/res/values/colors.xml b/MLKit-Sample/module-vision/src/main/res/values/colors.xml
new file mode 100644
index 0000000..a8d8236
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/res/values/colors.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="black">#000000</color>
+    <color name="common_line_color">#D9D9D9</color>
+    <color name="primary_text_color">#A9A9A9</color>
+    <color name="secondary_text_color">#626262</color>
+    <color name="text_color">#1d1d1d</color>
+    <color name="logo_background">#003853</color>
+    <color name="primary_background">#f2f2f2</color>
+    <color name="button_background">#5CACEE</color>
+    <color name="white">#ffffff</color>
+
+    <color name="color_red_card">#FFFA2A2D</color>
+    <color name="color_red_cancel">#EE6A50</color>
+
+</resources>
diff --git a/MLKit-Sample/module-vision/src/main/res/values/dimens.xml b/MLKit-Sample/module-vision/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..5930bbb
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/res/values/dimens.xml
@@ -0,0 +1,27 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+
+    <dimen name="start_icon_width">45dp</dimen>
+    <dimen name="facing_switch_width">35dp</dimen>
+    <dimen name="icon_new_width">18dp</dimen>
+    <dimen name="icon_new_height">15dp</dimen>
+    <dimen name="toolbar_height">45dp</dimen>
+
+    <dimen name="dialog_text_size">13sp</dimen>
+    <dimen name="toolbar_title_size">17sp</dimen>
+    <dimen name="toolbar_back_size">14sp</dimen>
+
+    <dimen name="icon_back_width">30dp</dimen>
+    <dimen name="icon_back_height">30dp</dimen>
+    <dimen name="icon_back_margin">15dp</dimen>
+
+    <dimen name="tab_title_text_size">16sp</dimen>
+
+    <dimen name="common_margin_top">5dp</dimen>
+
+    <dimen name="circle_stroke_radius">65dp</dimen>
+
+    <dimen name="start_logo_height">250dp</dimen>
+    <dimen name="start_logo_margin">230dp</dimen>
+    <dimen name="start_margin_top">70dp</dimen>
+</resources>
diff --git a/MLKit-Sample/module-vision/src/main/res/values/strings.xml b/MLKit-Sample/module-vision/src/main/res/values/strings.xml
new file mode 100644
index 0000000..bface07
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/res/values/strings.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">ML Kit</string>
+
+    <string name="camera_permission_rationale">This sample app requires camera and storage access in order to
+        demo the API.</string>
+
+    <string name="ok">OK</string>
+    <string name="settings">Settings</string>
+    <string name="cancel">cancel</string>
+
+    <string name="cloud_classification">Cloud Image Classification</string>
+
+    <string name="select_from_album">Select image from album</string>
+    <string name="take_photo">Take photo</string>
+    <string name="more_face_data">More face data</string>
+    <string name="versions">Version：</string>
+
+    <string name="get_data_failed">Failed to get data.</string>
+    <string name="loading_data">Loading…</string>
+    <string name="load_pictures">Load pictures</string>
+
+    <!--Full name-->
+    <string name="image_segmentation_s">Image Segmentation</string>
+    <string name="face_detection_s">Face Detection</string>
+    <string name="object_detection_s">Object Detection and Tracking</string>
+    <string name="image_classification_s">Image Classification</string>
+    <string name="landmark_s">Landmark Recognition</string>
+
+    <!--Abbreviation-->
+    <string name="image_segmentation">Segmentation</string>
+    <string name="face_detection">Face</string>
+    <string name="object_detection">Object</string>
+    <string name="image_classification">Classification</string>
+    <string name="landmark">Landmark</string>
+
+    <string name="all">all</string>
+    <string name="coming_soon">coming soon</string>
+    <string name="back">back</string>
+
+    <string name="background_substitution">Substitution</string>
+    <string name="select_picture">Select Picture</string>
+    <string name="cutout">Cutout</string>
+    <string name="cut">Cut</string>
+    <string name="cut_success">Cut success</string>
+    <string name="save_success">Save success</string>
+
+    <string name="replace_background">Background</string>
+    <string name="save">Save</string>
+    <string name="please_select_picture">Please select a picture to process~</string>
+    <string name="click_add_picture">Click to add picture~</string>
+    <string name="no_pic_neededSave">Null Image needed to save</string>
+
+    <string name="target_object">Object</string>
+    <string name="color">Color</string>
+
+    <string name="empty">Empty</string>
+
+</resources>
diff --git a/MLKit-Sample/module-vision/src/main/res/values/styles.xml b/MLKit-Sample/module-vision/src/main/res/values/styles.xml
new file mode 100644
index 0000000..20314c0
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/res/values/styles.xml
@@ -0,0 +1,57 @@
+<resources>
+
+    <style name="MaterialTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:popupMenuStyle">@style/menuStyle</item>
+        <item name="android:dropDownListViewStyle">@style/menuStyle</item>
+        <item name="android:textAppearanceSmallPopupMenu">@style/menuStyle</item>
+        <item name="android:textAppearanceLargePopupMenu">@style/menuStyle</item>
+        <item name="buttonStyle">@style/Widget.AppCompat.Button.Borderless</item>
+    </style>
+    <!--text and image -->
+    <style name="text_content">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:textColor">@color/secondary_text_color</item>
+        <item name="android:textSize">16sp</item>
+    </style>
+
+    <style name="common_line">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">0.25dp</item>
+        <item name="android:layout_marginStart">0dp</item>
+        <item name="android:layout_marginEnd">0dp</item>
+        <item name="android:background">@color/common_line_color</item>
+    </style>
+
+    <style name="progress_dialog" parent="@android:style/Theme.Dialog">
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:background">@null</item>
+        <item name="android:windowBackground">@null</item>
+        <item name="android:backgroundDimEnabled">false</item>
+    </style>
+
+    <style name="menuStyle">
+        <item name="android:textColor">@color/secondary_text_color</item>
+        <item name="android:textSize">11sp</item>
+    </style>
+
+    <style name="MyDialogStyle">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowIsTranslucent">false</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowAnimationStyle">@style/MyDialogAnim</item>
+        <item name="android:backgroundDimEnabled">true</item>
+    </style>
+
+    <style name="MyDialogAnim" parent="android:Animation">
+        <item name="android:windowEnterAnimation">@anim/anim_in</item>
+    </style>
+</resources>
diff --git a/MLKit-Sample/module-vision/src/main/res/xml/apk_file_provider.xml b/MLKit-Sample/module-vision/src/main/res/xml/apk_file_provider.xml
new file mode 100644
index 0000000..ffa74ab
--- /dev/null
+++ b/MLKit-Sample/module-vision/src/main/res/xml/apk_file_provider.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <external-path name="external_files" path="."/>
+</paths>
\ No newline at end of file
diff --git a/MLKit-Sample/settings.gradle b/MLKit-Sample/settings.gradle
index e7b4def..079bf18 100644
--- a/MLKit-Sample/settings.gradle
+++ b/MLKit-Sample/settings.gradle
@@ -1 +1 @@
-include ':app'
+include ':module-text', 'module-vision'
diff --git a/Photo-Translate/README.md b/Photo-Translate/README.md
index f728995..a30ecda 100644
--- a/Photo-Translate/README.md
+++ b/Photo-Translate/README.md
@@ -12,7 +12,7 @@
 ## Introduction
 The sample code mainly shows the use of Huawei Machine Learning SDK.
 
-It uses text recognition and translation of Huawei Machine Learning SDK. It uses still image of text to translate words in the photo into the language you want. Currently, the following languages are supported: Simplified Chinese (zh), English (en), French (fr), Arabic (ar), Thai (th), Spanish (es), and Turkish (tr). 
+It uses text recognition and translation of Huawei Machine Learning SDK. It uses still image of text to translate words in the photo into the language you want. Currently, the following languages are supported: Simplified Chinese (zh), English (en), French (fr), Arabic (ar), Thai (th), Spanish (es), and Turkish (tr).
 
 You need to use cloud analyzer, such as cloud text analyzer and translator.
 So you need to apply for an agconnect-services.json file in the developer alliance(https://developer.huawei.com/consumer/en/doc/development/HMS-Guides/ml-preparations-4), replacing the sample-agconnect-services.json in the project.
@@ -26,8 +26,8 @@ You only need to modify the applicationId in app Photo-Translate
 ## Configuration
 To use functions provided by packages in examples, You need to add the dependencies to the build.gradle file as follows:
 
-    implementation 'com.huawei.hms:ml-computer-vision:1.0.2.300'
-    implementation 'com.huawei.hms:ml-computer-translate:1.0.2.300'
+    implementation 'com.huawei.hms:ml-computer-vision-cloud:1.0.3.300'
+    implementation 'com.huawei.hms:ml-computer-translate:1.0.3.300'
 
 ## Supported Environments
 android 4.4 or a later version is recommended.
@@ -51,7 +51,7 @@ Sample code majors activitys as follows:
    2. Translation
 	  - MLTranslatorFactory.getInstance().getRemoteTranslator(settings)：Create a translator.
 	  - MLRemoteTranslator.asyncTranslate(sourceText): Parse out text from source language to target language, sourceText indicates the language to be detected.
-   
+
 
 ##  License
 HUAWEI-HMS-MLKit-Sample/Photo-Translate is licensed under the [Apache License, version 2.0](http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/Photo-Translate/app/build.gradle b/Photo-Translate/app/build.gradle
index 828aff8..7a37b0b 100644
--- a/Photo-Translate/app/build.gradle
+++ b/Photo-Translate/app/build.gradle
@@ -32,6 +32,6 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.huawei.hms:ml-computer-vision:1.0.2.300'
-    implementation 'com.huawei.hms:ml-computer-translate:1.0.2.300'
+    implementation 'com.huawei.hms:ml-computer-vision-cloud:1.0.3.300'
+    implementation 'com.huawei.hms:ml-computer-translate:1.0.3.300'
 }
diff --git a/Photo-Translate/app/sample-agconnect-services.json b/Photo-Translate/app/sample-agconnect-services.json
index 1326374..69e8ca7 100644
--- a/Photo-Translate/app/sample-agconnect-services.json
+++ b/Photo-Translate/app/sample-agconnect-services.json
@@ -9,7 +9,7 @@
 		"client_id":"268600551012363200",
 		"client_secret":"4819981CE7939A526B71AC3092D35C5CB77DF8341C6986559AA9211",
 		"app_id":"1015883",
-		"package_name":"com.mlkit.sample",
+		"package_name":"com.mlkit.sample.phototranslate",
 		"api_key":"CV46Xu0Y3+YFDS832xvOY69LHiAtZ2SviYUSZyELicm2NrxUesZE1TO"
 	},
 	"service":{
diff --git a/Smile-Camera/README.md b/Smile-Camera/README.md
index 75ca4a6..bf37e24 100644
--- a/Smile-Camera/README.md
+++ b/Smile-Camera/README.md
@@ -18,8 +18,8 @@ It uses face detection function of Huawei Machine Learning SDK. It uses real-tim
 ## Configuration
 To use functions provided by packages in examples, You need to add the dependencies to the build.gradle file as follows:
 
-    implementation 'com.huawei.hms:ml-computer-vision-face-recognition-model:1.0.2.300'
-    implementation 'com.huawei.hms:ml-computer-vision:1.0.2.300'
+    implementation 'com.huawei.hms:ml-computer-vision-face-recognition-model:1.0.3.300'
+    implementation 'com.huawei.hms:ml-computer-vision-face:1.0.3.300'
 
 ## Supported Environments
 android 4.4 or a later version is recommended.
diff --git a/Smile-Camera/app/build.gradle b/Smile-Camera/app/build.gradle
index d8c9485..7b16f71 100644
--- a/Smile-Camera/app/build.gradle
+++ b/Smile-Camera/app/build.gradle
@@ -44,7 +44,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.huawei.hms:ml-computer-vision-face-recognition-model:1.0.2.300'
-    implementation 'com.huawei.hms:ml-computer-vision:1.0.2.300'
+    implementation 'com.huawei.hms:ml-computer-vision-face-recognition-model:1.0.3.300'
+    implementation 'com.huawei.hms:ml-computer-vision-face:1.0.3.300'
 }
 
diff --git a/buildCI.sh b/buildCI.sh
index 304c7cf..08b7c35 100644
--- a/buildCI.sh
+++ b/buildCI.sh
@@ -5,9 +5,11 @@ echo "Begine build."
 set -e
 
 # Move agconnect-services.json in apps.
-cp MLKit-Sample/app/sample-agconnect-services.json MLKit-Sample/app/agconnect-services.json
-cp MLKit-Sample/app/sample-agconnect-services.json ID-Photo-DIY/app/agconnect-services.json
-cp MLKit-Sample/app/sample-agconnect-services.json Smile-Camera/app/agconnect-services.json
+cp MLKit-Sample/module-text/sample-agconnect-services.json MLKit-Sample/module-text/agconnect-services.json
+cp MLKit-Sample/module-vision/sample-agconnect-services.json MLKit-Sample/module-vision/agconnect-services.json
+cp ID-Photo-DIY/app/sample-agconnect-services.json ID-Photo-DIY/app/agconnect-services.json
+cp Smile-Camera/app/sample-agconnect-services.json Smile-Camera/app/agconnect-services.json
+cp Photo-Translate/app/sample-agconnect-services.json Photo-Translate/app/agconnect-services.json
 echo "Copy agc file end."
 
 # Build
diff --git a/settings.gradle b/settings.gradle
index 5e1a6c1..e87524a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,5 @@
 include 'ID-Photo-DIY:app'
-include 'MLKit-Sample:app'
 include 'Smile-Camera:app'
-include 'Photo-Translate:app'
\ No newline at end of file
+include 'Photo-Translate:app'
+include 'MLKit-Sample:module-vision'
+include 'MLKit-Sample:module-text'
\ No newline at end of file