Merge branch 'develop'

# Conflicts:
#	.gitignore

Author: xiangang

.gitignore

@@ -86,6 +86,8 @@ lint/tmp/
 
 ComposePlane/.idea/
 
+AndroidDoubleColorBall/\.idea/
+
 AndroidComposeExamples/.idea/
 
 AndroidGradlePluginsSample/.idea/
@@ -97,3 +99,5 @@ AndroidJetpackComposeSample/.idea/
 ASanTest/\.idea/
 
 LooperLinearLayoutManager/\.idea/
+
+\.idea/

AndroidASMSample/app/build.gradle

@@ -4,7 +4,7 @@ plugins {
     id 'greeting'
 }
 
-apply plugin: 'asm-gradle-plugin'
+//pply plugin: 'asm-gradle-plugin'
 
 android {
     compileSdk 31

AndroidASMSample/gradle.properties

@@ -17,4 +17,9 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
-org.gradle.java.home=/work/android/android-studio-4.0/android-studio/jre
+# 替换成实际的JDK 11的路径
+org.gradle.java.home=/work/android/android-studio/jre
+
+# 填入成你自己的key和secret
+gradle.publish.key=AJaM95kZyhPcGMOUcAeHfi4v93dHL96d
+gradle.publish.secret=ZeBa9hltMiExByWoFtl4LGHExjrQk93n

AndroidASMSample/keystore.properties

@@ -0,0 +1,3 @@
+# 线上版本持续集成使用环境变量，本地开发时手动填上对应的值
+gradlePublishKey = AJaM95kZyhPcGMOUcAeHfi4v93dHL96d
+gradlePublishSecret= gradle.publish.secret=ZeBa9hltMiExByWoFtl4LGHExjrQk93n

AndroidComposeExamples/app/src/main/java/com/nxg/compose/MainActivity.kt

@@ -2,14 +2,13 @@ package com.nxg.compose
 
 import android.animation.ArgbEvaluator
 import android.os.Bundle
+import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.animation.core.*
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
@@ -18,6 +17,7 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -32,9 +32,9 @@ class MainActivity : ComponentActivity() {
             AndroidComposeExamplesTheme {
                 // A surface container using the 'background' color from the theme
                 Surface(color = MaterialTheme.colors.background) {
-                    Greeting("Android")
+                    //Greeting("Android")
 
-                    TestComposeGradientColorAnimate()
+                    TestComposeGradientColorAnimate2()
                 }
             }
         }
@@ -43,6 +43,7 @@ class MainActivity : ComponentActivity() {
 
 @Composable
 fun Greeting(name: String) {
+
     Text(text = "Hello $name!")
 }
 
@@ -130,3 +131,33 @@ fun TestComposeGradientColorAnimate() {
     }
 
 }
+
+
+/**
+ * 测试渐变动画
+ */
+@Composable
+fun TestComposeGradientColorAnimate2() {
+
+    //触发渐变动画用的状态
+    var state by remember {
+        mutableStateOf(0)
+    }
+
+
+
+    print("state $state")
+
+    Box(
+        modifier = Modifier
+            .size(100.dp)
+            .background(Color.DarkGray)
+            .offset(x = 100.dp, y = (100).dp)
+            .clickable {
+                print("触发渐变动画-------->")
+                state++
+            }
+    )
+
+}
+

AndroidDoubleColorBall/.idea/gradle.xml

@@ -41,4 +41,5 @@ dependencies {
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    implementation 'com.github.xiangang:LooperLinearLayoutManager:v1.0.0-alpha01'
 }

AndroidDoubleColorBall/.idea/misc.xml

@@ -32,7 +32,6 @@
 import androidx.annotation.NonNull;
 import androidx.core.view.ViewCompat;
 import androidx.recyclerview.widget.ItemTouchHelper;
-import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.LinearSmoothScroller;
 import androidx.recyclerview.widget.OrientationHelper;
 import androidx.recyclerview.widget.RecyclerView;

AndroidDoubleColorBall/ScrollView/build.gradle

@@ -56,11 +56,11 @@ class NotificationsFragment : Fragment() {
         val scrollView6: ScrollView = binding.scrollView6
         val scrollView7: ScrollView = binding.scrollView7
         val configurationBlue = ScrollView.build {
-            scrollAnimatorDuration = 6000L
+            scrollAnimatorDuration = 3000L
             itemLayoutId = R.layout.item_text_blue
         }
         val configurationRed = ScrollView.build {
-            scrollAnimatorDuration = 6000L
+            scrollAnimatorDuration = 3000L
             itemLayoutId = R.layout.item_text_red
         }
         scrollView.setConfiguration(configurationRed)

AndroidDoubleColorBall/ScrollView/src/main/java/com/nxg/srollview/widget/LooperLinearLayoutManager.java

@@ -7,5 +7,5 @@
 
     <solid android:color="@android:color/transparent" />
 
-    <corners android:radius="20dp" />
+    <corners android:radius="22dp" />
 </shape>

AndroidDoubleColorBall/app/src/main/java/com/nxg/ssq/ui/notifications/NotificationsFragment.kt

@@ -7,5 +7,5 @@
 
     <solid android:color="@android:color/transparent" />
 
-    <corners android:radius="20dp" />
+    <corners android:radius="22dp" />
 </shape>

AndroidDoubleColorBall/app/src/main/res/drawable/shape_scroll_view_blue.xml

@@ -33,8 +33,8 @@
         app:layout_constraintVertical_bias="0.3">
 
         <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="44dp"
+            android:layout_height="44dp"
             android:background="@drawable/shape_scroll_view_red"
             android:gravity="center"
             android:orientation="vertical"
@@ -56,8 +56,8 @@
             android:layout_height="match_parent" />
 
         <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="44dp"
+            android:layout_height="44dp"
             android:background="@drawable/shape_scroll_view_red"
             android:gravity="center"
             android:orientation="vertical"
@@ -80,8 +80,8 @@
 
 
         <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="44dp"
+            android:layout_height="44dp"
             android:background="@drawable/shape_scroll_view_red"
             android:gravity="center"
             android:orientation="vertical"
@@ -103,8 +103,8 @@
             android:layout_height="match_parent" />
 
         <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="44dp"
+            android:layout_height="44dp"
             android:background="@drawable/shape_scroll_view_red"
             android:gravity="center"
             android:orientation="vertical"
@@ -126,8 +126,8 @@
             android:layout_height="match_parent" />
 
         <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="44dp"
+            android:layout_height="44dp"
             android:background="@drawable/shape_scroll_view_red"
             android:gravity="center"
             android:orientation="vertical"
@@ -150,8 +150,8 @@
 
 
         <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="44dp"
+            android:layout_height="44dp"
             android:background="@drawable/shape_scroll_view_red"
             android:gravity="center"
             android:orientation="vertical"
@@ -173,8 +173,8 @@
             android:layout_height="match_parent" />
 
         <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="44dp"
+            android:layout_height="44dp"
             android:background="@drawable/shape_scroll_view_blue"
             android:gravity="center"
             android:orientation="vertical"

AndroidDoubleColorBall/app/src/main/res/drawable/shape_scroll_view_red.xml

@@ -1,6 +1,7 @@
 plugins {
     id 'java-gradle-plugin'
     id 'maven-publish'
+    id 'org.jetbrains.kotlin.jvm'          // 注意要应用Kotlin 插件
 }
 
 //定义Maven仓库信息
@@ -33,8 +34,6 @@ publishing {
         maven {
             url = layout.buildDirectory.dir(MAVEN_NAME)
         }
-        maven {
-            url = "/home/xiangang/.m2/repository/"
-        }
+        mavenLocal()
     }
 }

AndroidDoubleColorBall/app/src/main/res/layout/fragment_notifications.xml

@@ -2,8 +2,8 @@ plugins {
     id 'com.android.application'
     id 'kotlin-android'
     id 'com.nxg.plugins.greeting'
-    //如果是本地没发过该插件，需要先注释掉这里，插件发布后在打开注释
-    id 'com.nxg.plugins.greeting-standalone' version '1.0.0'
+    //如果本地没发布过该插件，需要先注释掉这里，插件发布后再打开注释
+    //id 'com.nxg.plugins.greeting-standalone' version '1.0.0'
 }
 
 

AndroidGradlePluginsSample/StandaloneGradlePluginProject/build.gradle

@@ -19,4 +19,5 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-org.gradle.java.home=/work/android/android-studio-4.0/android-studio/jre
+# 替换成实际的JDK 11的路径
+org.gradle.java.home=/work/android/android-studio/jre

AndroidGradlePluginsSample/app/build.gradle

@@ -11,9 +11,6 @@ pluginManagement {
     repositories {
         mavenLocal()
         gradlePluginPortal()
-        maven {
-            url = "/home/xiangang/.m2/repository/"
-        }
     }
 }
 dependencyResolutionManagement {