Merge code

This commit is contained in:
2022-03-19 01:40:28 +08:00
parent 81aa8a7ef9
commit 07c52eb10a
4 changed files with 12 additions and 12 deletions

View File

@@ -33,7 +33,7 @@
android:value="93" />
<activity
android:name="com.fankes.tsbattery.ui.MainActivity"
android:name="com.fankes.tsbattery.ui.activity.MainActivity"
android:exported="true"
android:screenOrientation="behind">
@@ -49,7 +49,7 @@
android:exported="true"
android:label="@string/app_name"
android:screenOrientation="behind"
android:targetActivity="com.fankes.tsbattery.ui.MainActivity">
android:targetActivity="com.fankes.tsbattery.ui.activity.MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

View File

@@ -21,7 +21,7 @@
*/
@file:Suppress("SetTextI18n", "LocalVariableName", "SameParameterValue")
package com.fankes.tsbattery.ui
package com.fankes.tsbattery.ui.activity
import android.content.ComponentName
import android.content.Intent

View File

@@ -21,7 +21,7 @@
*/
@file:Suppress("SameParameterValue")
package com.fankes.tsbattery.view
package com.fankes.tsbattery.ui.view
import android.content.Context
import android.content.res.ColorStateList

View File

@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:background="@color/colorThemeBackground"
android:orientation="vertical"
tools:context=".ui.MainActivity"
tools:context=".ui.activity.MainActivity"
tools:ignore="HardcodedText,UseCompoundDrawables,ContentDescription,TooManyViews">
<LinearLayout
@@ -324,7 +324,7 @@
android:textSize="12sp" />
</LinearLayout>
<com.fankes.tsbattery.view.MaterialSwitch
<com.fankes.tsbattery.ui.view.MaterialSwitch
android:id="@+id/qqtim_protect_mode_switch"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -342,7 +342,7 @@
android:textColor="@color/colorTextDark"
android:textSize="12sp" />
<com.fankes.tsbattery.view.MaterialSwitch
<com.fankes.tsbattery.ui.view.MaterialSwitch
android:id="@+id/shut_core_sv_qqtim_switch"
android:layout_width="match_parent"
android:layout_height="35dp"
@@ -361,7 +361,7 @@
android:textColor="@color/colorTextDark"
android:textSize="12sp" />
<com.fankes.tsbattery.view.MaterialSwitch
<com.fankes.tsbattery.ui.view.MaterialSwitch
android:id="@+id/shut_core_sv_kn_qqtim_switch"
android:layout_width="match_parent"
android:layout_height="35dp"
@@ -414,7 +414,7 @@
android:textSize="12sp" />
</LinearLayout>
<com.fankes.tsbattery.view.MaterialSwitch
<com.fankes.tsbattery.ui.view.MaterialSwitch
android:id="@+id/disable_wechat_sv_switch"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -526,7 +526,7 @@
android:paddingLeft="15dp"
android:paddingRight="15dp">
<com.fankes.tsbattery.view.MaterialSwitch
<com.fankes.tsbattery.ui.view.MaterialSwitch
android:id="@+id/notify_module_notify_tip_switch"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -544,7 +544,7 @@
android:textColor="@color/colorTextDark"
android:textSize="12sp" />
<com.fankes.tsbattery.view.MaterialSwitch
<com.fankes.tsbattery.ui.view.MaterialSwitch
android:id="@+id/notify_module_info_switch"
android:layout_width="match_parent"
android:layout_height="35dp"
@@ -577,7 +577,7 @@
android:paddingLeft="15dp"
android:paddingRight="15dp">
<com.fankes.tsbattery.view.MaterialSwitch
<com.fankes.tsbattery.ui.view.MaterialSwitch
android:id="@+id/hide_icon_in_launcher_switch"
android:layout_width="match_parent"
android:layout_height="wrap_content"