Skip to content

Commit 5763c68

Browse files
committed
Merge branch '2_x'
2 parents 0b4f886 + 2c95c4c commit 5763c68

File tree

2 files changed

+20
-3
lines changed

2 files changed

+20
-3
lines changed

README.md

+12-3
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,13 @@ Pandora is a tool box that allows you to inspect and modify what includes networ
8080
1. Declare [Jitpack](https://jitpack.io/#whataa/pandora) repository and add dependencies:
8181

8282
```
83+
// android-support
8384
debugImplementation 'com.github.whataa:pandora:v${RELEASE}'
84-
releaseImplementation 'com.github.whataa:pandora-no-op:v${RELEASE}'
85+
// or androidX
86+
debugImplementation 'com.github.whataa:pandora:androidx_v${RELEASE}'
87+
88+
// No matter android-support or AndroidX
89+
releaseImplementation 'com.github.whataa:pandora-no-op:v${RELEASE}'
8590
```
8691

8792
library | version
@@ -102,7 +107,7 @@ Pandora is a tool box that allows you to inspect and modify what includes networ
102107
### 1. Add shortcuts to Pandora
103108

104109
Usually, we may hide some debugging switches in some pages to "switch the development environment", "check the Crash log" and so on. If you have similar needs, you can add a shortcut by:
105-
1. Implement `tech.linjiang.pandora.function.IFunc` , , return the icon, name and the action:
110+
1. Implement `tech.linjiang.pandora.function.IFunc` , return the icon, name and the action:
106111

107112
```
108113
private IFunc customFunc = new IFunc() {
@@ -124,7 +129,7 @@ Usually, we may hide some debugging switches in some pages to "switch the develo
124129
};
125130
```
126131
127-
2. Call `Pandora.get().addFunc()` to add it
132+
2. Call `Pandora.get().addFunc()` to add it.
128133
129134
130135
### 2. Let "view properties" support more.
@@ -196,6 +201,10 @@ and call `Pandora.get().open();` to open directly.
196201
-keep class tech.linjiang.pandora.cache.**{*;}
197202
```
198203
204+
#### 5. android-support or AndroidX ?
205+
> Which version to implementation depends on your project, The two versions have completely consistent logic and synchronized updates, except for different dependencies.
206+
> Although AndroidX is the trend, if your project cannot be migrated to AndroidX, please use android-support.
207+
199208
## Thanks
200209
201210
Pandora was developed on the shoulders of giants. Thanks to the following open source projects or person:

README_CN.md

+8
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ Pandora 是一款无需ROOT、可以直接在应用内查看和修改包括网
8080

8181
```
8282
debugImplementation 'com.github.whataa:pandora:v${RELEASE}'
83+
// 如果你的项目使用的是AndroidX, 替换为以下方式
84+
debugImplementation 'com.github.whataa:pandora:androidx_v${RELEASE}'
85+
86+
// 不区分android-support和AndroidX
8387
releaseImplementation 'com.github.whataa:pandora-no-op:v${RELEASE}'
8488
```
8589

@@ -192,6 +196,10 @@ Pandora.get().getSharedPref().addProvider(new XXProvider());
192196
-keep class tech.linjiang.pandora.cache.**{*;}
193197
```
194198
199+
#### 5. android-support还是AndroidX ?
200+
> 依赖哪种版本取决于你的项目,Pandora提供的两种版本的除了依赖不同,所有逻辑完全一致并保持同步更新;
201+
> 虽然AndroidX是趋势,但是如果你的项目无法迁移到AndroidX还是请使用android-support的方式
202+
195203
## 致谢
196204
197205
Pandora是站在巨人的肩膀上开发而来,非常感谢以下开源项目或作者:

0 commit comments

Comments
 (0)