diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index 29ab470c..7217c320 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -35,12 +35,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
@@ -168,7 +187,7 @@
-
+
diff --git a/build.gradle b/build.gradle
index c79ae903..eddbf9ff 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,25 +1,25 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- repositories {
- jcenter()
- }
- dependencies {
- classpath 'com.android.tools.build:gradle:1.0.0'
- }
+ repositories {
+ jcenter()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:1.0.0'
+ }
}
def isReleaseBuild() {
- return version.contains("SNAPSHOT") == false
+ return version.contains("SNAPSHOT") == false
}
allprojects {
- version = VERSION_NAME
- group = GROUP
+ version = VERSION_NAME
+ group = GROUP
- repositories {
- jcenter()
- maven { url 'https://oss.sonatype.org/content/groups/public' }
- }
+ repositories {
+ jcenter()
+ maven { url 'https://oss.sonatype.org/content/groups/public' }
+ }
}
apply plugin: 'android-reporting'
\ No newline at end of file
diff --git a/library/build.gradle b/library/build.gradle
index 37b646b5..92912e1a 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -1,25 +1,25 @@
apply plugin: 'com.android.library'
android {
- compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
- buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
+ compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
+ buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
- defaultConfig {
- minSdkVersion 7
- targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
- }
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- }
+ defaultConfig {
+ minSdkVersion 7
+ targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
+ }
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
+ }
}
dependencies {
- compile 'com.android.support:support-annotations:21.0.3'
- compile 'com.nineoldandroids:library:2.4.0'
- compile 'com.android.support:appcompat-v7:21.0.3'
+ compile 'com.android.support:support-annotations:21.0.3'
+ compile 'com.nineoldandroids:library:2.4.0'
+ compile 'com.android.support:appcompat-v7:21.0.3'
}
// Used to push in maven
diff --git a/library/src/androidTest/java/com/rengwuxian/materialedittext/ApplicationTest.java b/library/src/androidTest/java/com/rengwuxian/materialedittext/ApplicationTest.java
index e09a1270..375ff272 100644
--- a/library/src/androidTest/java/com/rengwuxian/materialedittext/ApplicationTest.java
+++ b/library/src/androidTest/java/com/rengwuxian/materialedittext/ApplicationTest.java
@@ -7,7 +7,7 @@
* Testing Fundamentals
*/
public class ApplicationTest extends ApplicationTestCase {
- public ApplicationTest() {
- super(Application.class);
- }
+ public ApplicationTest() {
+ super(Application.class);
+ }
}
\ No newline at end of file
diff --git a/library/src/androidTest/java/com/rengwuxian/materialedittext/MaterialEditTextSetErrorTest.java b/library/src/androidTest/java/com/rengwuxian/materialedittext/MaterialEditTextSetErrorTest.java
index b2def487..788d4907 100644
--- a/library/src/androidTest/java/com/rengwuxian/materialedittext/MaterialEditTextSetErrorTest.java
+++ b/library/src/androidTest/java/com/rengwuxian/materialedittext/MaterialEditTextSetErrorTest.java
@@ -9,20 +9,20 @@
*/
public class MaterialEditTextSetErrorTest extends AndroidTestCase {
- private MaterialEditText editTextUnderTest;
+ private MaterialEditText editTextUnderTest;
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- editTextUnderTest = new MaterialEditText(getContext());
- }
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ editTextUnderTest = new MaterialEditText(getContext());
+ }
- public void testGetErrorReturnsNullIfNoErrorMessageWasSet() {
- assertNull(editTextUnderTest.getError());
- }
+ public void testGetErrorReturnsNullIfNoErrorMessageWasSet() {
+ assertNull(editTextUnderTest.getError());
+ }
- public void testGetErrorReturnsMessageSetEarlierViaSetError() {
- editTextUnderTest.setError("Error!");
- assertEquals("Error!", editTextUnderTest.getError().toString());
- }
+ public void testGetErrorReturnsMessageSetEarlierViaSetError() {
+ editTextUnderTest.setError("Error!");
+ assertEquals("Error!", editTextUnderTest.getError().toString());
+ }
}
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
index 638cded6..96399115 100644
--- a/library/src/main/AndroidManifest.xml
+++ b/library/src/main/AndroidManifest.xml
@@ -1,3 +1 @@
-
-
+
diff --git a/library/src/main/java/com/rengwuxian/materialedittext/Density.java b/library/src/main/java/com/rengwuxian/materialedittext/Density.java
index 9a1f6d39..b5247c33 100644
--- a/library/src/main/java/com/rengwuxian/materialedittext/Density.java
+++ b/library/src/main/java/com/rengwuxian/materialedittext/Density.java
@@ -8,9 +8,9 @@
* Created by Zhukai on 2014/5/29 0029.
*/
class Density {
- public static int dp2px(Context context, float dp) {
- Resources r = context.getResources();
- float px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, r.getDisplayMetrics());
- return (int) px;
- }
+ public static int dp2px(Context context, float dp) {
+ Resources r = context.getResources();
+ float px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, r.getDisplayMetrics());
+ return (int) px;
+ }
}
diff --git a/library/src/main/java/com/rengwuxian/materialedittext/validation/METValidator.java b/library/src/main/java/com/rengwuxian/materialedittext/validation/METValidator.java
index 20581029..ffaee762 100644
--- a/library/src/main/java/com/rengwuxian/materialedittext/validation/METValidator.java
+++ b/library/src/main/java/com/rengwuxian/materialedittext/validation/METValidator.java
@@ -9,14 +9,14 @@ public abstract class METValidator {
/**
* Error message that the view will display if validation fails.
- *
+ *
* This is protected, so you can change this dynamically in your {@link #isValid(CharSequence, boolean)}
* implementation. If necessary, you can also interact with this via its getter and setter.
*/
protected String errorMessage;
public METValidator(@NonNull String errorMessage) {
- this.errorMessage = errorMessage;
+ this.errorMessage = errorMessage;
}
public void setErrorMessage(@NonNull String errorMessage) {
@@ -31,7 +31,7 @@ public String getErrorMessage() {
/**
* Abstract method to implement your own validation checking.
*
- * @param text The CharSequence representation of the text in the EditText field. Cannot be null, but may be empty.
+ * @param text The CharSequence representation of the text in the EditText field. Cannot be null, but may be empty.
* @param isEmpty Boolean indicating whether or not the text param is empty
* @return True if valid, false if not
*/
diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml
index 9ae17f4f..26886ba1 100644
--- a/library/src/main/res/values/attrs.xml
+++ b/library/src/main/res/values/attrs.xml
@@ -2,48 +2,48 @@
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/maven_push.gradle b/maven_push.gradle
index b741e61b..5b9379c0 100644
--- a/maven_push.gradle
+++ b/maven_push.gradle
@@ -3,90 +3,90 @@ apply plugin: 'signing'
def sonatypeRepositoryUrl
if (isReleaseBuild()) {
- println 'RELEASE BUILD'
- sonatypeRepositoryUrl = hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL
- : "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+ println 'RELEASE BUILD'
+ sonatypeRepositoryUrl = hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL
+ : "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
} else {
- println 'DEBUG BUILD'
- sonatypeRepositoryUrl = hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL
- : "https://oss.sonatype.org/content/repositories/snapshots/"
+ println 'DEBUG BUILD'
+ sonatypeRepositoryUrl = hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL
+ : "https://oss.sonatype.org/content/repositories/snapshots/"
}
def getRepositoryUsername() {
- return hasProperty('nexusUsername') ? nexusUsername : ""
+ return hasProperty('nexusUsername') ? nexusUsername : ""
}
def getRepositoryPassword() {
- return hasProperty('nexusPassword') ? nexusPassword : ""
+ return hasProperty('nexusPassword') ? nexusPassword : ""
}
afterEvaluate { project ->
- uploadArchives {
- repositories {
- mavenDeployer {
- beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+ uploadArchives {
+ repositories {
+ mavenDeployer {
+ beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
- pom.artifactId = POM_ARTIFACT_ID
+ pom.artifactId = POM_ARTIFACT_ID
- repository(url: sonatypeRepositoryUrl) {
- authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
- }
+ repository(url: sonatypeRepositoryUrl) {
+ authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
+ }
- pom.project {
- name POM_NAME
- packaging POM_PACKAGING
- description POM_DESCRIPTION
- url POM_URL
+ pom.project {
+ name POM_NAME
+ packaging POM_PACKAGING
+ description POM_DESCRIPTION
+ url POM_URL
- scm {
- url POM_SCM_URL
- connection POM_SCM_CONNECTION
- developerConnection POM_SCM_DEV_CONNECTION
- }
+ scm {
+ url POM_SCM_URL
+ connection POM_SCM_CONNECTION
+ developerConnection POM_SCM_DEV_CONNECTION
+ }
- licenses {
- license {
- name POM_LICENCE_NAME
- url POM_LICENCE_URL
- distribution POM_LICENCE_DIST
- }
- }
+ licenses {
+ license {
+ name POM_LICENCE_NAME
+ url POM_LICENCE_URL
+ distribution POM_LICENCE_DIST
+ }
+ }
- developers {
- developer {
- id POM_DEVELOPER_ID
- name POM_DEVELOPER_NAME
- }
- }
- }
+ developers {
+ developer {
+ id POM_DEVELOPER_ID
+ name POM_DEVELOPER_NAME
}
+ }
}
+ }
}
+ }
- signing {
- required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
- sign configurations.archives
- }
+ signing {
+ required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
+ sign configurations.archives
+ }
- task androidJavadocs(type: Javadoc) {
- source = android.sourceSets.main.java.sourceFiles
- }
+ task androidJavadocs(type: Javadoc) {
+ source = android.sourceSets.main.java.sourceFiles
+ }
- task androidJavadocsJar(type: Jar) {
- classifier = 'javadoc'
- //basename = artifact_id
- from androidJavadocs.destinationDir
- }
+ task androidJavadocsJar(type: Jar) {
+ classifier = 'javadoc'
+ //basename = artifact_id
+ from androidJavadocs.destinationDir
+ }
- task androidSourcesJar(type: Jar) {
- classifier = 'sources'
- //basename = artifact_id
- from android.sourceSets.main.java.sourceFiles
- }
+ task androidSourcesJar(type: Jar) {
+ classifier = 'sources'
+ //basename = artifact_id
+ from android.sourceSets.main.java.sourceFiles
+ }
- artifacts {
- //archives packageReleaseJar
- archives androidSourcesJar
- archives androidJavadocsJar
- }
+ artifacts {
+ //archives packageReleaseJar
+ archives androidSourcesJar
+ archives androidJavadocsJar
+ }
}
\ No newline at end of file
diff --git a/sample/build.gradle b/sample/build.gradle
index d2ebba82..674c9f74 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -1,25 +1,25 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
- buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
+ compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
+ buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
- defaultConfig {
- applicationId "com.rengwuxian.materialedittext.sample"
- minSdkVersion 12
- targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
- }
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- }
+ defaultConfig {
+ applicationId "com.rengwuxian.materialedittext.sample"
+ minSdkVersion 12
+ targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
+ }
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
+ }
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.android.support:appcompat-v7:21.0.3'
- compile 'com.rengwuxian.materialedittext:library:1.8.1'
+ compile fileTree(dir: 'libs', include: ['*.jar'])
+ compile 'com.android.support:appcompat-v7:21.0.3'
+ compile 'com.rengwuxian.materialedittext:library:1.8.1'
// compile project(':library')
}
diff --git a/sample/sample.iml b/sample/sample.iml
index 0c6902c5..26fd4c57 100644
--- a/sample/sample.iml
+++ b/sample/sample.iml
@@ -84,10 +84,10 @@
+
-
diff --git a/sample/src/androidTest/java/com/rengwuxian/materialedittext/sample/ApplicationTest.java b/sample/src/androidTest/java/com/rengwuxian/materialedittext/sample/ApplicationTest.java
index fce18681..28ff36b9 100644
--- a/sample/src/androidTest/java/com/rengwuxian/materialedittext/sample/ApplicationTest.java
+++ b/sample/src/androidTest/java/com/rengwuxian/materialedittext/sample/ApplicationTest.java
@@ -7,7 +7,7 @@
* Testing Fundamentals
*/
public class ApplicationTest extends ApplicationTestCase {
- public ApplicationTest() {
- super(Application.class);
- }
+ public ApplicationTest() {
+ super(Application.class);
+ }
}
\ No newline at end of file
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index 04da3074..844bc393 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -12,9 +12,9 @@
android:name=".MainActivity"
android:windowSoftInputMode="stateUnchanged">
-
+
-
+
diff --git a/sample/src/main/java/com/rengwuxian/materialedittext/sample/MainActivity.java b/sample/src/main/java/com/rengwuxian/materialedittext/sample/MainActivity.java
index 0e4820d2..914bef92 100644
--- a/sample/src/main/java/com/rengwuxian/materialedittext/sample/MainActivity.java
+++ b/sample/src/main/java/com/rengwuxian/materialedittext/sample/MainActivity.java
@@ -14,58 +14,58 @@
public class MainActivity extends ActionBarActivity {
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_main);
- getSupportActionBar().setDisplayHomeAsUpEnabled(true);
- getSupportActionBar().setDisplayShowTitleEnabled(false);
- initEnableBt();
- initSingleLineEllipsisEt();
- initSetErrorEt();
- initValidationEt();
- }
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_main);
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+ getSupportActionBar().setDisplayShowTitleEnabled(false);
+ initEnableBt();
+ initSingleLineEllipsisEt();
+ initSetErrorEt();
+ initValidationEt();
+ }
- private void initEnableBt() {
- final EditText basicEt = (EditText) findViewById(R.id.basicEt);
- final Button enableBt = (Button) findViewById(R.id.enableBt);
- enableBt.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- basicEt.setEnabled(!basicEt.isEnabled());
- enableBt.setText(basicEt.isEnabled() ? "DISABLE" : "ENABLE");
- }
- });
- }
+ private void initEnableBt() {
+ final EditText basicEt = (EditText) findViewById(R.id.basicEt);
+ final Button enableBt = (Button) findViewById(R.id.enableBt);
+ enableBt.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ basicEt.setEnabled(!basicEt.isEnabled());
+ enableBt.setText(basicEt.isEnabled() ? "DISABLE" : "ENABLE");
+ }
+ });
+ }
- private void initSingleLineEllipsisEt() {
- EditText singleLineEllipsisEt = (EditText) findViewById(R.id.singleLineEllipsisEt);
- singleLineEllipsisEt.setSelection(singleLineEllipsisEt.getText().length());
- }
+ private void initSingleLineEllipsisEt() {
+ EditText singleLineEllipsisEt = (EditText) findViewById(R.id.singleLineEllipsisEt);
+ singleLineEllipsisEt.setSelection(singleLineEllipsisEt.getText().length());
+ }
- private void initSetErrorEt() {
- final EditText bottomTextEt = (EditText) findViewById(R.id.bottomTextEt);
- final Button setErrorBt = (Button) findViewById(R.id.setErrorBt);
- setErrorBt.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- bottomTextEt.setError("1-Line Error!");
- }
- });
- final Button setError2Bt = (Button) findViewById(R.id.setError2Bt);
+ private void initSetErrorEt() {
+ final EditText bottomTextEt = (EditText) findViewById(R.id.bottomTextEt);
+ final Button setErrorBt = (Button) findViewById(R.id.setErrorBt);
+ setErrorBt.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ bottomTextEt.setError("1-Line Error!");
+ }
+ });
+ final Button setError2Bt = (Button) findViewById(R.id.setError2Bt);
setError2Bt.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- bottomTextEt.setError("2-Line\nError!");
- }
- });
- final Button setError3Bt = (Button) findViewById(R.id.setError3Bt);
+ @Override
+ public void onClick(View v) {
+ bottomTextEt.setError("2-Line\nError!");
+ }
+ });
+ final Button setError3Bt = (Button) findViewById(R.id.setError3Bt);
setError3Bt.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- bottomTextEt.setError("So Many Errors! So Many Errors! So Many Errors! So Many Errors! So Many Errors! So Many Errors! So Many Errors! So Many Errors!");
- }
- });
+ @Override
+ public void onClick(View v) {
+ bottomTextEt.setError("So Many Errors! So Many Errors! So Many Errors! So Many Errors! So Many Errors! So Many Errors! So Many Errors! So Many Errors!");
+ }
+ });
final EditText bottomTextWithMinLinesEt = (EditText) findViewById(R.id.bottomTextWithMinLinesEt);
final Button setErrorWithMinLinesBt = (Button) findViewById(R.id.setErrorWithMinLinesBt);
setErrorWithMinLinesBt.setOnClickListener(new View.OnClickListener() {
@@ -88,40 +88,40 @@ public void onClick(View v) {
bottomTextWithMinLinesEt.setError("So Many Errors! So Many Errors! So Many Errors! So Many Errors! So Many Errors! So Many Errors! So Many Errors! So Many Errors!");
}
});
- }
+ }
- private void initValidationEt() {
- final MaterialEditText validationEt = (MaterialEditText) findViewById(R.id.validationEt);
+ private void initValidationEt() {
+ final MaterialEditText validationEt = (MaterialEditText) findViewById(R.id.validationEt);
validationEt.addValidator(new RegexpValidator("Only Integer Valid!", "\\d+"));
- final Button validateBt = (Button) findViewById(R.id.validateBt);
- validateBt.setOnClickListener(new View.OnClickListener() {
+ final Button validateBt = (Button) findViewById(R.id.validateBt);
+ validateBt.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
// validate
validationEt.validate();
}
});
- }
+ }
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- // Inflate the menu; this adds items to the action bar if it is present.
- getMenuInflater().inflate(R.menu.menu_main, menu);
- return true;
- }
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ // Inflate the menu; this adds items to the action bar if it is present.
+ getMenuInflater().inflate(R.menu.menu_main, menu);
+ return true;
+ }
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- // Handle action bar item clicks here. The action bar will
- // automatically handle clicks on the Home/Up button, so long
- // as you specify a parent activity in AndroidManifest.xml.
- int id = item.getItemId();
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ // Handle action bar item clicks here. The action bar will
+ // automatically handle clicks on the Home/Up button, so long
+ // as you specify a parent activity in AndroidManifest.xml.
+ int id = item.getItemId();
- //noinspection SimplifiableIfStatement
- if (id == R.id.action_settings) {
- return true;
- }
+ //noinspection SimplifiableIfStatement
+ if (id == R.id.action_settings) {
+ return true;
+ }
- return super.onOptionsItemSelected(item);
- }
+ return super.onOptionsItemSelected(item);
+ }
}
diff --git a/sample/src/main/res/drawable/text_cursor_cyan.xml b/sample/src/main/res/drawable/text_cursor_cyan.xml
index 89cce415..a7531fb4 100644
--- a/sample/src/main/res/drawable/text_cursor_cyan.xml
+++ b/sample/src/main/res/drawable/text_cursor_cyan.xml
@@ -1,5 +1,5 @@
-
-
+
+
\ No newline at end of file
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
index 901b1f89..c89ebb05 100644
--- a/sample/src/main/res/layout/activity_main.xml
+++ b/sample/src/main/res/layout/activity_main.xml
@@ -1,459 +1,459 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:scrollbarStyle="outsideOverlay"
+ tools:context=".MainActivity">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sample/src/main/res/menu/menu_main.xml b/sample/src/main/res/menu/menu_main.xml
index db961b95..63bc0b2b 100644
--- a/sample/src/main/res/menu/menu_main.xml
+++ b/sample/src/main/res/menu/menu_main.xml
@@ -1,8 +1,10 @@
diff --git a/sample/src/main/res/values-w820dp/dimens.xml b/sample/src/main/res/values-w820dp/dimens.xml
index 63fc8164..1e656d65 100644
--- a/sample/src/main/res/values-w820dp/dimens.xml
+++ b/sample/src/main/res/values-w820dp/dimens.xml
@@ -1,6 +1,6 @@
-
- 64dp
+
+ 64dp