mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 23:28:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix 120 character line margin

Browse source
This commit is contained in:
AndyScherzinger 2017-03-26 15:17:39 +02:00
parent fae9d48784
commit 0a83e7d3ee
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/com/owncloud/android/ui/components/CustomEditText.java
View file

@ -56,7 +56,8 @@ public class CustomEditText extends android.support.v7.widget.AppCompatEditText
} }
public String getFullServerUrl() { public String getFullServerUrl() {
if (TextUtils.isEmpty(fixedText) || getText().toString().startsWith(AuthenticatorActivity.HTTP_PROTOCOL) if (TextUtils.isEmpty(fixedText)
|| getText().toString().startsWith(AuthenticatorActivity.HTTP_PROTOCOL)
|| getText().toString().startsWith(AuthenticatorActivity.HTTPS_PROTOCOL)) { || getText().toString().startsWith(AuthenticatorActivity.HTTPS_PROTOCOL)) {
return getText().toString(); return getText().toString();
} else if (isPrefixFixed) { } else if (isPrefixFixed) {
@ -81,7 +82,10 @@ public class CustomEditText extends android.support.v7.widget.AppCompatEditText
&& !getText().toString().startsWith(AuthenticatorActivity.HTTPS_PROTOCOL) && !getText().toString().startsWith(AuthenticatorActivity.HTTPS_PROTOCOL)
&& !TextUtils.isEmpty(fixedText)) { && !TextUtils.isEmpty(fixedText)) {
if (isPrefixFixed) { if (isPrefixFixed) {
canvas.drawText(fixedText, super.getCompoundPaddingLeft(), getBaseline(), getPaint()); canvas.drawText(fixedText,
super.getCompoundPaddingLeft(),
getBaseline(),
getPaint());
} else { } else {
canvas.drawText(fixedText, super.getCompoundPaddingLeft() canvas.drawText(fixedText, super.getCompoundPaddingLeft()
+ getPaint().measureText(getText().toString()), getBaseline(), getPaint()); + getPaint().measureText(getText().toString()), getBaseline(), getPaint());