Skip to content

Commit

Permalink
added links to policies
Browse files Browse the repository at this point in the history
  • Loading branch information
or-else committed Sep 11, 2019
1 parent 65fdf75 commit 0658f6b
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 0 deletions.
16 changes: 16 additions & 0 deletions app/src/main/java/co/tinode/tindroid/AccountInfoFragment.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@
import androidx.appcompat.widget.AppCompatImageView;
import androidx.appcompat.widget.Toolbar;

import android.text.Html;
import android.text.TextUtils;
import android.text.method.LinkMovementMethod;
import android.text.method.MovementMethod;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
Expand Down Expand Up @@ -82,6 +85,19 @@ public void onClick(View v) {
}
}
});

// Make policy links clickable.
MovementMethod movementInstance = LinkMovementMethod.getInstance();
TextView link = fragment.findViewById(R.id.contactUs);
link.setText(Html.fromHtml(getString(R.string.contact_us)));
link.setMovementMethod(movementInstance);
link = fragment.findViewById(R.id.termsOfUse);
link.setText(Html.fromHtml(getString(R.string.terms_of_use)));
link.setMovementMethod(movementInstance);
link = fragment.findViewById(R.id.privacyPolicy);
link.setText(Html.fromHtml(getString(R.string.privacy_policy)));
link.setMovementMethod(movementInstance);

return fragment;
}

Expand Down
50 changes: 50 additions & 0 deletions app/src/main/res/layout/fragment_account_info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,57 @@

</LinearLayout>

<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginTop="@dimen/activity_padding"
android:layout_marginBottom="@dimen/activity_padding"
android:background="@color/grey"/>

</LinearLayout>

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

<TextView
style="@style/sectionTitleStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/legal"/>

<TextView
android:id="@+id/contactUs"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/contact_us"
android:layout_marginStart="16dp"
android:layout_marginTop="@dimen/activity_padding"
android:layout_marginBottom="@dimen/activity_padding"
tools:text="Contact Us" />

<TextView
android:id="@+id/termsOfUse"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/terms_of_use"
android:layout_marginStart="16dp"
android:layout_marginTop="@dimen/activity_padding"
android:layout_marginBottom="@dimen/activity_padding"
tools:text="Terms of Use"/>

<TextView
android:id="@+id/privacyPolicy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:text="@string/privacy_policy"
android:layout_marginTop="@dimen/activity_padding"
android:layout_marginBottom="@dimen/activity_padding"
tools:text="Privacy Policy" />

</LinearLayout>

</LinearLayout>
</ScrollView>
4 changes: 4 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -230,4 +230,8 @@
<string name="new_chat_report">Block and report</string>
<string name="confirm_contact_ban">Block %1$s?</string>
<string name="confirm_report">Block and report %1$s?</string>
<string name="legal">Legal</string>
<string name="terms_of_use"><![CDATA[<a href=\"https://tinode.co/terms.html\">Terms of Use</a>]]></string>
<string name="contact_us"><![CDATA[<a href=\"mailto:info@tinode.co\">Contact Us</a>]]></string>
<string name="privacy_policy"><![CDATA[<a href=\"https://tinode.co/privacy.html\">Pricacy Policy</a>]]></string>
</resources>

0 comments on commit 0658f6b

Please sign in to comment.