diff --git a/LoopBar b/LoopBar new file mode 160000 index 0000000..00228e0 --- /dev/null +++ b/LoopBar @@ -0,0 +1 @@ +Subproject commit 00228e0edc3172fcc4b5f99be38737e92fcc34c6 diff --git a/LoopBar-widget/src/main/java/com/cleveroad/loopbar/widget/LoopBarView.java b/LoopBar-widget/src/main/java/com/cleveroad/loopbar/widget/LoopBarView.java index 95efed7..0069c53 100644 --- a/LoopBar-widget/src/main/java/com/cleveroad/loopbar/widget/LoopBarView.java +++ b/LoopBar-widget/src/main/java/com/cleveroad/loopbar/widget/LoopBarView.java @@ -115,6 +115,7 @@ public class LoopBarView extends FrameLayout implements OnItemClickListener { private RecyclerView.Adapter mInputAdapter; private List mClickListeners = new ArrayList<>(); private int mColorCodeSelectionView; + private int mColorListBackground; //view settings private Animator mSelectionInAnimator; @@ -181,7 +182,7 @@ private void inflate(IOrientationState orientationState, int placeHolderId, int /* background color must be set to container of recyclerView. * If you set it to main view, there will be any transparent part * when selector has overlay */ - vRvContainer.setBackgroundResource(backgroundResource); + vRvContainer.setBackgroundColor(backgroundResource); } private void init(Context context, @Nullable AttributeSet attrs) { @@ -189,6 +190,11 @@ private void init(Context context, @Nullable AttributeSet attrs) { TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.LoopBarView); mColorCodeSelectionView = typedArray.getColor(R.styleable.LoopBarView_enls_selectionBackground, ContextCompat.getColor(getContext(), android.R.color.holo_blue_dark)); + + mColorListBackground = typedArray.getColor(R.styleable.LoopBarView_enls_listBackground, + ContextCompat.getColor(getContext(), android.R.color.holo_green_dark)); + + int orientation = typedArray .getInteger(R.styleable.LoopBarView_enls_orientation, Orientation.ORIENTATION_HORIZONTAL); int selectionAnimatorInId = typedArray @@ -215,7 +221,7 @@ private void init(Context context, @Nullable AttributeSet attrs) { int[] attributes = new int[]{android.R.attr.background}; //then obtain typed array typedArray = context.obtainStyledAttributes(attrs, attributes); - int backgroundResource = typedArray.getResourceId(0, R.color.enls_default_list_background); + int backgroundResource = typedArray.getResourceId(0, mColorListBackground); mSelectionInAnimator = AnimatorInflater.loadAnimator(getContext(), selectionAnimatorInId); mSelectionOutAnimator = AnimatorInflater.loadAnimator(getContext(), selectionAnimatorOutId); diff --git a/LoopBar-widget/src/main/res/values/EndlessNavigationViewAttrs.xml b/LoopBar-widget/src/main/res/values/EndlessNavigationViewAttrs.xml index 4e36a1f..37ee364 100644 --- a/LoopBar-widget/src/main/res/values/EndlessNavigationViewAttrs.xml +++ b/LoopBar-widget/src/main/res/values/EndlessNavigationViewAttrs.xml @@ -16,6 +16,7 @@ + diff --git a/gradlew b/gradlew old mode 100755 new mode 100644 diff --git a/gradlew.bat b/gradlew.bat index aec9973..8a0b282 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,90 +1,90 @@ -@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 - -@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 DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@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 - -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 init - -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 - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_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=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -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% - -: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 +@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 + +@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 DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@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 + +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 init + +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 + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_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=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +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% + +: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 diff --git a/sample/src/main/res/layout/fragment_loopbar_horizontal.xml b/sample/src/main/res/layout/fragment_loopbar_horizontal.xml index c422b54..56cc5aa 100644 --- a/sample/src/main/res/layout/fragment_loopbar_horizontal.xml +++ b/sample/src/main/res/layout/fragment_loopbar_horizontal.xml @@ -64,6 +64,7 @@ app:enls_selectionGravity="start" app:enls_selectionInAnimation="@animator/enls_scale_restore" app:enls_selectionMargin="10dp" - app:enls_selectionOutAnimation="@animator/enls_scale_small" /> + app:enls_selectionOutAnimation="@animator/enls_scale_small" + app:enls_listBackground="@android:color/darker_gray"/> \ No newline at end of file diff --git a/sample/src/main/res/layout/fragment_loopbar_vertical.xml b/sample/src/main/res/layout/fragment_loopbar_vertical.xml index 306debb..4d4a348 100644 --- a/sample/src/main/res/layout/fragment_loopbar_vertical.xml +++ b/sample/src/main/res/layout/fragment_loopbar_vertical.xml @@ -60,6 +60,7 @@ app:enls_scrollMode="auto" app:enls_selectionBackground="@android:color/holo_blue_dark" app:enls_selectionGravity="start" - app:enls_selectionMargin="10dp" /> + app:enls_selectionMargin="10dp" + app:enls_listBackground="@android:color/darker_gray"/>