merged

nishantshah-me · Nov 30, 2016 · e3e60bf · e3e60bf
1 parent a586c2c
commit e3e60bf
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 157 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -25,9 +25,5 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".activity.RegisterActivity"
-            android:label="RegisterActivity"
-            android:theme="@style/AppTheme" />
     </application>
 </manifest>
diff --git a/app/src/main/java/com/neosoft/neostore/ui/LoginActivity.java b/app/src/main/java/com/neosoft/neostore/ui/LoginActivity.java
@@ -6,6 +6,7 @@
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
+import android.widget.EditText;
 
 import com.neosoft.neostore.R;
 import com.neosoft.neostore.model.login.LoginResponseModel;
@@ -26,11 +27,15 @@ public void onClick(View v) {
             }
         });
         Button login = (Button) findViewById(R.id.btn_login);
+        final EditText editPassword = (EditText) findViewById(R.id.edtPass);
+
+        final EditText editEmail = (EditText) findViewById(R.id.edtEmail);
+
         login.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 GetServices apiServices = new GetServices();
-                apiServices.login("[email protected]", "abhijeet", new ApiResponse<LoginResponseModel>() {
+                apiServices.login(editEmail.getText().toString(),editPassword.getText().toString(), new ApiResponse<LoginResponseModel>() {
                     @Override
                     public void onSuccess(LoginResponseModel response) {
                         Log.e("zzz", response.toString());

diff --git a/app/src/main/java/com/neosoft/neostore/ui/RegisterScreen.java b/app/src/main/java/com/neosoft/neostore/ui/RegisterScreen.java
@@ -5,18 +5,36 @@
 import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.RadioGroup;
 
 import com.neosoft.neostore.R;
+import com.neosoft.neostore.serviceapi.ApiResponse;
+import com.neosoft.neostore.serviceapi.GetServices;
 
 public class RegisterScreen extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.register);
+        setContentView(R.layout.activity_register);
         Button register = (Button) findViewById(R.id.register_btn);
+
+        final EditText editFname = (EditText) findViewById(R.id.etFirstname);
+        final EditText editLname = (EditText) findViewById(R.id.etLastname);
+        final EditText editPassword = (EditText) findViewById(R.id.etPassword);
+        final EditText editconfirmPassword = (EditText) findViewById(R.id.etConfirmPassword);
+        final EditText editEmail = (EditText) findViewById(R.id.etEmail);
+        final EditText editPhone = (EditText) findViewById(R.id.etPhone);
+        final CheckBox checkbox = (CheckBox) findViewById(R.id.checkBox);
+        final Button btnRegister = (Button) findViewById(R.id.register_btn);
+        final RadioGroup radio= (RadioGroup) findViewById(R.id.radioGender);
+
         register.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                GetServices apiServices = new GetServices();
+                apiServices.register(editFname.getText().toString(),editLname.getText().toString(),editEmail.getText().toString(),editPassword.getText().toString(),editconfirmPassword.getText().toString(),radio.getR);
                 finish();
             }
         });

diff --git a/app/src/main/res/layout/register.xml b/app/src/main/res/layout/register.xml