Skip to content
This repository has been archived by the owner on May 17, 2023. It is now read-only.

Commit

Permalink
Crash fixes, fixed issue with transparent controls in spacing dialog,…
Browse files Browse the repository at this point in the history
… 0.3.1
  • Loading branch information
afollestad committed Jan 2, 2016
1 parent 166311e commit f301610
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 4 deletions.
Binary file modified apk/PhotoAffix.apk
Binary file not shown.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ android {
applicationId "com.afollestad.photoaffix"
minSdkVersion 21
targetSdkVersion 23
versionCode 14
versionName "0.3.0 BETA"
versionCode 15
versionName "0.3.1 BETA"
}
buildTypes {
release {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
import android.app.Activity;
import android.app.Dialog;
import android.app.DialogFragment;
import android.graphics.Color;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.content.ContextCompat;
import android.view.View;
import android.widget.SeekBar;
import android.widget.TextView;
Expand Down Expand Up @@ -47,14 +49,17 @@ public interface SpacingCallback {

@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
final int fillColor = Prefs.bgFillColor(getActivity());
int fillColor = Prefs.bgFillColor(getActivity());
if (fillColor == Color.TRANSPARENT)
fillColor = ContextCompat.getColor(getActivity(), R.color.colorAccent);
MaterialDialog dialog = new MaterialDialog.Builder(getActivity())
.title(R.string.image_spacing)
.customView(R.layout.dialog_imagespacing, true)
.positiveText(android.R.string.ok)
.negativeText(android.R.string.cancel)
.positiveColor(fillColor)
.negativeColor(fillColor)
.widgetColor(fillColor)
.onPositive(new MaterialDialog.SingleButtonCallback() {
@Override
public void onClick(@NonNull MaterialDialog materialDialog, @NonNull DialogAction dialogAction) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import android.os.PersistableBundle;
import android.support.annotation.ColorInt;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.Size;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
Expand Down Expand Up @@ -224,7 +225,8 @@ protected void onResume() {
@Override
protected void onPause() {
super.onPause();
Inquiry.deinit();
if (isFinishing())
Inquiry.deinit();
}

public void clearSelection() {
Expand Down Expand Up @@ -348,7 +350,9 @@ private int[] getNextBitmapSize() {
return new int[]{options.outWidth, options.outHeight};
}

@Nullable
private BitmapFactory.Options getNextBitmapOptions() {
if (mSelectedPhotos == null) return null;
mTraverseIndex++;
if (mTraverseIndex > mSelectedPhotos.length - 1)
return null;
Expand Down

0 comments on commit f301610

Please # to comment.