Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit a284407
Merge: 33b0c4e 6cae917
Author: Filip Skowron <[email protected]>
Date:   Thu Sep 21 12:51:46 2017 +0200

    Merge pull request TangoAgency#97 from TangoAgency/feature/set_message_btn_text

    TangoAgency#91 Add MessageButtonClickListener

commit 6cae917
Author: bezmian <[email protected]>
Date:   Thu Sep 21 12:45:51 2017 +0200

    TangoAgency#91 Fix issue with non working MessageButtonBehaviour in example IntroActivity

commit ab5745a
Merge: 3fd86e3 33b0c4e
Author: bezmian <[email protected]>
Date:   Thu Sep 21 12:42:36 2017 +0200

    Merge remote-tracking branch 'origin/release/0.0.6' into feature/set_message_btn_text

    # Conflicts:
    #	README.md
    #	app/src/main/java/agency/tango/materialintro/IntroActivity.java
    #	build.gradle
    #	gradle/wrapper/gradle-wrapper.properties
    #	versions.gradle

commit 33b0c4e
Merge: a3245c0 b92da12
Author: Filip Skowron <[email protected]>
Date:   Thu Sep 21 12:39:52 2017 +0200

    Merge pull request TangoAgency#87 from TangoAgency/feature/update_lint

    Update Android Support Repository versions

commit b92da12
Author: bezmian <[email protected]>
Date:   Thu Sep 21 12:29:14 2017 +0200

    TangoAgency#87 Second attempt to fix travis builds

commit b915682
Author: bezmian <[email protected]>
Date:   Thu Sep 21 12:24:46 2017 +0200

    TangoAgency#87 Attempt to fix travis builds

commit c320585
Author: bezmian <[email protected]>
Date:   Thu Sep 21 12:19:50 2017 +0200

    TangoAgency#87 Update Android support libraries to 26.1.0

commit 67316a4
Merge: b63f8dc a3245c0
Author: bezmian <[email protected]>
Date:   Thu Sep 21 11:55:29 2017 +0200

    Merge remote-tracking branch 'origin/release/0.0.6' into feature/update_lint

    # Conflicts:
    #	gradle/wrapper/gradle-wrapper.properties

commit a3245c0
Merge: e510ea9 c8cbb54
Author: Filip Skowron <[email protected]>
Date:   Thu Sep 21 11:53:40 2017 +0200

    Merge pull request TangoAgency#78 from TangoAgency/feature/permissions_android_lollipop

    Permissions in Android Lollipop

commit e510ea9
Merge: db289f7 b6e9565
Author: Filip Skowron <[email protected]>
Date:   Thu Sep 21 11:14:17 2017 +0200

    Merge pull request TangoAgency#98 from TangoAgency/feature/custom_permission_string

    TangoAgency#62 Add translatable permissions strings for Slides

commit b6e9565
Author: bezmian <[email protected]>
Date:   Mon Apr 3 14:40:18 2017 +0200

    TangoAgency#62 Add translatable permissions strings for Slides
     * Update README.md
     * Add example to app module

commit b63f8dc
Author: bezmian <[email protected]>
Date:   Mon Apr 3 11:22:03 2017 +0200

    Update AndroidSupportLibrary version
     * Fix style bug on Android < v21

commit 3fd86e3
Author: bezmian <[email protected]>
Date:   Thu Mar 30 11:56:45 2017 +0200

    TangoAgency#91 Add MessageButtonClickListener
     * Update Readme
     * Update gradle
     * Update AndroidSupportRepository version

commit 4dda9b9
Author: bezmian <[email protected]>
Date:   Fri Mar 3 14:06:04 2017 +0100

    Update Android Support Repository versions
     * Update gradle build tools to 2.3
     * Fix Lint errors in App module

commit c8cbb54
Author: bezmian <[email protected]>
Date:   Mon Feb 20 14:04:48 2017 +0100

    Remove unnecessary methods from CustomSlide
     * Use Android TextUtils

commit db289f7
Author: Filip Skowron <[email protected]>
Date:   Mon Feb 20 11:29:34 2017 +0100

    Add showing error on failed swipe (TangoAgency#77)

    * Add ISlideErrorHandler
     * Better code formatting

commit 253c7c8
Author: Filip Skowron <[email protected]>
Date:   Mon Feb 20 11:22:32 2017 +0100

    Update Support Libraries to 25.1.1 (TangoAgency#80)

    * Add ParallaxPercentFrameLayout
     * Add ParallaxPercentRelativeLayout

commit 758608b
Merge: cdfb1bf b22bf75
Author: bezmian <[email protected]>
Date:   Mon Feb 20 10:45:53 2017 +0100

    Merge remote-tracking branch 'origin/release/0.0.6' into feature/permissions_android_lollipop

    # Conflicts:
    #	README.md
    #	material-intro-screen/src/main/java/agency/tango/materialintroscreen/fragments/SlideFragmentBase.java

commit b22bf75
Author: Filip Skowron <[email protected]>
Date:   Mon Feb 20 10:29:53 2017 +0100

    Add Jacoco support (TangoAgency#83)

    * buildToolsVersion set to 25.0.2

commit 69a806f
Author: Filip Skowron <[email protected]>
Date:   Mon Feb 20 10:29:20 2017 +0100

    Add base slide fragment class (TangoAgency#75)

    * SlideFragmentBuilder now throws Exception when missing necessary properties

    * Fix Codacy issues
     * Better class fields managment
     * Better packages naming

    * Fix Codacy issues
     * Suppress warnings in classes from other open source projects
     * Suppress warnings for nested condition statements for better readability

    * Move permissions handling to SlideFragmentBase
     * SlidesAdapter now stores SlideFragmentBase
     * Migrate every method from SlideFragment to SlideFragmentBase

    * Create behaviours and fragments package
     * Move proper classes to packages
     * Optimize imports

    * Make SlideFragmentBase methods not abstract
     * Update Readme
     * Update CustomSlide example
     * Add default slide colors

commit cdfb1bf
Author: bezmian <[email protected]>
Date:   Fri Feb 10 16:42:08 2017 +0100

    Fix showing permissions button in Android Lollipop and versions below.

commit 57886a4
Author: bezmian <[email protected]>
Date:   Fri Feb 10 13:30:25 2017 +0100

    Create behaviours and fragments package
     * Move proper classes to packages
     * Optimize imports

commit 3d1d1fe
Author: bezmian <[email protected]>
Date:   Wed Feb 8 12:56:32 2017 +0100

    Move permissions handling to SlideFragmentBase
     * SlidesAdapter now stores SlideFragmentBase
     * Migrate every method from SlideFragment to SlideFragmentBase

commit ede70c4
Author: bezmian <[email protected]>
Date:   Fri Feb 3 16:28:55 2017 +0100

    Fix Codacy issues
     * Suppress warnings in classes from other open source projects
     * Suppress warnings for nested condition statements for better readability

commit 0b17c6a
Author: bezmian <[email protected]>
Date:   Fri Feb 3 16:04:20 2017 +0100

    Fix Codacy issues
     * Better class fields managment
     * Better packages naming

commit 03e7cd2
Author: bezmian <[email protected]>
Date:   Fri Feb 3 13:33:05 2017 +0100

    SlideFragmentBuilder now throws Exception when missing necessary properties

commit a0bf6a4
Author: Filip Skowron <[email protected]>
Date:   Fri Feb 3 12:18:35 2017 +0100

    Add annotations (TangoAgency#71)

    * Update gradle version
     * Add proper annotations for Res assets and variables
     * Add @callsuper in needed places

    * Change OnFinish to OnLastSlidePassed
     * Update README.md
     * Rename method in IFinishListener to onFinish

    * Add proper comment to onLastSlidePassed
     * Improve SlideFragmentBuilder scoping access

    * Fix scoping in SlideFragmentBuilder

commit 5dfec3e
Author: Filip Skowron <[email protected]>
Date:   Fri Feb 3 11:42:01 2017 +0100

    Add prefix mis_ for all attributes from attrs.xml (TangoAgency#73)

    * Add prefix mis_ for all attributes from attrs.xml

    * Update README.md

    * Add mis_ prefix to all xml resources
     * Remove unused layout xml

    * Styles now doesn't have mis prefixes
     * Better styles naming

    * Update style name in README.md

commit b5d0795
Author: Filip Skowron <[email protected]>
Date:   Fri Feb 3 11:04:21 2017 +0100

    Fix bug when orientation changes, the screen goes transparent (TangoAgency#72)

    * Fix bug when orientation changes screen goes transparent
     * Improve code quality by extracting code to methods

    * Rename method color to getColorFromRes

    * getBackgroundColor and getButtonsColor now returns int instead of Integer

commit 866260d
Merge: 13515a3 01dd51d
Author: bezmian <[email protected]>
Date:   Tue Jan 31 11:01:11 2017 +0100

    Merge remote-tracking branch 'origin/master' into develop

commit 13515a3
Merge: 6066dd8 bc51c02
Author: Radek Piekarz <[email protected]>
Date:   Thu Dec 1 11:07:21 2016 +0100

    Merged branch develop into develop

commit bc51c02
Merge: e5f34ac 970ebc6
Author: Radek Piekarz <[email protected]>
Date:   Wed Oct 12 11:27:29 2016 +0200

    Merge pull request TangoAgency#30 from TangoAgency/release/0.0.4

    Release/0.0.4
  • Loading branch information
bliveinhack committed Dec 6, 2017
1 parent 01dd51d commit 9a38561
Show file tree
Hide file tree
Showing 66 changed files with 1,245 additions and 560 deletions.
34 changes: 30 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,38 @@ language: android
jdk:
- oraclejdk8

env:
global:
- ANDROID_TARGET=android-19
- ANDROID_ABI=armeabi-v7a

android:
components:
- tools
- tools
- platform-tools
- build-tools-24.0.3
- android-24
- build-tools-26.0.
- android-19
- android-26
- extra-google-google_play_services
- extra-google-m2repository
- extra-android-m2repository

licenses:
- sys-img-armeabi-v7a-android-19
licenses:
- '.+'

branches:
except:
- gh-pages

before_script:
# Create and start an emulator for instrumentation tests.
- echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
- emulator -avd test -no-audio -no-window &
- android-wait-for-emulator
- adb shell setprop dalvik.vm.dexopt-flags v=n,o=v
- adb shell input keyevent 82

before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
Expand All @@ -25,12 +43,20 @@ cache:
directories:
- $HOME/.m2
- $HOME/.gradle
- $HOME/.android/build-cache

before_install:
- chmod +x gradlew
- mkdir "$ANDROID_HOME/licenses" || true
- echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
- echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"

script:
- ./gradlew build jacocoTestReport assembleAndroidTest connectedCheck

after_success:
- bash <(curl -s https://codecov.io/bash)

notifications:
slack:
secure: qIOOj57yVyinyTs9SinZmp/aVN5Or/9LDg+l9SYMqVCaqM9zDk7s1/m/L7VNPdWCuWOzLf9g1+0ReBcwZ6vh+HWBQ4T1V4HQd09whhUGyW9kMj3BKE0gWpIJLYKuhM551auv3FVzTp3u27q4W0zgiXB8qHWatTQu9rcPumG+IJaZD1uHsbhrQq0RLD8n8hWjQAdkRKRtSo4UR55sTK35uGRZbMFcyJSiStBXRP43w2kTR1MxIst4r9NeOx/sjebBQ/XxabKJgqAHhue80O3Cy8s0u59NDHOMpqJOu00cdKbtmhePQsY0FUl5/689Xdc+bDs3OcwGWbokaFEjXLwA1De+CIz0NMjgdtyHIbEGWcYav8jujke4wYaAtQRPgKHtVL9EpIUX07jPznstRNV8T3H1qrf2S5xHW6elZ7nLOnYuDKsgETmEuDQLAg8ibYQTF4zNBYGFwvC3GOJCqCu+o40OwmFghyohmXxSmo8Cg019V/hOtmYThaFcyDQhN8QGkUSqHrjDNRxyyye2JHvU+bJlTshonZlPh2gM9NA9Tf/3fMEobtnA5XYurntj43UhdZ4HdsYjbrFhbOrXEBRx1mG8gcCFgexz/3E9wq7GN0fqm6LMB8radqUbP0hAd2cADlN9suCWWLVnufLAiS5iqo55M2e9u749p+e+ESCLXIo=
32 changes: 20 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Material intro screen is inspired by [Material Intro] and developed with love fr
- [Easily add new slides][Intro Activity]
- [Custom slides][Custom Slide]
- [Parallax slides][Parallax Slide]
- Easy extensible api
- Easy and extensible api
- Android TV support!
- Material design at it's best!!!

Expand All @@ -35,7 +35,7 @@ public class IntroActivity extends MaterialIntroActivity
```xml
<activity
android:name=".IntroActivity"
android:theme="@style/Theme.Intro" />
android:theme="@style/Theme.MaterialIntro" />
```
### Step 4:
#### [Add slides:][Intro Activity]
Expand All @@ -50,15 +50,18 @@ public class IntroActivity extends MaterialIntroActivity
.possiblePermissions(new String[]{Manifest.permission.CALL_PHONE, Manifest.permission.READ_SMS})
.neededPermissions(new String[]{Manifest.permission.CAMERA, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION})
.image(agency.tango.materialintroscreen.R.drawable.ic_next)
.grantPermissionMessage(R.string.txt_pls_grant_permission)
.grantPermissionError(R.string.txt_grant_permission_error)
.title("title 3")
.description("Description 3")
.build(),
new MessageButtonBehaviour(new View.OnClickListener() {
@Override
public void onClick(View v) {
showMessage("We provide solutions to make you love your work");
}
}, "Work with love"));
new MessageButtonBehaviour(new MessageButtonClickListener() {
@Override
public void onClick(Button messageButton) {
messageButton.setText("Click me once again!");
showMessage("We provide solutions to make you love your work");
}
}, "Work with love"));
}
```
#### Explanation of SlideFragment usage:
Expand All @@ -71,6 +74,7 @@ public class IntroActivity extends MaterialIntroActivity
- ```setSkipButtonVisible()``` &#8702; show skip button instead of back button on the left bottom of screen
- ```hideBackButton()``` &#8702; hides any button on the left bottom of screen
- ```enableLastSlideAlphaExitTransition()``` &#8702; set if the last slide should disapear with alpha hiding effect
- ```onLastSlidePassed``` &#8702; Override in order to perform some action after passing last slide

#### Customizing view animations:

Expand All @@ -92,25 +96,29 @@ getBackButtonTranslationWrapper()
- ```getSkipButtonTranslationWrapper()```

## Custom slides
#### Of course you are able to implement completely custom slides. You only need to extend SlideFragment and override following functions:
#### Of course you are able to implement completely custom slides. You only need to extend SlideFragmentBase and override all needed by you functions.
- ```backgroundColor()```
- ```buttonsColor()```
- ```canMoveFurther()``` (only if you want to stop user from being able to move further before he will do some action)
- ```cantMoveFurtherErrorMessage()``` (as above)

- ```neededPermissions()```
- ```possiblePermissions()```
- ```grantPermissionStringRes()```
- ```grantPermissionErrorStringRes()```

#### If you want to use parallax in a fragment please use one of the below views:
- [```ParallaxFrameLayout```][ParallaxFrame]
- [```ParallaxLinearLayout```][ParallaxLinear]
- [```ParallaxRelativeLayout```][ParallaxRelative]

#### And set there the [app:layout_parallaxFactor][ParallaxFactor] attribute:
#### And set there the [app:mis_layout_parallaxFactor][ParallaxFactor] attribute:
```xml
<agency.tango.materialintroscreen.parallax.ParallaxLinearLayout
xmlns:android="http://schemas.android.com/apk/res/android">

<ImageView
android:id="@+id/image_slide"
app:layout_parallaxFactor="0.6"/>
app:mis_layout_parallaxFactor="0.6"/>
```

All features which are not available in simple Slide Fragment are shown here: [Custom Slide]
Expand Down
9 changes: 5 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
apply plugin: 'com.android.application'
//apply from: '../jacoco-android.gradle'

apply from: "$rootDir/versions.gradle"

android {
compileSdkVersion 25
buildToolsVersion "25.0.0"
compileSdkVersion project.compileSdkVersion
buildToolsVersion project.buildToolsVersion
defaultConfig {
applicationId "agency.tango.materialintro"
minSdkVersion 15
targetSdkVersion 25
minSdkVersion project.minSdkVersion
targetSdkVersion project.targetSdkVersion
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
Expand Down
22 changes: 11 additions & 11 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="agency.tango.materialintro">
package="agency.tango.materialintro">

<uses-permission android:name="android.permission.CALL_PHONE" />
<uses-permission android:name="android.permission.READ_SMS" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.CALL_PHONE"/>
<uses-permission android:name="android.permission.READ_SMS"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<uses-permission android:name="android.permission.CAMERA"/>

<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:label="@string/mis_app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">

<activity
android:name=".SplashActivity"
android:theme="@style/SplashScreen">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>

<activity android:name=".MainActivity" />
<activity android:name=".MainActivity"/>

<activity
android:name=".IntroActivity"
android:theme="@style/Theme.Intro" />
android:theme="@style/Theme.MaterialIntro"/>

</application>

Expand Down
18 changes: 5 additions & 13 deletions app/src/main/java/agency/tango/materialintro/CustomSlide.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,21 @@
import android.view.ViewGroup;
import android.widget.CheckBox;

import agency.tango.materialintroscreen.SlideFragment;
import agency.tango.materialintroscreen.fragments.SlideFragmentBase;

public class CustomSlide extends SlideFragmentBase {

public class CustomSlide extends SlideFragment {
private CheckBox checkBox;

@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
@Nullable Bundle savedInstanceState) {
final View view = inflater.inflate(R.layout.fragment_custom_slide, container, false);
checkBox = (CheckBox) view.findViewById(R.id.checkBox);
return view;
}

@Override
public int backgroundColor() {
return R.color.custom_slide_background;
}

@Override
public int buttonsColor() {
return R.color.custom_slide_buttons;
}

@Override
public boolean canMoveFurther() {
return checkBox.isChecked();
Expand Down
44 changes: 33 additions & 11 deletions app/src/main/java/agency/tango/materialintro/IntroActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,28 @@
import android.support.annotation.FloatRange;
import android.support.annotation.Nullable;
import android.view.View;
import android.widget.Button;
import android.widget.Toast;

import agency.tango.materialintroscreen.MaterialIntroActivity;
import agency.tango.materialintroscreen.MessageButtonBehaviour;
import agency.tango.materialintroscreen.SlideFragmentBuilder;
import agency.tango.materialintroscreen.behaviours.MessageButtonBehaviour;
import agency.tango.materialintroscreen.animations.IViewTranslation;
import agency.tango.materialintroscreen.fragments.SlideFragmentBuilder;
import agency.tango.materialintroscreen.listeners.click.MessageButtonClickListener;

public class IntroActivity extends MaterialIntroActivity {

@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
enableLastSlideAlphaExitTransition(true);
setSkipButtonVisible();

getBackButtonTranslationWrapper()
.setEnterTranslation(new IViewTranslation() {
@Override
public void translate(View view, @FloatRange(from = 0, to = 1.0) float percentage) {
public void translate(View view,
@FloatRange(from = 0, to = 1.0) float percentage) {
view.setAlpha(percentage);
}
});
Expand All @@ -33,13 +38,23 @@ public void translate(View view, @FloatRange(from = 0, to = 1.0) float percentag
.title("Organize your time with us")
.description("Would you try?")
.build(),
new MessageButtonBehaviour(new View.OnClickListener() {
new MessageButtonBehaviour(new MessageButtonClickListener() {
@Override
public void onClick(View v) {
public void onClick(Button messageButton) {
messageButton.setText("Click me once again!");
showMessage("We provide solutions to make you love your work");
}
}, "Work with love"));

addSlide(new SlideFragmentBuilder()
.backgroundColor(R.color.first_slide_background)
.buttonsColor(R.color.first_slide_buttons)
.image(R.drawable.img_office)
.title("Organize your time with us")
.description("Would you try?")
.neededPermissions(new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE})
.build());

addSlide(new SlideFragmentBuilder()
.backgroundColor(R.color.second_slide_background)
.buttonsColor(R.color.second_slide_buttons)
Expand All @@ -52,15 +67,20 @@ public void onClick(View v) {
addSlide(new SlideFragmentBuilder()
.backgroundColor(R.color.third_slide_background)
.buttonsColor(R.color.third_slide_buttons)
.possiblePermissions(new String[]{Manifest.permission.CALL_PHONE, Manifest.permission.READ_SMS})
.neededPermissions(new String[]{Manifest.permission.CAMERA, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION})
.possiblePermissions(
new String[]{Manifest.permission.CALL_PHONE, Manifest.permission.READ_SMS})
.neededPermissions(new String[]{Manifest.permission.CAMERA,
Manifest.permission.ACCESS_FINE_LOCATION,
Manifest.permission.ACCESS_COARSE_LOCATION})
.image(R.drawable.img_equipment)
.grantPermissionMessage(R.string.error_message)
.grantPermissionError(R.string.error_message)
.title("We provide best tools")
.description("ever")
.build(),
new MessageButtonBehaviour(new View.OnClickListener() {
new MessageButtonBehaviour(new MessageButtonClickListener() {
@Override
public void onClick(View v) {
public void onClick(Button messageButton) {
showMessage("Try us!");
}
}, "Tools"));
Expand All @@ -71,11 +91,13 @@ public void onClick(View v) {
.title("That's it")
.description("Would you join us?")
.build());



}

@Override
public void onFinish() {
super.onFinish();
public void onLastSlidePassed() {
Toast.makeText(this, "Try this library in your project! :)", Toast.LENGTH_SHORT).show();
}
}
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

<ImageView
android:layout_width="wrap_content"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_custom_slide.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
android:layout_height="wrap_content"
android:layout_marginLeft="32dp"
android:text="@string/check_to_pass"
app:layout_parallaxFactor="0.4" />
app:mis_layout_parallaxFactor="0.4" />

</agency.tango.materialintroscreen.parallax.ParallaxLinearLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/values-v21/styles.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<style name="ColoredButton" parent="Widget.AppCompat.Button.Colored">
<style name="MaterialButton" parent="Widget.AppCompat.Button.Colored">
<item name="colorButtonNormal">@android:color/white</item>
<item name="android:colorControlHighlight">@android:color/darker_gray</item>
<item name="android:textColor">@android:color/black</item>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@
<string name="error_message">Please accept terms and conditions first.</string>
<string name="launch_intro_activity">Launch intro activity</string>
<string name="lorem_ipsum">Lorem ipsum \n\ndolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? But I must explain to you how all this mistaken idea of denouncing pleasure and praising pain was born and I will give you a complete account of the system, and expound the actual teachings of the great explorer of the truth, the master-builder of human happiness. No one rejects, dislikes, or avoids pleasure itself, because it is pleasure, but because those who do not know how to pursue pleasure rationally encounter consequences that are extremely painful. Nor again is there anyone who loves or pursues or desires to obtain pain of itself, because it is pain, but because occasionally circumstances occur in which toil and pain can procure him some great pleasure. To take a trivial example, which of us ever undertakes laborious physical exercise, except to obtain some advantage from it? But who has any right to find fault with a man who chooses to enjoy a pleasure that has no annoying consequences, or one who avoids a pain that produces no resultant pleasure</string>
<string name="txt_pls_grant_permission">Please grant all permissions</string>
<string name="txt_grant_permission_error">Error! Please grant permissions!</string>
</resources>
2 changes: 1 addition & 1 deletion app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<item name="colorAccent">@color/colorAccent</item>
</style>

<style name="ColoredButton" parent="Widget.AppCompat.Button.Colored">
<style name="MaterialButton" parent="Widget.AppCompat.Button.Colored">
<item name="colorButtonNormal">@android:color/white</item>
<item name="android:textColor">@android:color/black</item>
</style>
Expand Down
Loading

0 comments on commit 9a38561

Please sign in to comment.