diff --git a/README.md b/README.md index ee5d7e4..de766b2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![android-jetpack-demo](./images/hero.svg) +![android-jetpack-demo](./docs/images/hero.svg) ## 🔥Android-Jetpack-Demo @@ -16,17 +16,19 @@ * [四、项目组成[^1]]() * [五、规划]() * [六、示例内容(部分）]() - * [七、关于作者]()[![jianshu](./images/jianshu.svg)](https://www.jianshu.com/u/72294e6848c0)[![github](./images/github.svg)](https://github.com/zhiwei1990)[![csdn](./images/csdn.svg)](https://blog.csdn.net/zhiwei9001) + * [七、关于作者]()[![jianshu](./docs/images/jianshu.svg)](https://www.jianshu.com/u/72294e6848c0)[![github](./docs/images/github.svg)](https://github.com/zhiwei1990)[![csdn](./docs/images/csdn.svg)](https://blog.csdn.net/zhiwei9001) #### 一、项目简介 > 更新前言：不觉间项目已经三年有余了，Kotlin和Jetpack相关技术点也更新了很多，更成了为Android开发的技术首选。 > -> 忙碌于生活的苟且，屈服于资本家压榨之下，身心俱疲。颇有久在樊笼里的感觉，而今果断裸辞，只想做个纯粹的技术人，做自己感兴趣的事，有意义的事，也希望后续可以给各位朋友带来一些学习的分享。共勉之。 +> 忙碌于生活的苟且，屈服于资本家压榨之下，身心俱疲。颇有久在樊笼里的感觉，只想做个纯粹的技术人，做自己感兴趣的事，有意义的事，也希望后续可以给各位朋友带来一些学习的分享。共勉之。 + +**感谢支持的各位小伙伴，有技术问题或学习问题都可以在issues中留言** **Android-Jetpack-Demo** 全新设计开发中,会集合当下Android应用开发的Kotlin语言相关技术知识点、Jetpack各组建的使用及相关原理源码分析文章等。 -**代码清理全新设计中,历史代码可参照[source](https://github.com/zhiwei1990/android-jetpack-demo/releases/tag/v2.0.0-alpha01)这里下载。** +**代码清理全新设计中,所以为空项目，历史代码可参照[source](https://github.com/zhiwei1990/android-jetpack-demo/releases/tag/v2.0.0-alpha01)这里下载。** #### 二、更新日志 @@ -55,9 +57,9 @@ #### 三、Sample示例(这是以前老版本的) -[下载体验apk](https://raw.githubusercontent.com/zhiwei1990/android-jetpack-demo/master/apk/app-release.apk)或者手机扫描二维码下载`Demo`的`apk`包 +[下载体验apk](https://raw.githubusercontent.com/zhiwei1990/android-jetpack-demo/master/docs/apk/app-release.apk)或者手机扫描二维码下载`Demo`的`apk`包 -![扫描下载](./images/QR_Jetpack.png) +![扫描下载](./docs/images/QR_Jetpack.png) #### 四、项目组成[^1] @@ -65,7 +67,7 @@ #### 五、示例内容(1.x版本部分） -![databinding](./images/databinding.png)![lifecycle](./images/lifecycle.png)![logcat](./images/logcat.png) +![databinding](./docs/images/databinding.png)![lifecycle](./docs/images/lifecycle.png)![logcat](./docs/images/logcat.png) - `Kotlin`语法及部分博文[Kotlin](https://www.jianshu.com/p/bdbe2ab6e9b2) @@ -131,7 +133,7 @@ public final class KtClazz { 更多详情，请下载代码，内有详细注释，**鉴于本人才学有限，若有不足之处，请大神不吝赐教**。 -#### 六、关于作者 [![jianshu](./images/jianshu.svg)](https://www.jianshu.com/u/72294e6848c0)[![github](./images/github.svg)](https://github.com/zhiwei1990)[![csdn](./images/csdn.svg)](https://blog.csdn.net/zhiwei9001) +#### 六、关于作者 [![jianshu](./docs/images/jianshu.svg)](https://www.jianshu.com/u/72294e6848c0)[![github](./docs/images/github.svg)](https://github.com/zhiwei1990)[![csdn](./docs/images/csdn.svg)](https://blog.csdn.net/zhiwei9001) > 作者本人只是一个，就职于某`知名`(@_@ 有名字的)互联网公司的，技术小白一枚，对于编程有着某种兴趣和热爱，然技术确实渣渣，好读书、不求甚解~~ @@ -139,15 +141,15 @@ public final class KtClazz { 倘若本项目对你有一丝丝的帮助和价值，烦请给个`star`,或者有什么好的建议或意见，也可以发个`issues`，谢谢！:happy: -- **Donations**![donation](./images/donation.svg) +- **Donations**![donation](./docs/images/donation.svg) > 测试一下`Github`爱心💗**sponsor**功能,说不定您心血来潮了呢😂 - ![img](./images/admireCode.png)![alipay](./images/alipay2QR.png) + ![img](./docs/images/admireCode.png)![alipay](./docs/images/alipay2QR.png) - **感谢以下捐助者**，您的鼓励更是我的动力；即使没有捐赠的各位好友，还请不要吝惜`star/follow`或者`issues`的建议。 - ![01](./images/admire/01.jpg)![02](./images/admire/02.jpg)![03](./images/admire/03.jpg)![04](./images/admire/04.jpg)![05](./images/admire/05.jpg)![06](./images/admire/06.jpg)![07](./images/admire/07.jpg) + ![01](./docs/images/admire/01.jpg)![02](./docs/images/admire/02.jpg)![03](./docs/images/admire/03.jpg)![04](./docs/images/admire/04.jpg)![05](./docs/images/admire/05.jpg)![06](./docs/images/admire/06.jpg)![07](./docs/images/admire/07.jpg)![anjing](./docs/images/admire/anjing.jpg )beiyingchuifengfeizhaihaizeipandapigyayayijia [![Github stars](https://img.shields.io/github/stars/zhiwei1990/android-jetpack-demo.svg?style=social&label=star)](https://github.com/zhiwei1990/android-jetpack-demo)[![Github followers](https://img.shields.io/github/followers/zhiwei1990.svg?style=social&label=follow)](https://github.com/zhiwei1990/android-jetpack-demo)[![Github issues](https://img.shields.io/github/issues/zhiwei1990/android-jetpack-demo.svg?style=social&label=issues)](https://github.com/zhiwei1990/android-jetpack-demo) @@ -171,5 +173,6 @@ limitations under the License. [![Stargazers over time](https://starchart.cc/zhiwei1990/android-jetpack-demo.svg)](https://starchart.cc/zhiwei1990/android-jetpack-demo) -[^1]: 项目当前`(2021/04/08)`开发环境为AndroidStudio `4.1.3`、`gradle 6.8.3`、 `Jdk8`、`Kotlin 1.4.32` +[^1]: 为研究最新`jetpack`组件的版本和特性，项目当前`(2021/05/30)`开发环境为AndroidStudio `7.0.0-alpha14`、`gradle 7.1.0-alpha01`、 `Jdk8`、`Kotlin 1.5.10` +[^2]: **项目使用`AS`及相关环境配置可能与你本地不同，**参照 [配置gradle](https://github.com/zhiwei1990/android-jetpack-demo/issues/3#issuecomment-840276571) diff --git a/build.gradle b/build.gradle index 4a3a5e4..7617479 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { ext { - kotlin_version = '1.4.32' + kotlin_version = '1.5.10' compile_sdk_version = 30 build_tools_version = '30.0.3' min_sdk_verion = 21 @@ -16,7 +16,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.0-alpha14' + classpath 'com.android.tools.build:gradle:7.1.0-alpha01' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version" //和navigation版本号一致 diff --git a/dependencies.gradle b/dependencies.gradle index d1d41bd..d93a32e 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -45,8 +45,8 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.core:core-ktx:1.3.2' - implementation 'androidx.fragment:fragment-ktx:1.3.0' - implementation 'androidx.activity:activity-ktx:1.2.0' + implementation 'androidx.fragment:fragment-ktx:1.3.2' + implementation 'androidx.activity:activity-ktx:1.2.2' implementation 'com.google.android.material:material:1.3.0' implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation 'androidx.recyclerview:recyclerview:1.2.0' diff --git a/apk/app-release.apk b/docs/apk/app-release.apk similarity index 100% rename from apk/app-release.apk rename to docs/apk/app-release.apk diff --git a/docs/images/QR_Jetpack.png b/docs/images/QR_Jetpack.png new file mode 100644 index 0000000..5e156ba Binary files /dev/null and b/docs/images/QR_Jetpack.png differ diff --git a/images/admire/01.jpg b/docs/images/admire/01.jpg similarity index 100% rename from images/admire/01.jpg rename to docs/images/admire/01.jpg diff --git a/images/admire/02.jpg b/docs/images/admire/02.jpg similarity index 100% rename from images/admire/02.jpg rename to docs/images/admire/02.jpg diff --git a/images/admire/03.jpg b/docs/images/admire/03.jpg similarity index 100% rename from images/admire/03.jpg rename to docs/images/admire/03.jpg diff --git a/images/admire/04.jpg b/docs/images/admire/04.jpg similarity index 100% rename from images/admire/04.jpg rename to docs/images/admire/04.jpg diff --git a/images/admire/05.jpg b/docs/images/admire/05.jpg similarity index 100% rename from images/admire/05.jpg rename to docs/images/admire/05.jpg diff --git a/images/admire/06.jpg b/docs/images/admire/06.jpg similarity index 100% rename from images/admire/06.jpg rename to docs/images/admire/06.jpg diff --git a/images/admire/07.jpg b/docs/images/admire/07.jpg similarity index 100% rename from images/admire/07.jpg rename to docs/images/admire/07.jpg diff --git a/docs/images/admire/anjing.jpg b/docs/images/admire/anjing.jpg new file mode 100644 index 0000000..4725225 Binary files /dev/null and b/docs/images/admire/anjing.jpg differ diff --git a/docs/images/admire/beiying.jpg b/docs/images/admire/beiying.jpg new file mode 100644 index 0000000..7f545da Binary files /dev/null and b/docs/images/admire/beiying.jpg differ diff --git a/docs/images/admire/chuifeng.jpg b/docs/images/admire/chuifeng.jpg new file mode 100644 index 0000000..79c38f1 Binary files /dev/null and b/docs/images/admire/chuifeng.jpg differ diff --git a/docs/images/admire/feizhai.jpg b/docs/images/admire/feizhai.jpg new file mode 100644 index 0000000..0bd74d0 Binary files /dev/null and b/docs/images/admire/feizhai.jpg differ diff --git a/docs/images/admire/haizei.jpg b/docs/images/admire/haizei.jpg new file mode 100644 index 0000000..c57e7b0 Binary files /dev/null and b/docs/images/admire/haizei.jpg differ diff --git a/docs/images/admire/panda.jpg b/docs/images/admire/panda.jpg new file mode 100644 index 0000000..8caa8e8 Binary files /dev/null and b/docs/images/admire/panda.jpg differ diff --git a/docs/images/admire/pig.jpg b/docs/images/admire/pig.jpg new file mode 100644 index 0000000..a4df598 Binary files /dev/null and b/docs/images/admire/pig.jpg differ diff --git a/docs/images/admire/yaya.jpg b/docs/images/admire/yaya.jpg new file mode 100644 index 0000000..5021f90 Binary files /dev/null and b/docs/images/admire/yaya.jpg differ diff --git a/docs/images/admire/yijia.jpg b/docs/images/admire/yijia.jpg new file mode 100644 index 0000000..8308c44 Binary files /dev/null and b/docs/images/admire/yijia.jpg differ diff --git a/images/admireCode.png b/docs/images/admireCode.png similarity index 100% rename from images/admireCode.png rename to docs/images/admireCode.png diff --git a/images/alipay2QR.png b/docs/images/alipay2QR.png similarity index 100% rename from images/alipay2QR.png rename to docs/images/alipay2QR.png diff --git a/images/circle.png b/docs/images/circle.png similarity index 100% rename from images/circle.png rename to docs/images/circle.png diff --git a/docs/images/csdn.svg b/docs/images/csdn.svg new file mode 100644 index 0000000..9059cda --- /dev/null +++ b/docs/images/csdn.svg @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/images/databinding.png b/docs/images/databinding.png similarity index 100% rename from images/databinding.png rename to docs/images/databinding.png diff --git a/docs/images/donation.svg b/docs/images/donation.svg new file mode 100644 index 0000000..0162b9f --- /dev/null +++ b/docs/images/donation.svg @@ -0,0 +1,14 @@ + + + + + + + + \ No newline at end of file diff --git a/docs/images/github.svg b/docs/images/github.svg new file mode 100644 index 0000000..ec5959c --- /dev/null +++ b/docs/images/github.svg @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/docs/images/hero.svg b/docs/images/hero.svg new file mode 100644 index 0000000..efd27e4 --- /dev/null +++ b/docs/images/hero.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/jetpack-hero.png b/docs/images/jetpack-hero.png similarity index 100% rename from images/jetpack-hero.png rename to docs/images/jetpack-hero.png diff --git a/docs/images/jetpack-hero.svg b/docs/images/jetpack-hero.svg new file mode 100644 index 0000000..da29c00 --- /dev/null +++ b/docs/images/jetpack-hero.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + diff --git a/images/jetpack-icon.png b/docs/images/jetpack-icon.png similarity index 100% rename from images/jetpack-icon.png rename to docs/images/jetpack-icon.png diff --git a/docs/images/jianshu.svg b/docs/images/jianshu.svg new file mode 100644 index 0000000..b0bf8ef --- /dev/null +++ b/docs/images/jianshu.svg @@ -0,0 +1,20 @@ + + + + + + + + + + \ No newline at end of file diff --git a/images/lifecycle.png b/docs/images/lifecycle.png similarity index 100% rename from images/lifecycle.png rename to docs/images/lifecycle.png diff --git a/images/logcat.png b/docs/images/logcat.png similarity index 100% rename from images/logcat.png rename to docs/images/logcat.png diff --git a/images/square.png b/docs/images/square.png similarity index 100% rename from images/square.png rename to docs/images/square.png diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..f6b961f Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..0c18351 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sun May 30 18:27:25 CST 2021 +distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/images/QR_Jetpack.png b/images/QR_Jetpack.png deleted file mode 100644 index 6ab1411..0000000 Binary files a/images/QR_Jetpack.png and /dev/null differ diff --git a/images/csdn.svg b/images/csdn.svg deleted file mode 100644 index a1beafc..0000000 --- a/images/csdn.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/images/donation.svg b/images/donation.svg deleted file mode 100644 index 512e525..0000000 --- a/images/donation.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/images/github.svg b/images/github.svg deleted file mode 100644 index 7903576..0000000 --- a/images/github.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/images/hero.svg b/images/hero.svg deleted file mode 100644 index 2af4611..0000000 --- a/images/hero.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/images/jetpack-hero.svg b/images/jetpack-hero.svg deleted file mode 100644 index 60a5ba8..0000000 --- a/images/jetpack-hero.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - diff --git a/images/jianshu.svg b/images/jianshu.svg deleted file mode 100644 index 99857e2..0000000 --- a/images/jianshu.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - \ No newline at end of file