Skip to content

Commit 33e6df4

Browse files
#45 On initial start, deactivate connect button initially
1 parent f57a877 commit 33e6df4

File tree

2 files changed

+31
-1
lines changed

2 files changed

+31
-1
lines changed

app/app.iml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7272
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
7373
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" />
74+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/23.0.1/jars" />
7475
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.0.1/jars" />
7576
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/gridlayout-v7/23.0.1/jars" />
7677
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.0.1/jars" />
@@ -91,6 +92,7 @@
9192
<orderEntry type="library" exported="" name="recyclerview-v7-23.0.1" level="project" />
9293
<orderEntry type="library" exported="" name="gridlayout-v7-23.0.1" level="project" />
9394
<orderEntry type="library" exported="" name="bypasses-1.0.1" level="project" />
95+
<orderEntry type="library" exported="" name="cardview-v7-23.0.1" level="project" />
9496
<orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
9597
<orderEntry type="library" exported="" name="design-23.0.1" level="project" />
9698
<orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />

app/src/main/java/it/niedermann/owncloud/notes/android/activity/SettingsActivity.java

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
6666

6767
@Override
6868
public void onTextChanged(CharSequence s, int start, int before, int count) {
69-
String url = ((EditText) findViewById(R.id.settings_url)).getText().toString();
69+
String url = field_url.getText().toString();
7070

7171
if (!url.endsWith("/")) {
7272
url += "/";
@@ -81,13 +81,32 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
8181
} else {
8282
findViewById(R.id.settings_url_warn_http).setVisibility(View.GONE);
8383
}
84+
85+
handleSubmitButtonEnabled(field_url.getText(), field_username.getText());
8486
}
8587

8688
@Override
8789
public void afterTextChanged(Editable s) {
8890
}
8991
});
9092

93+
field_username.addTextChangedListener(new TextWatcher() {
94+
@Override
95+
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
96+
97+
}
98+
99+
@Override
100+
public void onTextChanged(CharSequence s, int start, int before, int count) {
101+
handleSubmitButtonEnabled(field_url.getText(), field_username.getText());
102+
}
103+
104+
@Override
105+
public void afterTextChanged(Editable s) {
106+
107+
}
108+
});
109+
91110
// Load current Preferences
92111
field_url.setText(preferences.getString(SETTINGS_URL, DEFAULT_SETTINGS));
93112
field_username.setText(preferences.getString(SETTINGS_USERNAME, DEFAULT_SETTINGS));
@@ -101,6 +120,7 @@ public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
101120
}
102121
});
103122

123+
btn_submit.setEnabled(false);
104124
btn_submit.setOnClickListener(new View.OnClickListener() {
105125
@Override
106126
public void onClick(View v) {
@@ -133,6 +153,14 @@ private void login() {
133153
new LoginValidatorAsyncTask().execute(url, username, password);
134154
}
135155

156+
private void handleSubmitButtonEnabled(Editable url, Editable username) {
157+
if (field_username.getText().length() > 0 && field_url.getText().length() > 0) {
158+
btn_submit.setEnabled(true);
159+
} else {
160+
btn_submit.setEnabled(false);
161+
}
162+
}
163+
136164
/************************************ Async Tasks ************************************/
137165

138166
/**

0 commit comments

Comments
 (0)