diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5e5ea47 --- /dev/null +++ b/.gitignore @@ -0,0 +1,50 @@ +# built application files +*.apk +*.ap_ + +# lint folder +lint + +# files for the dex VM +*.dex + +# Java class files +*.class + +# generated files +bin/ +gen/ +classes/ +gen-external-apklibs/ + +# maven output folder +target + +# OSX files +.DS_Store + +# Windows files +Thumbs.db + +# vi swap files +*.swp + +# backup files +*.bak + +# Android Studio +*.iml +*.ipr +*.iws +.idea/ + +# dummy +*.classpath +*.settings/ +*local.properties + +.gradle +/build +/captures +*/build + diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml deleted file mode 100644 index dcfd244..0000000 --- a/.idea/assetWizardSettings.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index ae78c11..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - \ No newline at end of file diff --git a/.idea/dictionaries/metecanduyal.xml b/.idea/dictionaries/metecanduyal.xml deleted file mode 100644 index bee96bf..0000000 --- a/.idea/dictionaries/metecanduyal.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 7ac24c7..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index f029bc1..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 09261aa..de0b964 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,11 +5,12 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 28 + namespace "app.layout.motion.motionlayoutexample" + compileSdkVersion 32 defaultConfig { applicationId "app.layout.motion.motionlayoutexample" - minSdkVersion 18 - targetSdkVersion 29 + minSdkVersion 21 + targetSdkVersion 32 versionCode 1 versionName "1.0" vectorDrawables.useSupportLibrary = true @@ -24,16 +25,17 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.1.0' +// implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10" + implementation 'androidx.appcompat:appcompat:1.4.1' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta3' - implementation 'androidx.constraintlayout:constraintlayout-solver:2.0.0-beta3' - implementation 'androidx.recyclerview:recyclerview:1.1.0-rc01' - implementation 'de.hdodenhof:circleimageview:2.2.0' - implementation 'androidx.fragment:fragment:1.2.0-rc02' - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.3.0-alpha02' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha02' + implementation 'androidx.constraintlayout:constraintlayout:2.1.3' + implementation 'androidx.constraintlayout:constraintlayout-solver:2.0.4' + implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation 'de.hdodenhof:circleimageview:3.1.0' + implementation 'androidx.fragment:fragment:1.4.1' + implementation 'com.google.android.material:material:1.9.0' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test:runner:1.4.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 14a020c..e8ec820 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + > - + diff --git a/app/src/main/java/app/layout/motion/motionlayoutexample/CustomBottomSheetBehavior.kt b/app/src/main/java/app/layout/motion/motionlayoutexample/CustomBottomSheetBehavior.kt new file mode 100644 index 0000000..8e7ecc4 --- /dev/null +++ b/app/src/main/java/app/layout/motion/motionlayoutexample/CustomBottomSheetBehavior.kt @@ -0,0 +1,38 @@ +package app.layout.motion.motionlayoutexample; + +import android.annotation.SuppressLint +import android.content.Context +import android.util.AttributeSet +import android.util.Log +import android.view.MotionEvent +import android.view.View +import androidx.constraintlayout.motion.widget.MotionLayout +import androidx.coordinatorlayout.widget.CoordinatorLayout +import com.google.android.material.bottomsheet.BottomSheetBehavior + +public class CustomBottomSheetBehavior(context: Context, attrs: AttributeSet) : BottomSheetBehavior(context, attrs) { + private val TAG = "CustomBottomSheetBehavior" + + @SuppressLint("LongLogTag") + override fun onInterceptTouchEvent(parent: CoordinatorLayout, child: V, event: MotionEvent): Boolean { + Log.i(TAG, "onInterceptTouchEvent, child: " + child + " MotionEvent:" + event) + + if (state == BottomSheetBehavior.STATE_EXPANDED) { + return false + } + + if (child is MotionLayout) { + val shouldIntercept = child.progress < 1 + isDraggable = shouldIntercept + return if (shouldIntercept) { + super.onInterceptTouchEvent(parent, child, event) + } else { + false + } + } + + return super.onInterceptTouchEvent(parent, child, event) + } + + +} \ No newline at end of file diff --git a/app/src/main/java/app/layout/motion/motionlayoutexample/DemoActivity.kt b/app/src/main/java/app/layout/motion/motionlayoutexample/DemoActivity.kt index 0afc826..8e1003b 100644 --- a/app/src/main/java/app/layout/motion/motionlayoutexample/DemoActivity.kt +++ b/app/src/main/java/app/layout/motion/motionlayoutexample/DemoActivity.kt @@ -1,18 +1,26 @@ package app.layout.motion.motionlayoutexample import android.animation.ArgbEvaluator +import android.content.res.ColorStateList import android.graphics.Color import android.os.Build import android.os.Bundle import android.os.Handler +import android.util.DisplayMetrics +import android.view.MotionEvent import android.view.View import android.view.WindowManager +import android.widget.LinearLayout import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import androidx.constraintlayout.motion.widget.MotionLayout import androidx.core.content.ContextCompat import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView +import com.google.android.material.bottomsheet.BottomSheetBehavior +import com.google.android.material.shape.CornerFamily +import com.google.android.material.shape.MaterialShapeDrawable +import com.google.android.material.shape.ShapeAppearanceModel class DemoActivity : AppCompatActivity(), MotionLayout.TransitionListener { @@ -26,6 +34,16 @@ class DemoActivity : AppCompatActivity(), MotionLayout.TransitionListener { private var startColor = Color.parseColor("#f48930") private var endColor = Color.parseColor("#b55fa3") private var currentColor = Color.parseColor("#b55fa3") + private var bottomSheetBehavior: BottomSheetBehavior? = null + + fun getScreenHeight(windowManager: WindowManager?): Int { + if (windowManager == null) { + return 0 + } + val metrics = DisplayMetrics() + windowManager.defaultDisplay.getMetrics(metrics) + return metrics.heightPixels + } override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -34,6 +52,51 @@ class DemoActivity : AppCompatActivity(), MotionLayout.TransitionListener { setTheme() setContentView(layout) initViews() + + // Initialize the bottom sheet behavior + val bottomSheet: LinearLayout? = findViewById(R.id.bottom_sheet) + if (null!=bottomSheet) { + val layoutParams = bottomSheet?.layoutParams + layoutParams?.height = getScreenHeight(windowManager) + bottomSheet?.layoutParams = layoutParams + + bottomSheetBehavior = BottomSheetBehavior.from(bottomSheet) +// bottomSheetBehavior.isDraggable = false + // Set the initial state of the bottom sheet + bottomSheetBehavior?.state = BottomSheetBehavior.STATE_COLLAPSED + + // Set the peek height (the height of the bottom sheet when it is collapsed) + bottomSheetBehavior?.peekHeight = 100 + bottomSheetBehavior?.isFitToContents = false + // Set the half expanded ratio (the ratio of the height of the bottom sheet when it is half expanded) + bottomSheetBehavior?.halfExpandedRatio = 0.6f + + val shapeAppearanceModel = ShapeAppearanceModel.Builder() + .setTopLeftCorner(CornerFamily.ROUNDED, 36f) + .setTopRightCorner(CornerFamily.ROUNDED, 36f) + .build() + + val materialShapeDrawable = MaterialShapeDrawable(shapeAppearanceModel).apply{ + fillColor = ColorStateList.valueOf(Color.WHITE) // Set the desired color + } + bottomSheet.background = materialShapeDrawable + + // Set the bottom sheet callback to handle changes in state + bottomSheetBehavior?.addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() { + override fun onStateChanged(bottomSheet: View, newState: Int) { + // Handle state change + + if (newState == BottomSheetBehavior.STATE_EXPANDED) { +// bottomSheetBehavior.isDraggable=false + } + } + + override fun onSlide(bottomSheet: View, slideOffset: Float) { + // Handle slide + } + }) + } + recyclerView!!.apply { setHasFixedSize(true) adapter = DummyListAdapter() @@ -67,11 +130,24 @@ class DemoActivity : AppCompatActivity(), MotionLayout.TransitionListener { motionLayout = findViewById(R.id.motionLayout) recyclerView = findViewById(R.id.recyclerView) + // Intercept the recyclerView onTouch event + recyclerView?.setOnTouchListener { _, event -> + if (bottomSheetBehavior?.state == BottomSheetBehavior.STATE_HALF_EXPANDED) { + // Disable the recyclerView scroll event when the BottomSheet is in Half Expand + return@setOnTouchListener true + } + return@setOnTouchListener false + } + if (layout == R.layout.collapsing_toolbar_2) { titleTextView = findViewById(R.id.title) } } + override fun onTouchEvent(event: MotionEvent?): Boolean { + return super.onTouchEvent(event) + } + override fun onTransitionChange(p0: MotionLayout?, p1: Int, p2: Int, progress: Float) { if (p0 == null) return diff --git a/app/src/main/java/app/layout/motion/motionlayoutexample/MainActivity.kt b/app/src/main/java/app/layout/motion/motionlayoutexample/MainActivity.kt index 37f9168..6b15ac6 100644 --- a/app/src/main/java/app/layout/motion/motionlayoutexample/MainActivity.kt +++ b/app/src/main/java/app/layout/motion/motionlayoutexample/MainActivity.kt @@ -13,16 +13,66 @@ class MainActivity : AppCompatActivity() { private lateinit var mLayoutManager: LinearLayoutManager private val mAdapterData: Array = arrayOf( - MainAdapter.Demo("Basic Collapsing Toolbar", ExampleTypes.DEFAULT, R.layout.collapsing_toolbar), - MainAdapter.Demo("Collapsing Toolbar w/ Text Interpolation", ExampleTypes.DEFAULT, R.layout.collapsing_toolbar_2), - MainAdapter.Demo("Collapsing Toolbar w/ Cover Example", ExampleTypes.FULLSCREEN, R.layout.collapsing_toolbar_with_cover), - MainAdapter.Demo("Complex Animation Example", ExampleTypes.WITHOUT_RECYCLER_VIEW, R.layout.complex_animation_example, ComplexAnimationActivity::class.java), - MainAdapter.Demo("Multiple Animation Example", ExampleTypes.FULLSCREEN, R.layout.multiple_animation_example, ComplexAnimationActivity::class.java), - MainAdapter.Demo("Basic Keyframe Example", ExampleTypes.WITHOUT_RECYCLER_VIEW, R.layout.basic_key_frame_example), - MainAdapter.Demo("Basic Keyframe Example 2", ExampleTypes.WITHOUT_RECYCLER_VIEW, R.layout.basic_key_frame_example_2), - MainAdapter.Demo("Notification Center Example", ExampleTypes.DEFAULT, R.layout.notification_center_example), - MainAdapter.Demo("ViewPager Example", ExampleTypes.VIEW_PAGER, R.layout.viewpager_example, ViewPagerActivity::class.java), - MainAdapter.Demo("Youtube Fragment Transition Example", ExampleTypes.FRAGMENT, R.layout.youtube_fragment_transition_example, FragmentActivity::class.java) + MainAdapter.Demo( + "Basic Collapsing Toolbar", + ExampleTypes.DEFAULT, + R.layout.collapsing_toolbar + ), + MainAdapter.Demo( + "Collapsing Toolbar w/ Text Interpolation", + ExampleTypes.DEFAULT, + R.layout.collapsing_toolbar_2 + ), + MainAdapter.Demo( + "Collapsing Toolbar w/ Cover Example", + ExampleTypes.FULLSCREEN, + R.layout.collapsing_toolbar_with_cover + ), + MainAdapter.Demo( + "Collapsing Toolbar with BottomSheet " + + "Example", + ExampleTypes.FULLSCREEN, + R.layout.collapsing_toolbar_with_cover_bottomsheet + ), + MainAdapter.Demo( + "Complex Animation Example", + ExampleTypes.WITHOUT_RECYCLER_VIEW, + R.layout.complex_animation_example, + ComplexAnimationActivity::class.java + ), + MainAdapter.Demo( + "Multiple Animation Example", + ExampleTypes.FULLSCREEN, + R.layout.multiple_animation_example, + ComplexAnimationActivity::class.java + ), + MainAdapter.Demo( + "Basic Keyframe Example", + ExampleTypes.WITHOUT_RECYCLER_VIEW, + R.layout.basic_key_frame_example + ), + MainAdapter.Demo( + "Basic Keyframe Example 2", + ExampleTypes.WITHOUT_RECYCLER_VIEW, + R.layout.basic_key_frame_example_2 + ), + MainAdapter.Demo( + "Notification Center Example", + ExampleTypes.DEFAULT, + R.layout.notification_center_example + ), + MainAdapter.Demo( + "ViewPager Example", + ExampleTypes.VIEW_PAGER, + R.layout.viewpager_example, + ViewPagerActivity::class.java + ), + MainAdapter.Demo( + "Youtube Fragment Transition Example", + ExampleTypes.FRAGMENT, + R.layout.youtube_fragment_transition_example, + FragmentActivity::class.java + ) ) diff --git a/app/src/main/res/layout/collapsing_toolbar_with_cover_bottomsheet.xml b/app/src/main/res/layout/collapsing_toolbar_with_cover_bottomsheet.xml new file mode 100644 index 0000000..05feeb7 --- /dev/null +++ b/app/src/main/res/layout/collapsing_toolbar_with_cover_bottomsheet.xml @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 7645d28..fb61b95 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.6.10' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath 'com.android.tools.build:gradle:7.3.1' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f6b961f..7454180 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 e0c4de3..45fe15e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Thu Sep 14 23:06:14 CST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index cccdd3d..1b6c787 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,129 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015-2021 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. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## 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/master/subprojects/plugins/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_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${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="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # 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 @@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + 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. Please set the JAVA_HOME variable in your environment to match the @@ -89,84 +140,95 @@ location of your Java installation." 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*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + 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" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; 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 # 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=$((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" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# 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 e95643d..ac1b06f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@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 @@ -13,15 +29,18 @@ 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= +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 init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,28 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :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 %CMD_LINE_ARGS% +"%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