TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-24 08:47:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Color registration buttons correctly <API21

Browse Source 
Fixes #6604
Closes #6605
// FREEBIE
This commit is contained in:
FeuRenard 2017-04-30 19:26:10 +02:00 committed by Moxie Marlinspike
parent 6ede47d4f7
commit 1b75d00de5
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/registration_activity.xml
View File

@ -104,7 +104,6 @@
android:text="@android:string/cancel" android:text="@android:string/cancel"
android:textColor="@color/white" android:textColor="@color/white"
android:background="@drawable/pill_button" android:background="@drawable/pill_button"
android:backgroundTint="@color/grey_400"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"
@ -119,7 +118,6 @@
android:text="@string/registration_activity__register" android:text="@string/registration_activity__register"
android:textColor="@color/white" android:textColor="@color/white"
android:background="@drawable/pill_button" android:background="@drawable/pill_button"
android:backgroundTint="@color/signal_primary"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"

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

@ -3,8 +3,9 @@ package org.thoughtcrime.securesms;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.graphics.PorterDuff;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.graphics.drawable.DrawableCompat; import android.support.v4.content.ContextCompat;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
import android.text.Editable; import android.text.Editable;
import android.text.TextUtils; import android.text.TextUtils;
@ -95,8 +96,10 @@ public class RegistrationActivity extends BaseActionBarActivity {
this.informationToggle = findViewById(R.id.information_link_container); this.informationToggle = findViewById(R.id.information_link_container);
this.informationToggleText = (TextView) findViewById(R.id.information_label); this.informationToggleText = (TextView) findViewById(R.id.information_label);
DrawableCompat.setTint(this.createButton.getBackground(), getResources().getColor(R.color.signal_primary)); this.createButton.getBackground().setColorFilter(ContextCompat.getColor(this, R.color.signal_primary),
DrawableCompat.setTint(this.skipButton.getBackground(), getResources().getColor(R.color.grey_400)); PorterDuff.Mode.MULTIPLY);
this.skipButton.getBackground().setColorFilter(ContextCompat.getColor(this, R.color.grey_400),
PorterDuff.Mode.MULTIPLY);
this.countryCode.addTextChangedListener(new CountryCodeChangedListener()); this.countryCode.addTextChangedListener(new CountryCodeChangedListener());
this.number.addTextChangedListener(new NumberChangedListener()); this.number.addTextChangedListener(new NumberChangedListener());