cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linked: use webview instead of app, and some minor layoutings

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-09-02 04:13:32 +02:00
parent 87f7fe65a8
commit 2cda486427
7 changed files with 196 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml
View File

@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="match_parent">
android:layout_height="match_parent"
xmlns:custom="http://schemas.android.com/apk/res-auto">
<ScrollView
android:layout_width="match_parent"
@@ -122,14 +123,16 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/button_container"
android:outAnimation="@anim/fade_out">
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:inAnimation="@anim/fade_in"
android:outAnimation="@anim/fade_out"
custom:initialView="2">
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
style="?android:buttonBarButtonStyle"
android:drawableLeft="@drawable/link_24dp"
android:drawableStart="@drawable/link_24dp"
@@ -142,6 +145,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<include layout="@layout/linked_id_item" />
</org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
</LinearLayout>

10
OpenKeychain/src/main/res/layout/loader_layout.xml
View File

@@ -4,7 +4,6 @@
android:layout_height="match_parent"
android:orientation="vertical">
<!--rebuild functionality of ListFragment -->
<LinearLayout
android:id="@+id/loader_progress"
android:orientation="vertical"
@@ -14,16 +13,9 @@
<ProgressBar
style="?android:attr/progressBarStyleLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text=""
android:paddingTop="4dip"
android:singleLine="true" />
android:gravity="center" />
</LinearLayout>

12
OpenKeychain/src/main/res/layout/oauth_webview.xml Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<WebView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/web_view"/>
</LinearLayout>

9
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -82,7 +82,6 @@
<string name="btn_export_to_server">"Upload To Keyserver"</string>
<string name="btn_next">"Next"</string>
<string name="btn_back">"Back"</string>
<string name="btn_cancel">"Cancel"</string>
<string name="btn_no">"No"</string>
<string name="btn_match">"Fingerprints match"</string>
<string name="btn_share_encrypted_signed">"Encrypt/sign and share text"</string>
@@ -1591,10 +1590,10 @@
<string name="linked_verified_github">"The link between this GitHub account and key was securely verified. <b>If you believe the account is genuine</b>, confirm this verification with your key."</string>
<string name="linked_verified_dns">"The link between this Domain Name and key was securely verified. <b>If you believe the Domain is genuine</b>, confirm this verification with your key."</string>
<string name="linked_verified_twitter">"The link between this Twitter account and key was securely verified. <b>If you believe the account is genuine</b>, confirm this verification with your key."</string>
<string name="linked_verified_secret_https">"The link between your Website and key was securely verified. Everything looks in order."</string>
<string name="linked_verified_secret_github">"The link between your GitHub account and key was securely verified. Everything looks in order."</string>
<string name="linked_verified_secret_dns">"The link between your Domain Name and key was securely verified. Everything looks in order."</string>
<string name="linked_verified_secret_twitter">"The link between this Twitter account and key was securely verified. Everything looks in order."</string>
<string name="linked_verified_secret_https">"Everything looks in order."</string>
<string name="linked_verified_secret_github">"Everything looks in order."</string>
<string name="linked_verified_secret_dns">"Everything looks in order."</string>
<string name="linked_verified_secret_twitter">"Everything looks in order."</string>
<plurals name="linked_id_expand">
<item quantity="one">"There is one more unknown identity type"</item>