From af31aeb1f8fd4f1d91ae01bc0e45798da3090f4c Mon Sep 17 00:00:00 2001
From: Takashi Matsuoka <matsujirushi@live.jp>
Date: Mon, 22 Mar 2021 18:06:12 +0900
Subject: [PATCH] Remove unused resources and code

---
 .../add_step/Step03WifiWioListActivity.java   | 111 ---------
 .../activity/user/LoginAndRegistActivity.java |   1 -
 .../seeed/iot/ui_main/MainScreenActivity.java |   5 -
 .../java/cc/seeed/iot/util/DialogUtils.java   |   1 -
 app/src/main/res/layout/ap_connect.xml        |   4 +-
 app/src/main/res/layout/dialog_name_input.xml |  38 ----
 .../main/res/layout/smartconfig_connect.xml   | 117 ----------
 .../res/layout/smartconfig_connect_backup.xml | 130 -----------
 .../main/res/layout/smartconfig_connected.xml |  96 --------
 app/src/main/res/layout/smartconfig_ready.xml |  31 ---
 app/src/main/res/menu/drawer_view.xml         |  51 -----
 app/src/main/res/menu/menu_main.xml           |   9 -
 app/src/main/res/menu/menu_main2.xml          |   9 -
 app/src/main/res/values-ja/strings.xml        |   7 +-
 app/src/main/res/values/strings.xml           | 215 ++++++------------
 15 files changed, 81 insertions(+), 744 deletions(-)
 delete mode 100644 app/src/main/res/layout/dialog_name_input.xml
 delete mode 100644 app/src/main/res/layout/smartconfig_connect.xml
 delete mode 100644 app/src/main/res/layout/smartconfig_connect_backup.xml
 delete mode 100644 app/src/main/res/layout/smartconfig_connected.xml
 delete mode 100644 app/src/main/res/layout/smartconfig_ready.xml
 delete mode 100644 app/src/main/res/menu/drawer_view.xml
 delete mode 100644 app/src/main/res/menu/menu_main.xml
 delete mode 100644 app/src/main/res/menu/menu_main2.xml

diff --git a/app/src/main/java/cc/seeed/iot/activity/add_step/Step03WifiWioListActivity.java b/app/src/main/java/cc/seeed/iot/activity/add_step/Step03WifiWioListActivity.java
index 9569a4e..5133a21 100644
--- a/app/src/main/java/cc/seeed/iot/activity/add_step/Step03WifiWioListActivity.java
+++ b/app/src/main/java/cc/seeed/iot/activity/add_step/Step03WifiWioListActivity.java
@@ -264,117 +264,6 @@ public void wifiConnect(final String SSID) {
                 mWaitDialog.setMessage("Connecting to " + SSID + "...");
                 mWaitDialog.setCanceledOnTouchOutside(false);
                 mWaitDialog.show();
-//                startTime = System.currentTimeMillis();
-//
-//                final Timer timer = new Timer();
-//                timer.scheduleAtFixedRate(new TimerTask() {
-//                                              public void run() {
-//                                                  flag++;
-//                                                  if (flag >= TimeOutCount) {
-//                                                      //    TimeOutCount = App.getSp().getInt(Constant.SP_Connect_Wifi_TimeOut_Count, 30);
-//                                                      if (TimeOutCount <= 60) {
-//                                                          TimeOutCount += 15;
-//                                                      }
-//                                                      App.getSp().edit().putInt(Constant.SP_Connect_Wifi_TimeOut_Count, TimeOutCount).commit();
-//                                                      timer.cancel();
-//                                                      MLog.e(this, "超时");
-//                                                      runOnUiThread(new Runnable() {
-//                                                          @Override
-//                                                          public void run() {
-//                                  /*  DialogUtils.showErrorDialog(Step03WifiWioListActivity.this, "Fail connect to Wio Wifi:1031", getString(R.string.dialog_btn_tryAgain),
-//                                            getString(R.string.dialog_btn_Cancel), getString(R.string.cont_connection_wio_wifi), new DialogUtils.OnErrorButtonClickListenter() {
-//                                                @Override
-//                                                public void okClick() {
-//                                                    wifiConnect(SSID);
-//                                                    timer.cancel();
-//                                                }
-//
-//                                                @Override
-//                                                public void cancelClick() {
-//                                                    timer.cancel();
-//                                                }
-//                                            });*/
-//                                                              AlertDialog dialog = new AlertDialog.Builder(Step03WifiWioListActivity.this)
-//                                                                      .setTitle("Fail connect to Wio Wi-Fi")
-//                                                                      .setMessage(getString(R.string.cont_connection_wio_wifi))
-//                                                                      .setPositiveButton("Try again", new DialogInterface.OnClickListener() {
-//                                                                          @Override
-//                                                                          public void onClick(DialogInterface dialog, int which) {
-//                                                                              TimeOutCount = App.getSp().getInt(Constant.SP_Connect_Wifi_TimeOut_Count, 30);
-//                                                                              wifiConnect(SSID);
-//                                                                              timer.cancel();
-//                                                                              ConnectCount++;
-//                                                                          }
-//                                                                      })
-//                                                                      .setNeutralButton("Setting", new DialogInterface.OnClickListener() {
-//                                                                          @Override
-//                                                                          public void onClick(DialogInterface dialog, int which) {
-//                                                                              timer.cancel();
-//                                                                              Intent intent = new Intent(Settings.ACTION_WIFI_SETTINGS);
-//                                                                              startActivityForResult(intent, SETTING_REQ_CODE);
-//                                                                          }
-//                                                                      })
-//                                                                      .setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
-//                                                                          @Override
-//
-//                                                                          public void onClick(DialogInterface dialog, int which) {
-//                                                                              timer.cancel();
-//                                                                          }
-//                                                                      }).create();
-//                                                              //  dialog.setCancelable(true);
-//                                                              dialog.setCanceledOnTouchOutside(true);
-//                                                              dialog.show();
-//
-//                                                              dialog.getButton(AlertDialog.BUTTON_NEUTRAL).setVisibility(View.VISIBLE);
-//                                  /*  if (ConnectCount > 2) {
-//                                        dialog.getButton(AlertDialog.BUTTON_NEUTRAL).setVisibility(View.VISIBLE);
-//                                    } else {
-//                                        dialog.getButton(AlertDialog.BUTTON_NEUTRAL).setVisibility(View.GONE);
-//                                    }*/
-//                                                          }
-//                                                      });
-//
-//                                                      if (mWaitDialog != null) {
-//                                                          mWaitDialog.dismiss();
-//                                                      }
-//                                                  } else {
-//                           /* runOnUiThread(new Runnable() {
-//                                @Override
-//                                public void run() {
-//                                    if (!checkWifiIsExist(SSID)) {
-//                                        timer.cancel();
-//                                        if (mWaitDialog != null) {
-//                                            mWaitDialog.dismiss();
-//                                        }
-//                                        DialogUtils.showErrorDialog(Step03WifiWioListActivity.this, "WiFi  not exist:1034", getString(R.string.dialog_btn_OK),
-//                                                null, "Equipment Wi-Fi hotspot does not exist", null);
-//                                    }
-//                                }
-//                            });*/
-//                                                  }
-//                                                  if (WifiUtils.isWifiConnected(Step03WifiWioListActivity.thi s) && getCurrentSsid().equals("\"" + SSID + "\"")) {
-//                                                      timer.cancel();
-//                                                      MLog.e(this, "连接成功");
-//                                                      if (mWaitDialog != null) {
-//                                                          mWaitDialog.dismiss();
-//                                                      }
-//                                                      Log.e(TAG, "###### connect success");
-//                                                      goStep04();
-//                                                      return;
-//                                                  } else {
-//                                                      //  MLog.e(this, "连接失败");
-//                                                  }
-//                                                  runOnUiThread(new Runnable() {
-//                                                      @Override
-//                                                      public void run() {
-//                                                          mWaitDialog.setMessage("Connecting to " + SSID + " Wi-Fi (" + (TimeOutCount - flag) + ")");
-//                                                      }
-//                                                  });
-//
-//                                              }
-//                                          }
-
-//                        , 1500, 1000);
                 break;
             }
         }
diff --git a/app/src/main/java/cc/seeed/iot/activity/user/LoginAndRegistActivity.java b/app/src/main/java/cc/seeed/iot/activity/user/LoginAndRegistActivity.java
index 3579ce9..e4779f1 100644
--- a/app/src/main/java/cc/seeed/iot/activity/user/LoginAndRegistActivity.java
+++ b/app/src/main/java/cc/seeed/iot/activity/user/LoginAndRegistActivity.java
@@ -200,7 +200,6 @@ public void cancelClick() {
                     return;
                 }
                 OtherPlatformUtils.getFacebookInfo(this, callbackManager, OtherPlatformUtils.LoginWithFacebook);
-                //    dialog = DialogUtils.showProgressDialog(LoginAndRegistActivity.this, getString(R.string.loading_login));
                 break;
             case R.id.mRlSelectServer:
                 startActivity(new Intent(LoginAndRegistActivity.this, SelectServerActivity.class));
diff --git a/app/src/main/java/cc/seeed/iot/ui_main/MainScreenActivity.java b/app/src/main/java/cc/seeed/iot/ui_main/MainScreenActivity.java
index e011add..318c277 100644
--- a/app/src/main/java/cc/seeed/iot/ui_main/MainScreenActivity.java
+++ b/app/src/main/java/cc/seeed/iot/ui_main/MainScreenActivity.java
@@ -612,11 +612,6 @@ public void onClick(DialogInterface dialog, int which) {
             return true;
         }
         Intent intent = new Intent(this, SetupDeviceActivity.class);
-       /* if (node.board.equals(Constant.WIO_LINK_V1_0)) {
-            intent.setClass(this, SetupIotLinkActivity.class);
-        } else if (node.board.equals(Constant.WIO_NODE_V1_0)) {
-            intent.setClass(this, SetupIotNodeActivity.class);
-        }*/
         intent.putExtra("node_sn", node.node_sn);
         startActivity(intent);
         return true;
diff --git a/app/src/main/java/cc/seeed/iot/util/DialogUtils.java b/app/src/main/java/cc/seeed/iot/util/DialogUtils.java
index 910c5a2..5d0db99 100644
--- a/app/src/main/java/cc/seeed/iot/util/DialogUtils.java
+++ b/app/src/main/java/cc/seeed/iot/util/DialogUtils.java
@@ -210,7 +210,6 @@ public void onClick(View v) {
                 if (mRbCustomServer.isChecked()) {
                     String url = mEtCustomServer.getText().toString().trim();
                     if (!RegularUtils.isWebsite(url)) {
-                        //  App.showToastShrot(context.getString(R.string.website_format_error));
                         mEtCustomServer.setError(context.getResources().getString(R.string.website_format_hint), context.getDrawable(R.mipmap.edit_help));
                         return;
                     }
diff --git a/app/src/main/res/layout/ap_connect.xml b/app/src/main/res/layout/ap_connect.xml
index d2cdfba..8f62cc5 100644
--- a/app/src/main/res/layout/ap_connect.xml
+++ b/app/src/main/res/layout/ap_connect.xml
@@ -36,10 +36,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/mIvLoading"
-        android:layout_marginTop="50dp"
         android:layout_centerHorizontal="true"
+        android:layout_marginTop="50dp"
         android:gravity="center_horizontal"
-        android:text="We are almost there!\r\nThis process will take about a minute."
+        android:text="We are almost there!\nThis process will take about a minute."
         android:textColor="#A6000000"
         android:textSize="14sp"
         app:cusTextFont="@string/Proxima_Nova_Regular" />
diff --git a/app/src/main/res/layout/dialog_name_input.xml b/app/src/main/res/layout/dialog_name_input.xml
deleted file mode 100644
index ef5e27e..0000000
--- a/app/src/main/res/layout/dialog_name_input.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/sign_in"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingEnd="24dp"
-    android:paddingStart="24dp">
-
-    <!-- Login progress -->
-    <ProgressBar
-        android:id="@+id/login_progress"
-        style="?android:attr/progressBarStyleLarge"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:visibility="gone" />
-
-
-    <LinearLayout
-        android:id="@+id/email_login_form"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <EditText
-            android:id="@+id/new_name"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:backgroundTint="@color/apptheme_dialog_edittext"
-            android:hint="@string/menu_name"
-            android:inputType="textEmailAddress"
-            android:maxLines="1"
-            android:singleLine="true" />
-
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/smartconfig_connect.xml b/app/src/main/res/layout/smartconfig_connect.xml
deleted file mode 100644
index 3f01656..0000000
--- a/app/src/main/res/layout/smartconfig_connect.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<RelativeLayout 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/apptheme_blue"
-    android:orientation="vertical"
-    tools:context="cc.seeed.iot.ui_login.test">
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        android:elevation="5dp"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
-
-    </androidx.appcompat.widget.Toolbar>
-
-
-    <androidx.cardview.widget.CardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:layout_marginLeft="50dp"
-        android:layout_marginRight="50dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="8dp"
-                android:layout_marginLeft="32dp"
-                android:layout_marginRight="32dp"
-                android:layout_marginTop="8dp"
-                android:singleLine="true"
-                android:text="@string/smartconfig_connect"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="@color/abc_primary_text_disable_only_material_light" />
-
-            <View
-                android:layout_width="fill_parent"
-                android:layout_height="2dp"
-                android:layout_gravity="center_horizontal"
-                android:background="#81a6db" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="22dp"
-                android:layout_marginLeft="24dp"
-                android:layout_marginRight="24dp"
-                android:layout_marginTop="16dp"
-                android:orientation="horizontal">
-
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/smartconfig_hint_SSID"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                <TextView
-                    android:id="@+id/ssid"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
-            </LinearLayout>
-
-            <EditText
-                android:id="@+id/wifi_password"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginLeft="24dp"
-                android:layout_marginRight="24dp"
-                android:hint="@string/smartconfig_hint_password"
-                android:inputType="textPassword"
-                android:minWidth="300dp"
-                android:singleLine="true"
-                tools:ignore="TextFields" />
-
-            <Button
-                android:id="@+id/first_time_how_to_api_key"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="16dp"
-                android:layout_marginLeft="24dp"
-                android:layout_marginRight="24dp"
-                android:layout_marginTop="24dp"
-                android:background="@color/apptheme_blue"
-                android:text="@string/smartconfig_btn_connect"
-                android:textColor="@android:color/white" />
-
-        </LinearLayout>
-    </androidx.cardview.widget.CardView>
-
-    <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="24dp"
-        android:gravity="center"
-        android:text="@string/smartconfig_tips_connect"
-        android:textAlignment="center"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="@color/primary_text_default_material_dark" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/smartconfig_connect_backup.xml b/app/src/main/res/layout/smartconfig_connect_backup.xml
deleted file mode 100644
index 0f8ee17..0000000
--- a/app/src/main/res/layout/smartconfig_connect_backup.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<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:orientation="vertical"
-    tools:context="cc.seeed.iot.ui_login.test">
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        android:elevation="5dp"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
-
-    </androidx.appcompat.widget.Toolbar>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/apptheme_blue">
-
-        <RelativeLayout
-            android:id="@+id/layout1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentLeft="true"
-            android:layout_alignWithParentIfMissing="false"
-            android:layout_centerInParent="true">
-
-            <androidx.cardview.widget.CardView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="false"
-                android:layout_alignParentLeft="false"
-                android:layout_alignParentTop="false"
-                android:layout_centerHorizontal="true">
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:id="@+id/title"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginBottom="8dp"
-                        android:layout_marginLeft="32dp"
-                        android:layout_marginRight="32dp"
-                        android:layout_marginTop="8dp"
-                        android:singleLine="true"
-                        android:text="@string/smartconfig_connect"
-                        android:textAppearance="@android:style/TextAppearance.Material.Medium"
-                        android:textColor="@color/abc_primary_text_disable_only_material_light" />
-
-                    <View
-                        android:layout_width="fill_parent"
-                        android:layout_height="2dp"
-                        android:layout_gravity="center_horizontal"
-                        android:background="#81a6db" />
-
-                    <EditText
-                        android:id="@+id/ssid"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginLeft="24dp"
-                        android:layout_marginRight="24dp"
-                        android:layout_marginTop="16dp"
-                        android:enabled="true"
-                        android:hint="@string/smartconfig_hint_SSID"
-                        android:inputType="none"
-                        android:singleLine="true" />
-
-                    <EditText
-                        android:id="@+id/wifi_password"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginLeft="24dp"
-                        android:layout_marginRight="24dp"
-                        android:hint="@string/smartconfig_hint_password"
-                        android:inputType="textPassword"
-                        android:minWidth="300dp"
-                        android:singleLine="true" />
-
-                    <Button
-                        android:id="@+id/first_time_how_to_api_key"
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginBottom="16dp"
-                        android:layout_marginLeft="24dp"
-                        android:layout_marginRight="24dp"
-                        android:layout_marginTop="24dp"
-                        android:background="@color/apptheme_blue"
-                        android:text="@string/smartconfig_btn_connect"
-                        android:textColor="@android:color/white" />
-
-                </LinearLayout>
-            </androidx.cardview.widget.CardView>
-
-        </RelativeLayout>
-
-        <LinearLayout
-            android:id="@+id/layout2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_centerHorizontal="true"
-            android:orientation="vertical"
-            android:paddingBottom="40dp">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="24dp"
-                android:gravity="center"
-                android:text="@string/smartconfig_tips_connect"
-                android:textAlignment="center"
-                android:textAppearance="@android:style/TextAppearance.Material.Medium"
-                android:textColor="@color/primary_text_default_material_dark" />
-        </LinearLayout>
-
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/smartconfig_connected.xml b/app/src/main/res/layout/smartconfig_connected.xml
deleted file mode 100644
index 30cb4e8..0000000
--- a/app/src/main/res/layout/smartconfig_connected.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<RelativeLayout 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/apptheme_blue"
-    android:orientation="vertical"
-    tools:context="cc.seeed.iot.ui_login.test">
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        android:elevation="5dp"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
-
-    </androidx.appcompat.widget.Toolbar>
-
-
-    <androidx.cardview.widget.CardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:layout_marginLeft="50dp"
-        android:layout_marginRight="50dp"
-        >
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="8dp"
-                android:layout_marginLeft="32dp"
-                android:layout_marginRight="32dp"
-                android:layout_marginTop="8dp"
-                android:singleLine="true"
-                android:text="@string/smartconfig_connected"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="@color/abc_primary_text_disable_only_material_light" />
-
-            <View
-                android:layout_width="fill_parent"
-                android:layout_height="2dp"
-                android:layout_gravity="center_horizontal"
-                android:background="#81a6db" />
-
-            <EditText
-                android:id="@+id/add_node_name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginLeft="24dp"
-                android:layout_marginRight="24dp"
-                android:layout_marginTop="16dp"
-                android:enabled="true"
-                android:hint="@string/smartconfig_hint_node_name"
-                android:inputType="none"
-                android:singleLine="true" />
-
-            <Button
-                android:id="@+id/first_time_how_to_api_key"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="16dp"
-                android:layout_marginLeft="24dp"
-                android:layout_marginRight="24dp"
-                android:layout_marginTop="24dp"
-                android:background="@color/apptheme_blue"
-                android:text="@string/smartconfig_btn_play"
-                android:textColor="@android:color/white" />
-
-        </LinearLayout>
-    </androidx.cardview.widget.CardView>
-
-    <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="24dp"
-        android:gravity="center"
-        android:text="@string/smartconfig_tips_node_name"
-        android:textAlignment="center"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="@color/primary_text_default_material_dark" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/smartconfig_ready.xml b/app/src/main/res/layout/smartconfig_ready.xml
deleted file mode 100644
index f85e876..0000000
--- a/app/src/main/res/layout/smartconfig_ready.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="@color/setup_blue">
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        android:elevation="5dp"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
-
-    </androidx.appcompat.widget.Toolbar>
-
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:src="@drawable/smartconfig_ready" />
-
-    <Button
-        android:id="@+id/smartconfig_ready_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="55dp"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="50dp"
-        android:background="@drawable/setup_button_style"
-        android:text="@string/smartconfig_ready"
-        android:textColor="@android:color/white" />
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/drawer_view.xml b/app/src/main/res/menu/drawer_view.xml
deleted file mode 100644
index 881d2e2..0000000
--- a/app/src/main/res/menu/drawer_view.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2015 The Android Open Source Project
-  ~
-  ~ 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.
-  -->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <group
-        android:id="@+id/main">
-        <item
-            android:id="@+id/nav_node_list"
-            android:icon="@drawable/ic_view_list_black"
-            android:title="@string/node_list_view" />
-        <item
-            android:id="@+id/nav_grove_list"
-            android:icon="@drawable/ic_view_list_black"
-            android:title="@string/grove_list_view" />
-    </group>
-
-    <group android:id="@+id/action">
-        <!--<item-->
-            <!--android:id="@+id/nav_smartconfig"-->
-            <!--android:icon="@drawable/ic_wifi_black"-->
-            <!--android:title="@string/smartconfig_view" />-->
-        <item
-            android:id="@+id/nav_setting"
-            android:icon="@drawable/ic_settings_black"
-            android:title="@string/setting_view" />
-        <item
-            android:id="@+id/nav_about"
-            android:icon="@drawable/ic_info_black_36dp"
-            android:title="@string/about_view" />
-    </group>
-
-    <group android:id="@+id/exit">
-        <item
-            android:id="@+id/nav_logout"
-            android:icon="@drawable/ic_exit_to_app_black_36dp"
-            android:title="@string/logout_view" />
-    </group>
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
deleted file mode 100644
index 06ef0a9..0000000
--- a/app/src/main/res/menu/menu_main.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".MainActivity">
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/action_settings" />
-</menu>
diff --git a/app/src/main/res/menu/menu_main2.xml b/app/src/main/res/menu/menu_main2.xml
deleted file mode 100644
index adf7e32..0000000
--- a/app/src/main/res/menu/menu_main2.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context="cc.seeed.iot.ui_login.SetupActivity">
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/action_settings" />
-</menu>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 3959aa1..c97b77e 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1,5 +1,6 @@
 <resources>
 
+    <!--Word-->
     <string name="server_global">グローバル</string>
     <string name="server_old_global">グローバル(旧)</string>
     <string name="server_chinese">中国</string>
@@ -27,6 +28,7 @@
     <string name="device_name">デバイス名</string>
     <string name="data_exchange_server">データ交換サーバー</string>
 
+    <!--Message-->
     <string name="msg_select_type_of_device">追加するデバイスを選択してください。</string>
     <string name="msg_email_format_error">Eメールアドレスのフォーマットが間違っています。正しいEメールアドレスを入力してください。</string>
     <string name="msg_password_too_short_error">パスワードが短すぎます。6文字以上を入力してください。</string>
@@ -35,6 +37,7 @@
     <string name="msg_check_wio_is_in_config_mode">デバイスが設定モードになっていることを確認してください。\n青色LEDがふんわりと点滅していればOKです。</string>
     <string name="msg_hint_not_device">デバイスが登録されていません。\nデバイスを追加してください。</string>
 
+    <!--Menu-->
     <string name="menu_grove_list">Grove一覧</string>
     <string name="menu_support">サポート</string>
     <string name="menu_setting">設定</string>
@@ -47,7 +50,7 @@
     <string name="menu_change_wifi">Wi-Fi変更</string>
     <string name="menu_help">サポート</string>
 
-    <!--Activity-->
+    <!--Specific Activity-->
     <string name="main_screen_activity_title">デバイス一覧</string>
     <string name="select_server_activity_title">サーバーを選択</string>
     <string name="step01_go_ready_activity_title_wio_link">Wio Linkをセットアップ</string>
@@ -58,7 +61,7 @@
     <string name="node_setting_activity_title">デバイス設定</string>
     <string name="node_setting_activity_data_exchange_server_empty">未設定</string>
 
-    <!--View-->
+    <!--Specific View-->
     <string name="activity_sel_server_description">あなたの地域を選択してください。\n独自のサーバーを使うときは"カスタム"を選んで、サーバーのURLを入力してください。</string>
     <string name="dialog_edit_node_name_description">デバイスの追加が完了しました。\nデバイスの名前を入力してください。</string>
     <string name="dialog_edit_node_name_submit">登録</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3296a7d..e3664f1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,12 +1,9 @@
 <resources>
+
     <string name="app_name">Wio</string>
     <string name="facebook_app_id">636196369868072</string>
     <string name="server_client_id">350434064578-ntcsdur516cbg6d5vfi328mshnkcpcrg.apps.googleusercontent.com</string>
 
-    <string name="hello_world">Hello world!</string>
-    <string name="action_settings">Settings</string>
-    <string name="title_activity_main2">Main2Activity</string>
-
     <!-- Font-->
     <string name="Proxima_Nova_Bold">Proxima_Nova_Bold.otf</string>
     <string name="Proxima_Nova_Light">Proxima_Nova_Light.otf</string>
@@ -14,19 +11,7 @@
     <string name="Proxima_Nova_Semibold">Proxima_Nova_Semibold.otf</string>
     <string name="ProximaNovaSoft_Medium">ProximaNovaSoft_Medium.otf</string>
 
-    <!-- common-->
-    <string name="ok">OK</string>
-    <string name="notification_error_ssl_cert_invalid">"You're accessing a page with an untrusted or invalid certificate. Do you want to continue?"</string>
-    <string name="website_format_error">hmmm..website looks wrong..</string>
-    <string name="website_format_hint">"e.g: https://wio.seeed.io or https://192.168.31.2"</string>
-    <string name="hint_get_host_address">"Get your server's host address…"</string>
-    <string name="loading">"loading…"</string>
-    <string name="dialog_btn_tryAgain">TRY AGAIN</string>
-    <string name="dialog_btn_OK">OK</string>
-    <string name="dialog_btn_Cancel">Cancel</string>
-    <string name="dialog_btn_FAQ">FAQ</string>
-    <string name="dialog_btn_NEXT">NEXT</string>
-
+    <!--Word-->
     <string name="server_global">Global</string>
     <string name="server_old_global">Global (old)</string>
     <string name="server_chinese">Chinese</string>
@@ -56,6 +41,7 @@
     <string name="device_name">Device Name</string>
     <string name="data_exchange_server">Customized Server</string>
 
+    <!--Message-->
     <string name="msg_select_type_of_device">CHOOSE A DEVICE TO START</string>
     <string name="msg_email_format_error">hmmm..email address looks wrong..</string>
     <string name="msg_password_too_short_error">Password is too short (minimum is 6 characters)</string>
@@ -64,6 +50,7 @@
     <string name="msg_check_wio_is_in_config_mode">Please check if Wio device is on configuration mode, in which the blue light appears as breathing.</string>
     <string name="msg_hint_not_device">You have not connected to any device yet,get started now!</string>
 
+    <!--Menu-->
     <string name="menu_grove_list">Groves</string>
     <string name="menu_support">Support</string>
     <string name="menu_setting">Setting</string>
@@ -76,7 +63,7 @@
     <string name="menu_change_wifi">Change Wi-Fi Network</string>
     <string name="menu_help">Help</string>
 
-    <!--Activity-->
+    <!--Specific Activity-->
     <string name="main_screen_activity_title">Devices</string>
     <string name="select_server_activity_title">Choose a Server</string>
     <string name="step01_go_ready_activity_title_wio_link">Setup Your Wio Link</string>
@@ -87,156 +74,102 @@
     <string name="node_setting_activity_title">Device Setting</string>
     <string name="node_setting_activity_data_exchange_server_empty">Not Set</string>
 
-    <!--View-->
+    <!--Specific View-->
     <string name="activity_sel_server_description">Simply choose your region, and Wio will recommend the fastest server for you.\nChoosing Customized Server if you plan to run your data on your own server.</string>
     <string name="dialog_edit_node_name_description">Your device is now ready!\n\nName this device if you wish.</string>
     <string name="dialog_edit_node_name_submit">Start Wio-ing</string>
     <string name="activity_node_setting_delete_device">Delete this device</string>
 
-    <!--Setup Activity-->
-    <string name="title_section1">Section 1</string>
-    <string name="title_section2">Section 2</string>
-    <string name="title_section3">Section 3</string>
-    <string name="setup_signin">Sign In</string>
-    <string name="setup_signup">Sign Up</string>
+    <!-- =====Original===== -->
+
+    <!--common-->
+    <string name="ok">OK</string>
+    <string name="website_format_hint">"e.g: https://wio.seeed.io or https://192.168.31.2"</string>
+    <string name="hint_get_host_address">"Get your server's host address…"</string>
+    <string name="loading">"loading…"</string>
     <string name="setup_switch_international">Switch to International</string>
-    <string name="setup_switch_china">Switch to China</string>
     <string name="signin_email">Your Email</string>
+    <string name="grove_detail">Detail</string>
+    <!--WebActivity.java-->
+    <string name="notification_error_ssl_cert_invalid">"You're accessing a page with an untrusted or invalid certificate. Do you want to continue?"</string>
+    <string name="share_api_to">Share API url to…</string>
+    <!--SelectServerActivity.java-->
+    <string name="website_format_error">hmmm..website looks wrong..</string>
+    <!--Step01GoReadyActivity.java-->
+    <string name="dialog_btn_OK">OK</string>
+    <string name="link_to_wifi">Please connect to Wi-Fi network before you start</string>
+    <string name="add_device_step01_progress_connect_server">Connect server…</string>
+    <string name="add_device_step01_err_not_connect_wifi">You are not connected to Wi-fi</string>
+    <!--Step02WifiListActivity.java-->
+    <string name="dialog_btn_tryAgain">TRY AGAIN</string>
+    <string name="dialog_btn_NEXT">NEXT</string>
+    <string name="cont_connection_wifi">Could not connection to Wi-Fi. Please check Wi-Fi password and try again\r\n\r\nError code:1021</string>
+    <string name="no_wifi_permission">Please ensure that the Wio app has location permissions turned on, and that your device has location services turned on.</string>
+    <!--Step04ApConnectActivity.java-->
+    <string name="title_ap_connect_activity">Transmitting Configuration</string>
+    <string name="check_fw">Check the firmware version…</string>
+    <string name="send_wifi_passwd">Sending Wi-Fi password to Wio…</string>
+    <string name="wait_wio">Waiting Wio get ip address…</string>
+    <!--activity_setup.xml-->
+    <string name="setup_signin">Sign In</string>
+    <string name="setup_signup">Sign Up</string>
+    <!--dialog_sign_in.xml-->
     <string name="signin_password">Password</string>
     <string name="signin_forgot_password"><u>Forgot your password?</u></string>
-    <string name="signup_email">Email</string>
-    <string name="signup_password">Password</string>
-    <string name="signup_verify_password">Verify Password</string>
-
-
-    <!--Smart Config-->
-    <string name="smartconfig_ready">Next</string>
-    <string name="smartconfig_connect">Connect Your Node to Wi-Fi</string>
-    <string name="smartconfig_error">Connection Failed</string>
-    <string name="smartconfig_connected">Connected</string>
-
-    <string name="smartconfig_hint_SSID">SSID:</string>
-    <string name="smartconfig_hint_password">Password</string>
-    <string name="smartconfig_hint_node_name">Take a name for Node</string>
-
-    <string name="smartconfig_btn_connect">Connect</string>
-    <string name="smartconfig_btn_try_again">Try Again</string>
-    <string name="smartconfig_btn_play">Let\'s Play</string>Fc
-
-    <string name="smartconfig_tips_connect">Smart config help you to connect your\n
-        IoT Node devices to Wi-Fi AP which\n
-        SSID input above.
-    </string>
-    <string name="ap_config_tips_connect">This help you to connect your\n
-        wio to Wi-Fi AP which\n
-        SSID input above.
-    </string>
-    <string name="smartconfig_tips_failed">If you have any issue, please visit:\n
-        http://seeedstudio.com.
-    </string>
-    <string name="smartconfig_tips_node_name">The Node\'s name help you identity it.</string>
-    <string name="title_activity_test">test</string>
-
-    <!--Mian Screen-->
-    <string name="menu_settings">Settings</string>
-    <string name="menu_name">New Wio name</string>
+    <!--DialogUtils.java-->
     <string name="confirm_quit">Confirm the exit</string>
-
-
-    <!--NavigationView-->
-    <string name="node_list_view">Nodes</string>
-    <string name="grove_list_view">Groves</string>
-    <string name="smartconfig_view">Smart Config</string>
-    <string name="sn_key_view">Update SN/Key</string>
-    <string name="about_view">About</string>
-    <string name="setting_view">Setting</string>
-    <string name="logout_view">Logout</string>
-    <string name="title_activity_setup_iot_node">SetupIotNodeActivity</string>
-    <string name="title_activity_go_ready">GoReadyActivity</string>
-
-    <string name="about_body"><![CDATA[
-        <b>Copyright 2015 <a href="http://www.seeed.cc/">Seeed Technology Co.,Ltd.</a></b><br>
-        <br>
-        <b><a href="http://iot.seeed.cc/privacy_policy.html">Privacy Policy</a></b><br>
-        <br>
-        <br>
-        <b>Many thanks to these libraries and ideas:</b><br><br>
-        <i><b><a href="https://github.com/JakeWharton/ViewPagerIndicator">viewpagerindicator</a></b> by Jake Wharton</i><br><br>
-        <i><b><a href="https://github.com/square/retrofit">retrofit</a></b> by Square</i><br><br>
-        <i><b><a href="https://github.com/EsotericSoftware/yamlbeans">yamlbeans</a></b> by EsotericSoftware</i><br><br>
-        <i><b><a href="https://github.com/zxing/zxing">zxing</a></b> by zxing</i><br><br>
-        <i><b><a href="https://github.com/tiagohm/MarkdownView">MarkdownView</a></b> by tiagohm</i><br><br>
-        <br>
-        This app is open source at <a href="https://github.com/Seeed-Studio/Wio_Link_Android_App">github</a><br>
-
-        ]]>
-    </string>
-
+    <!--AboutActivity.java-->
     <string name="title_about"><![CDATA[
         <b>Wio</b>&nbsp;<font color="#888888">v%1$s</font>
     ]]></string>
-
-    <string name="ap_config_hint_node_name">set your wio name</string>
-
-    <!--login-->
-    <string-array name="server">
-        <item>Default Server</item>
-        <item>Custom</item>
-    </string-array>
-
-    <!-- ui_ap_config -->
-    <string name="title_ap_connect_activity">Transmitting Configuration</string>
-    <string name="ap_config_progress_msg">Setting Wio name…</string>
-
-    <!-- main list-->
-    <string name="setting">"  Setting  "</string>
-    <string name="remove">"  Remove  "</string>
-    <string name="detail">"  API  "</string>
-
-    <!-- set node config-->
+    <!--SetupIotNodeActivity.java-->
     <string name="update">Update</string>
-    <string name="api">API</string>
-    <string name="share_api_to">Share API url to…</string>
-    <string name="ConnectServerFail">Can\'t connect server…</string>
-    <string name="serverOn">Server on</string>
-    <string name="change">. Change?</string>
+    <!--wifi_list.xml-->
     <string name="location_tip">Make sure that location services turned on</string>
-
-    <!-- login and regist activity-->
-    <string name="loading_login">Authenticating …</string>
+    <!--RegistFragment.java-->
     <string name="loading_regist">Creating Account …</string>
-
-    <!-- reset pwd-->
+    <!--ResetPwd01Activity.java,ResetPwd02Activity.java,ResetPwd03Activity.java-->
+    <string name="reset_pwd_title_01">Password Recovery</string>
+    <!--ResetPwd02Activity.java-->
     <string name="reset_pwd_email">Reset your email…</string>
+    <!--ResetPwd03Activity.java-->
     <string name="reset_pwd_pwd">Reset your password…</string>
-    <string name="reset_pwd_title_01">Password Recovery</string>
-
-    <!-- activity node setting-->
-    <string name="cont_connection_wifi">Could not connection to Wi-Fi. Please check Wi-Fi password and try again\r\n\r\nError code:1021</string>
-    <string name="cont_connection_wio_wifi">Could not connect to Wio Wi-fi hotspot, please try again or manually choose Wio\'s Wi-Fi hotspot in system settings.\r\n\r\n Error code:1031</string>
-    <string name="link_to_wifi">Please connect to Wi-Fi network before you start</string>
-
-    <!-- add device step 01-->
-    <string name="add_device_step01_progress_connect_server">Connect server…</string>
-    <string name="add_device_step01_err_not_connect_wifi">You are not connected to Wi-fi</string>
-
-    <string name="grove_detail">Detail</string>
-    <string name="choose_server_toolbar">Choose a Server</string>
+    <!--activity_test.xml-->
     <string name="old_server_hint"><![CDATA[This option is for users who registered with our old Global Server.<br><br> Because we are making changes our server architecture, our old Global Server will be terminated on <b><font color="#484848">September 1, 2016</font></b>. At that time, all your data will be transferred automatically to new Global Server.<br><br> We highly recommend that you use our new Global Server for your new projects.]]></string>
-    <string name="choose_display_grove">Choose Display Grove</string>
-
+    <!--activity_feedback.xml-->
     <string name="feedback_desc_hint">Tell us about your experience</string>
     <string name="feedback_email_adress">Your email address</string>
+    <!--FeedbackActivity.java-->
     <string name="feedback_email_format_error">hmmm..email address looks wrong..</string>
     <string name="feedback_submit_fail">Server Error. Please try again.</string>
     <string name="feedback_title">Feedback</string>
+    <!--feedback.xml-->
     <string name="feedback_submit">Submit</string>
+    <!--BindEmailActivity.java-->
     <string name="bind_email">Bind Email</string>
+    <!--LoginAndRegistActivity.java-->
     <string name="authorization_failure">Authorization failure!</string>
-    <string name="no_wifi_permission">Please ensure that the Wio app has location permissions turned on, and that your device has location services turned on.</string>
-    <string name="check_fw">Check the firmware version…</string>
-    <string name="send_wifi_passwd">Sending Wi-Fi password to Wio…</string>
-    <string name="wait_wio">Waiting Wio get ip address…</string>
+    <!--GroveDetailActivity.java-->
     <string name="add_on">"Added on "</string>
+    <!--PrivacyPolicyActivity.java-->
     <string name="privacy_policy">Privacy Policy</string>
+
+    <string name="about_body"><![CDATA[
+        <b>Copyright 2015 <a href="http://www.seeed.cc/">Seeed Technology Co.,Ltd.</a></b><br>
+        <br>
+        <b><a href="http://iot.seeed.cc/privacy_policy.html">Privacy Policy</a></b><br>
+        <br>
+        <br>
+        <b>Many thanks to these libraries and ideas:</b><br><br>
+        <i><b><a href="https://github.com/JakeWharton/ViewPagerIndicator">viewpagerindicator</a></b> by Jake Wharton</i><br><br>
+        <i><b><a href="https://github.com/square/retrofit">retrofit</a></b> by Square</i><br><br>
+        <i><b><a href="https://github.com/EsotericSoftware/yamlbeans">yamlbeans</a></b> by EsotericSoftware</i><br><br>
+        <i><b><a href="https://github.com/zxing/zxing">zxing</a></b> by zxing</i><br><br>
+        <i><b><a href="https://github.com/tiagohm/MarkdownView">MarkdownView</a></b> by tiagohm</i><br><br>
+        <br>
+        This app is open source at <a href="https://github.com/Seeed-Studio/Wio_Link_Android_App">github</a><br>
+
+        ]]>
+    </string>
+
 </resources>
\ No newline at end of file