diff options
| author | Sean Leonard <meanderingcode@aetherislands.net> | 2013-07-12 11:39:40 -0600 |
|---|---|---|
| committer | Sean Leonard <meanderingcode@aetherislands.net> | 2013-07-12 11:39:40 -0600 |
| commit | 9d89c120aa1f01874b3b41169456efdfc5407b17 (patch) | |
| tree | 2a0e101acc60fd7836c88305c1a46d1d07e50f6d /res | |
| parent | 872bcd1e5044b3b0119ae8ff2eff5509c5ee3274 (diff) | |
| parent | dd9f4b8f26debbbea034d00db85fe123cab5619d (diff) | |
Merge branch 'feature/provider-details-fragment' into develop
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/configuration_wizard_activity.xml (renamed from res/layout/activity_configuration_wizard.xml) | 0 | ||||
| -rw-r--r-- | res/layout/provider_detail_fragment.xml | 40 | ||||
| -rwxr-xr-x | res/values/strings.xml | 7 |
3 files changed, 45 insertions, 2 deletions
diff --git a/res/layout/activity_configuration_wizard.xml b/res/layout/configuration_wizard_activity.xml index 264ccf98..264ccf98 100644 --- a/res/layout/activity_configuration_wizard.xml +++ b/res/layout/configuration_wizard_activity.xml diff --git a/res/layout/provider_detail_fragment.xml b/res/layout/provider_detail_fragment.xml new file mode 100644 index 00000000..eb90fad9 --- /dev/null +++ b/res/layout/provider_detail_fragment.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" > + + <TextView + android:id="@+id/provider_detail_domain" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="4dp" + android:layout_marginLeft="4dp" + android:layout_marginRight="4dp" + android:layout_marginTop="16dp" + android:textAppearance="?android:attr/textAppearanceLarge" + android:textStyle="bold" /> + + <TextView + android:id="@+id/provider_detail_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:layout_marginLeft="4dp" + android:layout_marginRight="4dp" + android:layout_marginBottom="4dp" + android:textStyle="italic" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <TextView + android:id="@+id/provider_detail_description" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:layout_marginLeft="4dp" + android:layout_marginRight="4dp" + android:layout_marginBottom="4dp" + android:textStyle="normal" + android:textAppearance="?android:attr/textAppearanceSmall" /> + +</LinearLayout>
\ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 80dd85bd..0cc35934 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -268,9 +268,13 @@ <string name="new_provider_uri">New provider\'s main URL</string> <string name="valid_url_entered">It seems your URL is well formed</string> <string name="not_valid_url_entered">It seems your URL is not well formed</string> + <string name="provider_details_fragment_title">Provider details</string> + <string name="domain">Domain</string> + <string name="name">Name</string> + <string name="description">Description</string> + <string name="use_anonymously_button">Use anonymously</string> <string name="username_ask">Introduce your username</string> <string name="password_ask">Enter your password</string> - <string name="log_in_button">Log in</string> <string name="login_button">Log In</string> <string name="logout_button">Log Out</string> <string name="danger_checkbox">Trust completely</string> @@ -295,6 +299,5 @@ <string name="log_out_failed_message">Didn\'t logged out.</string> <string name="successful_authed_cert_downloaded_message">Your own cert has been correctly downloaded.</string> <string name="authed_cert_download_failed_message">Your own cert has incorrectly been downloaded.</string> - </resources> |