TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-26 11:21:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update registration activity style

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike
2017-03-30 18:18:04 -07:00
parent ad0f2830c8
commit 3aae86d20c
9 changed files with 111 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/org/thoughtcrime/securesms/RegistrationActivity.java
View File

@@ -1,11 +1,10 @@
package org.thoughtcrime.securesms;
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.support.v4.graphics.drawable.DrawableCompat;
import android.support.v7.app.AlertDialog;
import android.text.Editable;
import android.text.TextUtils;
@@ -15,14 +14,12 @@ import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;
import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.GoogleApiAvailability;
import com.google.android.gms.common.GooglePlayServicesUtil;
import com.google.i18n.phonenumbers.AsYouTypeFormatter;
import com.google.i18n.phonenumbers.NumberParseException;
import com.google.i18n.phonenumbers.PhoneNumberUtil;
@@ -58,8 +55,11 @@ public class RegistrationActivity extends BaseActionBarActivity {
private Spinner countrySpinner;
private TextView countryCode;
private TextView number;
private Button createButton;
private Button skipButton;
private TextView createButton;
private TextView skipButton;
private TextView informationView;
private View informationToggle;
private TextView informationToggleText;
private MasterSecret masterSecret;
@@ -86,37 +86,29 @@ public class RegistrationActivity extends BaseActionBarActivity {
private void initializeResources() {
this.masterSecret = getIntent().getParcelableExtra("master_secret");
this.countrySpinner = (Spinner)findViewById(R.id.country_spinner);
this.countryCode = (TextView)findViewById(R.id.country_code);
this.number = (TextView)findViewById(R.id.number);
this.createButton = (Button)findViewById(R.id.registerButton);
this.skipButton = (Button)findViewById(R.id.skipButton);
this.countrySpinner = (Spinner) findViewById(R.id.country_spinner);
this.countryCode = (TextView) findViewById(R.id.country_code);
this.number = (TextView) findViewById(R.id.number);
this.createButton = (TextView) findViewById(R.id.registerButton);
this.skipButton = (TextView) findViewById(R.id.skipButton);
this.informationView = (TextView) findViewById(R.id.registration_information);
this.informationToggle = findViewById(R.id.information_link_container);
this.informationToggleText = (TextView) findViewById(R.id.information_label);
DrawableCompat.setTint(this.createButton.getBackground(), getResources().getColor(R.color.signal_primary));
DrawableCompat.setTint(this.skipButton.getBackground(), getResources().getColor(R.color.grey_400));
this.countryCode.addTextChangedListener(new CountryCodeChangedListener());
this.number.addTextChangedListener(new NumberChangedListener());
this.createButton.setOnClickListener(new CreateButtonListener());
this.skipButton.setOnClickListener(new CancelButtonListener());
this.informationToggle.setOnClickListener(new InformationToggleListener());
if (getIntent().getBooleanExtra("cancel_button", false)) {
this.skipButton.setVisibility(View.VISIBLE);
} else {
this.skipButton.setVisibility(View.INVISIBLE);
}
findViewById(R.id.twilio_shoutout).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent();
intent.setAction(Intent.ACTION_VIEW);
intent.addCategory(Intent.CATEGORY_BROWSABLE);
intent.setData(Uri.parse("https://twilio.com"));
try {
startActivity(intent);
} catch (ActivityNotFoundException e) {
Log.w(TAG,e);
}
}
});
}
private void initializeSpinner() {
@@ -374,4 +366,17 @@ public class RegistrationActivity extends BaseActionBarActivity {
finish();
}
}
private class InformationToggleListener implements View.OnClickListener {
@Override
public void onClick(View v) {
if (informationView.getVisibility() == View.VISIBLE) {
informationView.setVisibility(View.GONE);
informationToggleText.setText(R.string.RegistrationActivity_more_information);
} else {
informationView.setVisibility(View.VISIBLE);
informationToggleText.setText(R.string.RegistrationActivity_less_information);
}
}
}
}