mirrors/nock-nock
0
0
Fork 0
mirror of https://github.com/afollestad/nock-nock.git synced 2025-08-05 15:48:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

0.1.3.0

Browse source
This commit is contained in:
Aidan Follestad 2016-08-24 20:28:04 -05:00
commit 084db24a2e
3 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
NockNock-0.1.3.0.apk
View file

Binary file not shown.

15
app/src/main/java/com/afollestad/nocknock/ui/AddSiteActivity.java
View file

@ -34,7 +34,9 @@ public class AddSiteActivity extends AppCompatActivity implements View.OnClickLi
private View rootLayout; private View rootLayout;
private Toolbar toolbar; private Toolbar toolbar;
private TextInputLayout nameTiLayout;
private EditText inputName; private EditText inputName;
private TextInputLayout urlTiLayout;
private EditText inputUrl; private EditText inputUrl;
private EditText inputInterval; private EditText inputInterval;
private Spinner spinnerInterval; private Spinner spinnerInterval;
@ -49,7 +51,9 @@ public class AddSiteActivity extends AppCompatActivity implements View.OnClickLi
setContentView(R.layout.activity_addsite); setContentView(R.layout.activity_addsite);
rootLayout = findViewById(R.id.rootView); rootLayout = findViewById(R.id.rootView);
nameTiLayout = (TextInputLayout) findViewById(R.id.nameTiLayout);
inputName = (EditText) findViewById(R.id.inputName); inputName = (EditText) findViewById(R.id.inputName);
urlTiLayout = (TextInputLayout) findViewById(R.id.urlTiLayout);
inputUrl = (EditText) findViewById(R.id.inputUrl); inputUrl = (EditText) findViewById(R.id.inputUrl);
textUrlWarning = (TextView) findViewById(R.id.textUrlWarning); textUrlWarning = (TextView) findViewById(R.id.textUrlWarning);
inputInterval = (EditText) findViewById(R.id.checkIntervalInput); inputInterval = (EditText) findViewById(R.id.checkIntervalInput);
@ -183,22 +187,21 @@ public class AddSiteActivity extends AppCompatActivity implements View.OnClickLi
model.status = ServerStatus.WAITING; model.status = ServerStatus.WAITING;
if (model.name.isEmpty()) { if (model.name.isEmpty()) {
((TextInputLayout) inputName.getParent()).setError(getString(R.string.please_enter_name)); nameTiLayout.setError(getString(R.string.please_enter_name));
isClosing = false; isClosing = false;
return; return;
} else { } else {
((TextInputLayout) inputName.getParent()).setError(null); nameTiLayout.setError(null);
} }
if (model.url.isEmpty()) { if (model.url.isEmpty()) {
((TextInputLayout) inputUrl.getParent()).setError(getString(R.string.please_enter_url)); urlTiLayout.setError(getString(R.string.please_enter_url));
isClosing = false; isClosing = false;
return; return;
} else { } else {
final TextInputLayout urlTl = (TextInputLayout) inputUrl.getParent(); urlTiLayout.setError(null);
urlTl.setError(null);
if (!Patterns.WEB_URL.matcher(model.url).find()) { if (!Patterns.WEB_URL.matcher(model.url).find()) {
urlTl.setError(getString(R.string.please_enter_valid_url)); urlTiLayout.setError(getString(R.string.please_enter_valid_url));
isClosing = false; isClosing = false;
return; return;
} else { } else {

2
app/src/main/res/layout/activity_addsite.xml
View file

@ -29,6 +29,7 @@
android:paddingRight="@dimen/content_inset"> android:paddingRight="@dimen/content_inset">
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/nameTiLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="-4dp" android:layout_marginLeft="-4dp"
@ -49,6 +50,7 @@
</android.support.design.widget.TextInputLayout> </android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/urlTiLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="-4dp" android:layout_marginLeft="-4dp"