diff --git a/examples/example_bestshot/example/app/src/main/AndroidManifest.xml b/examples/example_bestshot/example/app/src/main/AndroidManifest.xml index 7300e71..e7805d4 100644 --- a/examples/example_bestshot/example/app/src/main/AndroidManifest.xml +++ b/examples/example_bestshot/example/app/src/main/AndroidManifest.xml @@ -24,8 +24,12 @@ android:supportsRtl="true" android:theme="@style/AppTheme"> + diff --git a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/CheckInActivity.java b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/CheckInActivity.java index 8cf2959..9539397 100644 --- a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/CheckInActivity.java +++ b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/CheckInActivity.java @@ -2,13 +2,21 @@ package ru.visionlab.femdemo; import androidx.appcompat.app.AppCompatActivity; +import android.app.AlertDialog; +import android.content.DialogInterface; import android.content.Intent; +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; import android.os.Bundle; +import android.view.Gravity; +import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; +import android.view.WindowManager; import android.widget.Button; import android.widget.ImageView; import android.widget.PopupMenu; +import android.widget.TextView; import android.widget.Toast; import ru.visionlab.femdemo.login.LoginActivity; @@ -19,6 +27,8 @@ public class CheckInActivity extends AppCompatActivity { ImageView logout; ImageView menu; + AlertDialog dialogBuilder; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -38,7 +48,75 @@ public class CheckInActivity extends AppCompatActivity { menu.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - PopupMenu popupMenu = new PopupMenu(CheckInActivity.this, menu); + LayoutInflater inflater = LayoutInflater.from(getApplicationContext()); + view = inflater.inflate(R.layout.layout, null); + + /*Button btn_confirm = view.findViewById(R.id.btn_confirm); + Button btn_cancel = view.findViewById(R.id.btn_cancel); + TextView txt_title = view.findViewById(R.id.txt_title); + TextView txt_content = view.findViewById(R.id.txt_content); + + btn_cancel.setVisibility(View.GONE); + btn_confirm.setText("OK"); + + txt_title.setText("WARNING"); + txt_content.setText("This job is not active. Please synchronize to get the latest data, then contact your coordinator if needed.");*/ + + + final AlertDialog alertDialog = new AlertDialog.Builder(CheckInActivity.this) + .setView(view) + .create(); + alertDialog.show(); + alertDialog.getWindow().setLayout(600,460); + alertDialog.getWindow().setGravity(Gravity.TOP|Gravity.LEFT); + alertDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); + + + WindowManager.LayoutParams params = alertDialog.getWindow().getAttributes(); + alertDialog.setCanceledOnTouchOutside(true); + params.horizontalMargin = -100; + alertDialog.getWindow().setAttributes(params); + + /*btn_confirm.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + alertDialog.cancel(); + } + }); + + btn_cancel.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + alertDialog.cancel(); + } + });*/ + } + }); + /*menu.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + + // instance of alert dialog to build alert dialog + AlertDialog.Builder builder = new AlertDialog.Builder(CheckInActivity.this); + builder.setIcon(R.drawable.andrew); + builder.setTitle("Andrew Bahl"); + // builder.setMessage("Bottom Alert dialog"); + + // set the neutral button to do some actions + builder.setNeutralButton("Logout", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + Intent intent = new Intent(CheckInActivity.this, LoginActivity.class); + startActivity(intent); + } + }); + + // show the alert dialog + AlertDialog alertDialog = builder.create(); + alertDialog.show(); + alertDialog.getWindow().setLayout(800,400); + alertDialog.getWindow().setGravity(Gravity.TOP); + *//*PopupMenu popupMenu = new PopupMenu(CheckInActivity.this, menu); popupMenu.getMenuInflater().inflate(R.menu.navigation_menu, popupMenu.getMenu()); popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { @Override @@ -49,8 +127,10 @@ public class CheckInActivity extends AppCompatActivity { } }); // Showing the popup menu - popupMenu.show(); + popupMenu.show();*//* } - }); + });*/ } + + } \ No newline at end of file diff --git a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/api/JsonPlaceHolderApi.java b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/api/JsonPlaceHolderApi.java new file mode 100644 index 0000000..be3045e --- /dev/null +++ b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/api/JsonPlaceHolderApi.java @@ -0,0 +1,16 @@ +package ru.visionlab.femdemo.api; + +import java.util.Map; + +import retrofit2.Call; +import retrofit2.http.FieldMap; +import retrofit2.http.FormUrlEncoded; +import retrofit2.http.POST; +import ru.visionlab.femdemo.models.RegistrationNew; + +public interface JsonPlaceHolderApi { + + @FormUrlEncoded + @POST("posts") + Call createpost(@FieldMap Map fields); +} diff --git a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/models/RegistrationNew.java b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/models/RegistrationNew.java new file mode 100644 index 0000000..3953781 --- /dev/null +++ b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/models/RegistrationNew.java @@ -0,0 +1,38 @@ +package ru.visionlab.femdemo.models; + +public class RegistrationNew { + + private String companyId; + private String employeeId; + private String otp; + + public RegistrationNew(String companyId, String employeeId, String otp) { + this.companyId = companyId; + this.employeeId = employeeId; + this.otp = otp; + } + + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + + public String getEmployeeId() { + return employeeId; + } + + public void setEmployeeId(String employeeId) { + this.employeeId = employeeId; + } + + public String getOtp() { + return otp; + } + + public void setOtp(String otp) { + this.otp = otp; + } +} diff --git a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/register/RegisterActivityNew.java b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/register/RegisterActivityNew.java index 571edd8..c90d973 100644 --- a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/register/RegisterActivityNew.java +++ b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/register/RegisterActivityNew.java @@ -4,15 +4,27 @@ import androidx.appcompat.app.AppCompatActivity; import android.content.Intent; import android.os.Bundle; +import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.EditText; import android.widget.ImageButton; +import android.widget.Toast; +import java.util.HashMap; +import java.util.Map; + +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; +import retrofit2.Retrofit; +import retrofit2.converter.gson.GsonConverterFactory; import ru.visionlab.femdemo.CheckInActivity; import ru.visionlab.femdemo.R; +import ru.visionlab.femdemo.api.JsonPlaceHolderApi; import ru.visionlab.femdemo.login.LoginActivity; import ru.visionlab.femdemo.login.LoginActivityNew; +import ru.visionlab.femdemo.models.RegistrationNew; public class RegisterActivityNew extends AppCompatActivity { @@ -22,6 +34,8 @@ public class RegisterActivityNew extends AppCompatActivity { boolean isAllFieldsChecked = false; + JsonPlaceHolderApi jsonPlaceHolderApi; + Button verifynproceed; @Override @@ -33,14 +47,22 @@ public class RegisterActivityNew extends AppCompatActivity { edt_emp = findViewById(R.id.edt_emp); edt_otp = findViewById(R.id.edt_otp); + Retrofit retrofit=new Retrofit.Builder() + .baseUrl("https://jsonplaceholder.typicode.com/") + .addConverterFactory(GsonConverterFactory.create()) + .build(); + + jsonPlaceHolderApi=retrofit.create(JsonPlaceHolderApi.class); + verifynproceed = findViewById(R.id.verifynproceed); verifynproceed.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { isAllFieldsChecked = CheckAllFields(); if(isAllFieldsChecked) { - - + Intent intent = new Intent(RegisterActivityNew.this, SavePhotoActivity.class); + startActivity(intent); + //saveInfo(); } } }); @@ -73,4 +95,41 @@ public class RegisterActivityNew extends AppCompatActivity { // after all validation return true. return true; } + + public void saveInfo(){ + Map fields=new HashMap<>(); + fields.put("companyId",edt_comp.getText().toString()); + fields.put("employeeId",edt_emp.getText().toString()); + fields.put("otp",edt_otp.getText().toString()); + + Call call=jsonPlaceHolderApi.createpost(fields); + call.enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + if(response.isSuccessful()) + { + Log.e("code=", String.valueOf(response.code())); + Toast.makeText(RegisterActivityNew.this, "Info Added succesfully", Toast.LENGTH_SHORT).show(); +// Intent intent=new Intent(AddBook.this,Home.class); +// startActivity(intent); + + RegistrationNew post=response.body(); + String content=""; + content +="COMPANYID: "+post.getCompanyId() +"\n"; + content +="EMP ID: "+post.getEmployeeId() +"\n"; + content +="OTP: "+post.getOtp() +"\n"; + + // txt_value.append(content); + + } + + } + + @Override + public void onFailure(Call call, Throwable t) { + Toast.makeText(RegisterActivityNew.this, ""+t.getMessage(), Toast.LENGTH_SHORT).show(); + Log.e("error=",t.getMessage().toString()); + } + }); + } } \ No newline at end of file diff --git a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/register/SavePhotoActivity.java b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/register/SavePhotoActivity.java new file mode 100644 index 0000000..b862c46 --- /dev/null +++ b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/register/SavePhotoActivity.java @@ -0,0 +1,28 @@ +package ru.visionlab.femdemo.register; + +import androidx.appcompat.app.AppCompatActivity; + +import android.graphics.Bitmap; +import android.os.Bundle; + +import com.makeramen.roundedimageview.RoundedImageView; + +import ru.visionlab.femdemo.R; + +public class SavePhotoActivity extends AppCompatActivity { + + RoundedImageView photo; + + Bitmap bitmap; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_save_photo); + + /* photo = findViewById(R.id.photo); + + photo.setImageBitmap(bitmap); + bitmap = null;*/ + } +} \ No newline at end of file diff --git a/examples/example_bestshot/example/app/src/main/res/drawable/bg_button_disable.xml b/examples/example_bestshot/example/app/src/main/res/drawable/bg_button_disable.xml index 8d185d6..db346b9 100644 --- a/examples/example_bestshot/example/app/src/main/res/drawable/bg_button_disable.xml +++ b/examples/example_bestshot/example/app/src/main/res/drawable/bg_button_disable.xml @@ -3,8 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - - + + diff --git a/examples/example_bestshot/example/app/src/main/res/drawable/shape.xml b/examples/example_bestshot/example/app/src/main/res/drawable/shape.xml new file mode 100644 index 0000000..b1cfde8 --- /dev/null +++ b/examples/example_bestshot/example/app/src/main/res/drawable/shape.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/example_bestshot/example/app/src/main/res/layout/activity_register_new.xml b/examples/example_bestshot/example/app/src/main/res/layout/activity_register_new.xml index 392438a..43dc2ce 100644 --- a/examples/example_bestshot/example/app/src/main/res/layout/activity_register_new.xml +++ b/examples/example_bestshot/example/app/src/main/res/layout/activity_register_new.xml @@ -97,7 +97,8 @@ android:paddingRight="16dp" android:textSize="14sp" android:textStyle="bold" - android:inputType="number"/> + android:inputType="numberPassword" + android:maxLength="3"/>