Merge pull request #305 from amlcurran/fit-windows

Adds custom text rendering

Author: amlcurran

gradle.properties

@@ -29,8 +29,8 @@ POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=amlcurran
 POM_DEVELOPER_NAME=Alex Curran
 
-BUILD_TOOLS_VERSION=21.0.0
-COMPILE_SDK=21
+BUILD_TOOLS_VERSION=22.0.1
+COMPILE_SDK=23
 MIN_SDK_LIBRARY=9
 MIN_SDK_SAMPLE=11
-TARGET_SDK=21
+TARGET_SDK=23

library/src/main/java/com/github/amlcurran/showcaseview/ShowcaseView.java

@@ -24,6 +24,7 @@
 import android.graphics.Color;
 import android.graphics.Point;
 import android.graphics.PorterDuff;
+import android.text.TextPaint;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
@@ -504,6 +505,28 @@ public Builder setShowcaseEventListener(OnShowcaseEventListener showcaseEventLis
             showcaseView.setOnShowcaseEventListener(showcaseEventListener);
             return this;
         }
+
+        public Builder setContentTextPaint(TextPaint textPaint) {
+            showcaseView.setContentTextPaint(textPaint);
+            return this;
+        }
+
+        public Builder setContentTitlePaint(TextPaint textPaint) {
+            showcaseView.setContentTitlePaint(textPaint);
+            return this;
+        }
+    }
+
+    private void setContentTitlePaint(TextPaint textPaint) {
+        this.textDrawer.setTitlePaint(textPaint);
+        hasAlteredText = true;
+        invalidate();
+    }
+
+    private void setContentTextPaint(TextPaint paint) {
+        this.textDrawer.setContentPaint(paint);
+        hasAlteredText = true;
+        invalidate();
     }
 
     /**

library/src/main/java/com/github/amlcurran/showcaseview/TextDrawer.java

@@ -214,4 +214,12 @@ public float[] getBestTextPosition() {
     public boolean shouldDrawText() {
         return !TextUtils.isEmpty(mTitle) || !TextUtils.isEmpty(mDetails);
     }
+
+    public void setContentPaint(TextPaint contentPaint) {
+        textPaint.set(contentPaint);
+    }
+
+    public void setTitlePaint(TextPaint textPaint) {
+        titlePaint.set(textPaint);
+    }
 }

sample/src/main/AndroidManifest.xml

@@ -33,18 +33,12 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".v14.ActionItemsSampleActivity"
-            android:theme="@style/SampleTheme" />
-        <!--<activity-->
-        <!--android:name=".v14.MultipleActionItemsSampleActivity"-->
-        <!--android:theme="@style/SampleTheme"/>-->
-        <!--<activity-->
-        <!--android:name=".legacy.MultipleShowcaseSampleActivity"/>-->
+
         <activity android:name=".animations.AnimationSampleActivity" />
 
         <activity android:name=".SingleShotActivity" />
 
-        <!--<activity android:name=".MemoryManagementTesting" />-->
+        <activity android:name=".CustomTextActivity" />
+
     </application>
 </manifest>

sample/src/main/assets/RobotoSlab-Regular.ttf

@@ -0,0 +1,37 @@
+package com.github.amlcurran.showcaseview.sample;
+
+import android.app.Activity;
+import android.graphics.Paint;
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.text.TextPaint;
+
+import com.github.amlcurran.showcaseview.ShowcaseView;
+import com.github.amlcurran.showcaseview.targets.ViewTarget;
+
+public class CustomTextActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_custom_text);
+
+        TextPaint paint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
+        paint.setTextSize(getResources().getDimension(R.dimen.abc_text_size_body_1_material));
+        paint.setStrikeThruText(true);
+        paint.setTypeface(Typeface.createFromAsset(getAssets(), "RobotoSlab-Regular.ttf"));
+
+        TextPaint title = new TextPaint(Paint.ANTI_ALIAS_FLAG);
+        title.setTextSize(getResources().getDimension(R.dimen.abc_text_size_headline_material));
+        title.setUnderlineText(true);
+        title.setTypeface(Typeface.createFromAsset(getAssets(), "RobotoSlab-Regular.ttf"));
+
+        new ShowcaseView.Builder(this)
+                .setTarget(new ViewTarget(R.id.imageView, this))
+                .setContentTitle(R.string.custom_text_painting_title)
+                .setContentText(R.string.custom_text_painting_text)
+                .setContentTextPaint(paint)
+                .setContentTitlePaint(title)
+                .build();
+    }
+}

sample/src/main/java/com/github/amlcurran/showcaseview/sample/CustomTextActivity.java

@@ -139,7 +139,7 @@ public void onItemClick(AdapterView<?> adapterView, View view, int position, lon
 
             // Not currently used
             case 3:
-                startActivity(new Intent(this, MemoryManagementTesting.class));
+                startActivity(new Intent(this, CustomTextActivity.class));
         }
     }
 
@@ -148,13 +148,15 @@ private static class HardcodedListAdapter extends ArrayAdapter {
         private static final int[] TITLE_RES_IDS = new int[] {
                 R.string.title_action_items,
                 R.string.title_animations,
-                R.string.title_single_shot//, R.string.title_memory
+                R.string.title_single_shot,
+                R.string.custom_text //, R.string.title_memory
         };
 
         private static final int[] SUMMARY_RES_IDS = new int[] {
                 R.string.sum_action_items,
                 R.string.sum_animations,
-                R.string.sum_single_shot//, R.string.sum_memory
+                R.string.sum_single_shot,
+                R.string.custom_text_summary//, R.string.sum_memory
         };
 
         public HardcodedListAdapter(Context context) {

sample/src/main/java/com/github/amlcurran/showcaseview/sample/SampleActivity.java

@@ -16,7 +16,7 @@
   ~ limitations under the License.
   -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="16dp">
@@ -51,4 +51,4 @@
         android:layout_marginBottom="72dp"
         android:singleLine="false"
         android:layout_alignParentBottom="true" />
-</RelativeLayout>
+</LinearLayout>

sample/src/main/res/layout/activity_animation.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/imageView"
+            android:layout_gravity="center_horizontal"
+            android:src="@drawable/ic_launcher"
+            android:layout_centerVertical="true"
+            android:layout_centerHorizontal="true"/>
+</RelativeLayout>

sample/src/main/res/layout/activity_custom_text.xml

@@ -61,4 +61,8 @@
     <string name="title_single_shot">Single shot</string>
     <string name="sum_single_shot">Demonstrate how to make a ShowcaseView show only once</string>
     <string name="R.string.desc_single_shot">Press the OK button and you\'ll only ever see this ShowcaseView once. To see it again, clear the app\'s cache.</string>
+    <string name="custom_text">Custom text</string>
+    <string name="custom_text_summary">See how to create custom text drawing</string>
+    <string name="custom_text_painting_title">Custom text painting</string>
+    <string name="custom_text_painting_text">Here\'s an example of custom text painting</string>
 </resources>