diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..ea7e0e9 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,26 @@ +name: Build + +on: + push: + pull_request: + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Configure JDK + uses: actions/setup-java@v4 + with: + distribution: zulu + java-version: '17' + cache: gradle + + - name: Validate Gradle Wrapper + uses: gradle/actions/wrapper-validation@v4 + + - name: Build + run: ./gradlew build diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml new file mode 100644 index 0000000..816827c --- /dev/null +++ b/.github/workflows/publish-release.yml @@ -0,0 +1,33 @@ +name: Publish Release + +on: + push: + tags: + - '*' + +env: + RELEASE_SIGNING_ENABLED: true + +jobs: + publish: + runs-on: ubuntu-latest + if: github.repository == 'Commit451/AdapterLayout' + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Install JDK + uses: actions/setup-java@v4 + with: + distribution: zulu + java-version: '17' + cache: gradle + + - name: Release to Maven Central + run: ./gradlew publishAndReleaseToMavenCentral -PVERSION_NAME="${GITHUB_REF_NAME}" --no-configuration-cache + env: + ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_CENTRAL_USERNAME }} + ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} + ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_PRIVATE_KEY }} + ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 7c4c1b1..0000000 --- a/.travis.yml +++ /dev/null @@ -1,11 +0,0 @@ -language: android - -jdk: - - oraclejdk8 - -before_install: - - chmod +x gradlew - - mkdir "$ANDROID_HOME/licenses" || true - - echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > "$ANDROID_HOME/licenses/android-sdk-license" - -script: "./gradlew build" diff --git a/README.md b/README.md index c79ea11..ff7a23c 100644 --- a/README.md +++ b/README.md @@ -1,38 +1,24 @@ # AdapterLayout ViewGroup backed by RecyclerView.Adapter, allowing for easy data set manipulation with non recycling views. Aka RecyclerView minus the recycling. -[![Build Status](https://travis-ci.org/Commit451/AdapterLayout.svg?branch=master)](https://travis-ci.org/Commit451/AdapterLayout) [![](https://jitpack.io/v/Commit451/AdapterLayout.svg)](https://jitpack.io/#Commit451/AdapterLayout) +[![Build](https://github.com/Commit451/AdapterLayout/actions/workflows/ci.yml/badge.svg)](https://github.com/Commit451/AdapterLayout/actions/workflows/ci.yml) [![Maven Central](https://img.shields.io/maven-central/v/com.commit451.adapterlayout/adapterlayout.svg?label=Maven%20Central)](https://central.sonatype.com/search?q=g:com.commit451.adapterlayout) # Dependency -```gradle -allprojects { - repositories { - maven { url "https://jitpack.io" } - } -} -``` -and within your application `build.gradle` - ```gradle dependencies { - implementation 'com.github.Commit451.AdapterLayout:adapterlayout:latest.release.here' + implementation "com.commit451.adapterlayout:adapterlayout:latest.release.here" } ``` and for [FlowLayout](https://github.com/blazsolar/FlowLayout) support: [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.wefika/flowlayout/badge.svg?style=flat)](https://maven-badges.herokuapp.com/maven-central/com.wefika/flowlayout) ```gradle dependencies { - //add the latest of FlowLayout - implementation 'com.wefika:flowlayout:latest.release.here' - implementation 'com.github.Commit451.AdapterLayout:adapterflowlayout:latest.release.here' -} -``` -and for Kotlin extensions support: -```gradle -dependencies { - implementation 'com.github.Commit451.AdapterLayout:adapterlayout-kotlin:latest.release.here' + // add the latest of FlowLayout + implementation "com.wefika:flowlayout:latest.release.here" + implementation "com.commit451.adapterlayout:adapterflowlayout:latest.release.here" } ``` +Kotlin extensions are included in `adapterlayout`. # Usage See the sample project for full usage. diff --git a/adapterflowlayout/build.gradle b/adapterflowlayout/build.gradle deleted file mode 100644 index d363870..0000000 --- a/adapterflowlayout/build.gradle +++ /dev/null @@ -1,30 +0,0 @@ -apply plugin: 'com.android.library' - -android { - compileSdkVersion rootProject.ext.compileSdkVersion - - defaultConfig { - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 1 - versionName "1.0" - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } - lintOptions { - abortOnError false - } -} - -dependencies { - compileOnly("com.wefika:flowlayout:0.4.1") { - exclude group: 'com.intellij', module: 'annotations' - } - compileOnly project(':adapterlayout') -} - -apply from: 'https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.0.0/gradle-android-javadocs.gradle' diff --git a/adapterflowlayout/build.gradle.kts b/adapterflowlayout/build.gradle.kts new file mode 100644 index 0000000..40f39da --- /dev/null +++ b/adapterflowlayout/build.gradle.kts @@ -0,0 +1,54 @@ +import com.vanniktech.maven.publish.AndroidSingleVariantLibrary +import com.vanniktech.maven.publish.SonatypeHost + +plugins { + id("com.android.library") + id("com.vanniktech.maven.publish") +} + +group = findProperty("GROUP") as String +version = findProperty("VERSION_NAME") as String + +android { + namespace = "com.commit451.adapterflowlayout" + compileSdk = 35 + + defaultConfig { + minSdk = 21 + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro", + ) + } + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + lint { + abortOnError = false + } +} + +dependencies { + compileOnly("com.wefika:flowlayout:0.4.1") { + exclude(group = "com.intellij", module = "annotations") + } + compileOnly(project(":adapterlayout")) +} + +mavenPublishing { + configure(AndroidSingleVariantLibrary("release", true, true)) + coordinates("com.commit451.adapterlayout", "adapterflowlayout", version.toString()) + publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL) + if (System.getenv("RELEASE_SIGNING_ENABLED") == "true") { + signAllPublications() + } +} diff --git a/adapterflowlayout/src/main/AndroidManifest.xml b/adapterflowlayout/src/main/AndroidManifest.xml index 330d191..cc947c5 100644 --- a/adapterflowlayout/src/main/AndroidManifest.xml +++ b/adapterflowlayout/src/main/AndroidManifest.xml @@ -1,2 +1 @@ - + diff --git a/adapterflowlayout/src/main/java/com/commit451/adapterflowlayout/AdapterFlowLayout.java b/adapterflowlayout/src/main/java/com/commit451/adapterflowlayout/AdapterFlowLayout.java deleted file mode 100644 index 8bf1181..0000000 --- a/adapterflowlayout/src/main/java/com/commit451/adapterflowlayout/AdapterFlowLayout.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.commit451.adapterflowlayout; - -import android.content.Context; -import android.util.AttributeSet; - -import com.commit451.adapterlayout.AdapterLayoutDelegate; -import com.wefika.flowlayout.FlowLayout; - -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -/** - * {@link com.wefika.flowlayout.FlowLayout} with {@link androidx.recyclerview.widget.RecyclerView.Adapter} support. - */ -@SuppressWarnings("unused") -public class AdapterFlowLayout extends FlowLayout { - - private AdapterLayoutDelegate adapterLayoutDelegate; - - public AdapterFlowLayout(Context context) { - super(context); - } - - public AdapterFlowLayout(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public AdapterFlowLayout(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - } - - public void setAdapter(RecyclerView.Adapter adapter) { - if (adapterLayoutDelegate == null) { - adapterLayoutDelegate = new AdapterLayoutDelegate(this); - } - adapterLayoutDelegate.setAdapter(adapter); - } - - @Nullable - public RecyclerView.Adapter getAdapter() { - if (adapterLayoutDelegate != null) { - return adapterLayoutDelegate.getAdapter(); - } - return null; - } - - @Nullable - public RecyclerView.ViewHolder getViewHolderAt(int index) { - if (adapterLayoutDelegate != null) { - return adapterLayoutDelegate.getViewHolderAt(index); - } - return null; - } -} diff --git a/adapterflowlayout/src/main/java/com/commit451/adapterflowlayout/AdapterFlowLayout.kt b/adapterflowlayout/src/main/java/com/commit451/adapterflowlayout/AdapterFlowLayout.kt new file mode 100644 index 0000000..e9c2b3e --- /dev/null +++ b/adapterflowlayout/src/main/java/com/commit451/adapterflowlayout/AdapterFlowLayout.kt @@ -0,0 +1,39 @@ +@file:Suppress("unused") + +package com.commit451.adapterflowlayout + +import android.content.Context +import android.util.AttributeSet +import androidx.annotation.Nullable +import androidx.recyclerview.widget.RecyclerView +import com.commit451.adapterlayout.AdapterLayoutDelegate +import com.wefika.flowlayout.FlowLayout + +/** + * [FlowLayout] with [RecyclerView.Adapter] support. + */ +class AdapterFlowLayout : FlowLayout { + + private var adapterLayoutDelegate: AdapterLayoutDelegate? = null + + constructor(context: Context?) : super(context) + + constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs) + + constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) + + @get:Nullable + var adapter: RecyclerView.Adapter<*>? + get() = adapterLayoutDelegate?.getAdapter() + set(value) { + if (adapterLayoutDelegate == null) { + adapterLayoutDelegate = AdapterLayoutDelegate(this) + } + adapterLayoutDelegate?.setAdapter(value) + } + + @Nullable + fun getViewHolderAt(index: Int): RecyclerView.ViewHolder? { + return adapterLayoutDelegate?.getViewHolderAt(index) + } +} diff --git a/adapterlayout-kotlin/.gitignore b/adapterlayout-kotlin/.gitignore deleted file mode 100644 index 796b96d..0000000 --- a/adapterlayout-kotlin/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/adapterlayout-kotlin/build.gradle b/adapterlayout-kotlin/build.gradle deleted file mode 100644 index d4e604a..0000000 --- a/adapterlayout-kotlin/build.gradle +++ /dev/null @@ -1,28 +0,0 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' - -android { - compileSdkVersion rootProject.ext.compileSdkVersion - - defaultConfig { - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 1 - versionName "1.0" - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } - lintOptions { - abortOnError false - } -} - -dependencies { - api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - - compileOnly project(':adapterlayout') -} diff --git a/adapterlayout-kotlin/proguard-rules.pro b/adapterlayout-kotlin/proguard-rules.pro deleted file mode 100644 index 8ef0f5b..0000000 --- a/adapterlayout-kotlin/proguard-rules.pro +++ /dev/null @@ -1,17 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /Users/johncarlson/Develop/Android/sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/adapterlayout-kotlin/src/main/AndroidManifest.xml b/adapterlayout-kotlin/src/main/AndroidManifest.xml deleted file mode 100644 index e2f5bed..0000000 --- a/adapterlayout-kotlin/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/adapterlayout/build.gradle b/adapterlayout/build.gradle deleted file mode 100644 index 8e71d22..0000000 --- a/adapterlayout/build.gradle +++ /dev/null @@ -1,27 +0,0 @@ -apply plugin: 'com.android.library' - -android { - compileSdkVersion rootProject.ext.compileSdkVersion - - defaultConfig { - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 1 - versionName "1.0" - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } - lintOptions { - abortOnError false - } -} - -dependencies { - api "androidx.recyclerview:recyclerview:1.1.0" -} - -apply from: 'https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.0.0/gradle-android-javadocs.gradle' diff --git a/adapterlayout/build.gradle.kts b/adapterlayout/build.gradle.kts new file mode 100644 index 0000000..c193d3c --- /dev/null +++ b/adapterlayout/build.gradle.kts @@ -0,0 +1,51 @@ +import com.vanniktech.maven.publish.AndroidSingleVariantLibrary +import com.vanniktech.maven.publish.SonatypeHost + +plugins { + id("com.android.library") + id("com.vanniktech.maven.publish") +} + +group = findProperty("GROUP") as String +version = findProperty("VERSION_NAME") as String + +android { + namespace = "com.commit451.adapterlayout" + compileSdk = 35 + + defaultConfig { + minSdk = 21 + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro", + ) + } + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + lint { + abortOnError = false + } +} + +dependencies { + api("androidx.recyclerview:recyclerview:1.4.0") +} + +mavenPublishing { + configure(AndroidSingleVariantLibrary("release", true, true)) + coordinates("com.commit451.adapterlayout", "adapterlayout", version.toString()) + publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL) + if (System.getenv("RELEASE_SIGNING_ENABLED") == "true") { + signAllPublications() + } +} diff --git a/adapterlayout/src/main/AndroidManifest.xml b/adapterlayout/src/main/AndroidManifest.xml index 33ab65f..cc947c5 100644 --- a/adapterlayout/src/main/AndroidManifest.xml +++ b/adapterlayout/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/adapterlayout/src/main/java/com/commit451/adapterlayout/AdapterLayout.java b/adapterlayout/src/main/java/com/commit451/adapterlayout/AdapterLayout.java deleted file mode 100644 index 5a0c29f..0000000 --- a/adapterlayout/src/main/java/com/commit451/adapterlayout/AdapterLayout.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.commit451.adapterlayout; - -import androidx.recyclerview.widget.RecyclerView; - -/** - * Provides access to some of the public API of AdapterLayout in a way that will be available for any given - * AdapterLayout - */ -public class AdapterLayout { - - /** - * Get the position in the AdapterLayout of the View holder. - * Use this instead of {@link RecyclerView.ViewHolder#getAdapterPosition()} - * - * @param viewHolder the holder to find the position of - * @return the index of the holder, or -1 if not found - */ - public static int getAdapterPosition(RecyclerView.ViewHolder viewHolder) { - return getPosition(viewHolder); - } - - /** - * Get the position in the AdapterLayout of the View holder. - * Use this instead of {@link RecyclerView.ViewHolder#getLayoutPosition()} - * - * @param viewHolder the holder to find the position of - * @return the index of the holder, or -1 if not found - */ - public static int getLayoutPosition(RecyclerView.ViewHolder viewHolder) { - return getPosition(viewHolder); - } - - private static int getPosition(RecyclerView.ViewHolder viewHolder) { - return (int) viewHolder.itemView.getTag(R.id.adapter_layout_list_position); - } -} diff --git a/adapterlayout/src/main/java/com/commit451/adapterlayout/AdapterLayout.kt b/adapterlayout/src/main/java/com/commit451/adapterlayout/AdapterLayout.kt new file mode 100644 index 0000000..d707275 --- /dev/null +++ b/adapterlayout/src/main/java/com/commit451/adapterlayout/AdapterLayout.kt @@ -0,0 +1,39 @@ +package com.commit451.adapterlayout + +import androidx.recyclerview.widget.RecyclerView + +/** + * Provides access to some of the public API of AdapterLayout in a way that will be available for any given + * AdapterLayout + */ +class AdapterLayout { + companion object { + /** + * Get the position in the AdapterLayout of the View holder. + * Use this instead of [RecyclerView.ViewHolder.getAdapterPosition] + * + * @param viewHolder the holder to find the position of + * @return the index of the holder, or -1 if not found + */ + @JvmStatic + fun getAdapterPosition(viewHolder: RecyclerView.ViewHolder): Int { + return getPosition(viewHolder) + } + + /** + * Get the position in the AdapterLayout of the View holder. + * Use this instead of [RecyclerView.ViewHolder.getLayoutPosition] + * + * @param viewHolder the holder to find the position of + * @return the index of the holder, or -1 if not found + */ + @JvmStatic + fun getLayoutPosition(viewHolder: RecyclerView.ViewHolder): Int { + return getPosition(viewHolder) + } + + private fun getPosition(viewHolder: RecyclerView.ViewHolder): Int { + return viewHolder.itemView.getTag(R.id.adapter_layout_list_position) as Int + } + } +} diff --git a/adapterlayout/src/main/java/com/commit451/adapterlayout/AdapterLayoutDelegate.java b/adapterlayout/src/main/java/com/commit451/adapterlayout/AdapterLayoutDelegate.java deleted file mode 100644 index 5f2823d..0000000 --- a/adapterlayout/src/main/java/com/commit451/adapterlayout/AdapterLayoutDelegate.java +++ /dev/null @@ -1,200 +0,0 @@ -package com.commit451.adapterlayout; - -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -/** - * Does all the hard to work to map a {@link androidx.recyclerview.widget.RecyclerView.Adapter} to a - * {@link ViewGroup}. See {@link AdapterLinearLayout} for an example on how to create your own - */ -public class AdapterLayoutDelegate { - - private RecyclerView.Adapter adapter; - private ViewGroup viewGroup; - - /** - * Checks for if the data changes and changes the views accordingly - */ - private RecyclerView.AdapterDataObserver observer = new RecyclerView.AdapterDataObserver() { - @Override - public void onChanged() { - super.onChanged(); - //too general, we just have to completely recreate - recreateViews(); - reindex(); - } - - @Override - public void onItemRangeChanged(int positionStart, int itemCount) { - super.onItemRangeChanged(positionStart, itemCount); - updateViews(positionStart, itemCount); - reindex(); - } - - @Override - public void onItemRangeChanged(int positionStart, int itemCount, Object payload) { - super.onItemRangeChanged(positionStart, itemCount, payload); - updateViews(positionStart, itemCount); - reindex(); - } - - @Override - public void onItemRangeInserted(int positionStart, int itemCount) { - super.onItemRangeInserted(positionStart, itemCount); - addViews(positionStart, itemCount); - reindex(); - } - - @Override - public void onItemRangeRemoved(int positionStart, int itemCount) { - super.onItemRangeRemoved(positionStart, itemCount); - removeViews(positionStart, itemCount); - reindex(); - } - - @Override - public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) { - super.onItemRangeMoved(fromPosition, toPosition, itemCount); - // this should probably be smarter and just move relevant views - recreateViews(); - reindex(); - } - }; - - /** - * Create a new delegate, acting as the bridge between the adapter and the ViewGroup - * - * @param viewGroup the ViewGroup which will have views added and removed from - */ - public AdapterLayoutDelegate(ViewGroup viewGroup) { - this.viewGroup = viewGroup; - } - - /** - * Set the adapter which will add and remove views from this layout - * - * @param adapter the adapter - */ - public void setAdapter(@Nullable RecyclerView.Adapter adapter) { - if (this.adapter != null) { - try { - this.adapter.unregisterAdapterDataObserver(observer); - } catch (Exception ignored) { - } - } - - this.adapter = adapter; - if (this.adapter != null) { - this.adapter.registerAdapterDataObserver(observer); - } - recreateViews(); - } - - /** - * Returns the adapter which was passed via {@link #setAdapter(RecyclerView.Adapter)} - * - * @return the adapter - */ - public RecyclerView.Adapter getAdapter() { - return adapter; - } - - /** - * Return the {@link RecyclerView.ViewHolder} at the specified position. - * - * @param index the position at which to get the ViewHolder - * @return the ViewHolder at the index, or null if none exists - */ - @Nullable - public RecyclerView.ViewHolder getViewHolderAt(int index) { - View view = viewGroup.getChildAt(index); - if (view == null) { - return null; - } - return (RecyclerView.ViewHolder) view.getTag(R.id.adapter_layout_list_holder); - } - - private void addViews(int positionStart, int itemCount) { - final int end = positionStart + itemCount; - for (int i = positionStart; i < end; i++) { - addViewAt(i); - } - } - - private void addViewAt(int index) { - addViewAt(adapter.getItemViewType(index), index); - } - - private void addViewAt(int viewType, int index) { - RecyclerView.ViewHolder viewHolder = adapter.onCreateViewHolder(viewGroup, viewType); - //setting the lib to min 4.0 to avoid leaks from doing this - viewHolder.itemView.setTag(R.id.adapter_layout_list_holder, viewHolder); - viewHolder.itemView.setTag(R.id.adapter_layout_list_view_type, viewType); - viewHolder.itemView.setTag(R.id.adapter_layout_list_position, index); - viewGroup.addView(viewHolder.itemView); - //noinspection unchecked - adapter.onBindViewHolder(viewHolder, index); - } - - private void updateViews(int positionStart, int itemCount) { - final int end = positionStart + itemCount; - for (int i = positionStart; i < end; i++) { - RecyclerView.ViewHolder viewHolder = getViewHolderAt(i); - //noinspection unchecked - adapter.onBindViewHolder(viewHolder, i); - } - } - - private void removeViews(int positionStart, int itemCount) { - viewGroup.removeViews(positionStart, itemCount); - } - - /** - * Updates all the views to match the dataset changing. Its kinda a last resort since we would - * prefer to just adjust the views that were changed or removed - */ - private void recreateViews() { - if (adapter == null) { - viewGroup.removeAllViews(); - return; - } - int i; - for (i = 0; i < adapter.getItemCount(); i++) { - int viewType = adapter.getItemViewType(i); - //This means the view could already exist - if (i < viewGroup.getChildCount()) { - View child = viewGroup.getChildAt(i); - Integer savedViewType = (Integer) child.getTag(R.id.adapter_layout_list_view_type); - RecyclerView.ViewHolder savedViewHolder = (RecyclerView.ViewHolder) child.getTag(R.id.adapter_layout_list_holder); - - if (savedViewType != null && savedViewType == viewType && savedViewHolder != null) { - //perfect, it exists and is the right type, so just bind it - //noinspection unchecked - adapter.onBindViewHolder(savedViewHolder, i); - } else { - //it already existed, but something was wrong. So remove it and recreate it - addViewAt(viewType, i); - viewGroup.removeView(child); - } - } else { - //Creating a brand new view - addViewAt(viewType, i); - } - } - - //Outside the bounds of the dataset, so remove it - if (i < viewGroup.getChildCount()) { - viewGroup.removeViews(i, viewGroup.getChildCount() - i); - } - } - - private void reindex() { - for (int i = 0; i < adapter.getItemCount(); i++) { - View child = viewGroup.getChildAt(i); - child.setTag(R.id.adapter_layout_list_position, i); - } - } -} diff --git a/adapterlayout/src/main/java/com/commit451/adapterlayout/AdapterLayoutDelegate.kt b/adapterlayout/src/main/java/com/commit451/adapterlayout/AdapterLayoutDelegate.kt new file mode 100644 index 0000000..7c5bcc2 --- /dev/null +++ b/adapterlayout/src/main/java/com/commit451/adapterlayout/AdapterLayoutDelegate.kt @@ -0,0 +1,184 @@ +package com.commit451.adapterlayout + +import android.view.View +import android.view.ViewGroup +import androidx.annotation.Nullable +import androidx.recyclerview.widget.RecyclerView + +/** + * Does all the hard to work to map a [RecyclerView.Adapter] to a + * [ViewGroup]. See [AdapterLinearLayout] for an example on how to create your own + */ +class AdapterLayoutDelegate( + private val viewGroup: ViewGroup, +) { + + @Suppress("UNCHECKED_CAST") + private var adapter: RecyclerView.Adapter? = null + + /** + * Checks for if the data changes and changes the views accordingly + */ + private val observer = object : RecyclerView.AdapterDataObserver() { + override fun onChanged() { + super.onChanged() + // too general, we just have to completely recreate + recreateViews() + reindex() + } + + override fun onItemRangeChanged(positionStart: Int, itemCount: Int) { + super.onItemRangeChanged(positionStart, itemCount) + updateViews(positionStart, itemCount) + reindex() + } + + override fun onItemRangeChanged(positionStart: Int, itemCount: Int, payload: Any?) { + super.onItemRangeChanged(positionStart, itemCount, payload) + updateViews(positionStart, itemCount) + reindex() + } + + override fun onItemRangeInserted(positionStart: Int, itemCount: Int) { + super.onItemRangeInserted(positionStart, itemCount) + addViews(positionStart, itemCount) + reindex() + } + + override fun onItemRangeRemoved(positionStart: Int, itemCount: Int) { + super.onItemRangeRemoved(positionStart, itemCount) + removeViews(positionStart, itemCount) + reindex() + } + + override fun onItemRangeMoved(fromPosition: Int, toPosition: Int, itemCount: Int) { + super.onItemRangeMoved(fromPosition, toPosition, itemCount) + // this should probably be smarter and just move relevant views + recreateViews() + reindex() + } + } + + /** + * Set the adapter which will add and remove views from this layout + * + * @param adapter the adapter + */ + @Suppress("UNCHECKED_CAST") + fun setAdapter(@Nullable adapter: RecyclerView.Adapter<*>?) { + this.adapter?.let { + try { + it.unregisterAdapterDataObserver(observer) + } catch (_: Exception) { + } + } + + this.adapter = adapter as? RecyclerView.Adapter + this.adapter?.registerAdapterDataObserver(observer) + recreateViews() + } + + /** + * Returns the adapter which was passed via [setAdapter] + * + * @return the adapter + */ + fun getAdapter(): RecyclerView.Adapter<*>? = adapter + + /** + * Return the [RecyclerView.ViewHolder] at the specified position. + * + * @param index the position at which to get the ViewHolder + * @return the ViewHolder at the index, or null if none exists + */ + @Nullable + fun getViewHolderAt(index: Int): RecyclerView.ViewHolder? { + val view = viewGroup.getChildAt(index) ?: return null + return view.getTag(R.id.adapter_layout_list_holder) as? RecyclerView.ViewHolder + } + + private fun addViews(positionStart: Int, itemCount: Int) { + val end = positionStart + itemCount + for (i in positionStart until end) { + addViewAt(i) + } + } + + private fun addViewAt(index: Int) { + val safeAdapter = adapter ?: return + addViewAt(safeAdapter.getItemViewType(index), index) + } + + private fun addViewAt(viewType: Int, index: Int) { + val safeAdapter = adapter ?: return + val viewHolder = safeAdapter.onCreateViewHolder(viewGroup, viewType) + // setting min sdk high enough to avoid leaks doing this + viewHolder.itemView.setTag(R.id.adapter_layout_list_holder, viewHolder) + viewHolder.itemView.setTag(R.id.adapter_layout_list_view_type, viewType) + viewHolder.itemView.setTag(R.id.adapter_layout_list_position, index) + viewGroup.addView(viewHolder.itemView) + safeAdapter.onBindViewHolder(viewHolder, index) + } + + private fun updateViews(positionStart: Int, itemCount: Int) { + val safeAdapter = adapter ?: return + val end = positionStart + itemCount + for (i in positionStart until end) { + val viewHolder = getViewHolderAt(i) ?: continue + safeAdapter.onBindViewHolder(viewHolder, i) + } + } + + private fun removeViews(positionStart: Int, itemCount: Int) { + viewGroup.removeViews(positionStart, itemCount) + } + + /** + * Updates all the views to match the dataset changing. Its kinda a last resort since we would + * prefer to just adjust the views that were changed or removed + */ + private fun recreateViews() { + val safeAdapter = adapter + if (safeAdapter == null) { + viewGroup.removeAllViews() + return + } + + var i = 0 + while (i < safeAdapter.itemCount) { + val viewType = safeAdapter.getItemViewType(i) + // This means the view could already exist + if (i < viewGroup.childCount) { + val child = viewGroup.getChildAt(i) + val savedViewType = child.getTag(R.id.adapter_layout_list_view_type) as? Int + val savedViewHolder = child.getTag(R.id.adapter_layout_list_holder) as? RecyclerView.ViewHolder + + if (savedViewType != null && savedViewType == viewType && savedViewHolder != null) { + // perfect, it exists and is the right type, so just bind it + safeAdapter.onBindViewHolder(savedViewHolder, i) + } else { + // it already existed, but something was wrong. So remove it and recreate it + addViewAt(viewType, i) + viewGroup.removeView(child) + } + } else { + // Creating a brand new view + addViewAt(viewType, i) + } + i++ + } + + // Outside the bounds of the dataset, so remove it + if (i < viewGroup.childCount) { + viewGroup.removeViews(i, viewGroup.childCount - i) + } + } + + private fun reindex() { + val count = adapter?.itemCount ?: return + for (i in 0 until count) { + val child: View = viewGroup.getChildAt(i) + child.setTag(R.id.adapter_layout_list_position, i) + } + } +} diff --git a/adapterlayout/src/main/java/com/commit451/adapterlayout/AdapterLinearLayout.java b/adapterlayout/src/main/java/com/commit451/adapterlayout/AdapterLinearLayout.java deleted file mode 100644 index f3fc290..0000000 --- a/adapterlayout/src/main/java/com/commit451/adapterlayout/AdapterLinearLayout.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.commit451.adapterlayout; - -import android.annotation.TargetApi; -import android.content.Context; -import android.os.Build; -import android.util.AttributeSet; -import android.widget.Adapter; -import android.widget.LinearLayout; - -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -/** - * LinearLayout with {@link Adapter} support. See {@link AdapterLayoutDelegate} for - * the good bits, and follow the convention here to create your own {@link RecyclerView.Adapter} - * backed {@link android.view.ViewGroup} - */ -@SuppressWarnings("unused") -public class AdapterLinearLayout extends LinearLayout { - - private AdapterLayoutDelegate adapterLayoutDelegate; - - public AdapterLinearLayout(Context context) { - super(context); - } - - public AdapterLinearLayout(Context context, AttributeSet attrs) { - super(context, attrs); - } - - @TargetApi(Build.VERSION_CODES.HONEYCOMB) - public AdapterLinearLayout(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - } - - @TargetApi(Build.VERSION_CODES.LOLLIPOP) - public AdapterLinearLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - } - - public void setAdapter(RecyclerView.Adapter adapter) { - if (adapterLayoutDelegate == null) { - adapterLayoutDelegate = new AdapterLayoutDelegate(this); - } - adapterLayoutDelegate.setAdapter(adapter); - } - - @Nullable - public RecyclerView.Adapter getAdapter() { - if (adapterLayoutDelegate != null) { - return adapterLayoutDelegate.getAdapter(); - } - return null; - } - - @Nullable - public RecyclerView.ViewHolder getViewHolderAt(int index) { - if (adapterLayoutDelegate != null) { - return adapterLayoutDelegate.getViewHolderAt(index); - } - return null; - } -} diff --git a/adapterlayout/src/main/java/com/commit451/adapterlayout/AdapterLinearLayout.kt b/adapterlayout/src/main/java/com/commit451/adapterlayout/AdapterLinearLayout.kt new file mode 100644 index 0000000..4197978 --- /dev/null +++ b/adapterlayout/src/main/java/com/commit451/adapterlayout/AdapterLinearLayout.kt @@ -0,0 +1,48 @@ +@file:Suppress("unused") + +package com.commit451.adapterlayout + +import android.content.Context +import android.util.AttributeSet +import android.widget.Adapter +import android.widget.LinearLayout +import androidx.annotation.Nullable +import androidx.recyclerview.widget.RecyclerView + +/** + * LinearLayout with [Adapter] support. See [AdapterLayoutDelegate] for + * the good bits, and follow the convention here to create your own [RecyclerView.Adapter] + * backed [android.view.ViewGroup] + */ +class AdapterLinearLayout : LinearLayout { + + private var adapterLayoutDelegate: AdapterLayoutDelegate? = null + + constructor(context: Context) : super(context) + + constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) + + constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) + + constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super( + context, + attrs, + defStyleAttr, + defStyleRes, + ) + + @get:Nullable + var adapter: RecyclerView.Adapter<*>? + get() = adapterLayoutDelegate?.getAdapter() + set(value) { + if (adapterLayoutDelegate == null) { + adapterLayoutDelegate = AdapterLayoutDelegate(this) + } + adapterLayoutDelegate?.setAdapter(value) + } + + @Nullable + fun getViewHolderAt(index: Int): RecyclerView.ViewHolder? { + return adapterLayoutDelegate?.getViewHolderAt(index) + } +} diff --git a/adapterlayout-kotlin/src/main/java/com/commit451/adapterlayout/kotlin/kotlin.kt b/adapterlayout/src/main/java/com/commit451/adapterlayout/kotlin/kotlin.kt similarity index 100% rename from adapterlayout-kotlin/src/main/java/com/commit451/adapterlayout/kotlin/kotlin.kt rename to adapterlayout/src/main/java/com/commit451/adapterlayout/kotlin/kotlin.kt diff --git a/app/build.gradle b/app/build.gradle deleted file mode 100644 index a8508c1..0000000 --- a/app/build.gradle +++ /dev/null @@ -1,39 +0,0 @@ -apply plugin: 'com.android.application' - -apply plugin: 'kotlin-android' - -android { - compileSdkVersion rootProject.ext.compileSdkVersion - - defaultConfig { - applicationId "com.commit451.adapterlayout.sample" - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 1 - versionName "1.0" - vectorDrawables.useSupportLibrary = true - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } - lintOptions { - abortOnError false - } -} - -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation "androidx.appcompat:appcompat:1.2.0" - implementation "com.google.android.material:material:1.2.1" - - implementation("com.wefika:flowlayout:0.4.1") { - exclude group: 'com.intellij', module: 'annotations' - } - - implementation project(':adapterlayout') - - implementation project(':adapterflowlayout') -} diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..e0beea2 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,48 @@ +plugins { + id("com.android.application") +} + +android { + namespace = "com.commit451.adapterlayout.sample" + compileSdk = 35 + + defaultConfig { + applicationId = "com.commit451.adapterlayout.sample" + minSdk = 21 + targetSdk = 35 + versionCode = 1 + versionName = "1.0" + vectorDrawables.useSupportLibrary = true + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro", + ) + } + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + lint { + abortOnError = false + } +} + +dependencies { + implementation("androidx.appcompat:appcompat:1.7.1") + implementation("com.google.android.material:material:1.13.0") + + implementation("com.wefika:flowlayout:0.4.1") { + exclude(group = "com.intellij", module = "annotations") + } + + implementation(project(":adapterlayout")) + implementation(project(":adapterflowlayout")) +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ff833f2..7f2ba41 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + - + diff --git a/app/src/main/java/com/commit451/adapterlayout/sample/MainActivity.kt b/app/src/main/java/com/commit451/adapterlayout/sample/MainActivity.kt index 98febd4..e149a01 100644 --- a/app/src/main/java/com/commit451/adapterlayout/sample/MainActivity.kt +++ b/app/src/main/java/com/commit451/adapterlayout/sample/MainActivity.kt @@ -38,9 +38,9 @@ class MainActivity : AppCompatActivity() { findViewById(R.id.change_all).setOnClickListener { adapter.changeAll() } findViewById(R.id.set_to_5).setOnClickListener { adapter.setData(Cheeses.getRandomCheeses(5)) } findViewById(R.id.new_adapter).setOnClickListener { - adapterLinearLayout.setAdapter(null) + adapterLinearLayout.adapter = null adapter = CheeseAdapter(listener) - adapterLinearLayout.setAdapter(adapter) + adapterLinearLayout.adapter = adapter } toolbar.setTitle(R.string.app_name) toolbar.inflateMenu(R.menu.main) diff --git a/build.gradle b/build.gradle deleted file mode 100644 index b2f8197..0000000 --- a/build.gradle +++ /dev/null @@ -1,30 +0,0 @@ -buildscript { - ext.kotlin_version = '1.4.10' - repositories { - google() - jcenter() - } - dependencies { - classpath 'com.android.tools.build:gradle:4.0.1' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' - } -} - -allprojects { - repositories { - google() - jcenter() - maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" } - } -} - -task clean(type: Delete) { - delete rootProject.buildDir -} - -ext { - minSdkVersion = 15 - compileSdkVersion = 30 - targetSdkVersion = compileSdkVersion -} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..d709a4e --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,9 @@ +plugins { + id("com.android.application") version "9.1.0" apply false + id("com.android.library") version "9.1.0" apply false + id("com.vanniktech.maven.publish") version "0.30.0" apply false +} + +tasks.register("clean") { + delete(rootProject.layout.buildDirectory) +} diff --git a/gradle.properties b/gradle.properties index ccd5dda..abd25c7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,19 +1,26 @@ -# Project-wide Gradle settings. +android.useAndroidX=true -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html +GROUP=com.commit451.adapterlayout +VERSION_NAME=1.2.1 -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -# Default value: -Xmx10248m -XX:MaxPermSize=256m -# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +POM_NAME=AdapterLayout +POM_DESCRIPTION=ViewGroup backed by RecyclerView.Adapter, without recycling +POM_INCEPTION_YEAR=2018 +POM_URL=https://github.com/Commit451/AdapterLayout/ -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true -android.useAndroidX=true \ No newline at end of file +POM_LICENSE_NAME=The Apache Software License, Version 2.0 +POM_LICENSE_URL=https://www.apache.org/licenses/LICENSE-2.0.txt +POM_LICENSE_DIST=repo + +POM_SCM_URL=https://github.com/Commit451/AdapterLayout/ +POM_SCM_CONNECTION=scm:git:git://github.com/Commit451/AdapterLayout.git +POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/Commit451/AdapterLayout.git + +POM_DEVELOPER_ID=Commit451 +POM_DEVELOPER_NAME=Commit 451 +POM_DEVELOPER_URL=https://github.com/Commit451/ + +SONATYPE_CONNECT_TIMEOUT_SECONDS=60 +SONATYPE_CLOSE_TIMEOUT_SECONDS=900 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..61285a6 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 33682bb..5f38436 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-all.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..adff685 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,81 +15,114 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +131,118 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 107acd3..e509b2d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,89 +1,93 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 5c9c8ce..0000000 --- a/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':app', ':adapterlayout', ':adapterflowlayout', ':adapterlayout-kotlin' diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..85d80e3 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,18 @@ +pluginManagement { + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +rootProject.name = "AdapterLayout" +include(":app", ":adapterlayout", ":adapterflowlayout")