Skip to content

✨ 更改包名,增强同类模块之间的兼容性，解决防止相同包名存在用户只能二选一的窘境 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Fansirsqi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

✨ 更改包名,增强同类模块之间的兼容性，解决防止相同包名存在用户只能二选一的窘境 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ android {
def buildTime = new Date().format("yyyy-MM-dd HH:mm:ss", TimeZone.getTimeZone("Asia/Shanghai"))

compileSdk 34
namespace 'io.github.lazyimmortal.sesame'
namespace 'io.github.dragon813.sesame'
defaultConfig {
applicationId "io.github.lazyimmortal.sesame"
applicationId "io.github.dragon813.sesame"
minSdk 21
//noinspection ExpiredTargetSdkVersion
targetSdk 34
Expand Down Expand Up @@ -54,6 +54,7 @@ android {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.debug
}
}
applicationVariants.configureEach { variant ->
Expand Down
16 changes: 8 additions & 8 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="io.github.lazyimmortal.sesame">
package="io.github.dragon813.sesame">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
Expand Down Expand Up @@ -40,7 +40,7 @@


<activity
android:name="io.github.lazyimmortal.sesame.ui.MainActivity"
android:name="io.github.dragon813.sesame.ui.MainActivity"
android:exported="true"
android:resizeableActivity="true">
<intent-filter>
Expand All @@ -53,36 +53,36 @@
android:name=".ui.MainActivityAlias"
android:enabled="true"
android:exported="true"
android:targetActivity="io.github.lazyimmortal.sesame.ui.MainActivity">
android:targetActivity="io.github.dragon813.sesame.ui.MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity-alias>

<activity
android:name="io.github.lazyimmortal.sesame.ui.AlphaActivity"
android:name="io.github.dragon813.sesame.ui.AlphaActivity"
android:resizeableActivity="true"
tools:targetApi="n"
tools:ignore="MissingClass" />

<activity
android:name="io.github.lazyimmortal.sesame.ui.ExtensionsActivity"
android:name="io.github.dragon813.sesame.ui.ExtensionsActivity"
android:resizeableActivity="true"
tools:targetApi="n" />

<activity
android:name="io.github.lazyimmortal.sesame.ui.NewSettingsActivity"
android:name="io.github.dragon813.sesame.ui.NewSettingsActivity"
android:resizeableActivity="true"
tools:targetApi="n" />

<activity
android:name="io.github.lazyimmortal.sesame.ui.SettingsActivity"
android:name="io.github.dragon813.sesame.ui.SettingsActivity"
android:resizeableActivity="true"
tools:targetApi="n" />

<activity
android:name="io.github.lazyimmortal.sesame.ui.HtmlViewerActivity"
android:name="io.github.dragon813.sesame.ui.HtmlViewerActivity"
android:resizeableActivity="true"
tools:targetApi="n" />

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/assets/xposed_init
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
io.github.lazyimmortal.sesame.hook.ApplicationHook
io.github.dragon813.sesame.hook.ApplicationHook
8 changes: 4 additions & 4 deletions ...b/lazyimmortal/sesame/data/AppConfig.java → ...thub/dragon813/sesame/data/AppConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package io.github.lazyimmortal.sesame.data;
package io.github.dragon813.sesame.data;

import android.annotation.SuppressLint;
import android.app.Application;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.JsonMappingException;
import lombok.Data;
import io.github.lazyimmortal.sesame.util.FileUtil;
import io.github.lazyimmortal.sesame.util.JsonUtil;
import io.github.lazyimmortal.sesame.util.Log;
import io.github.dragon813.sesame.util.FileUtil;
import io.github.dragon813.sesame.util.JsonUtil;
import io.github.dragon813.sesame.util.Log;

import java.io.File;

Expand Down
10 changes: 5 additions & 5 deletions ...ub/lazyimmortal/sesame/data/ConfigV2.java → ...ithub/dragon813/sesame/data/ConfigV2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package io.github.lazyimmortal.sesame.data;
package io.github.dragon813.sesame.data;

import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;

import io.github.lazyimmortal.sesame.data.task.ModelTask;
import io.github.lazyimmortal.sesame.entity.UserEntity;
import io.github.lazyimmortal.sesame.util.*;
import io.github.lazyimmortal.sesame.util.idMap.UserIdMap;
import io.github.dragon813.sesame.data.task.ModelTask;
import io.github.dragon813.sesame.entity.UserEntity;
import io.github.dragon813.sesame.util.*;
import io.github.dragon813.sesame.util.idMap.UserIdMap;

import java.io.File;
import java.util.HashMap;
Expand Down
10 changes: 5 additions & 5 deletions ...ithub/lazyimmortal/sesame/data/Model.java → ...o/github/dragon813/sesame/data/Model.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.lazyimmortal.sesame.data;
package io.github.dragon813.sesame.data;

import java.lang.reflect.Constructor;
import java.util.ArrayList;
Expand All @@ -11,10 +11,10 @@
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;

import io.github.lazyimmortal.sesame.data.modelFieldExt.BooleanModelField;
import io.github.lazyimmortal.sesame.data.task.ModelTask;
import io.github.lazyimmortal.sesame.model.base.ModelOrder;
import io.github.lazyimmortal.sesame.util.Log;
import io.github.dragon813.sesame.data.modelFieldExt.BooleanModelField;
import io.github.dragon813.sesame.data.task.ModelTask;
import io.github.dragon813.sesame.model.base.ModelOrder;
import io.github.dragon813.sesame.util.Log;
import lombok.Getter;

public abstract class Model {
Expand Down
4 changes: 2 additions & 2 deletions ...lazyimmortal/sesame/data/ModelConfig.java → ...ub/dragon813/sesame/data/ModelConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.github.lazyimmortal.sesame.data;
package io.github.dragon813.sesame.data;

import lombok.Data;
import io.github.lazyimmortal.sesame.data.modelFieldExt.BooleanModelField;
import io.github.dragon813.sesame.data.modelFieldExt.BooleanModelField;

import java.io.Serializable;
import java.util.Map;
Expand Down
10 changes: 5 additions & 5 deletions .../lazyimmortal/sesame/data/ModelField.java → ...hub/dragon813/sesame/data/ModelField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.lazyimmortal.sesame.data;
package io.github.dragon813.sesame.data;

import android.content.Context;
import android.view.Gravity;
Expand All @@ -15,10 +15,10 @@
import java.lang.reflect.Type;
import java.util.Objects;

import io.github.lazyimmortal.sesame.R;
import io.github.lazyimmortal.sesame.util.JsonUtil;
import io.github.lazyimmortal.sesame.util.ToastUtil;
import io.github.lazyimmortal.sesame.util.TypeUtil;
import io.github.dragon813.sesame.R;
import io.github.dragon813.sesame.util.JsonUtil;
import io.github.dragon813.sesame.util.ToastUtil;
import io.github.dragon813.sesame.util.TypeUtil;
import lombok.Data;

@Data
Expand Down
2 changes: 1 addition & 1 deletion ...lazyimmortal/sesame/data/ModelFields.java → ...ub/dragon813/sesame/data/ModelFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.lazyimmortal.sesame.data;
package io.github.dragon813.sesame.data;

import java.util.LinkedHashMap;

Expand Down
2 changes: 1 addition & 1 deletion .../lazyimmortal/sesame/data/ModelGroup.java → ...hub/dragon813/sesame/data/ModelGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.lazyimmortal.sesame.data;
package io.github.dragon813.sesame.data;

import lombok.Getter;

Expand Down
2 changes: 1 addition & 1 deletion ...b/lazyimmortal/sesame/data/ModelType.java → ...thub/dragon813/sesame/data/ModelType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.lazyimmortal.sesame.data;
package io.github.dragon813.sesame.data;

import java.util.HashMap;
import java.util.Map;
Expand Down
2 changes: 1 addition & 1 deletion ...hub/lazyimmortal/sesame/data/RunType.java → ...github/dragon813/sesame/data/RunType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.lazyimmortal.sesame.data;
package io.github.dragon813.sesame.data;

import java.util.HashMap;
import java.util.Map;
Expand Down
8 changes: 4 additions & 4 deletions ...lazyimmortal/sesame/data/RuntimeInfo.java → ...ub/dragon813/sesame/data/RuntimeInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package io.github.lazyimmortal.sesame.data;
package io.github.dragon813.sesame.data;

import org.json.JSONException;
import org.json.JSONObject;

import io.github.lazyimmortal.sesame.util.FileUtil;
import io.github.lazyimmortal.sesame.util.Log;
import io.github.lazyimmortal.sesame.util.idMap.UserIdMap;
import io.github.dragon813.sesame.util.FileUtil;
import io.github.dragon813.sesame.util.Log;
import io.github.dragon813.sesame.util.idMap.UserIdMap;

import java.util.Objects;

Expand Down
14 changes: 7 additions & 7 deletions ...lazyimmortal/sesame/data/TokenConfig.java → ...ub/dragon813/sesame/data/TokenConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.lazyimmortal.sesame.data;
package io.github.dragon813.sesame.data;

import android.os.Build;

Expand All @@ -19,12 +19,12 @@
import java.util.Set;
import java.util.concurrent.TimeUnit;

import io.github.lazyimmortal.sesame.util.FileUtil;
import io.github.lazyimmortal.sesame.util.JsonUtil;
import io.github.lazyimmortal.sesame.util.Log;
import io.github.lazyimmortal.sesame.util.RandomUtil;
import io.github.lazyimmortal.sesame.util.StringUtil;
import io.github.lazyimmortal.sesame.util.TimeUtil;
import io.github.dragon813.sesame.util.FileUtil;
import io.github.dragon813.sesame.util.JsonUtil;
import io.github.dragon813.sesame.util.Log;
import io.github.dragon813.sesame.util.RandomUtil;
import io.github.dragon813.sesame.util.StringUtil;
import io.github.dragon813.sesame.util.TimeUtil;
import lombok.Data;

@Data
Expand Down
6 changes: 3 additions & 3 deletions ...lazyimmortal/sesame/data/ViewAppInfo.java → ...ub/dragon813/sesame/data/ViewAppInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.lazyimmortal.sesame.data;
package io.github.dragon813.sesame.data;

import android.content.ContentResolver;
import android.content.Context;
Expand All @@ -9,8 +9,8 @@
import android.os.Bundle;
import lombok.Getter;
import lombok.Setter;
import io.github.lazyimmortal.sesame.R;
import io.github.lazyimmortal.sesame.util.Log;
import io.github.dragon813.sesame.R;
import io.github.dragon813.sesame.util.Log;

public final class ViewAppInfo {

Expand Down
4 changes: 2 additions & 2 deletions ...data/modelFieldExt/BooleanModelField.java → ...data/modelFieldExt/BooleanModelField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package io.github.lazyimmortal.sesame.data.modelFieldExt;
package io.github.dragon813.sesame.data.modelFieldExt;


import android.content.Context;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.Switch;
import io.github.lazyimmortal.sesame.data.ModelField;
import io.github.dragon813.sesame.data.ModelField;

public class BooleanModelField extends ModelField<Boolean> {

Expand Down
8 changes: 4 additions & 4 deletions .../data/modelFieldExt/ChoiceModelField.java → .../data/modelFieldExt/ChoiceModelField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.lazyimmortal.sesame.data.modelFieldExt;
package io.github.dragon813.sesame.data.modelFieldExt;


import android.content.Context;
Expand All @@ -10,9 +10,9 @@

import androidx.core.content.ContextCompat;

import io.github.lazyimmortal.sesame.R;
import io.github.lazyimmortal.sesame.data.ModelField;
import io.github.lazyimmortal.sesame.ui.ChoiceDialog;
import io.github.dragon813.sesame.R;
import io.github.dragon813.sesame.data.ModelField;
import io.github.dragon813.sesame.ui.ChoiceDialog;

public class ChoiceModelField extends ModelField<Integer> {

Expand Down
8 changes: 4 additions & 4 deletions ...e/data/modelFieldExt/EmptyModelField.java → ...e/data/modelFieldExt/EmptyModelField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.lazyimmortal.sesame.data.modelFieldExt;
package io.github.dragon813.sesame.data.modelFieldExt;

import android.app.AlertDialog;
import android.content.Context;
Expand All @@ -12,9 +12,9 @@

import com.fasterxml.jackson.annotation.JsonIgnore;

import io.github.lazyimmortal.sesame.R;
import io.github.lazyimmortal.sesame.data.ModelField;
import io.github.lazyimmortal.sesame.util.ToastUtil;
import io.github.dragon813.sesame.R;
import io.github.dragon813.sesame.data.ModelField;
import io.github.dragon813.sesame.util.ToastUtil;

public class EmptyModelField extends ModelField<Object> {

Expand Down
10 changes: 5 additions & 5 deletions ...data/modelFieldExt/IntegerModelField.java → ...data/modelFieldExt/IntegerModelField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.lazyimmortal.sesame.data.modelFieldExt;
package io.github.dragon813.sesame.data.modelFieldExt;


import android.content.Context;
Expand All @@ -11,10 +11,10 @@
import androidx.core.content.ContextCompat;

import lombok.Getter;
import io.github.lazyimmortal.sesame.R;
import io.github.lazyimmortal.sesame.data.ModelField;
import io.github.lazyimmortal.sesame.ui.StringDialog;
import io.github.lazyimmortal.sesame.util.Log;
import io.github.dragon813.sesame.R;
import io.github.dragon813.sesame.data.ModelField;
import io.github.dragon813.sesame.ui.StringDialog;
import io.github.dragon813.sesame.util.Log;

@Getter
public class IntegerModelField extends ModelField<Integer> {
Expand Down
8 changes: 4 additions & 4 deletions ...me/data/modelFieldExt/ListModelField.java → ...me/data/modelFieldExt/ListModelField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.lazyimmortal.sesame.data.modelFieldExt;
package io.github.dragon813.sesame.data.modelFieldExt;

import android.content.Context;
import android.view.Gravity;
Expand All @@ -10,9 +10,9 @@
import androidx.core.content.ContextCompat;

import com.fasterxml.jackson.core.type.TypeReference;
import io.github.lazyimmortal.sesame.R;
import io.github.lazyimmortal.sesame.data.ModelField;
import io.github.lazyimmortal.sesame.ui.StringDialog;
import io.github.dragon813.sesame.R;
import io.github.dragon813.sesame.data.ModelField;
import io.github.dragon813.sesame.ui.StringDialog;

import java.util.ArrayList;
import java.util.List;
Expand Down
12 changes: 6 additions & 6 deletions ...delFieldExt/SelectAndCountModelField.java → ...delFieldExt/SelectAndCountModelField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.lazyimmortal.sesame.data.modelFieldExt;
package io.github.dragon813.sesame.data.modelFieldExt;


import android.content.Context;
Expand All @@ -10,11 +10,11 @@

import androidx.core.content.ContextCompat;

import io.github.lazyimmortal.sesame.R;
import io.github.lazyimmortal.sesame.data.ModelField;
import io.github.lazyimmortal.sesame.data.modelFieldExt.common.SelectModelFieldFunc;
import io.github.lazyimmortal.sesame.entity.IdAndName;
import io.github.lazyimmortal.sesame.ui.ListDialog;
import io.github.dragon813.sesame.R;
import io.github.dragon813.sesame.data.ModelField;
import io.github.dragon813.sesame.data.modelFieldExt.common.SelectModelFieldFunc;
import io.github.dragon813.sesame.entity.IdAndName;
import io.github.dragon813.sesame.ui.ListDialog;

import java.util.List;
import java.util.Map;
Expand Down
14 changes: 7 additions & 7 deletions ...FieldExt/SelectAndCountOneModelField.java → ...FieldExt/SelectAndCountOneModelField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.lazyimmortal.sesame.data.modelFieldExt;
package io.github.dragon813.sesame.data.modelFieldExt;

import android.content.Context;
import android.view.Gravity;
Expand All @@ -9,12 +9,12 @@

import androidx.core.content.ContextCompat;

import io.github.lazyimmortal.sesame.R;
import io.github.lazyimmortal.sesame.data.ModelField;
import io.github.lazyimmortal.sesame.data.modelFieldExt.common.SelectModelFieldFunc;
import io.github.lazyimmortal.sesame.entity.IdAndName;
import io.github.lazyimmortal.sesame.entity.KVNode;
import io.github.lazyimmortal.sesame.ui.ListDialog;
import io.github.dragon813.sesame.R;
import io.github.dragon813.sesame.data.ModelField;
import io.github.dragon813.sesame.data.modelFieldExt.common.SelectModelFieldFunc;
import io.github.dragon813.sesame.entity.IdAndName;
import io.github.dragon813.sesame.entity.KVNode;
import io.github.dragon813.sesame.ui.ListDialog;

import java.util.List;
import java.util.Objects;
Expand Down
Loading