Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport pt. 1 (continued from #62) #68

Merged
merged 12 commits into from
Feb 29, 2016
Merged
4 changes: 3 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ android {

defaultConfig {
applicationId "io.plaidapp"
minSdkVersion 21
minSdkVersion 15
targetSdkVersion 23
versionCode gitCommitCount
versionName gitTag
Expand All @@ -44,6 +44,8 @@ android {
"DESIGNER_NEWS_CLIENT_SECRET", "\"${designer_news_client_secret}\""
buildConfigField "String",
"PROCUCT_HUNT_DEVELOPER_TOKEN", "\"${product_hunt_developer_token}\""

vectorDrawables.useSupportLibrary = true
}
buildTypes {
release {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.util.Date;

import io.plaidapp.util.DribbbleUtils;
import io.plaidapp.util.compat.LocalTextViewCompat;

/**
* Models a commend on a Dribbble shot.
Expand Down Expand Up @@ -59,7 +60,7 @@ public Comment(long id,
public Spanned getParsedBody(TextView textView) {
if (parsedBody == null && !TextUtils.isEmpty(body)) {
parsedBody = DribbbleUtils.parseDribbbleHtml(body, textView.getLinkTextColors(),
textView.getHighlightColor());
LocalTextViewCompat.getHighlightColor(textView));
}
return parsedBody;
}
Expand Down
7 changes: 5 additions & 2 deletions app/src/main/java/io/plaidapp/ui/AboutActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.ActivityCompat;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.support.v7.widget.RecyclerView;
Expand Down Expand Up @@ -79,12 +81,13 @@ protected void onCreate(Bundle savedInstanceState) {
public void onDragDismissed() {
// if we drag dismiss downward then the default reversal of the enter
// transition would slide content upward which looks weird. So reverse it.
if (draggableFrame.getTranslationY() > 0) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP
&& draggableFrame.getTranslationY() > 0) {
getWindow().setReturnTransition(
TransitionInflater.from(AboutActivity.this)
.inflateTransition(R.transition.about_return_downward));
}
finishAfterTransition();
ActivityCompat.finishAfterTransition(AboutActivity.this);
}
});
}
Expand Down
41 changes: 23 additions & 18 deletions app/src/main/java/io/plaidapp/ui/DesignerNewsLogin.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,16 @@
import android.content.Intent;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.design.widget.TextInputLayout;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.support.v4.view.ViewCompat;
import android.text.Editable;
import android.text.TextWatcher;
import android.transition.Transition;
import android.transition.TransitionManager;
import android.util.Log;
import android.util.Patterns;
import android.view.Gravity;
Expand Down Expand Up @@ -72,6 +74,8 @@
import io.plaidapp.ui.transitions.FabDialogMorphSetup;
import io.plaidapp.util.AnimUtils;
import io.plaidapp.util.ScrimUtil;
import io.plaidapp.util.ViewUtils;
import io.plaidapp.util.compat.TransitionManagerCompat;
import io.plaidapp.util.glide.CircleTransform;
import retrofit.Callback;
import retrofit.RestAdapter;
Expand Down Expand Up @@ -104,9 +108,9 @@ protected void onCreate(Bundle savedInstanceState) {
ButterKnife.bind(this);
FabDialogMorphSetup.setupSharedEelementTransitions(this, container,
getResources().getDimensionPixelSize(R.dimen.dialog_corners));
if (getWindow().getSharedElementEnterTransition() != null) {
getWindow().getSharedElementEnterTransition().addListener(new AnimUtils
.TransitionListenerAdapter() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP
&& getWindow().getSharedElementEnterTransition() != null) {
getWindow().getSharedElementEnterTransition().addListener(new AnimUtils.TransitionListenerAdapter() {
@Override
public void onTransitionEnd(Transition transition) {
finishSetup();
Expand Down Expand Up @@ -151,22 +155,22 @@ public void onBackPressed() {

@Override
public void onRequestPermissionsResult(int requestCode,
String[] permissions,
int[] grantResults) {
@NonNull String[] permissions,
@NonNull int[] grantResults) {
if (requestCode == PERMISSIONS_REQUEST_GET_ACCOUNTS) {
TransitionManager.beginDelayedTransition(container);
TransitionManagerCompat.beginDelayedTransition(container);
if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
setupAccountAutocomplete();
username.requestFocus();
username.showDropDown();
} else {
// if permission was denied check if we should ask again in the future (i.e. they
// did not check 'never ask again')
if (shouldShowRequestPermissionRationale(Manifest.permission.GET_ACCOUNTS)) {
if (ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.GET_ACCOUNTS)) {
setupPermissionPrimer();
} else {
// denied & shouldn't ask again. deal with it (•_•) ( •_•)>⌐■-■ (⌐■_■)
TransitionManager.beginDelayedTransition(container);
TransitionManagerCompat.beginDelayedTransition(container);
permissionPrimer.setVisibility(View.GONE);
}
}
Expand All @@ -186,7 +190,7 @@ public void signup(View view) {
public void dismiss(View view) {
isDismissing = true;
setResult(Activity.RESULT_CANCELED);
finishAfterTransition();
ActivityCompat.finishAfterTransition(this);
}

/**
Expand All @@ -196,7 +200,7 @@ public void dismiss(View view) {
*/
private void finishSetup() {
if (shouldPromptForPermission) {
requestPermissions(new String[]{ Manifest.permission.GET_ACCOUNTS },
ActivityCompat.requestPermissions(this, new String[]{ Manifest.permission.GET_ACCOUNTS },
PERMISSIONS_REQUEST_GET_ACCOUNTS);
shouldPromptForPermission = false;
}
Expand All @@ -222,7 +226,7 @@ public void afterTextChanged(Editable s) {

private void maybeShowAccounts() {
if (username.hasFocus()
&& username.isAttachedToWindow()
&& ViewCompat.isAttachedToWindow(username)
&& username.getAdapter() != null
&& username.getAdapter().getCount() > 0) {
username.showDropDown();
Expand All @@ -234,7 +238,7 @@ private boolean isLoginValid() {
}

private void showLoading() {
TransitionManager.beginDelayedTransition(container);
TransitionManagerCompat.beginDelayedTransition(container);
title.setVisibility(View.GONE);
usernameLabel.setVisibility(View.GONE);
permissionPrimer.setVisibility(View.GONE);
Expand All @@ -244,7 +248,7 @@ private void showLoading() {
}

private void showLogin() {
TransitionManager.beginDelayedTransition(container);
TransitionManagerCompat.beginDelayedTransition(container);
title.setVisibility(View.VISIBLE);
usernameLabel.setVisibility(View.VISIBLE);
passwordLabel.setVisibility(View.VISIBLE);
Expand Down Expand Up @@ -314,8 +318,8 @@ public void success(UserResponse userResponse, Response response) {
.placeholder(R.drawable.avatar_placeholder)
.transform(new CircleTransform(getApplicationContext()))
.into((ImageView) v.findViewById(R.id.avatar));
v.findViewById(R.id.scrim).setBackground(ScrimUtil
.makeCubicGradientScrimDrawable(
ViewUtils.setBackground(v.findViewById(R.id.scrim),
ScrimUtil.makeCubicGradientScrimDrawable(
ContextCompat.getColor(DesignerNewsLogin.this, R.color.scrim),
5, Gravity.BOTTOM));
confirmLogin.setView(v);
Expand Down Expand Up @@ -345,7 +349,7 @@ private void setupAccountAutocomplete() {
username.setAdapter(new ArrayAdapter<>(this,
R.layout.account_dropdown_item, new ArrayList<>(emailSet)));
} else {
if (shouldShowRequestPermissionRationale(Manifest.permission.GET_ACCOUNTS)) {
if (ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.GET_ACCOUNTS)) {
setupPermissionPrimer();
} else {
permissionPrimer.setVisibility(View.GONE);
Expand All @@ -361,7 +365,8 @@ private void setupPermissionPrimer() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (isChecked) {
requestPermissions(new String[]{ Manifest.permission.GET_ACCOUNTS },
ActivityCompat.requestPermissions(DesignerNewsLogin.this, new String[]{ Manifest.permission
.GET_ACCOUNTS },
PERMISSIONS_REQUEST_GET_ACCOUNTS);
}
}
Expand Down
Loading