Merge branch 'master' into cleanup2

pjpak · Dec 22, 2017 · 7818723 · 7818723
2 parents 15df0ba + 8ba9a72
commit 7818723
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 324 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -58,8 +58,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 }
 
@@ -69,7 +69,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.android.support.constraint:constraint-layout:1.1.0-beta3'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.0-beta4'
     implementation "com.android.support:customtabs:${versions.supportLibrary}"
     implementation "com.android.support:design:${versions.supportLibrary}"
     implementation "com.android.support:palette-v7:${versions.supportLibrary}"

diff --git a/app/src/main/java/io/plaidapp/ui/ShareDribbbleImageTask.java b/app/src/main/java/io/plaidapp/ui/ShareDribbbleImageTask.java
@@ -78,14 +78,7 @@ protected void onPostExecute(File result) {
     }
 
     private String getShareText() {
-        return new StringBuilder()
-                .append("“")
-                .append(shot.title)
-                .append("” by ")
-                .append(shot.user.name)
-                .append("\n")
-                .append(shot.url)
-                .toString();
+        return "“" + shot.title + "” by " + shot.user.name + "\n" + shot.url;
     }
 
     private String getImageMimeType(@NonNull String fileName) {

diff --git a/app/src/main/java/io/plaidapp/ui/transitions/MorphDialogToFab.java b/app/src/main/java/io/plaidapp/ui/transitions/MorphDialogToFab.java
@@ -124,8 +124,8 @@ public Animator createAnimator(final ViewGroup sceneRoot,
         MorphDrawable background = new MorphDrawable(startColor, startCornerRadius);
         endValues.view.setBackground(background);
 
-        Animator color = ObjectAnimator.ofArgb(background, background.COLOR, endColor);
-        Animator corners = ObjectAnimator.ofFloat(background, background.CORNER_RADIUS,
+        Animator color = ObjectAnimator.ofArgb(background, MorphDrawable.COLOR, endColor);
+        Animator corners = ObjectAnimator.ofFloat(background, MorphDrawable.CORNER_RADIUS,
                 endCornerRadius);
 
         // hide child views (offset down & fade out)

diff --git a/app/src/main/java/io/plaidapp/ui/widget/CheckableImageButton.java b/app/src/main/java/io/plaidapp/ui/widget/CheckableImageButton.java
@@ -17,6 +17,7 @@
 package io.plaidapp.ui.widget;
 
 import android.content.Context;
+import android.support.v7.widget.AppCompatImageButton;
 import android.util.AttributeSet;
 import android.view.SoundEffectConstants;
 import android.widget.Checkable;
@@ -25,7 +26,7 @@
 /**
  * An extension to {@link ImageButton} which implements the {@link Checkable} interface.
  */
-public class CheckableImageButton extends ImageButton implements Checkable {
+public class CheckableImageButton extends AppCompatImageButton implements Checkable {
 
     private static final int[] CHECKED_STATE_SET = {android.R.attr.state_checked};
 

diff --git a/app/src/main/java/io/plaidapp/ui/widget/CutoutTextView.java b/app/src/main/java/io/plaidapp/ui/widget/CutoutTextView.java
@@ -45,7 +45,6 @@ public class CutoutTextView extends View {
     private Bitmap cutout;
     private int foregroundColor = Color.MAGENTA;
     private String text;
-    private float textSize;
     private float textY;
     private float textX;
     private float maxTextSize;
@@ -86,8 +85,8 @@ protected void onSizeChanged(int w, int h, int oldw, int oldh) {
 
     private void calculateTextPosition() {
         float targetWidth = getWidth() / PHI;
-        textSize = ViewUtils.getSingleLineTextSize(text, textPaint, targetWidth, 0f, maxTextSize,
-                0.5f, getResources().getDisplayMetrics());
+        float textSize = ViewUtils.getSingleLineTextSize(
+                text, textPaint, targetWidth, 0f, maxTextSize, 0.5f, getResources().getDisplayMetrics());
         textPaint.setTextSize(textSize);
 
         // measuring text is fun :] see: https://chris.banes.me/2014/03/27/measuring-text/

diff --git a/app/src/main/java/io/plaidapp/ui/widget/DynamicTextView.java b/app/src/main/java/io/plaidapp/ui/widget/DynamicTextView.java