diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7158618..cca2cda 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
-
+
diff --git a/app/src/main/java/ch/pizzalink/android/activity/RegisterActivity.java b/app/src/main/java/ch/pizzalink/android/activity/RegisterActivity.java
index 5b160b0..cd8851a 100644
--- a/app/src/main/java/ch/pizzalink/android/activity/RegisterActivity.java
+++ b/app/src/main/java/ch/pizzalink/android/activity/RegisterActivity.java
@@ -2,6 +2,7 @@ package ch.pizzalink.android.activity;
import android.content.Intent;
import android.os.Bundle;
+import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.RelativeLayout;
@@ -88,18 +89,6 @@ public class RegisterActivity extends BaseActivity {
onBackPressed();
}
});
- zonePizzalinkDropdown.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- showZoneDialog();
- }
- });
- countryPizzalinkDropdown.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- showCountryDialog();
- }
- });
}
private boolean checkFields(){
@@ -269,11 +258,19 @@ public class RegisterActivity extends BaseActivity {
params.put("address_2", "");
params.put("city", pizzalinkEditTextList.get(7).getText());
params.put("postcode", postcodePizzalinkDrowpdown.getText());
- params.put("zone_id", "1");
- params.put("country_id", "1");
+ params.put("zone_id", selectedZoneModel.getStoreId());
+ params.put("country_id", selectedCountryModel.getId());
return params;
}
+ private void onZoneDropdownClicked(View view){
+ Log.i("vdknvkd", "vıjıwf");
+ }
+
+ private void onCountryDropdownClicked(View view){
+ Log.i("vdknvkd", "vıjıwf");
+ }
+
private void showZoneDialog(){
final ArrayList zoneNameList = new ArrayList<>();
diff --git a/app/src/main/java/ch/pizzalink/android/view/PizzalinkDropdown.java b/app/src/main/java/ch/pizzalink/android/view/PizzalinkDropdown.java
index 757059c..44b9ef4 100644
--- a/app/src/main/java/ch/pizzalink/android/view/PizzalinkDropdown.java
+++ b/app/src/main/java/ch/pizzalink/android/view/PizzalinkDropdown.java
@@ -7,6 +7,7 @@ import android.text.Editable;
import android.text.InputType;
import android.text.TextWatcher;
import android.util.AttributeSet;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
@@ -22,25 +23,13 @@ import ch.pizzalink.android.helper.PasswordHelper;
* Created by cimenmus on 23.10.2017.
*/
-public class PizzalinkDropdown extends LinearLayout implements View.OnClickListener {
+public class PizzalinkDropdown extends LinearLayout{
private View rootView;
private TextView hintTextView;
- private EditText editText;
+ private TextView textview;
private Typeface typeFace;
private String hint;
- private OnClickListener onClickListener;
-
- /*
- public PizzalinkDropdown(LinearLayout rootView, boolean isLeftIconVisible, int leftIconId,
- int editTextHintId, int inputType, boolean isPasswordIconVisible){
-
- initViews(rootView);
- setLeftIcon(isLeftIconVisible, leftIconId);
- setPasswordIcon(isPasswordIconVisible);
- setEditTextt(editTextHintId, inputType);
- }
- */
public PizzalinkDropdown(Context context) {
super(context);
@@ -61,34 +50,9 @@ public class PizzalinkDropdown extends LinearLayout implements View.OnClickListe
private void init(Context context) {
rootView = (View) inflate(context, R.layout.layout_pizzalink_dropdown, this);
hintTextView = (TextView) rootView.findViewById(R.id.hintTextView);
- editText = (EditText) rootView.findViewById(R.id.editText);
+ textview = (TextView) rootView.findViewById(R.id.textview);
rootView.setClickable(true);
hintTextView.setText(hint);
- rootView.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- if(onClickListener != null){
- onClickListener.onClick(rootView);
- }
- }
- });
-
-
- this.setClickable(true);
-
- this.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- if(onClickListener != null){
- onClickListener.onClick(rootView);
- }
- }
- });
-
- }
-
- public void setOnClickListener(OnClickListener onClickListener){
- this.onClickListener = onClickListener;
}
public boolean isEmpty(){
@@ -100,13 +64,14 @@ public class PizzalinkDropdown extends LinearLayout implements View.OnClickListe
}
public void setText(String text){
- editText.setText(text);
+ textview.setText(text);
}
- @Override
- public void onClick(View v) {
- if(onClickListener != null){
- onClickListener.onClick(rootView);
- }
+ private void onZoneDropdownClicked(View view){
+ Log.i("vdknvkd", "vıjıwf");
+ }
+
+ private void onCountryDropdownClicked(View view){
+ Log.i("vdknvkd", "vıjıwf");
}
}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
index c5a1d12..6a207fb 100644
--- a/app/src/main/res/layout/activity_register.xml
+++ b/app/src/main/res/layout/activity_register.xml
@@ -30,8 +30,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:background="@color/white"
- tools:context="ch.pizzalink.android.activity.LoginActivity">
+ android:background="@color/white">
+ app:dropdownHint="@string/zone"
+ android:onClick="onZoneDropdownClicked"/>
+ app:dropdownHint="@string/country"
+ android:onClick="onCountryDropdownClicked"/>
+ android:paddingEnd="24dp">
-
+ android:layout_marginBottom="12dp" />