Skip to content

Commit b6c81d4

Browse files
s1riuss1rius
committed
rename package
1 parent 78bf22e commit b6c81d4

34 files changed

+82
-82
lines changed

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ repositories {
5050
dependencies {
5151
...
5252
// android view system implementation
53-
implementation "wtf.s1.ptr:nsptr-view:x.x.x"
53+
implementation "wtf.s1.ui:nsptr-view:x.x.x"
5454
// jetpack compose implementation
55-
implementation "wtf.s1.ptr:nsptr-compose:x.x.x"
55+
implementation "wtf.s1.ui:nsptr-compose:x.x.x"
5656
...
5757
}
5858
```
@@ -117,13 +117,13 @@ addView(
117117
- or use in XML layouts
118118

119119
```xml
120-
<wtf.s1.ptr.nsptr.view.NSPtrEZLayout
120+
<wtf.s1.ui.nsptr.view.NSPtrEZLayout
121121
android:layout_width="match_parent"
122122
android:layout_height="match_parent">
123123

124124
<androidx.recyclerview.widget.RecyclerView
125125
android:layout_width="match_parent"
126126
android:layout_height="match_parent"/>
127127

128-
</wtf.s1.ptr.nsptr.view.NSPtrEZLayout>
128+
</wtf.s1.ui.nsptr.view.NSPtrEZLayout>
129129
```

‎README_CN.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ repositories {
4646
dependencies {
4747
...
4848
// android view system 的依赖
49-
implementation "wtf.s1.ptr:nsptr-view:x.x.x"
49+
implementation "wtf.s1.ui:nsptr-view:x.x.x"
5050
// jetpack compose 的依赖
51-
implementation "wtf.s1.ptr:nsptr-compose:x.x.x"
51+
implementation "wtf.s1.ui:nsptr-compose:x.x.x"
5252
...
5353
}
5454
```
@@ -113,13 +113,13 @@ addView(
113113
- 用XML实现
114114

115115
```xml
116-
<wtf.s1.ptr.nsptr.view.NSPtrEZLayout
116+
<wtf.s1.ui.nsptr.view.NSPtrEZLayout
117117
android:layout_width="match_parent"
118118
android:layout_height="match_parent">
119119

120120
<androidx.recyclerview.widget.RecyclerView
121121
android:layout_width="match_parent"
122122
android:layout_height="match_parent"/>
123123

124-
</wtf.s1.ptr.nsptr.view.NSPtrEZLayout>
124+
</wtf.s1.ui.nsptr.view.NSPtrEZLayout>
125125
```

‎build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
import wtf.s1rius.ptr.buildsrc.*
1+
import wtf.s1.ui.buildsrc.*
22

33
buildscript {
44
repositories {
55
mavenLocal()
66
google()
77
mavenCentral()
88
jcenter()
9+
maven { url "https://oss.sonatype.org/content/repositories/snapshots"}
910
}
1011

1112
dependencies {
@@ -24,5 +25,6 @@ allprojects {
2425
google()
2526
mavenCentral()
2627
jcenter()
28+
maven { url "https://oss.sonatype.org/content/repositories/snapshots"}
2729
}
2830
}

‎buildSrc/src/main/java/wtf/s1rius/ptr/buildsrc/Configs.kt renamed to ‎buildSrc/src/main/java/wtf/s1/ui/buildsrc/Configs.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package wtf.s1rius.ptr.buildsrc
1+
package wtf.s1.ui.buildsrc
22

33
const val dev = true
44

@@ -15,9 +15,9 @@ object Versions {
1515
const val versionName = "1.0.0"
1616
const val bytex = "0.2.7"
1717
const val compose = "1.0.0"
18-
const val nsptr = "0.1.0"
18+
const val nsptr = "0.1.0-SNAPSHOT"
1919
const val nsptrDev = "0.1.0-SNAPSHOT"
20-
const val group = "wtf.s1.ptr"
20+
const val group = "wtf.s1.ui"
2121
}
2222

2323
object Plugins {
@@ -27,9 +27,9 @@ object Plugins {
2727
object Deps {
2828

2929

30-
const val nsptrCore = "wtf.s1.ptr:nsptr-core:${Versions.nsptr}"
31-
const val nsptrView = "wtf.s1.ptr:nsptr-view:${Versions.nsptr}"
32-
const val nsptrCompose = "wtf.s1.ptr:nsptr-compose:${Versions.nsptr}"
30+
const val nsptrCore = "wtf.s1.ui:nsptr-core:${Versions.nsptr}"
31+
const val nsptrView = "wtf.s1.ui:nsptr-view:${Versions.nsptr}"
32+
const val nsptrCompose = "wtf.s1.ui:nsptr-compose:${Versions.nsptr}"
3333

3434

3535
object Kotlin {

‎ptr-compose/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
import wtf.s1rius.ptr.buildsrc.*
16+
import wtf.s1.ui.buildsrc.*
1717

1818
plugins {
1919
id 'com.android.library'

‎ptr-compose/gradle.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
GROUP=wtf.s1.ptr
21
POM_NAME=nsptr-compose
32
POM_DESCRIPTION=nsptr
43
POM_ARTIFACT_ID=nsptr-compose

‎ptr-compose/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
~ limitations under the License.
1515
-->
1616

17-
<manifest package="wtf.s1.ptr.nsptr.compose">
17+
<manifest package="wtf.s1.ui.nsptr.compose">
1818
</manifest>

‎ptr-compose/src/main/java/wtf/s1/ptr/nsptr/compose/NSPtrDefault.kt renamed to ‎ptr-compose/src/main/java/wtf/s1/ui/nsptr/compose/NSPtrDefault.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package wtf.s1.ptr.nsptr.compose
1+
package wtf.s1.ui.nsptr.compose
22

33
import androidx.compose.animation.core.*
44
import androidx.compose.foundation.Canvas
@@ -11,9 +11,9 @@ import androidx.compose.ui.graphics.Color
1111
import androidx.compose.ui.graphics.drawscope.Stroke
1212
import androidx.compose.ui.unit.Dp
1313
import androidx.compose.ui.unit.dp
14-
import wtf.s1.ptr.nsptr.SideEffect
15-
import wtf.s1.ptr.nsptr.State
16-
import wtf.s1.ptr.nsptr.StateMachine
14+
import wtf.s1.ui.nsptr.SideEffect
15+
import wtf.s1.ui.nsptr.State
16+
import wtf.s1.ui.nsptr.StateMachine
1717

1818
@Composable
1919
fun NSPtrEZHeader(

‎ptr-compose/src/main/java/wtf/s1/ptr/nsptr/compose/NSPtrGesture.kt renamed to ‎ptr-compose/src/main/java/wtf/s1/ui/nsptr/compose/NSPtrGesture.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package wtf.s1.ptr.nsptr.compose
1+
package wtf.s1.ui.nsptr.compose
22

33
import androidx.compose.foundation.gestures.awaitFirstDown
44
import androidx.compose.foundation.gestures.forEachGesture

‎ptr-compose/src/main/java/wtf/s1/ptr/nsptr/compose/NSPtrLayout.kt renamed to ‎ptr-compose/src/main/java/wtf/s1/ui/nsptr/compose/NSPtrLayout.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package wtf.s1.ptr.nsptr.compose
1+
package wtf.s1.ui.nsptr.compose
22

33
import androidx.compose.animation.core.AnimationSpec
44
import androidx.compose.animation.core.SpringSpec
@@ -20,8 +20,8 @@ import androidx.compose.ui.unit.Dp
2020
import androidx.compose.ui.unit.dp
2121
import kotlinx.coroutines.CoroutineScope
2222
import kotlinx.coroutines.launch
23-
import wtf.s1.ptr.nsptr.*
24-
import wtf.s1.ptr.nsptr.State
23+
import wtf.s1.ui.nsptr.*
24+
import wtf.s1.ui.nsptr.State
2525
import kotlin.math.max
2626
import kotlin.math.roundToInt
2727

‎ptr-core/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import wtf.s1rius.ptr.buildsrc.*
1+
import wtf.s1.ui.buildsrc.*
22

33
plugins {
44
id 'com.android.library'

‎ptr-core/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
~ limitations under the License.
1515
-->
1616

17-
<manifest package="wtf.s1.ptr.nsptr">
17+
<manifest package="wtf.s1.ui.nsptr">
1818
</manifest>

‎ptr-core/src/main/java/wtf/s1/ptr/nsptr/NSPtr.kt renamed to ‎ptr-core/src/main/java/wtf/s1/ui/nsptr/NSPtr.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package wtf.s1.ptr.nsptr
1+
package wtf.s1.ui.nsptr
22

33

44
sealed class State {

‎ptr-core/src/main/java/wtf/s1/ptr/nsptr/StateMachine.kt renamed to ‎ptr-core/src/main/java/wtf/s1/ui/nsptr/StateMachine.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2424
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
2525
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2626
*/
27-
package wtf.s1.ptr.nsptr
27+
package wtf.s1.ui.nsptr
2828

2929
import java.util.concurrent.atomic.AtomicReference
3030

‎ptr-demo/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import wtf.s1rius.ptr.buildsrc.*
1+
import wtf.s1.ui.buildsrc.*
22

33
apply plugin: "com.android.application"
44
apply plugin: 'kotlin-android'

‎ptr-demo/src/main/java/wtf/s1/android/ptr/demo/App.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class App: Application() {
1212

1313
override fun logI(clazz: String, method: String, params: String) {
1414
super.logI(clazz, method, params)
15-
var simpleClazz = ""
15+
var simpleClazz: String
1616
if (clazz.endsWith(SimpleListView::class.java.simpleName)) {
1717
simpleClazz = "child"
1818
Log.i("hugo", "----> $simpleClazz $method $params")

‎ptr-demo/src/main/java/wtf/s1/android/ptr/demo/InsCompose.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import androidx.compose.ui.Modifier
1212
import androidx.compose.ui.platform.AbstractComposeView
1313
import androidx.compose.ui.unit.dp
1414
import kotlinx.coroutines.delay
15-
import wtf.s1.ptr.nsptr.Event
16-
import wtf.s1.ptr.nsptr.compose.NSPtrEZHeader
17-
import wtf.s1.ptr.nsptr.compose.NSPtrLayout
18-
import wtf.s1.ptr.nsptr.compose.NSPtrState
15+
import wtf.s1.ui.nsptr.Event
16+
import wtf.s1.ui.nsptr.compose.NSPtrEZHeader
17+
import wtf.s1.ui.nsptr.compose.NSPtrLayout
18+
import wtf.s1.ui.nsptr.compose.NSPtrState
1919

2020
class InsCompose @JvmOverloads constructor(
2121
context: Context, attrs: AttributeSet? = null

‎ptr-demo/src/main/java/wtf/s1/android/ptr/demo/InstagramView.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import android.widget.LinearLayout
88
import android.widget.TextView
99
import androidx.core.view.updatePadding
1010
import wtf.s1.android.ptr.demo.util.dp
11-
import wtf.s1.ptr.nsptr.view.NSPtrEZLayout
12-
import wtf.s1.ptr.nsptr.view.NSPtrLayout
13-
import wtf.s1.ptr.nsptr.view.NSPtrListener
11+
import wtf.s1.ui.nsptr.view.NSPtrEZLayout
12+
import wtf.s1.ui.nsptr.view.NSPtrLayout
13+
import wtf.s1.ui.nsptr.view.NSPtrListener
1414

1515
class InstagramView @JvmOverloads constructor(
1616
context: Context, attrs: AttributeSet? = null

‎ptr-demo/src/main/java/wtf/s1/android/ptr/demo/SwipeToRefreshLayout.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ package wtf.s1.android.ptr.demo
1818
import android.content.Context
1919
import android.util.AttributeSet
2020
import android.view.View
21-
import wtf.s1.ptr.nsptr.view.NSPtrEZLayout
22-
import wtf.s1.ptr.nsptr.view.NSPtrLayout
23-
import wtf.s1.ptr.nsptr.view.NSPtrListener
21+
import wtf.s1.ui.nsptr.view.NSPtrEZLayout
22+
import wtf.s1.ui.nsptr.view.NSPtrLayout
23+
import wtf.s1.ui.nsptr.view.NSPtrListener
2424
import wtf.s1.pudge.hugo2.DebugLog
2525

2626
/**
@@ -41,15 +41,15 @@ class SwipeToRefreshLayout : NSPtrEZLayout {
4141
init {
4242
this.addPtrListener(object: NSPtrListener {
4343

44-
override fun onDrag(frame: NSPtrLayout) {}
44+
override fun onDrag(ptrLayout: NSPtrLayout) {}
4545

46-
override fun onRefreshing(frame: NSPtrLayout) {
46+
override fun onRefreshing(ptrLayout: NSPtrLayout) {
4747
listener?.onRefresh()
4848
}
4949

50-
override fun onComplete(frame: NSPtrLayout) {}
50+
override fun onComplete(ptrLayout: NSPtrLayout) {}
5151

52-
override fun onPositionChange(frame: NSPtrLayout, offset: Int) {}
52+
override fun onPositionChange(ptrLayout: NSPtrLayout, offset: Int) {}
5353
})
5454
}
5555

‎ptr-demo/src/main/java/wtf/s1/android/ptr/demo/WeChatMainView.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import android.widget.FrameLayout
99
import android.widget.LinearLayout
1010
import android.widget.TextView
1111
import androidx.core.view.updatePadding
12-
import wtf.s1.ptr.nsptr.Event
13-
import wtf.s1.ptr.nsptr.view.NSPtrConfig
14-
import wtf.s1.ptr.nsptr.view.NSPtrLayout
15-
import wtf.s1.ptr.nsptr.State
12+
import wtf.s1.ui.nsptr.Event
13+
import wtf.s1.ui.nsptr.view.NSPtrConfig
14+
import wtf.s1.ui.nsptr.view.NSPtrLayout
15+
import wtf.s1.ui.nsptr.State
1616
import wtf.s1.android.ptr.demo.util.dp
1717
import wtf.s1.android.ptr_support_design.R
1818

‎ptr-demo/src/main/java/wtf/s1/android/ptr/demo/WeChatMomentView.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import androidx.recyclerview.widget.LinearLayoutManager
1414
import androidx.recyclerview.widget.RecyclerView
1515
import com.drakeet.multitype.MultiTypeAdapter
1616
import com.drakeet.multitype.ViewDelegate
17-
import wtf.s1.ptr.nsptr.view.NSPtrHeader
18-
import wtf.s1.ptr.nsptr.view.NSPtrLayout
19-
import wtf.s1.ptr.nsptr.view.NSPtrListener
17+
import wtf.s1.ui.nsptr.view.NSPtrHeader
18+
import wtf.s1.ui.nsptr.view.NSPtrLayout
19+
import wtf.s1.ui.nsptr.view.NSPtrListener
2020
import wtf.s1.android.ptr.demo.util.dp
2121
import wtf.s1.android.ptr.demo.util.screenRectPx
2222
import wtf.s1.android.ptr_support_design.R
@@ -120,7 +120,7 @@ class WeChatMomentView @JvmOverloads constructor(
120120
layout(left, top, right, bottom)
121121
}
122122

123-
override fun onPositionChange(frame: NSPtrLayout, offset: Int) {
123+
override fun onPositionChange(ptrLayout: NSPtrLayout, offset: Int) {
124124
offsetTopAndBottom(offset)
125125
}
126126
}

‎ptr-demo/src/main/java/wtf/s1/android/ptr/demo/damping/DampingView.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import androidx.recyclerview.widget.LinearLayoutManager
1111
import androidx.recyclerview.widget.RecyclerView
1212
import com.drakeet.multitype.MultiTypeAdapter
1313
import com.drakeet.multitype.ViewDelegate
14-
import wtf.s1.ptr.nsptr.view.NSPtrConfig
15-
import wtf.s1.ptr.nsptr.view.NSPtrLayout
14+
import wtf.s1.ui.nsptr.view.NSPtrConfig
15+
import wtf.s1.ui.nsptr.view.NSPtrLayout
1616
import wtf.s1.android.ptr.demo.*
1717
import wtf.s1.android.ptr.demo.md.MDPtrView
1818
import wtf.s1.android.ptr.demo.util.dp

‎ptr-view/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import wtf.s1rius.ptr.buildsrc.*
1+
import wtf.s1.ui.buildsrc.*
22

33
apply plugin: 'com.android.library'
44
apply plugin: 'kotlin-android'

‎ptr-view/gradle.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
GROUP=wtf.s1.ptr
21
POM_NAME=nsptr-view
32
POM_DESCRIPTION=nsptr android view system implementation
43
POM_ARTIFACT_ID=nsptr-view

‎ptr-view/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="wtf.s1.ptr.nsptr.view">
3+
package="wtf.s1.ui.nsptr.view">
44
<application />
55
</manifest>

‎ptr-view/src/main/java/wtf/s1/ptr/nsptr/view/NSPtrComponent.kt renamed to ‎ptr-view/src/main/java/wtf/s1/ui/nsptr/view/NSPtrComponent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package wtf.s1.ptr.nsptr.view
1+
package wtf.s1.ui.nsptr.view
22

33
/**
44
* if NSPtrLayout child want hold the measure and layout, will implement this interface

‎ptr-view/src/main/java/wtf/s1/ptr/nsptr/view/NSPtrConfig.kt renamed to ‎ptr-view/src/main/java/wtf/s1/ui/nsptr/view/NSPtrConfig.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package wtf.s1.ptr.nsptr.view
1+
package wtf.s1.ui.nsptr.view
22

3-
import wtf.s1.ptr.nsptr.Event
3+
import wtf.s1.ui.nsptr.Event
44

55
interface NSPtrConfig {
66

‎ptr-view/src/main/java/wtf/s1/ptr/nsptr/view/NSPtrEZHeader.kt renamed to ‎ptr-view/src/main/java/wtf/s1/ui/nsptr/view/NSPtrEZHeader.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package wtf.s1.ptr.nsptr.view
1+
package wtf.s1.ui.nsptr.view
22

33
import android.content.Context
44
import android.util.AttributeSet
55
import android.view.Gravity
66
import android.widget.FrameLayout
7-
import wtf.s1.ptr.nsptr.Event
8-
import wtf.s1.ptr.nsptr.SideEffect
9-
import wtf.s1.ptr.nsptr.State
10-
import wtf.s1.ptr.nsptr.StateMachine
7+
import wtf.s1.ui.nsptr.Event
8+
import wtf.s1.ui.nsptr.SideEffect
9+
import wtf.s1.ui.nsptr.State
10+
import wtf.s1.ui.nsptr.StateMachine
1111

1212
/**
1313
* implement NSPtrHeader in an easy way

‎ptr-view/src/main/java/wtf/s1/ptr/nsptr/view/NSPtrEZLayout.kt renamed to ‎ptr-view/src/main/java/wtf/s1/ui/nsptr/view/NSPtrEZLayout.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package wtf.s1.ptr.nsptr.view
1+
package wtf.s1.ui.nsptr.view
22

33
import android.content.Context
44
import android.util.AttributeSet

‎ptr-view/src/main/java/wtf/s1/ptr/nsptr/view/NSPtrLayout.kt renamed to ‎ptr-view/src/main/java/wtf/s1/ui/nsptr/view/NSPtrLayout.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package wtf.s1.ptr.nsptr.view
1+
package wtf.s1.ui.nsptr.view
22

33
import android.animation.ValueAnimator
44
import android.animation.ValueAnimator.AnimatorUpdateListener
@@ -16,7 +16,7 @@ import android.widget.FrameLayout
1616
import android.widget.ListView
1717
import androidx.core.view.*
1818
import androidx.core.widget.ListViewCompat
19-
import wtf.s1.ptr.nsptr.*
19+
import wtf.s1.ui.nsptr.*
2020
import kotlin.math.abs
2121

2222
/**

0 commit comments

Comments
 (0)