Skip to content

Commit 30d2dec

Browse files
author
Henrik
committed
Merge pull request wrapp-archive#2 from Nemisis/updates
Am now mirroring EditText API. Added more style attributes.
2 parents 142b61b + c11783b commit 30d2dec

File tree

7 files changed

+693
-121
lines changed

7 files changed

+693
-121
lines changed

build.gradle

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
buildscript {
2-
repositories {
3-
mavenCentral()
4-
}
5-
6-
dependencies {
7-
classpath 'com.android.tools.build:gradle:0.6.+'
8-
}
2+
repositories {
3+
mavenCentral()
4+
}
5+
dependencies {
6+
classpath 'com.android.tools.build:gradle:0.8.+'
7+
}
98
}
109

1110
allprojects {

floatlabelededittext/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies {
66

77
android {
88
compileSdkVersion 14
9-
buildToolsVersion '17.0.0'
9+
buildToolsVersion '19.0.1'
1010

1111
sourceSets {
1212
main {

floatlabelededittext/res/layout/float_labeled_edit_text.xml

Lines changed: 0 additions & 21 deletions
This file was deleted.
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<merge xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:layout_width="wrap_content"
4+
android:layout_height="wrap_content"
5+
android:orientation="vertical">
6+
7+
<TextView
8+
android:id="@+id/FloatLabeledEditTextHint"
9+
android:layout_width="match_parent"
10+
android:layout_height="wrap_content"
11+
android:paddingLeft="@dimen/flet_hint_text_padding_horizontal"
12+
android:paddingRight="@dimen/flet_hint_text_padding_horizontal"
13+
android:textSize="@dimen/flet_hint_text_size" />
14+
15+
<EditText
16+
android:id="@+id/FloatLabeledEditTextEditText"
17+
android:layout_width="match_parent"
18+
android:layout_height="wrap_content"
19+
android:layout_marginTop="-7dp" />
20+
21+
</merge>

floatlabelededittext/res/values/attrs.xml

Lines changed: 276 additions & 1 deletion
Large diffs are not rendered by default.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<resources>
2+
<dimen name="flet_hint_text_size">11sp</dimen>
3+
<dimen name="flet_hint_text_padding_horizontal">13dp</dimen>
4+
</resources>

0 commit comments

Comments
 (0)