diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1e8e82a..6416125 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -16,20 +16,16 @@
-
-
-
-
-
-
-
+
+
+
-
+
@@ -272,14 +268,22 @@
1621332661575
-
+
+ 1621374926281
+
+
+
+ 1621374926281
+
+
-
+
+
@@ -318,10 +322,10 @@
-
+
-
+
@@ -346,10 +350,10 @@
-
+
-
+
diff --git a/app/src/main/java/com/example/moviestreaming/Activity/MovieDetailActivity.java b/app/src/main/java/com/example/moviestreaming/Activity/MovieDetailActivity.java
index ce5611c..f38e616 100644
--- a/app/src/main/java/com/example/moviestreaming/Activity/MovieDetailActivity.java
+++ b/app/src/main/java/com/example/moviestreaming/Activity/MovieDetailActivity.java
@@ -14,15 +14,12 @@
import android.view.ViewGroup;
import android.view.Window;
-import com.android.volley.RequestQueue;
-import com.android.volley.toolbox.Volley;
import com.bumptech.glide.Glide;
import com.example.moviestreaming.Adapter.ActorsAdapter;
import com.example.moviestreaming.Adapter.CommentAdapter;
import com.example.moviestreaming.Adapter.MovieByGenreAdapter;
import com.example.moviestreaming.Connection.ApiClient;
import com.example.moviestreaming.Connection.ApiService;
-import com.example.moviestreaming.Interface.MovieResponse;
import com.example.moviestreaming.Model.Actors.ActorItems;
import com.example.moviestreaming.Model.Actors.ActorModel;
import com.example.moviestreaming.Model.CommentModel;
@@ -30,7 +27,6 @@
import com.example.moviestreaming.R;
import com.example.moviestreaming.RoomDB.AppDatabase;
import com.example.moviestreaming.RoomDB.Favorites;
-import com.example.moviestreaming.Utils.API;
import com.example.moviestreaming.Utils.Constant;
import com.example.moviestreaming.Utils.Methods;
import com.example.moviestreaming.Utils.SessionManager;
@@ -46,11 +42,6 @@
import java.util.ArrayList;
import java.util.List;
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
-import io.reactivex.rxjava3.annotations.NonNull;
-import io.reactivex.rxjava3.core.Scheduler;
-import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.schedulers.Schedulers;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
diff --git a/app/src/main/java/com/example/moviestreaming/Fragment/GenreFragment.java b/app/src/main/java/com/example/moviestreaming/Fragment/GenreFragment.java
index a3e72a1..76e017f 100644
--- a/app/src/main/java/com/example/moviestreaming/Fragment/GenreFragment.java
+++ b/app/src/main/java/com/example/moviestreaming/Fragment/GenreFragment.java
@@ -15,14 +15,10 @@
import android.view.View;
import android.view.ViewGroup;
-import com.android.volley.RequestQueue;
-import com.android.volley.toolbox.Volley;
-
import com.example.moviestreaming.Activity.MovieActivity;
import com.example.moviestreaming.Adapter.GenreAdapter;
import com.example.moviestreaming.Model.GenreModel;
import com.example.moviestreaming.R;
-import com.example.moviestreaming.Utils.API;
import com.example.moviestreaming.Utils.Methods;
import com.example.moviestreaming.databinding.FragmentGenreBinding;
import com.example.moviestreaming.viewmodel.GenreViewModel;
diff --git a/app/src/main/java/com/example/moviestreaming/Utils/API.java b/app/src/main/java/com/example/moviestreaming/Utils/API.java
deleted file mode 100644
index 445ccdf..0000000
--- a/app/src/main/java/com/example/moviestreaming/Utils/API.java
+++ /dev/null
@@ -1,751 +0,0 @@
-package com.example.moviestreaming.Utils;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Color;
-import android.util.Log;
-import android.widget.Toast;
-
-import com.android.volley.AuthFailureError;
-import com.android.volley.DefaultRetryPolicy;
-import com.android.volley.Request;
-import com.android.volley.RequestQueue;
-import com.android.volley.Response;
-import com.android.volley.VolleyError;
-import com.android.volley.toolbox.JsonObjectRequest;
-import com.android.volley.toolbox.StringRequest;
-import com.android.volley.toolbox.Volley;
-import com.example.moviestreaming.Activity.HomeActivity;
-import com.example.moviestreaming.Activity.LoginActivity;
-import com.example.moviestreaming.Activity.VerifyActivity;
-import com.example.moviestreaming.Interface.ActorsResponse;
-import com.example.moviestreaming.Interface.GenreResponse;
-import com.example.moviestreaming.Interface.MovieResponse;
-import com.example.moviestreaming.Interface.SliderResponse;
-import com.example.moviestreaming.Model.Actors.ActorItems;
-import com.example.moviestreaming.Model.GenreModel;
-import com.example.moviestreaming.Model.MovieModel;
-import com.example.moviestreaming.Model.SliderModel;
-import com.example.moviestreaming.R;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class API {
-
- RequestQueue requestQueue;
-
- //Slider
- String sliderUrl = Constant.MAIN_URL+"getSlider.php";
- List sliderList = new ArrayList<>();
-
-
- //IMDBTopMovie
- String IMDBTopUrl = Constant.MAIN_URL+"getMovie.php?category=top_imdb";
- List IMDBTopList = new ArrayList<>();
-
-
- //NewMovies
- String NewMoviesUrl = Constant.MAIN_URL+"getMovie.php?category=new";
- List newMoviesList = new ArrayList<>();
-
-
- //PopularMovies
- String PopularUrl = Constant.MAIN_URL+"getMovie.php?popular=1";
- List popularList = new ArrayList<>();
-
-
- //Genre
- String genreUrl = Constant.MAIN_URL+"getGenre.php";
- List genreList = new ArrayList<>();
-
-
- //Movie By Genre
- String movieByGenreUrl = Constant.MAIN_URL+"getMovie.php?genre=";
- List movieByGenreList = new ArrayList<>();
-
- //Actors
- String actorsUrl = Constant.MAIN_URL+"getActors.php?movie_id=";
- List actorsList = new ArrayList<>();
-
- //Search
- String searchUrl = Constant.MAIN_URL+"getMovie.php?search=";
- List searchList;
-
- //checkRegister
- String checkRegisterUrl = Constant.MAIN_URL+"checkRegister.php";
-
- //verifyCode
-
- //register
- String registerUrl = Constant.MAIN_URL+"register.php";
-
- //login
- String loginUrl = Constant.MAIN_URL+"login.php";
-
- String verifyCodeUrl ="https://api.kavenegar.com/v1/"+Constant.API_KEY+"/verify/lookup.json";
-
-
-// public void getSlider (final Context context , RequestQueue requestQueue , final List list, final SliderResponse sliderResponse) {
-//
-// this.requestQueue = requestQueue;
-// requestQueue = Volley.newRequestQueue(context);
-// this.sliderList = list;
-//
-//
-//
-// JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.GET, sliderUrl,
-// null, new Response.Listener() {
-// @Override
-// public void onResponse(JSONObject response) {
-//
-// try {
-// JSONArray jsonArray = response.getJSONArray("slider");
-//
-// for (int i =0 ; i list, final MovieResponse movieResponse){
-
- this.requestQueue = requestQueue;
- requestQueue = Volley.newRequestQueue(context);
- this.IMDBTopList = list;
-
- JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.POST, IMDBTopUrl,null,new Response.Listener() {
- @Override
- public void onResponse(JSONObject response) {
-
- try {
- JSONArray jsonArray = response.getJSONArray("movies");
-
- for (int i =0 ; i list, final MovieResponse movieResponse){
-
- this.requestQueue = requestQueue;
- requestQueue = Volley.newRequestQueue(context);
- this.newMoviesList = list;
-
- JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.GET, NewMoviesUrl,null,new Response.Listener() {
- @Override
- public void onResponse(JSONObject response) {
-
- try {
- JSONArray jsonArray = response.getJSONArray("movies");
-
- for (int i =0 ; i list, final MovieResponse movieResponse){
-
- this.requestQueue = requestQueue;
- requestQueue = Volley.newRequestQueue(context);
- this.popularList = list;
-
- JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.GET, PopularUrl,null,new Response.Listener() {
- @Override
- public void onResponse(JSONObject response) {
-
- try {
- JSONArray jsonArray = response.getJSONArray("movies");
-
- for (int i =0 ; i list, final GenreResponse genreResponse) {
-
- this.requestQueue = requestQueue;
- requestQueue = Volley.newRequestQueue(context);
- this.genreList = list;
-
-
-
- JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.GET, genreUrl,
- null, new Response.Listener() {
- @Override
- public void onResponse(JSONObject response) {
-
- try {
- JSONArray jsonArray = response.getJSONArray("genre");
-
- for (int i =0 ; i list, String movie_id, final ActorsResponse actorsResponse) {
-
- this.requestQueue = requestQueue;
- requestQueue = Volley.newRequestQueue(context);
- this.actorsList = list;
- this.actorsUrl = actorsUrl +movie_id;
-
-
-
- JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.GET, actorsUrl,
- null, new Response.Listener() {
- @Override
- public void onResponse(JSONObject response) {
-
- try {
- JSONArray jsonArray = response.getJSONArray("actors");
-
- for (int i =0 ; i list, String genreLink, final MovieResponse movieResponse) {
-
- this.requestQueue = requestQueue;
- requestQueue = Volley.newRequestQueue(context);
- this.movieByGenreList = list;
- this.movieByGenreUrl = movieByGenreUrl +genreLink;
-
-
-
- JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.GET, movieByGenreUrl,
- null, new Response.Listener() {
- @Override
- public void onResponse(JSONObject response) {
-
- try {
- JSONArray jsonArray = response.getJSONArray("movies");
-
- for (int i =0 ; i() {
- @Override
- public void onResponse(JSONObject response) {
-
- try {
- JSONArray jsonArray = response.getJSONArray("movies");
- searchList=new ArrayList<>();
-
- for (int i =0 ; i() {
- @Override
- public void onResponse(String response) {
-
- if (response.equals("exist")){
-
-
- Methods.showSnackBar((Activity)context,context.getResources().getString(R.string.user_already_exist), Color.RED);
-
-
- }else if (response.equals("not exist")){
-
- Intent intent=new Intent(context,VerifyActivity.class);
- intent.putExtra("phone",phone);
- intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- context.startActivity(intent);
-
- }else {
-
- Methods.showSnackBar((Activity)context,response, Color.RED);
- }
-
- }
- }, new Response.ErrorListener() {
- @Override
- public void onErrorResponse(VolleyError error) {
-
- Log.i("Error" , error.getMessage()+"");
-
- }
- }){
-
- @Override
- protected Map getParams() throws AuthFailureError {
-
- HashMap params = new HashMap<>();
- params.put("phone" ,phone );
- return params;
- }
- };
-
- requestQueue.add(stringRequest);
-
- }
-
-
- public void verifyCode(final String phone,final String token,final String template, Context context,RequestQueue requestQueue ) {
-
- this.requestQueue=requestQueue;
- StringRequest stringRequest = new StringRequest(Request.Method.POST, verifyCodeUrl, new Response.Listener() {
- @Override
- public void onResponse(String response) {
-
- Log.i("verifyCode" , response);
-
- }
-
- }, new Response.ErrorListener() {
- @Override
- public void onErrorResponse(VolleyError error) {
-
- Log.i("verifyCode" , error.getMessage()+"");
- }
- }){
-
- @Override
- protected Map getParams() throws AuthFailureError {
-
- HashMap params = new HashMap<>();
- params.put("receptor" ,phone );
- params.put("token" ,token );
- params.put("template" ,template );
- return params;
- }
- };
-
- requestQueue.add(stringRequest);
-
- }
-
- public void register(final String phone,final String password,final String name,final String lastName, Context context,RequestQueue requestQueue ) {
-
- this.requestQueue=requestQueue;
- StringRequest stringRequest = new StringRequest(Request.Method.POST, registerUrl, new Response.Listener() {
- @Override
- public void onResponse(String response) {
-
- if (response.equals("successful")){
- SessionManager sessionManager=new SessionManager(context);
- sessionManager.setUserName(name);
- Intent intent=new Intent(context, LoginActivity.class);
- intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- context.startActivity(intent);
-
-
- }else {
-
- Methods.showSnackBar((Activity)context,response, Color.RED);
-
- }
-
- }
- }, new Response.ErrorListener() {
- @Override
- public void onErrorResponse(VolleyError error) {
-
- Log.i("Error" , error.getMessage()+"");
-
- }
- }){
-
- @Override
- protected Map getParams() throws AuthFailureError {
-
- HashMap params = new HashMap<>();
- params.put("name" ,name );
- params.put("last_name" ,lastName );
- params.put("password" ,password );
- params.put("phone" ,phone );
- return params;
- }
- };
-
- requestQueue.add(stringRequest);
-
- }
-
- public void login(final String phone,final String password, Context context,RequestQueue requestQueue ) {
-
- this.requestQueue=requestQueue;
- StringRequest stringRequest = new StringRequest(Request.Method.POST, loginUrl, new Response.Listener() {
- @Override
- public void onResponse(String response) {
-
- SessionManager sessionManager=new SessionManager(context);
-
- try {
- JSONObject jsonObject=new JSONObject(response);
- JSONArray jsonArray=jsonObject.getJSONArray("user_id");
- String userId=jsonArray.getJSONObject(0).getString("id");
- sessionManager.setUserId(userId);
- Log.i("user_id",userId);
-
-
-
-
-
- } catch (JSONException e) {
- e.printStackTrace();
- }
-
- if (response.contains("successful")){
-
-
- sessionManager.setUserPassword(password);
- sessionManager.setUserPhone(phone);
- sessionManager.setLoggedIn(true);
- Intent intent=new Intent(context, HomeActivity.class);
- intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- context.startActivity(intent);
-
- }else {
-
- Methods.showSnackBar((Activity)context,response, Color.RED);
- }
-
-
- Log.i("login",response);
-
- }
- }, new Response.ErrorListener() {
- @Override
- public void onErrorResponse(VolleyError error) {
-
- Log.i("Error" , error.getMessage()+"");
-
- }
- }){
-
- @Override
- protected Map getParams() throws AuthFailureError {
-
- HashMap params = new HashMap<>();
- params.put("phone" ,phone );
- params.put("password" ,password );
- return params;
- }
- };
-
- requestQueue.add(stringRequest);
-
- }
-}