TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-26 14:37:33 +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
Download Patch File Download Diff File Expand all files Collapse all files

76
res/layout/change_passphrase_activity.xml
View File

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

2
res/values/attrs.xml
View File

@@ -84,8 +84,6 @@
<attr name="encrypted_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="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>
<!-- change_passphrase_activity -->
<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__repeat_new_passphrase">REPEAT NEW 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__repeat_new_passphrase">Repeaet new passhprase</string>
<!-- contact_selection_activity -->
<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:typeface">sans</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:layout_gravity">left</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:shadowDy">1.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_video">@drawable/ic_video_light</item>
<item name="registration_text_shadow_color">@color/gray95</item>
<item name="reminder_header_background">#ff1d85d7</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_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="pref_ic_sms_mms">@drawable/ic_textsms_grey_32dp</item>