From 87e0edf94712a4713429cacf5fce5099ccef2eae Mon Sep 17 00:00:00 2001 From: Georg Reisinger <43533139+GeorgReisinger@users.noreply.github.com> Date: Wed, 20 Feb 2019 21:31:36 +0100 Subject: [PATCH] Popup kein leerer input --- .../smartshopper/activitys/Dash.java | 59 ++++++++++++++++++- .../activitys/ItemListActivity.java | 32 +++++++++- .../activitys/ShoppinglistDetails.java | 30 +++++++++- 3 files changed, 117 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/at/smartshopper/smartshopper/activitys/Dash.java b/app/src/main/java/at/smartshopper/smartshopper/activitys/Dash.java index 4352f81..7b6c243 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/activitys/Dash.java +++ b/app/src/main/java/at/smartshopper/smartshopper/activitys/Dash.java @@ -17,6 +17,8 @@ import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; +import android.text.Editable; +import android.text.TextWatcher; import android.util.Log; import android.view.Gravity; import android.view.LayoutInflater; @@ -250,12 +252,38 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte ImageButton addClose = (ImageButton) customView.findViewById(R.id.addClose); colorBtn = (Button) customView.findViewById(R.id.addColor); - Button addFertig = (Button) customView.findViewById(R.id.addFertig); + final Button addFertig = (Button) customView.findViewById(R.id.addFertig); final EditText name = (EditText) customView.findViewById(R.id.addName); final EditText description = (EditText) customView.findViewById(R.id.addDescription); Picasso.get().load(R.drawable.close).into(addClose); + if(!name.getText().toString().isEmpty()){ + addFertig.setEnabled(true); + }else{ + addFertig.setEnabled(false); + } + name.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + + } + + @Override + public void afterTextChanged(Editable s) { + if(!name.getText().toString().isEmpty()){ + addFertig.setEnabled(true); + }else{ + addFertig.setEnabled(false); + } + } + }); + if (fromDB) { Shoppinglist dbShoppinglist = db.getShoppinglist(sl_id); String colorstring; @@ -498,8 +526,35 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte popupAddShare.dismiss(); } }); + final Button finish = (Button) popupContentView.findViewById(R.id.shareAddFinish); + + if(!linkEingabe.getText().toString().isEmpty()){ + finish.setEnabled(true); + }else{ + finish.setEnabled(false); + } + linkEingabe.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + + } + + @Override + public void afterTextChanged(Editable s) { + if(!linkEingabe.getText().toString().isEmpty()){ + finish.setEnabled(true); + }else{ + finish.setEnabled(false); + } + } + }); + - Button finish = (Button) popupContentView.findViewById(R.id.shareAddFinish); finish.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/app/src/main/java/at/smartshopper/smartshopper/activitys/ItemListActivity.java b/app/src/main/java/at/smartshopper/smartshopper/activitys/ItemListActivity.java index 6e54757..286d5b4 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/activitys/ItemListActivity.java +++ b/app/src/main/java/at/smartshopper/smartshopper/activitys/ItemListActivity.java @@ -9,6 +9,8 @@ import android.support.design.widget.FloatingActionButton; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; +import android.text.Editable; +import android.text.TextWatcher; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; @@ -178,7 +180,7 @@ public class ItemListActivity extends Activity implements ItemAdapter.OnItemEdit ImageButton close = (ImageButton) customView.findViewById(R.id.itemClose); final EditText name = (EditText) customView.findViewById(R.id.itemName); final EditText count = (EditText) customView.findViewById(R.id.itemAnzahl); - Button finish = (Button) customView.findViewById(R.id.itemFinish); + final Button finish = (Button) customView.findViewById(R.id.itemFinish); Picasso.get().load(R.drawable.close).into(close); @@ -193,6 +195,34 @@ public class ItemListActivity extends Activity implements ItemAdapter.OnItemEdit colorString = "ffffff"; } + if(!name.getText().toString().isEmpty()){ + finish.setEnabled(true); + }else{ + finish.setEnabled(false); + } + TextWatcher tw = new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + + } + + @Override + public void afterTextChanged(Editable s) { + if(!name.getText().toString().isEmpty() && !count.getText().toString().isEmpty()){ + finish.setEnabled(true); + }else{ + finish.setEnabled(false); + } + } + }; + count.addTextChangedListener(tw); + name.addTextChangedListener(tw); + finish.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/app/src/main/java/at/smartshopper/smartshopper/activitys/ShoppinglistDetails.java b/app/src/main/java/at/smartshopper/smartshopper/activitys/ShoppinglistDetails.java index 1d9bdd6..e5d0ee6 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/activitys/ShoppinglistDetails.java +++ b/app/src/main/java/at/smartshopper/smartshopper/activitys/ShoppinglistDetails.java @@ -9,6 +9,8 @@ import android.support.design.widget.FloatingActionButton; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; +import android.text.Editable; +import android.text.TextWatcher; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; @@ -129,7 +131,7 @@ public class ShoppinglistDetails extends Activity implements DetailsAdapter.OnGr ImageButton close = (ImageButton) customView.findViewById(R.id.groupClose); final EditText name = (EditText) customView.findViewById(R.id.groupName); Button color = (Button) customView.findViewById(R.id.groupColor); - Button finish = (Button) customView.findViewById(R.id.groupFinish); + final Button finish = (Button) customView.findViewById(R.id.groupFinish); this.colorBtn = color; @@ -149,6 +151,32 @@ public class ShoppinglistDetails extends Activity implements DetailsAdapter.OnGr colorString = "ffffff"; } + if(!name.getText().toString().isEmpty()){ + finish.setEnabled(true); + }else{ + finish.setEnabled(false); + } + name.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + + } + + @Override + public void afterTextChanged(Editable s) { + if(!name.getText().toString().isEmpty()){ + finish.setEnabled(true); + }else{ + finish.setEnabled(false); + } + } + }); + finish.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) {