TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-24 07:59:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

go back to old reminder view look

Browse Source 
Closes #4283
// FREEBIE
This commit is contained in:
Jake McGinty
2015-10-23 12:47:21 -07:00
committed by Moxie Marlinspike
parent 23a2a5e5f3
commit 2f568c6400
9 changed files with 87 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/org/thoughtcrime/securesms/components/reminder/DefaultSmsReminder.java
View File

@@ -17,8 +17,7 @@ public class DefaultSmsReminder extends Reminder {
@TargetApi(VERSION_CODES.KITKAT)
public DefaultSmsReminder(final Context context) {
super(context.getString(R.string.reminder_header_sms_default_title),
context.getString(R.string.reminder_header_sms_default_text),
context.getString(R.string.reminder_header_sms_default_button));
context.getString(R.string.reminder_header_sms_default_text));
final OnClickListener okListener = new OnClickListener() {
@Override

3
src/org/thoughtcrime/securesms/components/reminder/ExpiredBuildReminder.java
View File

@@ -14,8 +14,7 @@ public class ExpiredBuildReminder extends Reminder {
public ExpiredBuildReminder(final Context context) {
super(context.getString(R.string.reminder_header_expired_build),
context.getString(R.string.reminder_header_expired_build_details),
context.getString(R.string.reminder_header_expired_build_button));
context.getString(R.string.reminder_header_expired_build_details));
setOkListener(new OnClickListener() {
@Override public void onClick(View v) {
try {

3
src/org/thoughtcrime/securesms/components/reminder/InviteReminder.java
View File

@@ -16,8 +16,7 @@ public class InviteReminder extends Reminder {
final @NonNull Recipients recipients)
{
super(context.getString(R.string.reminder_header_invite_title),
context.getString(R.string.reminder_header_invite_text, recipients.toShortString()),
context.getString(R.string.reminder_header_invite_button));
context.getString(R.string.reminder_header_invite_text, recipients.toShortString()));
setDismissListener(new OnClickListener() {
@Override public void onClick(View v) {

3
src/org/thoughtcrime/securesms/components/reminder/PushRegistrationReminder.java
View File

@@ -14,8 +14,7 @@ public class PushRegistrationReminder extends Reminder {
public PushRegistrationReminder(final Context context, final MasterSecret masterSecret) {
super(context.getString(R.string.reminder_header_push_title),
context.getString(R.string.reminder_header_push_text),
context.getString(R.string.reminder_header_push_button));
context.getString(R.string.reminder_header_push_text));
final OnClickListener okListener = new OnClickListener() {
@Override

11
src/org/thoughtcrime/securesms/components/reminder/Reminder.java
View File

@@ -1,12 +1,9 @@
package org.thoughtcrime.securesms.components.reminder;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.annotation.StringRes;
import android.view.View.OnClickListener;
public abstract class Reminder {
private CharSequence buttonText;
private CharSequence title;
private CharSequence text;
@@ -14,12 +11,10 @@ public abstract class Reminder {
private OnClickListener dismissListener;
public Reminder(@NonNull CharSequence title,
@NonNull CharSequence text,
@NonNull CharSequence buttonText)
@NonNull CharSequence text)
{
this.title = title;
this.text = text;
this.buttonText = buttonText;
}
public CharSequence getTitle() {
@@ -30,10 +25,6 @@ public abstract class Reminder {
return text;
}
public CharSequence getButtonText() {
return buttonText;
}
public OnClickListener getOkListener() {
return okListener;
}

16
src/org/thoughtcrime/securesms/components/reminder/ReminderView.java
View File

@@ -7,6 +7,7 @@ import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageButton;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -18,8 +19,7 @@ import org.thoughtcrime.securesms.util.ViewUtil;
*/
public class ReminderView extends LinearLayout {
private ViewGroup container;
private TextView acceptButton;
private TextView closeButton;
private ImageButton closeButton;
private TextView title;
private TextView text;
@@ -41,19 +41,17 @@ public class ReminderView extends LinearLayout {
private void initialize() {
LayoutInflater.from(getContext()).inflate(R.layout.reminder_header, this, true);
container = ViewUtil.findById(this, R.id.container);
acceptButton = ViewUtil.findById(this, R.id.accept);
closeButton = ViewUtil.findById(this, R.id.cancel);
title = ViewUtil.findById(this, R.id.reminder_title);
text = ViewUtil.findById(this, R.id.reminder_text);
container = ViewUtil.findById(this, R.id.container);
closeButton = ViewUtil.findById(this, R.id.cancel);
title = ViewUtil.findById(this, R.id.reminder_title);
text = ViewUtil.findById(this, R.id.reminder_text);
}
public void showReminder(final Reminder reminder) {
title.setText(reminder.getTitle());
text.setText(reminder.getText());
acceptButton.setText(reminder.getButtonText());
acceptButton.setOnClickListener(reminder.getOkListener());
setOnClickListener(reminder.getOkListener());
if (reminder.isDismissable()) {
closeButton.setOnClickListener(new OnClickListener() {

3
src/org/thoughtcrime/securesms/components/reminder/SystemSmsImportReminder.java
View File

@@ -15,8 +15,7 @@ public class SystemSmsImportReminder extends Reminder {
public SystemSmsImportReminder(final Context context, final MasterSecret masterSecret) {
super(context.getString(R.string.reminder_header_sms_import_title),
context.getString(R.string.reminder_header_sms_import_text),
context.getString(R.string.reminder_header_sms_import_button));
context.getString(R.string.reminder_header_sms_import_text));
final OnClickListener okListener = new OnClickListener() {
@Override