diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 99c23ae..1e50816 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -24,7 +24,7 @@ android:value="93" /> @@ -39,7 +39,7 @@ android:exported="true" android:label="@string/app_name" android:screenOrientation="behind" - android:targetActivity=".ui.MainActivity"> + android:targetActivity=".ui.activity.MainActivity"> @@ -48,7 +48,7 @@ diff --git a/app/src/main/java/com/fankes/coloros/notify/ui/ConfigureActivity.kt b/app/src/main/java/com/fankes/coloros/notify/ui/activity/ConfigureActivity.kt similarity index 99% rename from app/src/main/java/com/fankes/coloros/notify/ui/ConfigureActivity.kt rename to app/src/main/java/com/fankes/coloros/notify/ui/activity/ConfigureActivity.kt index b00739a..1d784d9 100644 --- a/app/src/main/java/com/fankes/coloros/notify/ui/ConfigureActivity.kt +++ b/app/src/main/java/com/fankes/coloros/notify/ui/activity/ConfigureActivity.kt @@ -22,7 +22,7 @@ */ @file:Suppress("SetTextI18n", "InflateParams", "DEPRECATION") -package com.fankes.coloros.notify.ui +package com.fankes.coloros.notify.ui.activity import android.app.ProgressDialog import android.os.Bundle @@ -47,11 +47,11 @@ import com.fankes.coloros.notify.hook.factory.isAppNotifyHookOf import com.fankes.coloros.notify.hook.factory.putAppNotifyHookAllOf import com.fankes.coloros.notify.hook.factory.putAppNotifyHookOf import com.fankes.coloros.notify.param.IconPackParams -import com.fankes.coloros.notify.ui.base.BaseActivity +import com.fankes.coloros.notify.ui.activity.base.BaseActivity +import com.fankes.coloros.notify.ui.view.MaterialSwitch import com.fankes.coloros.notify.utils.factory.* import com.fankes.coloros.notify.utils.tool.ClientRequestTool import com.fankes.coloros.notify.utils.tool.SystemUITool -import com.fankes.coloros.notify.view.MaterialSwitch import com.google.android.material.radiobutton.MaterialRadioButton import com.google.android.material.textfield.TextInputEditText import com.highcapable.yukihookapi.hook.factory.modulePrefs diff --git a/app/src/main/java/com/fankes/coloros/notify/ui/MainActivity.kt b/app/src/main/java/com/fankes/coloros/notify/ui/activity/MainActivity.kt similarity index 98% rename from app/src/main/java/com/fankes/coloros/notify/ui/MainActivity.kt rename to app/src/main/java/com/fankes/coloros/notify/ui/activity/MainActivity.kt index d451f19..0189520 100644 --- a/app/src/main/java/com/fankes/coloros/notify/ui/MainActivity.kt +++ b/app/src/main/java/com/fankes/coloros/notify/ui/activity/MainActivity.kt @@ -22,7 +22,7 @@ */ @file:Suppress("SetTextI18n") -package com.fankes.coloros.notify.ui +package com.fankes.coloros.notify.ui.activity import android.content.ComponentName import android.content.Intent @@ -45,7 +45,7 @@ import com.fankes.coloros.notify.hook.HookConst.REMOVE_CHANGECP_NOTIFY import com.fankes.coloros.notify.hook.HookConst.REMOVE_DEV_NOTIFY import com.fankes.coloros.notify.hook.HookConst.REMOVE_DNDALERT_NOTIFY import com.fankes.coloros.notify.param.IconPackParams -import com.fankes.coloros.notify.ui.base.BaseActivity +import com.fankes.coloros.notify.ui.activity.base.BaseActivity import com.fankes.coloros.notify.utils.factory.* import com.fankes.coloros.notify.utils.tool.SystemUITool import com.highcapable.yukihookapi.hook.factory.modulePrefs diff --git a/app/src/main/java/com/fankes/coloros/notify/ui/base/BaseActivity.kt b/app/src/main/java/com/fankes/coloros/notify/ui/activity/base/BaseActivity.kt similarity index 97% rename from app/src/main/java/com/fankes/coloros/notify/ui/base/BaseActivity.kt rename to app/src/main/java/com/fankes/coloros/notify/ui/activity/base/BaseActivity.kt index 1b889f7..bb78f45 100644 --- a/app/src/main/java/com/fankes/coloros/notify/ui/base/BaseActivity.kt +++ b/app/src/main/java/com/fankes/coloros/notify/ui/activity/base/BaseActivity.kt @@ -20,7 +20,7 @@ * * This file is Created by fankes on 2022/1/30. */ -package com.fankes.coloros.notify.ui.base +package com.fankes.coloros.notify.ui.activity.base import android.os.Bundle import androidx.appcompat.app.AppCompatActivity diff --git a/app/src/main/java/com/fankes/coloros/notify/view/MaterialSwitch.kt b/app/src/main/java/com/fankes/coloros/notify/ui/view/MaterialSwitch.kt similarity index 98% rename from app/src/main/java/com/fankes/coloros/notify/view/MaterialSwitch.kt rename to app/src/main/java/com/fankes/coloros/notify/ui/view/MaterialSwitch.kt index 8f6c142..befc669 100644 --- a/app/src/main/java/com/fankes/coloros/notify/view/MaterialSwitch.kt +++ b/app/src/main/java/com/fankes/coloros/notify/ui/view/MaterialSwitch.kt @@ -22,7 +22,7 @@ */ @file:Suppress("SameParameterValue") -package com.fankes.coloros.notify.view +package com.fankes.coloros.notify.ui.view import android.content.Context import android.content.res.ColorStateList diff --git a/app/src/main/res/layout/activity_config.xml b/app/src/main/res/layout/activity_config.xml index 78167c1..04aa37e 100644 --- a/app/src/main/res/layout/activity_config.xml +++ b/app/src/main/res/layout/activity_config.xml @@ -5,7 +5,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"> - - - - - - - - - -