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

ImportKeys: Show refresh button and change text for "Show key"

Browse Source
This commit is contained in:
Andrea Torlaschi
2016-08-26 00:04:04 +02:00
parent c0c7c8cc62
commit 9714bcc85b
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenKeychain/src/main/res/layout/import_keys_list_item_extra.xml
View File

@@ -103,17 +103,23 @@
</LinearLayout> </LinearLayout>
<Button <LinearLayout
android:id="@+id/import_key" android:layout_width="match_parent"
style="@style/CardViewActionButton" android:layout_height="wrap_content"
android:text="@string/btn_import" android:orientation="horizontal">
android:visibility="@{entry.updated ? V.GONE : V.VISIBLE}" />
<Button <Button
android:id="@+id/show_key" android:id="@+id/import_key"
style="@style/CardViewActionButton" style="@style/CardViewActionButton"
android:text="@string/btn_show_key" android:text="@{entry.updated ? @string/btn_refresh : @string/btn_import}" />
android:visibility="@{entry.updated ? V.VISIBLE : V.GONE}" />
<Button
android:id="@+id/show_key"
style="@style/CardViewActionButton"
android:text="@string/btn_go_to_key"
android:visibility="@{entry.updated ? V.VISIBLE : V.GONE}" />
</LinearLayout>
</LinearLayout> </LinearLayout>

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

@@ -536,7 +536,7 @@
<string name="btn_import_keys">"Import all keys"</string> <string name="btn_import_keys">"Import all keys"</string>
<string name="btn_view_list">"View list"</string> <string name="btn_view_list">"View list"</string>
<string name="btn_refresh">"Refresh"</string> <string name="btn_refresh">"Refresh"</string>
<string name="btn_show_key">"Show key"</string> <string name="btn_go_to_key">"Go to key"</string>
<!-- Import from URL --> <!-- Import from URL -->
<string name="import_url_warn_no_search_parameter">"No search query defined. You can still manually search on this keyserver."</string> <string name="import_url_warn_no_search_parameter">"No search query defined. You can still manually search on this keyserver."</string>