TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-20 09:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stringify and clean layout

Browse Source
This commit is contained in:
Moxie Marlinspike 2013-07-09 16:24:48 -07:00
parent 3634ba0b55
commit 7eef93c829
2 changed files with 101 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
res/layout/registration_activity.xml
View File

@ -6,77 +6,73 @@
android:fillViewport="true" android:fillViewport="true"
android:background="@drawable/background_pattern_repeat"> android:background="@drawable/background_pattern_repeat">
<FrameLayout <LinearLayout android:paddingRight="16dip"
android:layout_width="fill_parent" android:paddingLeft="16dip"
android:layout_height="fill_parent" android:paddingTop="10dip"
android:gravity="center" > android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical">
<LinearLayout android:paddingRight="16dip" <TextView style="@style/Registration.Description"
android:paddingLeft="16dip" android:layout_width="fill_parent"
android:paddingTop="10dip" android:layout_marginBottom="16dip"
android:layout_marginTop="16dip"
android:text="@string/registration_activity__please_confirm_your_country_code_and_phone_number"/>
<TextView style="@style/Registration.Label"
android:layout_width="fill_parent"
android:textAllCaps="true"
android:text="@string/registration_activity__your_country" />
<Spinner android:id="@+id/country_spinner"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dip" />
<TextView style="@style/Registration.Label"
android:layout_width="fill_parent"
android:textAllCaps="true"
android:text="@string/registration_activity__your_country_code_and_phone_number" />
<LinearLayout android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:textSize="20sp"
android:orientation="vertical"> style="@style/Registration.Constant"
android:text="+" />
<TextView style="@style/Registration.Description" <EditText android:id="@+id/country_code"
android:layout_width="fill_parent" android:layout_width="55dip"
android:layout_marginBottom="16dip" android:layout_height="wrap_content"
android:layout_marginTop="16dip" android:singleLine="true"
android:text="Please confirm your country code and phone number."/> android:gravity="center"
android:inputType="phone"
android:digits="0123456789" />
<TextView style="@style/Registration.Label" <EditText android:id="@+id/number"
android:layout_width="fill_parent" android:layout_width="0dip"
android:textAllCaps="true" android:layout_height="wrap_content"
android:text="YOUR COUNTRY" /> android:layout_weight="1"
android:inputType="phone"
android:hint="@string/registration_activity__phone_number"
android:gravity="center"
android:singleLine="true"/>
<Spinner android:id="@+id/country_spinner"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dip" />
<TextView style="@style/Registration.Label"
android:layout_width="fill_parent"
android:textAllCaps="true"
android:text="YOUR COUNTRY CODE AND PHONE NUMBER" />
<LinearLayout android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="20sp"
style="@style/Registration.Constant"
android:text="+" />
<EditText android:id="@+id/country_code"
android:layout_width="55dip"
android:layout_height="wrap_content"
android:singleLine="true"
android:gravity="center"
android:inputType="phone"
android:digits="0123456789" />
<EditText android:id="@+id/number"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:inputType="phone"
android:hint="PHONE NUMBER"
android:gravity="center"
android:singleLine="true"/>
</LinearLayout>
<Button android:id="@+id/registerButton"
android:text="Register"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_marginTop="20dip"
android:layout_marginBottom="20dip"/>
</LinearLayout> </LinearLayout>
</FrameLayout>
</ScrollView> <Button
android:id="@+id/registerButton"
android:text="@string/registration_activity__register"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_marginTop="20dip"
android:layout_marginBottom="20dip"/>
</LinearLayout>
</ScrollView>

64
res/values/strings.xml
View File

@ -402,6 +402,38 @@
<!-- receive_key_activity --> <!-- receive_key_activity -->
<string name="receive_key_activity__complete">Complete</string> <string name="receive_key_activity__complete">Complete</string>
<!-- registration_activity -->
<string name="registration_activity__please_confirm_your_country_code_and_phone_number">Please
confirm your country code and phone number.
</string>
<string name="registration_activity__your_country">YOUR COUNTRY</string>
<string name="registration_activity__your_country_code_and_phone_number">YOUR COUNTRY CODE AND
PHONE NUMBER
</string>
<string name="registration_activity__phone_number">PHONE NUMBER</string>
<string name="registration_activity__register">Register</string>
<!-- registration_problems -->
<string name="registration_problems__some_possible_problems_include">Some possible problems
include:
</string>
<string name="registration_problems__sms_interceptors">SMS Interceptors.</string>
<string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">
Some third party text messaging clients, such as Handcent or GoSMS, behave poorly and
intercept all incoming SMS messages. Check to see if you received a text message that starts
with \'Your TextSecure verification code:\', in which case you\'ll need to configure your
third party text messaging app to let text messages through.
</string>
<string name="registration_problems__incorrect_number">Incorrect number.</string>
<string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">
Please check to make sure you entered your number correctly, and that it is formatted for
correctly your region.
</string>
<string name="registration_problems__google_voice">Google Voice.</string>
<string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">
TextSecure will not work with Google Voice numbers.
</string>
<!-- registration_progress_activity --> <!-- registration_progress_activity -->
<string name="registration_progress_activity__voice_verification">Voice Verification</string> <string name="registration_progress_activity__voice_verification">Voice Verification</string>
<string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number"> <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">
@ -442,7 +474,12 @@
<string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">This <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">This
could take a moment. Please be patient, we\'ll notify you when verification is complete. could take a moment. Please be patient, we\'ll notify you when verification is complete.
</string> </string>
<string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">
TextSecure timed out while waiting for a verification SMS message.
</string>
<string name="registration_progress_activity__sms_verification_failed">SMS verification
failed.
</string>
<!-- recipients_panel --> <!-- recipients_panel -->
<string name="recipients_panel__to">To</string> <string name="recipients_panel__to">To</string>
@ -624,31 +661,6 @@
<!-- verify_keys --> <!-- verify_keys -->
<string name="verify_keys__menu_verified">Verified</string> <string name="verify_keys__menu_verified">Verified</string>
<string name="registration_problems__some_possible_problems_include">Some possible problems
include:
</string>
<string name="registration_problems__sms_interceptors">SMS Interceptors.</string>
<string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">
Some third party text messaging clients, such as Handcent or GoSMS, behave poorly and
intercept all incoming SMS messages. Check to see if you received a text message that starts
with \'Your TextSecure verification code:\', in which case you\'ll need to configure your
third party text messaging app to let text messages through.
</string>
<string name="registration_problems__incorrect_number">Incorrect number.</string>
<string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">
Please check to make sure you entered your number correctly, and that it is formatted for
correctly your region.
</string>
<string name="registration_problems__google_voice">Google Voice.</string>
<string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">
TextSecure will not work with Google Voice numbers.
</string>
<string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">
TextSecure timed out while waiting for a verification SMS message.
</string>
<string name="registration_progress_activity__sms_verification_failed">SMS verification
failed.
</string>
<!-- EOF --> <!-- EOF -->
</resources> </resources>