From 517fcfa0eadf026879520e4bc31e450d85d3cdbc Mon Sep 17 00:00:00 2001
From: odeyfox <odey.khalaf@gmail.com>
Date: Thu, 7 Oct 2021 22:35:27 +0300
Subject: [PATCH 1/2] - added functionality to load image from URL using
 Picasso. - added functionality to change "title text color", "description
 text color", "title text style", "description text style", "title text size",
 "description text size". - added TextStyle.java Enum. - added internet
 permission to the fragment example. - added Picasso dependency.

---
 .../src/main/AndroidManifest.xml              |  1 +
 .../examples/fragment/FragmentsActivity.java  | 10 +-
 .../src/main/AndroidManifest.xml              |  2 +
 paper-onboarding/build.gradle                 |  1 +
 .../PaperOnboardingEngine.java                | 68 +++++++++++++-
 .../paperonboarding/PaperOnboardingPage.java  | 93 +++++++++++++++++++
 .../paperonboarding/utils/TextStyle.java      | 18 ++++
 7 files changed, 187 insertions(+), 6 deletions(-)
 create mode 100644 paper-onboarding/src/main/java/com/ramotion/paperonboarding/utils/TextStyle.java

diff --git a/paper-onboarding-fragment-example/src/main/AndroidManifest.xml b/paper-onboarding-fragment-example/src/main/AndroidManifest.xml
index c477fa9..edd8037 100644
--- a/paper-onboarding-fragment-example/src/main/AndroidManifest.xml
+++ b/paper-onboarding-fragment-example/src/main/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.ramotion.paperonboarding.examples.fragment">
 
+    <uses-permission android:name="android.permission.INTERNET" />
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
diff --git a/paper-onboarding-fragment-example/src/main/java/com/ramotion/paperonboarding/examples/fragment/FragmentsActivity.java b/paper-onboarding-fragment-example/src/main/java/com/ramotion/paperonboarding/examples/fragment/FragmentsActivity.java
index 0df9049..fb098f8 100644
--- a/paper-onboarding-fragment-example/src/main/java/com/ramotion/paperonboarding/examples/fragment/FragmentsActivity.java
+++ b/paper-onboarding-fragment-example/src/main/java/com/ramotion/paperonboarding/examples/fragment/FragmentsActivity.java
@@ -3,17 +3,17 @@
 import android.graphics.Color;
 import android.os.Bundle;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
 import com.ramotion.paperonboarding.PaperOnboardingFragment;
 import com.ramotion.paperonboarding.PaperOnboardingPage;
 import com.ramotion.paperonboarding.listeners.PaperOnboardingOnRightOutListener;
 
 import java.util.ArrayList;
 
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-
 public class FragmentsActivity extends AppCompatActivity {
 
     private FragmentManager fragmentManager;
diff --git a/paper-onboarding-simple-example/src/main/AndroidManifest.xml b/paper-onboarding-simple-example/src/main/AndroidManifest.xml
index b4f28b5..074dc51 100644
--- a/paper-onboarding-simple-example/src/main/AndroidManifest.xml
+++ b/paper-onboarding-simple-example/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.ramotion.paperonboarding.examples.simple">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
diff --git a/paper-onboarding/build.gradle b/paper-onboarding/build.gradle
index db6ae09..ccc7b30 100644
--- a/paper-onboarding/build.gradle
+++ b/paper-onboarding/build.gradle
@@ -40,6 +40,7 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'com.squareup.picasso:picasso:2.71828'
     testImplementation 'junit:junit:4.12'
 }
 
diff --git a/paper-onboarding/src/main/java/com/ramotion/paperonboarding/PaperOnboardingEngine.java b/paper-onboarding/src/main/java/com/ramotion/paperonboarding/PaperOnboardingEngine.java
index b0d1c7c..ee9bb87 100644
--- a/paper-onboarding/src/main/java/com/ramotion/paperonboarding/PaperOnboardingEngine.java
+++ b/paper-onboarding/src/main/java/com/ramotion/paperonboarding/PaperOnboardingEngine.java
@@ -5,7 +5,9 @@
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.content.Context;
+import android.graphics.Typeface;
 import android.os.Build;
+import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -26,6 +28,7 @@
 import com.ramotion.paperonboarding.listeners.PaperOnboardingOnLeftOutListener;
 import com.ramotion.paperonboarding.listeners.PaperOnboardingOnRightOutListener;
 import com.ramotion.paperonboarding.utils.PaperOnboardingEngineDefaults;
+import com.squareup.picasso.Picasso;
 
 import java.util.ArrayList;
 
@@ -468,8 +471,56 @@ protected ViewGroup createContentTextView(PaperOnboardingPage PaperOnboardingPag
         ViewGroup contentTextView = (ViewGroup) vi.inflate(R.layout.onboarding_text_content_layout, mContentTextContainer, false);
         TextView contentTitle = (TextView) contentTextView.getChildAt(0);
         contentTitle.setText(PaperOnboardingPage.getTitleText());
+
+        if (PaperOnboardingPage.getTitleTextColor() != 0) {
+            contentTitle.setTextColor(PaperOnboardingPage.getTitleTextColor());
+        }
+
+        if (PaperOnboardingPage.getTitleTextSize() != 0) {
+            contentTitle.setTextSize(TypedValue.COMPLEX_UNIT_SP, PaperOnboardingPage.getTitleTextSize());
+        }
+
+        switch (PaperOnboardingPage.getTitleTextStyle()) {
+            case NORMAL:
+                contentTitle.setTypeface(contentTitle.getTypeface(), Typeface.NORMAL);
+                break;
+            case ITALIC:
+                contentTitle.setTypeface(contentTitle.getTypeface(), Typeface.ITALIC);
+                break;
+            case BOLD_ITALIC:
+                contentTitle.setTypeface(contentTitle.getTypeface(), Typeface.BOLD_ITALIC);
+                break;
+            case BOLD:
+            default:
+                contentTitle.setTypeface(contentTitle.getTypeface(), Typeface.BOLD);
+        }
+
         TextView contentText = (TextView) contentTextView.getChildAt(1);
         contentText.setText(PaperOnboardingPage.getDescriptionText());
+
+        if (PaperOnboardingPage.getDescriptionTextColor() != 0) {
+            contentText.setTextColor(PaperOnboardingPage.getDescriptionTextColor());
+        }
+
+        if (PaperOnboardingPage.getDescriptionTextSize() != 0) {
+            contentText.setTextSize(TypedValue.COMPLEX_UNIT_SP, PaperOnboardingPage.getDescriptionTextSize());
+        }
+
+        switch (PaperOnboardingPage.getDescriptionTextStyle()) {
+            case NORMAL:
+                contentText.setTypeface(contentTitle.getTypeface(), Typeface.NORMAL);
+                break;
+            case ITALIC:
+                contentText.setTypeface(contentTitle.getTypeface(), Typeface.ITALIC);
+                break;
+            case BOLD_ITALIC:
+                contentText.setTypeface(contentTitle.getTypeface(), Typeface.BOLD_ITALIC);
+                break;
+            case BOLD:
+            default:
+                contentText.setTypeface(contentTitle.getTypeface(), Typeface.BOLD);
+        }
+
         return contentTextView;
     }
 
@@ -479,7 +530,22 @@ protected ViewGroup createContentTextView(PaperOnboardingPage PaperOnboardingPag
      */
     protected ImageView createContentIconView(PaperOnboardingPage PaperOnboardingPage) {
         ImageView contentIcon = new ImageView(mAppContext);
-        contentIcon.setImageResource(PaperOnboardingPage.getContentIconRes());
+
+        if (PaperOnboardingPage.getImageUrl() != null) {
+            if (PaperOnboardingPage.getImageUrl().startsWith("http")) {
+                if (PaperOnboardingPage.getImageHeight() != 0 && PaperOnboardingPage.getImageWidth() != 0) {
+                    Picasso.get()
+                            .load(PaperOnboardingPage.getImageUrl())
+                            .resize(dpToPixels(PaperOnboardingPage.getImageWidth()), dpToPixels(PaperOnboardingPage.getImageHeight()))
+                            .into(contentIcon);
+                } else {
+                    Picasso.get().load(PaperOnboardingPage.getImageUrl()).into(contentIcon);
+                }
+            }
+        } else {
+            contentIcon.setImageResource(PaperOnboardingPage.getContentIconRes());
+        }
+
         FrameLayout.LayoutParams iconLP = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         iconLP.gravity = Gravity.CENTER;
         contentIcon.setLayoutParams(iconLP);
diff --git a/paper-onboarding/src/main/java/com/ramotion/paperonboarding/PaperOnboardingPage.java b/paper-onboarding/src/main/java/com/ramotion/paperonboarding/PaperOnboardingPage.java
index d90beba..25eeb1a 100644
--- a/paper-onboarding/src/main/java/com/ramotion/paperonboarding/PaperOnboardingPage.java
+++ b/paper-onboarding/src/main/java/com/ramotion/paperonboarding/PaperOnboardingPage.java
@@ -1,5 +1,7 @@
 package com.ramotion.paperonboarding;
 
+import com.ramotion.paperonboarding.utils.TextStyle;
+
 import java.io.Serializable;
 
 /**
@@ -13,6 +15,17 @@ public class PaperOnboardingPage implements Serializable {
     private int contentIconRes;
     private int bottomBarIconRes;
 
+    private String imageUrl;
+    private int imageHeight;
+    private int imageWidth;
+
+    private int titleTextColor;
+    private int titleTextSize;
+    private int descriptionTextColor;
+    private int descriptionTextSize;
+    private TextStyle titleTextStyle;
+    private TextStyle descriptionTextStyle;
+
     public PaperOnboardingPage() {
     }
 
@@ -24,6 +37,86 @@ public PaperOnboardingPage(String titleText, String descriptionText, int bgColor
         this.titleText = titleText;
     }
 
+    public PaperOnboardingPage(String titleText, String descriptionText, String imageUrl, int bgColor, int bottomBarIconRes) {
+        this.titleText = titleText;
+        this.descriptionText = descriptionText;
+        this.bgColor = bgColor;
+        this.bottomBarIconRes = bottomBarIconRes;
+        this.imageUrl = imageUrl;
+    }
+
+    public TextStyle getTitleTextStyle() {
+        return titleTextStyle;
+    }
+
+    public void setTitleTextStyle(TextStyle titleTextStyle) {
+        this.titleTextStyle = titleTextStyle;
+    }
+
+    public TextStyle getDescriptionTextStyle() {
+        return descriptionTextStyle;
+    }
+
+    public void setDescriptionTextStyle(TextStyle descriptionTextStyle) {
+        this.descriptionTextStyle = descriptionTextStyle;
+    }
+
+    public int getTitleTextSize() {
+        return titleTextSize;
+    }
+
+    public void setTitleTextSize(int titleTextSize) {
+        this.titleTextSize = titleTextSize;
+    }
+
+    public int getDescriptionTextSize() {
+        return descriptionTextSize;
+    }
+
+    public void setDescriptionTextSize(int descriptionTextSize) {
+        this.descriptionTextSize = descriptionTextSize;
+    }
+
+    public int getTitleTextColor() {
+        return titleTextColor;
+    }
+
+    public void setTitleTextColor(int titleTextColor) {
+        this.titleTextColor = titleTextColor;
+    }
+
+    public int getDescriptionTextColor() {
+        return descriptionTextColor;
+    }
+
+    public void setDescriptionTextColor(int descriptionTextColor) {
+        this.descriptionTextColor = descriptionTextColor;
+    }
+
+    public int getImageHeight() {
+        return imageHeight;
+    }
+
+    public void setImageHeight(int imageHeight) {
+        this.imageHeight = imageHeight;
+    }
+
+    public int getImageWidth() {
+        return imageWidth;
+    }
+
+    public void setImageWidth(int imageWidth) {
+        this.imageWidth = imageWidth;
+    }
+
+    public String getImageUrl() {
+        return imageUrl;
+    }
+
+    public void setImageUrl(String imageUrl) {
+        this.imageUrl = imageUrl;
+    }
+
     public String getTitleText() {
         return titleText;
     }
diff --git a/paper-onboarding/src/main/java/com/ramotion/paperonboarding/utils/TextStyle.java b/paper-onboarding/src/main/java/com/ramotion/paperonboarding/utils/TextStyle.java
new file mode 100644
index 0000000..f9d134f
--- /dev/null
+++ b/paper-onboarding/src/main/java/com/ramotion/paperonboarding/utils/TextStyle.java
@@ -0,0 +1,18 @@
+package com.ramotion.paperonboarding.utils;
+
+/**
+ * TextView Text style values
+ */
+public enum TextStyle {
+
+    NORMAL(0),
+    BOLD(1),
+    ITALIC(2),
+    BOLD_ITALIC(3);
+
+    public int value;
+
+    TextStyle(int value) {
+        this.value = value;
+    }
+}
\ No newline at end of file

From 5000906d11d35a1173e2a15e6ea6bded5942fd1b Mon Sep 17 00:00:00 2001
From: odeyfox <odey.khalaf@gmail.com>
Date: Tue, 30 Nov 2021 15:32:33 +0200
Subject: [PATCH 2/2] - bug fix when text style is not set for title and
 description. - applied user set height and width for local icon resources.

---
 .../PaperOnboardingEngine.java                | 78 +++++++++++--------
 1 file changed, 44 insertions(+), 34 deletions(-)

diff --git a/paper-onboarding/src/main/java/com/ramotion/paperonboarding/PaperOnboardingEngine.java b/paper-onboarding/src/main/java/com/ramotion/paperonboarding/PaperOnboardingEngine.java
index ee9bb87..9305538 100644
--- a/paper-onboarding/src/main/java/com/ramotion/paperonboarding/PaperOnboardingEngine.java
+++ b/paper-onboarding/src/main/java/com/ramotion/paperonboarding/PaperOnboardingEngine.java
@@ -54,7 +54,7 @@ public class PaperOnboardingEngine implements PaperOnboardingEngineDefaults {
     private final Context mAppContext;
 
     // state variables
-    private ArrayList<PaperOnboardingPage> mElements = new ArrayList<>();
+    private final ArrayList<PaperOnboardingPage> mElements = new ArrayList<>();
     private int mActiveElementIndex = 0;
 
     // params for Pager position calculations, virtually final, but initializes in onGlobalLayoutListener
@@ -83,10 +83,10 @@ public PaperOnboardingEngine(View rootLayout, ArrayList<PaperOnboardingPage> con
         this.mAppContext = appContext.getApplicationContext();
 
         mRootLayout = (RelativeLayout) rootLayout;
-        mContentTextContainer = (FrameLayout) rootLayout.findViewById(R.id.onboardingContentTextContainer);
-        mContentIconContainer = (FrameLayout) rootLayout.findViewById(R.id.onboardingContentIconContainer);
-        mBackgroundContainer = (FrameLayout) rootLayout.findViewById(R.id.onboardingBackgroundContainer);
-        mPagerIconsContainer = (LinearLayout) rootLayout.findViewById(R.id.onboardingPagerIconsContainer);
+        mContentTextContainer = rootLayout.findViewById(R.id.onboardingContentTextContainer);
+        mContentIconContainer = rootLayout.findViewById(R.id.onboardingContentIconContainer);
+        mBackgroundContainer = rootLayout.findViewById(R.id.onboardingBackgroundContainer);
+        mPagerIconsContainer = rootLayout.findViewById(R.id.onboardingPagerIconsContainer);
 
         mContentRootLayout = (RelativeLayout) mRootLayout.getChildAt(1);
         mContentCenteredContainer = (LinearLayout) mContentRootLayout.getChildAt(0);
@@ -105,7 +105,6 @@ public void onSwipeLeft() {
             public void onSwipeRight() {
                 toggleContent(true);
             }
-
         });
 
         mRootLayout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
@@ -127,7 +126,7 @@ public void onGlobalLayout() {
                 mPagerElementRightMargin = layoutParams.rightMargin;
 
                 mPagerIconsContainer.setX(calculateNewPagerPosition(0));
-                mContentCenteredContainer.setY((mContentRootLayout.getHeight() - mContentCenteredContainer.getHeight()) / 2);
+                mContentCenteredContainer.setY((mContentRootLayout.getHeight() - mContentCenteredContainer.getHeight()) >> 1);
 
             }
         });
@@ -480,19 +479,23 @@ protected ViewGroup createContentTextView(PaperOnboardingPage PaperOnboardingPag
             contentTitle.setTextSize(TypedValue.COMPLEX_UNIT_SP, PaperOnboardingPage.getTitleTextSize());
         }
 
-        switch (PaperOnboardingPage.getTitleTextStyle()) {
-            case NORMAL:
-                contentTitle.setTypeface(contentTitle.getTypeface(), Typeface.NORMAL);
-                break;
-            case ITALIC:
-                contentTitle.setTypeface(contentTitle.getTypeface(), Typeface.ITALIC);
-                break;
-            case BOLD_ITALIC:
-                contentTitle.setTypeface(contentTitle.getTypeface(), Typeface.BOLD_ITALIC);
-                break;
-            case BOLD:
-            default:
-                contentTitle.setTypeface(contentTitle.getTypeface(), Typeface.BOLD);
+        if (PaperOnboardingPage.getTitleTextStyle() != null) {
+            switch (PaperOnboardingPage.getTitleTextStyle()) {
+                case NORMAL:
+                    contentTitle.setTypeface(contentTitle.getTypeface(), Typeface.NORMAL);
+                    break;
+                case ITALIC:
+                    contentTitle.setTypeface(contentTitle.getTypeface(), Typeface.ITALIC);
+                    break;
+                case BOLD_ITALIC:
+                    contentTitle.setTypeface(contentTitle.getTypeface(), Typeface.BOLD_ITALIC);
+                    break;
+                case BOLD:
+                default:
+                    contentTitle.setTypeface(contentTitle.getTypeface(), Typeface.BOLD);
+            }
+        } else {
+            contentTitle.setTypeface(contentTitle.getTypeface(), Typeface.BOLD);
         }
 
         TextView contentText = (TextView) contentTextView.getChildAt(1);
@@ -506,21 +509,24 @@ protected ViewGroup createContentTextView(PaperOnboardingPage PaperOnboardingPag
             contentText.setTextSize(TypedValue.COMPLEX_UNIT_SP, PaperOnboardingPage.getDescriptionTextSize());
         }
 
-        switch (PaperOnboardingPage.getDescriptionTextStyle()) {
-            case NORMAL:
-                contentText.setTypeface(contentTitle.getTypeface(), Typeface.NORMAL);
-                break;
-            case ITALIC:
-                contentText.setTypeface(contentTitle.getTypeface(), Typeface.ITALIC);
-                break;
-            case BOLD_ITALIC:
-                contentText.setTypeface(contentTitle.getTypeface(), Typeface.BOLD_ITALIC);
-                break;
-            case BOLD:
-            default:
-                contentText.setTypeface(contentTitle.getTypeface(), Typeface.BOLD);
+        if (PaperOnboardingPage.getDescriptionTextStyle() != null) {
+            switch (PaperOnboardingPage.getDescriptionTextStyle()) {
+                case NORMAL:
+                    contentText.setTypeface(contentTitle.getTypeface(), Typeface.NORMAL);
+                    break;
+                case ITALIC:
+                    contentText.setTypeface(contentTitle.getTypeface(), Typeface.ITALIC);
+                    break;
+                case BOLD_ITALIC:
+                    contentText.setTypeface(contentTitle.getTypeface(), Typeface.BOLD_ITALIC);
+                    break;
+                case BOLD:
+                default:
+                    contentText.setTypeface(contentTitle.getTypeface(), Typeface.BOLD);
+            }
+        } else {
+            contentText.setTypeface(contentTitle.getTypeface(), Typeface.BOLD);
         }
-
         return contentTextView;
     }
 
@@ -543,6 +549,10 @@ protected ImageView createContentIconView(PaperOnboardingPage PaperOnboardingPag
                 }
             }
         } else {
+            if (PaperOnboardingPage.getImageHeight() != 0 && PaperOnboardingPage.getImageWidth() != 0) {
+                contentIcon.setMinimumHeight(dpToPixels(PaperOnboardingPage.getImageHeight()));
+                contentIcon.setMinimumWidth(dpToPixels(PaperOnboardingPage.getImageWidth()));
+            }
             contentIcon.setImageResource(PaperOnboardingPage.getContentIconRes());
         }