diff --git a/README.md b/README.md index 05d7dc5..cb49cd6 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ public class IntroActivity extends MaterialIntroActivity ```xml + android:theme="@style/Theme.MaterialIntro" /> ``` ### Step 4: #### [Add slides:][Intro Activity] @@ -103,14 +103,14 @@ getBackButtonTranslationWrapper() - [```ParallaxLinearLayout```][ParallaxLinear] - [```ParallaxRelativeLayout```][ParallaxRelative] -#### And set there the [app:layout_parallaxFactor][ParallaxFactor] attribute: +#### And set there the [app:mis_layout_parallaxFactor][ParallaxFactor] attribute: ```xml + app:mis_layout_parallaxFactor="0.6"/> ``` All features which are not available in simple Slide Fragment are shown here: [Custom Slide] diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 40ed932..8b8637d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,16 +1,16 @@ + package="agency.tango.materialintro"> - - - - - + + + + + @@ -18,16 +18,16 @@ android:name=".SplashActivity" android:theme="@style/SplashScreen"> - - + + - + + android:theme="@style/Theme.MaterialIntro"/> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index c134d92..8fc4954 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -11,7 +11,7 @@ android:layout_gravity="center_horizontal|bottom" android:layout_margin="16dp" android:text="@string/launch_intro_activity" - android:theme="@style/ColoredButton" /> + android:theme="@style/MaterialButton" /> + app:mis_layout_parallaxFactor="0.4" /> diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml index c8e30c1..4a7d424 100644 --- a/app/src/main/res/values-v21/styles.xml +++ b/app/src/main/res/values-v21/styles.xml @@ -1,7 +1,7 @@ - - diff --git a/material-intro-screen/build.gradle b/material-intro-screen/build.gradle index 160a4ba..a7beb54 100644 --- a/material-intro-screen/build.gradle +++ b/material-intro-screen/build.gradle @@ -5,6 +5,7 @@ apply from: "$rootDir/versions.gradle" android { compileSdkVersion 25 buildToolsVersion "25.0.0" + resourcePrefix 'mis_' defaultConfig { minSdkVersion 15 diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/MaterialIntroActivity.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/MaterialIntroActivity.java index 9a96040..a85cc99 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/MaterialIntroActivity.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/MaterialIntroActivity.java @@ -77,7 +77,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { window.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS, WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS); } - setContentView(R.layout.activity_material_intro); + setContentView(R.layout.mis_activity_material_intro); overScrollLayout = (OverScrollViewPager) findViewById(R.id.view_pager_slides); viewPager = overScrollLayout.getOverScrollView(); @@ -165,7 +165,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) { } public void showPermissionsNotGrantedError() { - showError(getString(R.string.please_grant_permissions)); + showError(getString(R.string.mis_please_grant_permissions)); } /** @@ -367,13 +367,13 @@ public void pageSelected(int position) { private void nextButtonBehaviour(final int position, final SlideFragment fragment) { boolean hasPermissionToGrant = fragment.hasNeededPermissionsToGrant(); if (hasPermissionToGrant) { - nextButton.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_next)); + nextButton.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.mis_ic_next)); nextButton.setOnClickListener(permissionNotGrantedClickListener); } else if (adapter.isLastSlide(position)) { - nextButton.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_finish)); + nextButton.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.mis_ic_finish)); nextButton.setOnClickListener(finishScreenClickListener); } else { - nextButton.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_next)); + nextButton.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.mis_ic_next)); nextButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/SlideFragment.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/SlideFragment.java index ba15ac6..e1a66b0 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/SlideFragment.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/SlideFragment.java @@ -62,7 +62,7 @@ public static boolean isNotNullOrEmpty(String string) { @Nullable @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.fragment_slide, container, false); + View view = inflater.inflate(R.layout.mis_fragment_slide, container, false); titleTextView = (TextView) view.findViewById(R.id.txt_title_slide); descriptionTextView = (TextView) view.findViewById(R.id.txt_description_slide); imageView = (ImageView) view.findViewById(R.id.image_slide); @@ -108,7 +108,7 @@ public boolean canMoveFurther() { } public String cantMoveFurtherErrorMessage() { - return getString(R.string.impassable_slide); + return getString(R.string.mis_impassable_slide); } private void updateViewWithValues() { diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/EnterDefaultTranslation.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/EnterDefaultTranslation.java index 48905f0..eeee4db 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/EnterDefaultTranslation.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/EnterDefaultTranslation.java @@ -9,6 +9,6 @@ public class EnterDefaultTranslation implements IViewTranslation { @Override public void translate(View view, @FloatRange(from = 0, to = 1.0) float percentage) { - view.setTranslationY((1f - percentage) * view.getResources().getDimensionPixelOffset(R.dimen.y_offset)); + view.setTranslationY((1f - percentage) * view.getResources().getDimensionPixelOffset(R.dimen.mis_y_offset)); } } diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/ExitDefaultTranslation.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/ExitDefaultTranslation.java index a1d6693..45dcca3 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/ExitDefaultTranslation.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/translations/ExitDefaultTranslation.java @@ -9,6 +9,6 @@ public class ExitDefaultTranslation implements IViewTranslation { @Override public void translate(View view, @FloatRange(from = 0, to = 1.0) float percentage) { - view.setTranslationY(percentage * view.getResources().getDimensionPixelOffset(R.dimen.y_offset)); + view.setTranslationY(percentage * view.getResources().getDimensionPixelOffset(R.dimen.mis_y_offset)); } } diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/wrappers/NextButtonTranslationWrapper.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/wrappers/NextButtonTranslationWrapper.java index 3d8baaf..8a294fb 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/wrappers/NextButtonTranslationWrapper.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/animations/wrappers/NextButtonTranslationWrapper.java @@ -13,6 +13,6 @@ public NextButtonTranslationWrapper(View view) { setExitTranslation(new ExitDefaultTranslation()) .setDefaultTranslation(new DefaultPositionTranslation()) - .setErrorAnimation(R.anim.shake_it); + .setErrorAnimation(R.anim.mis_shake_it); } } \ No newline at end of file diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/listeners/MessageButtonBehaviourOnPageSelected.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/listeners/MessageButtonBehaviourOnPageSelected.java index 3ee439d..6c40b52 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/listeners/MessageButtonBehaviourOnPageSelected.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/listeners/MessageButtonBehaviourOnPageSelected.java @@ -29,7 +29,7 @@ public void pageSelected(int position) { if (slideFragment.hasAnyPermissionsToGrant()) { showMessageButton(slideFragment); - messageButton.setText(slideFragment.getActivity().getString(R.string.grant_permissions)); + messageButton.setText(slideFragment.getActivity().getString(R.string.mis_grant_permissions)); messageButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -41,7 +41,7 @@ public void onClick(View view) { messageButton.setText(messageButtonBehaviours.get(position).getMessageButtonText()); messageButton.setOnClickListener(messageButtonBehaviours.get(position).getClickListener()); } else if (messageButton.getVisibility() != View.INVISIBLE) { - messageButton.startAnimation(AnimationUtils.loadAnimation(slideFragment.getContext(), R.anim.fade_out)); + messageButton.startAnimation(AnimationUtils.loadAnimation(slideFragment.getContext(), R.anim.mis_fade_out)); messageButton.setVisibility(View.INVISIBLE); } } @@ -54,7 +54,7 @@ private void showMessageButton(final SlideFragment fragment) { if (messageButton.getVisibility() != View.VISIBLE) { messageButton.setVisibility(View.VISIBLE); if (fragment.getActivity() != null) { - messageButton.startAnimation(AnimationUtils.loadAnimation(fragment.getActivity(), R.anim.fade_in)); + messageButton.startAnimation(AnimationUtils.loadAnimation(fragment.getActivity(), R.anim.mis_fade_in)); } } diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxFrameLayout.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxFrameLayout.java index 2fb4f6d..30fb215 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxFrameLayout.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxFrameLayout.java @@ -60,8 +60,8 @@ public static class LayoutParams extends FrameLayout.LayoutParams { LayoutParams(Context context, AttributeSet attributeSet) { super(context, attributeSet); - TypedArray typedArray = context.obtainStyledAttributes(attributeSet, R.styleable.ParallaxLayout_Layout); - parallaxFactor = typedArray.getFloat(R.styleable.ParallaxLayout_Layout_layout_parallaxFactor, parallaxFactor); + TypedArray typedArray = context.obtainStyledAttributes(attributeSet, R.styleable.mis_ParallaxLayout_Layout); + parallaxFactor = typedArray.getFloat(R.styleable.mis_ParallaxLayout_Layout_mis_layout_parallaxFactor, parallaxFactor); typedArray.recycle(); } diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxLinearLayout.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxLinearLayout.java index 3fa2743..41c2423 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxLinearLayout.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxLinearLayout.java @@ -60,8 +60,8 @@ public static class LayoutParams extends LinearLayout.LayoutParams { LayoutParams(Context context, AttributeSet attributeSet) { super(context, attributeSet); - TypedArray typedArray = context.obtainStyledAttributes(attributeSet, R.styleable.ParallaxLayout_Layout); - parallaxFactor = typedArray.getFloat(R.styleable.ParallaxLayout_Layout_layout_parallaxFactor, parallaxFactor); + TypedArray typedArray = context.obtainStyledAttributes(attributeSet, R.styleable.mis_ParallaxLayout_Layout); + parallaxFactor = typedArray.getFloat(R.styleable.mis_ParallaxLayout_Layout_mis_layout_parallaxFactor, parallaxFactor); typedArray.recycle(); } diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxRelativeLayout.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxRelativeLayout.java index 1e524be..54025f2 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxRelativeLayout.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/parallax/ParallaxRelativeLayout.java @@ -60,8 +60,8 @@ public static class LayoutParams extends RelativeLayout.LayoutParams { LayoutParams(Context context, AttributeSet attributeSet) { super(context, attributeSet); - TypedArray typedArray = context.obtainStyledAttributes(attributeSet, R.styleable.ParallaxLayout_Layout); - parallaxFactor = typedArray.getFloat(R.styleable.ParallaxLayout_Layout_layout_parallaxFactor, parallaxFactor); + TypedArray typedArray = context.obtainStyledAttributes(attributeSet, R.styleable.mis_ParallaxLayout_Layout); + parallaxFactor = typedArray.getFloat(R.styleable.mis_ParallaxLayout_Layout_mis_layout_parallaxFactor, parallaxFactor); typedArray.recycle(); } diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/InkPageIndicator.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/InkPageIndicator.java index 5fa7762..137cd72 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/InkPageIndicator.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/InkPageIndicator.java @@ -90,16 +90,16 @@ public InkPageIndicator(Context context, AttributeSet attrs, int defStyle) { final int density = (int) context.getResources().getDisplayMetrics().density; final TypedArray typedArray = getContext().obtainStyledAttributes( - attrs, R.styleable.InkPageIndicator, defStyle, 0); + attrs, R.styleable.mis_InkPageIndicator, defStyle, 0); - dotDiameter = typedArray.getDimensionPixelSize(R.styleable.InkPageIndicator_dotDiameter, DEFAULT_DOT_SIZE * density); + dotDiameter = typedArray.getDimensionPixelSize(R.styleable.mis_InkPageIndicator_mis_dotDiameter, DEFAULT_DOT_SIZE * density); dotRadius = dotDiameter / 2; halfDotRadius = dotRadius / 2; - gap = typedArray.getDimensionPixelSize(R.styleable.InkPageIndicator_dotGap, DEFAULT_GAP * density); - animDuration = (long) typedArray.getInteger(R.styleable.InkPageIndicator_animationDuration, DEFAULT_ANIM_DURATION); + gap = typedArray.getDimensionPixelSize(R.styleable.mis_InkPageIndicator_mis_dotGap, DEFAULT_GAP * density); + animDuration = (long) typedArray.getInteger(R.styleable.mis_InkPageIndicator_mis_animationDuration, DEFAULT_ANIM_DURATION); animHalfDuration = animDuration / 2; - unselectedColour = typedArray.getColor(R.styleable.InkPageIndicator_pageIndicatorColor, DEFAULT_UNSELECTED_COLOUR); - int selectedColour = typedArray.getColor(R.styleable.InkPageIndicator_currentPageIndicatorColor, DEFAULT_SELECTED_COLOUR); + unselectedColour = typedArray.getColor(R.styleable.mis_InkPageIndicator_mis_pageIndicatorColor, DEFAULT_UNSELECTED_COLOUR); + int selectedColour = typedArray.getColor(R.styleable.mis_InkPageIndicator_mis_currentPageIndicatorColor, DEFAULT_SELECTED_COLOUR); typedArray.recycle(); unselectedPaint = new Paint(Paint.ANTI_ALIAS_FLAG); diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/OverScrollViewPager.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/OverScrollViewPager.java index 186d532..aab1941 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/OverScrollViewPager.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/OverScrollViewPager.java @@ -138,7 +138,7 @@ private boolean canOverScrollAtEnd() { private SwipeableViewPager createOverScrollView() { SwipeableViewPager swipeableViewPager = new SwipeableViewPager(getContext(), null); - swipeableViewPager.setId(R.id.swipeable_view_pager); + swipeableViewPager.setId(R.id.mis_swipeable_view_pager); return swipeableViewPager; } diff --git a/material-intro-screen/src/main/res/anim/cycle_2.xml b/material-intro-screen/src/main/res/anim/mis_cycle_2.xml similarity index 100% rename from material-intro-screen/src/main/res/anim/cycle_2.xml rename to material-intro-screen/src/main/res/anim/mis_cycle_2.xml diff --git a/material-intro-screen/src/main/res/anim/fade_in.xml b/material-intro-screen/src/main/res/anim/mis_fade_in.xml similarity index 100% rename from material-intro-screen/src/main/res/anim/fade_in.xml rename to material-intro-screen/src/main/res/anim/mis_fade_in.xml diff --git a/material-intro-screen/src/main/res/anim/fade_out.xml b/material-intro-screen/src/main/res/anim/mis_fade_out.xml similarity index 100% rename from material-intro-screen/src/main/res/anim/fade_out.xml rename to material-intro-screen/src/main/res/anim/mis_fade_out.xml diff --git a/material-intro-screen/src/main/res/anim/shake_it.xml b/material-intro-screen/src/main/res/anim/mis_shake_it.xml similarity index 80% rename from material-intro-screen/src/main/res/anim/shake_it.xml rename to material-intro-screen/src/main/res/anim/mis_shake_it.xml index 12fc9f9..c4a07f5 100644 --- a/material-intro-screen/src/main/res/anim/shake_it.xml +++ b/material-intro-screen/src/main/res/anim/mis_shake_it.xml @@ -2,5 +2,5 @@ \ No newline at end of file diff --git a/material-intro-screen/src/main/res/drawable-v21/button_background.xml b/material-intro-screen/src/main/res/drawable-v21/mis_button_background.xml similarity index 100% rename from material-intro-screen/src/main/res/drawable-v21/button_background.xml rename to material-intro-screen/src/main/res/drawable-v21/mis_button_background.xml diff --git a/material-intro-screen/src/main/res/drawable/button_background.xml b/material-intro-screen/src/main/res/drawable/mis_button_background.xml similarity index 100% rename from material-intro-screen/src/main/res/drawable/button_background.xml rename to material-intro-screen/src/main/res/drawable/mis_button_background.xml diff --git a/material-intro-screen/src/main/res/drawable/ic_finish.xml b/material-intro-screen/src/main/res/drawable/mis_ic_finish.xml similarity index 100% rename from material-intro-screen/src/main/res/drawable/ic_finish.xml rename to material-intro-screen/src/main/res/drawable/mis_ic_finish.xml diff --git a/material-intro-screen/src/main/res/drawable/ic_next.xml b/material-intro-screen/src/main/res/drawable/mis_ic_next.xml similarity index 100% rename from material-intro-screen/src/main/res/drawable/ic_next.xml rename to material-intro-screen/src/main/res/drawable/mis_ic_next.xml diff --git a/material-intro-screen/src/main/res/drawable/ic_previous.xml b/material-intro-screen/src/main/res/drawable/mis_ic_previous.xml similarity index 100% rename from material-intro-screen/src/main/res/drawable/ic_previous.xml rename to material-intro-screen/src/main/res/drawable/mis_ic_previous.xml diff --git a/material-intro-screen/src/main/res/drawable/ic_skip.xml b/material-intro-screen/src/main/res/drawable/mis_ic_skip.xml similarity index 100% rename from material-intro-screen/src/main/res/drawable/ic_skip.xml rename to material-intro-screen/src/main/res/drawable/mis_ic_skip.xml diff --git a/material-intro-screen/src/main/res/layout-land/fragment_slide.xml b/material-intro-screen/src/main/res/layout-land/mis_fragment_slide.xml similarity index 93% rename from material-intro-screen/src/main/res/layout-land/fragment_slide.xml rename to material-intro-screen/src/main/res/layout-land/mis_fragment_slide.xml index 98ee8d2..ddbe0e0 100644 --- a/material-intro-screen/src/main/res/layout-land/fragment_slide.xml +++ b/material-intro-screen/src/main/res/layout-land/mis_fragment_slide.xml @@ -16,13 +16,13 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:layout_marginRight="16dp" android:layout_marginBottom="128dp" - android:paddingTop="32dp" + android:layout_marginRight="16dp" android:layout_weight="1" android:adjustViewBounds="true" + android:paddingTop="32dp" android:visibility="gone" - app:layout_parallaxFactor="0.6" + app:mis_layout_parallaxFactor="0.6" tools:src="@android:drawable/arrow_down_float" tools:visibility="visible" /> @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:gravity="center" android:textAppearance="@style/TextAppearance.AppCompat.Headline" - app:layout_parallaxFactor="0.5" + app:mis_layout_parallaxFactor="0.5" tools:text="Lorem ipsum" /> diff --git a/material-intro-screen/src/main/res/layout/empty_fragment_slide.xml b/material-intro-screen/src/main/res/layout/empty_fragment_slide.xml deleted file mode 100644 index ca62b3a..0000000 --- a/material-intro-screen/src/main/res/layout/empty_fragment_slide.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/material-intro-screen/src/main/res/layout/activity_material_intro.xml b/material-intro-screen/src/main/res/layout/mis_activity_material_intro.xml similarity index 81% rename from material-intro-screen/src/main/res/layout/activity_material_intro.xml rename to material-intro-screen/src/main/res/layout/mis_activity_material_intro.xml index 0826b95..5cbe553 100644 --- a/material-intro-screen/src/main/res/layout/activity_material_intro.xml +++ b/material-intro-screen/src/main/res/layout/mis_activity_material_intro.xml @@ -30,7 +30,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal|bottom" - android:theme="@style/ColoredButton" + android:theme="@style/Widget.ColoredButton" android:visibility="invisible" tools:text="Message btn" /> @@ -46,9 +46,9 @@ android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:layout_marginLeft="16dp" - android:background="@drawable/button_background" + android:background="@drawable/mis_button_background" android:padding="16dp" - android:src="@drawable/ic_previous" + android:src="@drawable/mis_ic_previous" android:visibility="invisible" /> + app:mis_animationDuration="320" + app:mis_currentPageIndicatorColor="@android:color/white" + app:mis_dotDiameter="8dp" + app:mis_dotGap="8dp" + app:mis_pageIndicatorColor="@android:color/holo_red_light" /> + android:src="@drawable/mis_ic_next" /> diff --git a/material-intro-screen/src/main/res/layout/fragment_slide.xml b/material-intro-screen/src/main/res/layout/mis_fragment_slide.xml similarity index 93% rename from material-intro-screen/src/main/res/layout/fragment_slide.xml rename to material-intro-screen/src/main/res/layout/mis_fragment_slide.xml index b8ed075..983ca3f 100644 --- a/material-intro-screen/src/main/res/layout/fragment_slide.xml +++ b/material-intro-screen/src/main/res/layout/mis_fragment_slide.xml @@ -26,7 +26,7 @@ android:layout_weight="1" android:adjustViewBounds="true" android:gravity="center" - app:layout_parallaxFactor="0.6" + app:mis_layout_parallaxFactor="0.6" tools:src="@android:drawable/sym_action_call" /> diff --git a/material-intro-screen/src/main/res/values-v21/styles.xml b/material-intro-screen/src/main/res/values-v21/styles.xml index a5663b4..dce9a94 100644 --- a/material-intro-screen/src/main/res/values-v21/styles.xml +++ b/material-intro-screen/src/main/res/values-v21/styles.xml @@ -1,13 +1,13 @@ - + - - diff --git a/material-intro-screen/src/main/res/values/attrs.xml b/material-intro-screen/src/main/res/values/attrs.xml index 4dcfc69..59921f4 100644 --- a/material-intro-screen/src/main/res/values/attrs.xml +++ b/material-intro-screen/src/main/res/values/attrs.xml @@ -1,13 +1,13 @@ - - - - - - + + + + + + - - + + \ No newline at end of file diff --git a/material-intro-screen/src/main/res/values/colors.xml b/material-intro-screen/src/main/res/values/colors.xml index 6a195f9..885af63 100644 --- a/material-intro-screen/src/main/res/values/colors.xml +++ b/material-intro-screen/src/main/res/values/colors.xml @@ -1,5 +1,5 @@ - @android:color/transparent + @android:color/transparent \ No newline at end of file diff --git a/material-intro-screen/src/main/res/values/dimens.xml b/material-intro-screen/src/main/res/values/dimens.xml index a4d05b0..c178919 100644 --- a/material-intro-screen/src/main/res/values/dimens.xml +++ b/material-intro-screen/src/main/res/values/dimens.xml @@ -1,4 +1,4 @@ - 72dp + 72dp \ No newline at end of file diff --git a/material-intro-screen/src/main/res/values/ids.xml b/material-intro-screen/src/main/res/values/ids.xml index 79ba769..dd7e099 100644 --- a/material-intro-screen/src/main/res/values/ids.xml +++ b/material-intro-screen/src/main/res/values/ids.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/material-intro-screen/src/main/res/values/strings.xml b/material-intro-screen/src/main/res/values/strings.xml index b2480a8..a18bfc0 100644 --- a/material-intro-screen/src/main/res/values/strings.xml +++ b/material-intro-screen/src/main/res/values/strings.xml @@ -1,6 +1,6 @@ - material-intro-screen - Grant permissions - Please grant needed permissions - Can\'t pass this slide. + material-intro-screen + Grant permissions + Please grant needed permissions + Can\'t pass this slide. diff --git a/material-intro-screen/src/main/res/values/styles.xml b/material-intro-screen/src/main/res/values/styles.xml index 13307cc..9f37492 100644 --- a/material-intro-screen/src/main/res/values/styles.xml +++ b/material-intro-screen/src/main/res/values/styles.xml @@ -1,12 +1,12 @@ - + - -