リファクタリング

tmitsuhashi · tmitsuhashi · commit e6036e46c1c7 · 2020-02-06T10:21:28.000+09:00
diff --git a/dConnectDevicePlugin/dConnectDeviceSwitchBot/plugin/src/main/AndroidManifest.xml b/dConnectDevicePlugin/dConnectDeviceSwitchBot/plugin/src/main/AndroidManifest.xml
@@ -16,7 +16,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".settings.DemoSettingActivity"
+            android:name=".settings.DemoPageSettingActivity"
             android:label="@string/title_setting_demo_app"
             android:theme="@style/AppCompatTheme"/>
         <activity
diff --git a/dConnectDevicePlugin/dConnectDeviceSwitchBot/plugin/src/main/java/org/deviceconnect/android/deviceplugin/switchbot/settings/DemoPageSettingActivity.java b/dConnectDevicePlugin/dConnectDeviceSwitchBot/plugin/src/main/java/org/deviceconnect/android/deviceplugin/switchbot/settings/DemoPageSettingActivity.java
@@ -4,12 +4,12 @@
 
 import org.deviceconnect.android.deviceplugin.switchbot.R;
 
-public class DemoSettingActivity extends BaseSettingActivity {
+public class DemoPageSettingActivity extends BaseSettingActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_demo_setting);
+        setContentView(R.layout.activity_demo_page_setting);
 
     }
 }
diff --git a/dConnectDevicePlugin/dConnectDeviceSwitchBot/plugin/src/main/java/org/deviceconnect/android/deviceplugin/switchbot/settings/DemoPageSettingFragment.java b/dConnectDevicePlugin/dConnectDeviceSwitchBot/plugin/src/main/java/org/deviceconnect/android/deviceplugin/switchbot/settings/DemoPageSettingFragment.java
@@ -18,7 +18,7 @@
 import org.deviceconnect.android.deviceplugin.switchbot.R;
 import org.deviceconnect.android.deviceplugin.switchbot.demo.SwitchBotDemoInstaller;
 
-public class SwitchBotDemoSettingFragment extends DemoSettingFragment {
+public class DemoPageSettingFragment extends DemoSettingFragment {
     private static final String TAG = "SwitchBotDemoSetting";
     private static final Boolean DEBUG = BuildConfig.DEBUG;
 
diff --git a/dConnectDevicePlugin/dConnectDeviceSwitchBot/plugin/src/main/java/org/deviceconnect/android/deviceplugin/switchbot/settings/SettingActivity.java b/dConnectDevicePlugin/dConnectDeviceSwitchBot/plugin/src/main/java/org/deviceconnect/android/deviceplugin/switchbot/settings/SettingActivity.java
@@ -75,8 +75,8 @@ protected void onCreate(final Bundle savedInstanceState) {
         });
 
         findViewById(R.id.text_title_demo_app).setOnClickListener((view) -> {
-            Intent demoSettingActivity = new Intent(this, DemoSettingActivity.class);
-            startActivity(demoSettingActivity);
+            Intent demoPageSettingActivity = new Intent(this, DemoPageSettingActivity.class);
+            startActivity(demoPageSettingActivity);
         });
     }
 
diff --git a/dConnectDevicePlugin/dConnectDeviceSwitchBot/plugin/src/main/res/layout/activity_demo_page_setting.xml b/dConnectDevicePlugin/dConnectDeviceSwitchBot/plugin/src/main/res/layout/activity_demo_page_setting.xml
@@ -4,11 +4,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".settings.DemoSettingActivity">
+    tools:context=".settings.DemoPageSettingActivity">
 
     <fragment
         android:id="@+id/fragment"
-        android:name="org.deviceconnect.android.deviceplugin.switchbot.settings.SwitchBotDemoSettingFragment"
+        android:name="org.deviceconnect.android.deviceplugin.switchbot.settings.DemoPageSettingFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"

Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,12 @@`
`4`	`4`
`5`	`5`	`import org.deviceconnect.android.deviceplugin.switchbot.R;`
`6`	`6`
`7`		`-public class DemoSettingActivity extends BaseSettingActivity {`
	`7`	`+public class DemoPageSettingActivity extends BaseSettingActivity {`
`8`	`8`
`9`	`9`	`@Override`
`10`	`10`	`protected void onCreate(Bundle savedInstanceState) {`
`11`	`11`	`super.onCreate(savedInstanceState);`
`12`		`- setContentView(R.layout.activity_demo_setting);`
	`12`	`+ setContentView(R.layout.activity_demo_page_setting);`
`13`	`13`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,8 @@ protected void onCreate(final Bundle savedInstanceState) {`
`75`	`75`	`});`
`76`	`76`
`77`	`77`	`findViewById(R.id.text_title_demo_app).setOnClickListener((view) -> {`
`78`		`- Intent demoSettingActivity = new Intent(this, DemoSettingActivity.class);`
`79`		`- startActivity(demoSettingActivity);`
	`78`	`+ Intent demoPageSettingActivity = new Intent(this, DemoPageSettingActivity.class);`
	`79`	`+ startActivity(demoPageSettingActivity);`
`80`	`80`	`});`
`81`	`81`	`}`
`82`	`82`