TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-30 13:35:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

use material labels for passphrase text

Browse Source 
closes #3374
Closes #4570
// FREEBIE
This commit is contained in:
Jake McGinty 2015-11-16 17:39:13 -08:00 committed by Moxie Marlinspike
parent 245c0adeea
commit 25da3525fa
7 changed files with 47 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -49,6 +49,7 @@ dependencies {
compile 'com.soundcloud.android:android-crop:0.9.10@aar' compile 'com.soundcloud.android:android-crop:0.9.10@aar'
compile 'com.android.support:appcompat-v7:22.2.1' compile 'com.android.support:appcompat-v7:22.2.1'
compile 'com.android.support:recyclerview-v7:22.2.1' compile 'com.android.support:recyclerview-v7:22.2.1'
compile 'com.android.support:design:22.2.1'
compile 'com.melnykov:floatingactionbutton:1.3.0' compile 'com.melnykov:floatingactionbutton:1.3.0'
compile 'com.google.zxing:android-integration:3.1.0' compile 'com.google.zxing:android-integration:3.1.0'
compile ('com.android.support:support-v4-preferencefragment:1.0.0@aar'){ compile ('com.android.support:support-v4-preferencefragment:1.0.0@aar'){
@ -107,6 +108,7 @@ dependencyVerification {
'com.soundcloud.android:android-crop:ffd4b973cf6e97f7d64118a0dc088df50e9066fd5634fe6911dd0c0c5d346177', 'com.soundcloud.android:android-crop:ffd4b973cf6e97f7d64118a0dc088df50e9066fd5634fe6911dd0c0c5d346177',
'com.android.support:appcompat-v7:4b5ccba8c4557ef04f99aa0a80f8aa7d50f05f926a709010a54afd5c878d3618', 'com.android.support:appcompat-v7:4b5ccba8c4557ef04f99aa0a80f8aa7d50f05f926a709010a54afd5c878d3618',
'com.android.support:recyclerview-v7:b0f530a5b14334d56ce0de85527ffe93ac419bc928e2884287ce1dddfedfb505', 'com.android.support:recyclerview-v7:b0f530a5b14334d56ce0de85527ffe93ac419bc928e2884287ce1dddfedfb505',
'com.android.support:design:58be3ca6a73789615f7ece0937d2f683b98b594bb90aa10565fa760fb10b07ee',
'com.melnykov:floatingactionbutton:15d58d4fac0f7a288d0e5301bbaf501a146f5b3f5921277811bf99bd3b397263', 'com.melnykov:floatingactionbutton:15d58d4fac0f7a288d0e5301bbaf501a146f5b3f5921277811bf99bd3b397263',
'com.google.zxing:android-integration:89e56aadf1164bd71e57949163c53abf90af368b51669c0d4a47a163335f95c4', 'com.google.zxing:android-integration:89e56aadf1164bd71e57949163c53abf90af368b51669c0d4a47a163335f95c4',
'com.android.support:support-v4-preferencefragment:5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad', 'com.android.support:support-v4-preferencefragment:5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad',

42
res/layout/change_passphrase_activity.xml
View File

@ -5,10 +5,9 @@
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:fillViewport="true"> android:fillViewport="true">
<FrameLayout <FrameLayout android:layout_width="fill_parent"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_height="fill_parent" android:gravity="center">
android:gravity="center" >
<LinearLayout android:paddingRight="16dip" <LinearLayout android:paddingRight="16dip"
android:paddingLeft="16dip" android:paddingLeft="16dip"
@ -19,40 +18,45 @@
android:visibility="visible" android:visibility="visible"
android:orientation="vertical"> android:orientation="vertical">
<TextView style="@style/Registration.Label" <android.support.design.widget.TextInputLayout
android:id="@+id/old_passphrase_label" android:layout_width="match_parent"
android:layout_width="fill_parent" android:layout_height="wrap_content">
android:textAllCaps="true"
android:text="@string/change_passphrase_activity__old_passphrase" />
<EditText android:id="@+id/old_passphrase" <EditText android:id="@+id/old_passphrase"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="textPassword" android:inputType="textPassword"
android:layout_marginBottom="10dip" android:layout_marginBottom="10dip"
android:hint="@string/change_passphrase_activity__old_passphrase"
android:singleLine="true"/> android:singleLine="true"/>
<TextView style="@style/Registration.Label" </android.support.design.widget.TextInputLayout>
android:layout_width="fill_parent"
android:textAllCaps="true" <android.support.design.widget.TextInputLayout
android:text="@string/change_passphrase_activity__new_passphrase" /> android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText android:id="@+id/new_passphrase" <EditText android:id="@+id/new_passphrase"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="textPassword" android:inputType="textPassword"
android:hint="@string/change_passphrase_activity__new_passphrase"
android:singleLine="true"/> android:singleLine="true"/>
<TextView style="@style/Registration.Label" </android.support.design.widget.TextInputLayout>
android:layout_width="fill_parent"
android:textAllCaps="true" <android.support.design.widget.TextInputLayout
android:text="@string/change_passphrase_activity__repeat_new_passphrase" /> android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText android:id="@+id/repeat_passphrase" <EditText android:id="@+id/repeat_passphrase"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="textPassword" android:inputType="textPassword"
android:singleLine="true"/> android:hint="@string/change_passphrase_activity__repeat_new_passphrase"
android:singleLine="true" />
</android.support.design.widget.TextInputLayout>
<LinearLayout android:orientation="horizontal" <LinearLayout android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="fill_parent"

2
res/values/attrs.xml
View File

@ -84,8 +84,6 @@
<attr name="encrypted_backup" format="reference" /> <attr name="encrypted_backup" format="reference" />
<attr name="plaintext_backup" format="reference" /> <attr name="plaintext_backup" format="reference" />
<attr name="registration_text_shadow_color" format="color" />
<attr name="reminder_header_background" format="color"/> <attr name="reminder_header_background" format="color"/>
<attr name="menu_new_conversation_icon" format="reference" /> <attr name="menu_new_conversation_icon" format="reference" />

6
res/values/strings.xml
View File

@ -576,9 +576,9 @@
<string name="attachment_type_selector__camera">Camera</string> <string name="attachment_type_selector__camera">Camera</string>
<!-- change_passphrase_activity --> <!-- change_passphrase_activity -->
<string name="change_passphrase_activity__old_passphrase">OLD PASSPHRASE:</string> <string name="change_passphrase_activity__old_passphrase">Old passphrase</string>
<string name="change_passphrase_activity__new_passphrase">NEW PASSPHRASE:</string> <string name="change_passphrase_activity__new_passphrase">New passphrase</string>
<string name="change_passphrase_activity__repeat_new_passphrase">REPEAT NEW PASSPHRASE:</string> <string name="change_passphrase_activity__repeat_new_passphrase">Repeaet new passhprase</string>
<!-- contact_selection_activity --> <!-- contact_selection_activity -->
<string name="contact_selection_activity__enter_name_or_number">Enter name or number</string> <string name="contact_selection_activity__enter_name_or_number">Enter name or number</string>

4
res/values/styles.xml
View File

@ -122,11 +122,11 @@
<item name="android:textSize">12.0sp</item> <item name="android:textSize">12.0sp</item>
<item name="android:typeface">sans</item> <item name="android:typeface">sans</item>
<item name="android:textStyle">normal</item> <item name="android:textStyle">normal</item>
<item name="android:textColor">?android:attr/textColorSecondary</item> <item name="android:textColor">#ff808080</item>
<item name="android:gravity">left</item> <item name="android:gravity">left</item>
<item name="android:layout_gravity">left</item> <item name="android:layout_gravity">left</item>
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:shadowColor">?registration_text_shadow_color</item> <item name="android:shadowColor">#ffffff</item>
<item name="android:shadowDx">1.0</item> <item name="android:shadowDx">1.0</item>
<item name="android:shadowDy">1.0</item> <item name="android:shadowDy">1.0</item>
<item name="android:shadowRadius">0.0</item> <item name="android:shadowRadius">0.0</item>

4
res/values/themes.xml
View File

@ -181,8 +181,6 @@
<item name="conversation_icon_attach_audio">@drawable/ic_audio_light</item> <item name="conversation_icon_attach_audio">@drawable/ic_audio_light</item>
<item name="conversation_icon_attach_video">@drawable/ic_video_light</item> <item name="conversation_icon_attach_video">@drawable/ic_video_light</item>
<item name="registration_text_shadow_color">@color/gray95</item>
<item name="reminder_header_background">#ff1d85d7</item> <item name="reminder_header_background">#ff1d85d7</item>
<item name="pref_ic_sms_mms">@drawable/ic_textsms_black_32dp</item> <item name="pref_ic_sms_mms">@drawable/ic_textsms_black_32dp</item>
@ -296,8 +294,6 @@
<item name="conversation_icon_attach_audio">@drawable/ic_audio_dark</item> <item name="conversation_icon_attach_audio">@drawable/ic_audio_dark</item>
<item name="conversation_icon_attach_video">@drawable/ic_video_dark</item> <item name="conversation_icon_attach_video">@drawable/ic_video_dark</item>
<item name="registration_text_shadow_color">@color/gray13</item>
<item name="reminder_header_background">@color/textsecure_primary_dark</item> <item name="reminder_header_background">@color/textsecure_primary_dark</item>
<item name="pref_ic_sms_mms">@drawable/ic_textsms_grey_32dp</item> <item name="pref_ic_sms_mms">@drawable/ic_textsms_grey_32dp</item>

5
src/org/thoughtcrime/securesms/PassphraseChangeActivity.java
View File

@ -25,7 +25,6 @@ import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import org.thoughtcrime.securesms.crypto.InvalidPassphraseException; import org.thoughtcrime.securesms.crypto.InvalidPassphraseException;
@ -49,7 +48,6 @@ public class PassphraseChangeActivity extends PassphraseActivity {
private EditText originalPassphrase; private EditText originalPassphrase;
private EditText newPassphrase; private EditText newPassphrase;
private EditText repeatPassphrase; private EditText repeatPassphrase;
private TextView originalPassphraseLabel;
private Button okButton; private Button okButton;
private Button cancelButton; private Button cancelButton;
@ -72,7 +70,6 @@ public class PassphraseChangeActivity extends PassphraseActivity {
} }
private void initializeResources() { private void initializeResources() {
this.originalPassphraseLabel = (TextView) findViewById(R.id.old_passphrase_label);
this.originalPassphrase = (EditText) findViewById(R.id.old_passphrase ); this.originalPassphrase = (EditText) findViewById(R.id.old_passphrase );
this.newPassphrase = (EditText) findViewById(R.id.new_passphrase ); this.newPassphrase = (EditText) findViewById(R.id.new_passphrase );
this.repeatPassphrase = (EditText) findViewById(R.id.repeat_passphrase ); this.repeatPassphrase = (EditText) findViewById(R.id.repeat_passphrase );
@ -85,10 +82,8 @@ public class PassphraseChangeActivity extends PassphraseActivity {
if (TextSecurePreferences.isPasswordDisabled(this)) { if (TextSecurePreferences.isPasswordDisabled(this)) {
this.originalPassphrase.setVisibility(View.GONE); this.originalPassphrase.setVisibility(View.GONE);
this.originalPassphraseLabel.setVisibility(View.GONE);
} else { } else {
this.originalPassphrase.setVisibility(View.VISIBLE); this.originalPassphrase.setVisibility(View.VISIBLE);
this.originalPassphraseLabel.setVisibility(View.VISIBLE);
} }
} }