Skip to content

Commit

Permalink
Squashed 'libs/editor/' changes from 2b066be..eb8d070
Browse files Browse the repository at this point in the history
eb8d070 Merge pull request #311 from wordpress-mobile/issue/310-add-labels-to-link-edittext
6c99e24 wrap DialogLink's EditText inside TextInputLayout

git-subtree-dir: libs/editor
git-subtree-split: eb8d070e013e9c9ce30d20ba28825831b4689e79
  • Loading branch information
maxme committed Mar 8, 2016
1 parent a299686 commit 8db246f
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 15 deletions.
1 change: 1 addition & 0 deletions WordPressEditor/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ android {
dependencies {
compile 'com.android.support:appcompat-v7:23.1.1'
compile 'com.android.support:support-v4:23.1.1'
compile 'com.android.support:design:23.1.1'
compile 'org.wordpress:utils:1.9.0'

// Test libraries
Expand Down
40 changes: 25 additions & 15 deletions WordPressEditor/src/main/res/layout/dialog_link.xml
Original file line number Diff line number Diff line change
@@ -1,31 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:orientation="vertical">

<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/link_dialog_margin_inner"
android:layout_marginLeft="@dimen/link_dialog_margin_outer"
android:layout_marginRight="@dimen/link_dialog_margin_outer"
android:layout_marginTop="@dimen/link_dialog_margin_outer">

<EditText
android:id="@+id/linkURL"
android:inputType="textUri"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/link_dialog_margin_outer"
android:layout_marginLeft="@dimen/link_dialog_margin_outer"
android:layout_marginRight="@dimen/link_dialog_margin_outer"
android:layout_marginBottom="@dimen/link_dialog_margin_inner"
android:hint="@string/link_enter_url"
android:imeOptions="actionNext"
tools:ignore="HardcodedText"/>
android:inputType="textUri"
tools:ignore="HardcodedText" />
</android.support.design.widget.TextInputLayout>

<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/link_dialog_margin_outer"
android:layout_marginLeft="@dimen/link_dialog_margin_outer"
android:layout_marginRight="@dimen/link_dialog_margin_outer"
android:layout_marginTop="@dimen/link_dialog_margin_inner">

<EditText
android:id="@+id/linkText"
android:inputType="text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/link_dialog_margin_inner"
android:layout_marginLeft="@dimen/link_dialog_margin_outer"
android:layout_marginRight="@dimen/link_dialog_margin_outer"
android:layout_marginBottom="@dimen/link_dialog_margin_outer"
android:hint="@string/link_enter_url_text" />
</LinearLayout>
android:hint="@string/link_enter_url_text"
android:inputType="text" />
</android.support.design.widget.TextInputLayout>
</LinearLayout>

0 comments on commit 8db246f

Please sign in to comment.