Commit 05daba6d authored by Hussein's avatar Hussein

Merge branch 'feature/P4A-1036' into develop

parents 14df611c d000a137
......@@ -3,6 +3,7 @@ package security.pEp.ui.about
import android.content.Context
import android.content.Intent
import android.graphics.Paint
import android.net.Uri
import android.os.Bundle
import android.text.method.LinkMovementMethod
import android.view.MenuItem
......@@ -53,6 +54,10 @@ class AboutActivity : PepActivity() {
}
contact_button.paintFlags = contact_button.paintFlags or Paint.UNDERLINE_TEXT_FLAG
documentation_button.setOnClickListener {
startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.pEp_documentation_url))))
}
documentation_button.paintFlags = documentation_button.paintFlags or Paint.UNDERLINE_TEXT_FLAG
val librariesString = buildLibrariesHtml()
librariesText.movementMethod = LinkMovementMethod.getInstance()
......
......@@ -63,6 +63,29 @@
app:layout_constraintTop_toTopOf="@+id/contact_label" />
<TextView
android:id="@+id/documentation_label"
style="@style/LightBlackText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginStart="16dp"
android:text="@string/about_documentation"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/contact_button" />
<TextView
android:id="@+id/documentation_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginStart="4dp"
android:text="@string/pEp_documentation_url"
android:textColor="@color/colorPrimary"
app:layout_constraintStart_toEndOf="@+id/documentation_label"
app:layout_constraintTop_toTopOf="@+id/documentation_label" />
<TextView
android:id="@+id/librariesText"
style="@style/LightBlackText"
......@@ -71,7 +94,7 @@
android:padding="16dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/contact_button"
app:layout_constraintTop_toBottomOf="@+id/documentation_button"
tools:text="asdfasofmawfmaewf awefoawef awefoawe f" />
<TextView
......
......@@ -8,6 +8,7 @@
<string name="pep_handshake" translatable="false">Handshake</string>
<string name="pep_title_activity_trustwords" translatable="false">Trustwords</string>
<string name="support_email" translatable="false">support@pep.security</string>
<string name="pEp_documentation_url" translatable="false">https://pep.security/docs</string>
<string name="pEp_trustwords">p≡p Trustwords</string>
<string name="pep_user_address_format" translatable="false">%1$s &lt;%2$s&gt;</string>
<string name="pep_user_name_format" translatable="false">%1$s</string>
......@@ -282,4 +283,7 @@
<string name="pep_sync_folder">p≡p sync folder</string>
<string name="pep_sync_folder_is_enabled">p≡p sync folder is enabled</string>
<string name="pep_sync_folder_is_disabled"> p≡p sync folder is disabled, using INBOX</string>
<string name="about_contact">Contact:</string>
<string name="about_documentation">Documentation:</string>
</resources>
\ No newline at end of file
......@@ -56,7 +56,6 @@
<string name="app_authors_fmt">Authors: <xliff:g id="app_authors">%s</xliff:g></string>
<string name="app_revision_fmt">Revision Information: <xliff:g id="app_revision_url">%s</xliff:g></string>
<string name="app_libraries">We\'re using the following third-party libraries:</string>
<string name="about_contact">Contact:</string>
<string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
<string name="read_attachment_label">Read Email attachments</string>
<string name="read_attachment_desc">Allows this application to read your Email attachments.</string>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment