Skip to content

Commit

Permalink
turn RegistrationProblemsActivity into a dialog
Browse files Browse the repository at this point in the history 
// FREEBIE
  • Loading branch information
@mcginty
mcginty committed May 15, 2015
1 parent ab8593d commit deea90d
Show file tree
Hide file tree
Showing 4 changed files with 108 additions and 165 deletions.
4 changes: 0 additions & 4 deletions AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,6 @@
<meta-data android:name="org.thoughtcrime.securesms.mms.TextSecureGlideModule"
android:value="GlideModule" />

<activity android:name=".RegistrationProblemsActivity"
android:theme="@style/Theme.AppCompat.Light.DialogWhenLarge"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

<activity android:name=".CountrySelectionActivity"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

Expand Down
235 changes: 101 additions & 134 deletions res/layout/registration_problems.xml
View file
Original file line number Diff line number Diff line change
@@ -1,140 +1,107 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingLeft="16dip"
android:paddingRight="10dip"
android:baselineAligned="false">

<ScrollView android:layout_alignParentTop="true"
android:layout_above="@+id/button_frame"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:paddingTop="5dip"
android:paddingBottom="12dip">

<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">

<TextView
style="@style/Registration.Description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dip"
android:text="@string/registration_problems__some_possible_problems_include" />

<TableLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content" >

<TableRow>

<TextView
style="@style/Registration.Description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="10dip"
android:text="•" />

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical" >

<TextView
style="@style/Registration.Description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/registration_problems__sms_interceptors"
android:textStyle="bold" />

<TextView
style="@style/Registration.Description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="10dip"
android:text="@string/registration_problems__some_third_party_text_messaging_clients_such_as_handcent" />
</LinearLayout>
</TableRow>

<TableRow>

<TextView
style="@style/Registration.Description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dip"
android:text="@string/registration_problems__some_possible_problems_include" />

<TableLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content" >

<TableRow>

<TextView
style="@style/Registration.Description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="10dip"
android:text="•" />

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical" >

<TextView
style="@style/Registration.Description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/registration_problems__sms_interceptors"
android:textStyle="bold" />

<TextView
style="@style/Registration.Description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="10dip"
android:text="@string/registration_problems__some_third_party_text_messaging_clients_such_as_handcent" />
</LinearLayout>
</TableRow>

<TableRow>

<TextView
style="@style/Registration.Description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="10dip"
android:text="•" />

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical" >

<TextView
style="@style/Registration.Description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/registration_problems__incorrect_number"
android:textStyle="bold" />

<TextView
style="@style/Registration.Description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="10dip"
android:text="@string/registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly" />
</LinearLayout>
</TableRow>

<TableRow>

<TextView
style="@style/Registration.Description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="•" />

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical" >

<TextView
style="@style/Registration.Description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/registration_problems__google_voice"
android:textStyle="bold" />

<TextView
style="@style/Registration.Description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="10dip"
android:text="@string/registration_problems__textsecure_will_not_work_with_google_voice_numbers" />
</LinearLayout>
</TableRow>
</TableLayout>
</LinearLayout>
</ScrollView>

<LinearLayout android:id="@+id/button_frame"
android:layout_alignParentBottom="true"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:minHeight="54dip"
android:orientation="vertical"
android:gravity="center">

<Button android:id="@+id/close_button"
android:layout_width="fill_parent"
android:layout_gravity="center"
android:layout_height="wrap_content"
android:paddingLeft="10dip"
android:paddingRight="10dip"
android:text="@android:string/ok"/>
</LinearLayout>
</RelativeLayout>
android:paddingRight="10dip"
android:text="•" />

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical" >

<TextView
style="@style/Registration.Description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/registration_problems__incorrect_number"
android:textStyle="bold" />

<TextView
style="@style/Registration.Description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="10dip"
android:text="@string/registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly" />
</LinearLayout>
</TableRow>

<TableRow>

<TextView
style="@style/Registration.Description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="•" />

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical" >

<TextView
style="@style/Registration.Description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/registration_problems__google_voice"
android:textStyle="bold" />

<TextView
style="@style/Registration.Description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="10dip"
android:text="@string/registration_problems__textsecure_will_not_work_with_google_voice_numbers" />
</LinearLayout>
</TableRow>
</TableLayout>
</LinearLayout>
24 changes: 0 additions & 24 deletions src/org/thoughtcrime/securesms/RegistrationProblemsActivity.java
View file

This file was deleted.

10 changes: 7 additions & 3 deletions src/org/thoughtcrime/securesms/RegistrationProgressActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
import android.widget.Toast;


import com.afollestad.materialdialogs.MaterialDialog;

import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.push.TextSecureCommunicationFactory;
import org.thoughtcrime.securesms.service.KeyCachingService;
Expand Down Expand Up @@ -171,9 +173,11 @@ private void initializeLinks() {
spannableString.setSpan(new ClickableSpan() {
@Override
public void onClick(View widget) {
Intent intent = new Intent(RegistrationProgressActivity.this,
RegistrationProblemsActivity.class);
startActivity(intent);
new MaterialDialog.Builder(RegistrationProgressActivity.this)
.title(R.string.RegistrationProblemsActivity_possible_problems)
.customView(R.layout.registration_problems, true)
.neutralText(android.R.string.ok)
.show();
}
}, pretext.length() + 1, spannableString.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);

Expand Down

0 comments on commit deea90d

Please sign in to comment.