diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 7f3ebf04..dd84aced 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -7,7 +7,7 @@ - + diff --git a/app/src/main/java/org/nuclearfog/twidda/activity/LoginActivity.java b/app/src/main/java/org/nuclearfog/twidda/activity/LoginActivity.java index 931cd1eb..360b0dae 100644 --- a/app/src/main/java/org/nuclearfog/twidda/activity/LoginActivity.java +++ b/app/src/main/java/org/nuclearfog/twidda/activity/LoginActivity.java @@ -55,10 +55,10 @@ public class LoginActivity extends AppCompatActivity implements OnClickListener super.onCreate(b); setContentView(R.layout.page_login); Toolbar toolbar = findViewById(R.id.login_toolbar); - linkButton = findViewById(R.id.linkButton); - loginButton = findViewById(R.id.verifier); + linkButton = findViewById(R.id.login_get_link); + loginButton = findViewById(R.id.login_verifier); root = findViewById(R.id.login_root); - pinInput = findViewById(R.id.pin); + pinInput = findViewById(R.id.login_enter_pin); settings = GlobalSettings.getInstance(this); toolbar.setTitle(R.string.login_info); @@ -116,7 +116,7 @@ public class LoginActivity extends AppCompatActivity implements OnClickListener @Override public void onClick(View v) { // get login request link - if (v.getId() == R.id.linkButton) { + if (v.getId() == R.id.login_get_link) { if (registerAsync == null || registerAsync.getStatus() != RUNNING) { Toast.makeText(this, R.string.info_fetching_link, LENGTH_LONG).show(); registerAsync = new Registration(this); @@ -124,7 +124,7 @@ public class LoginActivity extends AppCompatActivity implements OnClickListener } } // verify user - else if (v.getId() == R.id.verifier) { + else if (v.getId() == R.id.login_verifier) { if (registerAsync == null || registerAsync.getStatus() != FINISHED) { Toast.makeText(this, R.string.info_get_link, LENGTH_LONG).show(); } else if (pinInput.getText() != null && pinInput.length() > 0) { diff --git a/app/src/main/res/layout/page_editprofile.xml b/app/src/main/res/layout/page_editprofile.xml index 7af02cd4..413976a7 100644 --- a/app/src/main/res/layout/page_editprofile.xml +++ b/app/src/main/res/layout/page_editprofile.xml @@ -102,13 +102,14 @@ android:layout_height="wrap_content" android:layout_marginLeft="@dimen/editprofile_layout_padding" android:layout_marginRight="@dimen/editprofile_layout_padding" - android:padding="@dimen/editprofile_edittext_padding" android:background="@color/half_transparent" android:hint="@string/enter_username" + android:importantForAutofill="no" android:inputType="text" + android:maxLength="@integer/editprofile_username_max_length" + android:padding="@dimen/editprofile_edittext_padding" android:singleLine="true" - android:textSize="@dimen/editprofile_textsize" - android:importantForAutofill="no" /> + android:textSize="@dimen/editprofile_textsize" /> @@ -70,18 +70,19 @@ android:textSize="24sp" /> + app:drawableStartCompat="@drawable/key" /> @@ -105,10 +106,10 @@ android:textSize="24sp" /> + android:textSize="@dimen/settings_edittext_textsize" /> + android:textSize="@dimen/settings_edittext_textsize" /> diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 59a83a78..1cef400d 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -76,6 +76,7 @@ @dimen/toolbar_height @dimen/profile_button_height 40dp + 50 36sp @@ -126,11 +127,12 @@ @dimen/toolbar_height 24dp - 40dp + 40dp 14sp 5dp - 24sp + 20sp 10dp + 10 5dp diff --git a/build.gradle b/build.gradle index 3f964761..a9ad3f61 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:4.1.1' } }