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

more (subtle) ui work

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-03-26 17:52:18 +01:00
parent dc8b04a793
commit ab5a7d4094
4 changed files with 65 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml
View File

@@ -60,17 +60,18 @@
android:layout_marginBottom="4dp"
android:inAnimation="@anim/fade_in_quick"
android:outAnimation="@anim/fade_out_quick"
android:measureAllChildren="false"
android:layout_weight="1">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium" />
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium" />
android:textAppearance="?android:attr/textAppearanceSmall" />
</TextSwitcher>
@@ -110,32 +111,28 @@
</ViewAnimator>
<org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner
android:layout_marginLeft="14dp"
android:layout_marginRight="14dp"
<FrameLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:id="@+id/cert_key_spinner"
android:visibility="gone">
</org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner>
android:id="@+id/cert_key_spincontainer"
android:visibility="gone"
>
<org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner
android:layout_marginLeft="14dp"
android:layout_marginRight="14dp"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:id="@+id/cert_key_spinner">
</org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner>
</FrameLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/back_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_chevron_left_grey_24dp"
android:visibility="gone"
style="?android:attr/borderlessButtonStyle" />
<Space
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
android:orientation="horizontal"
android:gravity="right|end">
<Button
android:id="@+id/button_view"

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

@@ -1327,14 +1327,14 @@
<string name="linked_create_verify">"Verify"</string>
<string name="linked_text_clipboard">Text has been copied to clipboard</string>
<string name="linked_verified_https">"The Website has been fetched and verified."</string>
<string name="linked_verified_github">"The Gist has been fetched and verified."</string>
<string name="linked_verified_dns">"The DNS record has been fetched and verified."</string>
<string name="linked_verified_twitter">"The Tweet has been fetched and verified."</string>
<string name="linked_verified_secret_https">"Your Website has been fetched and verified. Everything looks in order."</string>
<string name="linked_verified_secret_github">"Your Gist has been fetched and verified. Everything looks in order."</string>
<string name="linked_verified_secret_dns">"Your DNS record has been fetched and verified. Everything looks in order."</string>
<string name="linked_verified_secret_twitter">"Your Tweet has been fetched and verified. Everything looks in order."</string>
<string name="linked_verified_https">"The link between this Website and key was securely verified. If you believe the Website is genuine, you may confirm this Identity with your key."</string>
<string name="linked_verified_github">"The link between this Github account and key was securely verified. If you believe the account is genuine, you may confirm this Identity with your key."</string>
<string name="linked_verified_dns">"The link between this Domain Name and key was securely verified. If you believe the Domain is genuine, you may confirm this Identity with your key."</string>
<string name="linked_verified_twitter">"The link between this Twitter account and key was securely verified. If you believe the account is genuine, you may confirm this Identity 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>
<plurals name="linked_id_expand">
<item quantity="one">"There is one more unknown identity type"</item>