Fix theme crash

pull/848/head
Alex Baker 5 years ago
parent fbedfc3c89
commit a4b3967158

@ -25,7 +25,7 @@ android {
defaultConfig {
testApplicationId = "org.tasks.test"
applicationId = "org.tasks"
versionCode = 603
versionCode = 604
versionName = "6.8"
targetSdkVersion(Versions.compileSdk)
minSdkVersion(Versions.minSdk)

@ -15,7 +15,6 @@ import android.os.Bundle;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
@ -82,13 +81,9 @@ public class NameYourPriceDialog extends InjectingDialogFragment implements OnPu
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
AlertDialog dialog =
dialogBuilder
.newDialog(R.string.name_your_price)
.setView(R.layout.dialog_name_your_price)
.show();
View view = theme.getLayoutInflater(context).inflate(R.layout.dialog_name_your_price, null);
ButterKnife.bind(this, dialog);
ButterKnife.bind(this, view);
setWaitScreen(true);
@ -104,7 +99,7 @@ public class NameYourPriceDialog extends InjectingDialogFragment implements OnPu
adapter.setSelected(savedInstanceState.getInt(EXTRA_PRICE));
}
return dialog;
return dialogBuilder.newDialog(R.string.name_your_price).setView(view).show();
}
private void onButtonChecked(MaterialButtonToggleGroup group, int id, boolean checked) {

@ -41,7 +41,8 @@ public class PurchaseAdapter extends ListAdapter<Integer, PurchaseHolder> {
@NonNull
@Override
public PurchaseHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View view = theme.getLayoutInflater(context).inflate(R.layout.dialog_purchase_cell, parent, false);
View view =
theme.getLayoutInflater(context).inflate(R.layout.dialog_purchase_cell, parent, false);
return new PurchaseHolder(view, onPriceChanged, locale);
}

@ -4,7 +4,6 @@ import static com.google.common.collect.Lists.transform;
import static java.util.Arrays.asList;
import static org.tasks.billing.NameYourPriceDialog.newNameYourPriceDialog;
import android.app.Activity;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
@ -21,12 +20,14 @@ import org.tasks.dialogs.DialogBuilder;
import org.tasks.injection.DialogFragmentComponent;
import org.tasks.injection.ForActivity;
import org.tasks.injection.InjectingDialogFragment;
import org.tasks.themes.Theme;
public class PurchaseDialog extends InjectingDialogFragment {
private static final String FRAG_TAG_PRICE = "frag_tag_price";
@Inject DialogBuilder dialogBuilder;
@Inject Theme theme;
@Inject @ForActivity Context context;
private OnDismissListener listener;
@ -37,7 +38,7 @@ public class PurchaseDialog extends InjectingDialogFragment {
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
View view = ((Activity) context).getLayoutInflater().inflate(R.layout.dialog_purchase, null);
View view = theme.getLayoutInflater(context).inflate(R.layout.dialog_purchase, null);
TextView textView = view.findViewById(R.id.feature_list);
String[] rows = context.getResources().getStringArray(R.array.pro_description);
textView.setText(Joiner.on('\n').join(transform(asList(rows), item -> "\u2022 " + item)));

Loading…
Cancel
Save