diff --git a/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/view/AgentsActivity.java b/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/view/AgentsActivity.java index 1120daa..4364850 100644 --- a/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/view/AgentsActivity.java +++ b/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/view/AgentsActivity.java @@ -6,11 +6,7 @@ import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.RecyclerView; -import android.content.Intent; import android.os.Bundle; -import android.view.View; -import android.view.View.OnClickListener; - import java.util.List; import fr.romanet.vj.apps.myrealestateagency.R; @@ -18,7 +14,7 @@ import fr.romanet.vj.apps.myrealestateagency.adapter.AgentsAdapter; import fr.romanet.vj.apps.myrealestateagency.entities.Agent; import fr.romanet.vj.apps.myrealestateagency.viewmodel.AgentsActivityViewModel; -final public class AgentsActivity extends AppCompatActivity implements OnClickListener { +final public class AgentsActivity extends AppCompatActivity{ private RecyclerView recyclerView; @@ -31,26 +27,22 @@ final public class AgentsActivity extends AppCompatActivity implements OnClickLi setContentView(R.layout.activity_agents); recyclerView = findViewById(R.id.recyclerViewAgents); recyclerView.addItemDecoration(new DividerItemDecoration(this, DividerItemDecoration.VERTICAL)); + viewModel = new ViewModelProvider(this).get(AgentsActivityViewModel.class); observeAgents(); - - Intent i = new Intent(AgentsActivity.this, MapsActivity.class); - AgentsActivity.this.startActivity(i); } private void observeAgents() { - viewModel.agents.observe(this, new Observer>() { + viewModel.agents.observe(this, new Observer>() + { @Override - public void onChanged(List agents) { - final AgentsAdapter agentsAdapter = new AgentsAdapter(agents); - recyclerView.setAdapter(agentsAdapter); + public void onChanged(List users) + { + final AgentsAdapter usersAdapter = new AgentsAdapter(users); + recyclerView.setAdapter(usersAdapter); } }); } - @Override - public void onClick(View view) { - - } -} +} \ No newline at end of file diff --git a/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/view/HomeActivity.java b/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/view/HomeActivity.java new file mode 100644 index 0000000..cb55c50 --- /dev/null +++ b/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/view/HomeActivity.java @@ -0,0 +1,46 @@ +package fr.romanet.vj.apps.myrealestateagency.view; + +import android.content.Intent; +import android.os.Bundle; +import android.os.SystemClock; +import android.util.Log; +import android.view.View; +import android.widget.ArrayAdapter; +import android.widget.Button; +import android.widget.ListView; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.lifecycle.LiveData; + +import java.util.ArrayList; +import java.util.List; + +import fr.romanet.vj.apps.myrealestateagency.R; +import fr.romanet.vj.apps.myrealestateagency.database.RealEstateAgencyDatabase; +import fr.romanet.vj.apps.myrealestateagency.entities.Agent; + +final public class HomeActivity extends AppCompatActivity implements View.OnClickListener { + + + @Override + protected void onCreate(Bundle savedInstanceState) + { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_home); + Button button = (Button) findViewById(R.id.buttonFirst); + button.setOnClickListener(new View.OnClickListener() + { + public void onClick(View v) + { + Intent intent = new Intent(HomeActivity.this, AgentsActivity.class); + startActivity(intent); + } + }); + } + + @Override + public void onClick(View view) { + + } + +} diff --git a/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/viewmodel/AgentsActivityViewModel.java b/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/viewmodel/AgentsActivityViewModel.java index 63ec474..a23062f 100644 --- a/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/viewmodel/AgentsActivityViewModel.java +++ b/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/viewmodel/AgentsActivityViewModel.java @@ -1,36 +1,26 @@ package fr.romanet.vj.apps.myrealestateagency.viewmodel; import android.app.Application; -import android.os.Handler; import androidx.annotation.NonNull; import androidx.lifecycle.AndroidViewModel; -import androidx.lifecycle.Lifecycle; -import androidx.lifecycle.LifecycleEventObserver; -import androidx.lifecycle.LifecycleObserver; +import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; -import androidx.lifecycle.OnLifecycleEvent; -import androidx.lifecycle.ViewModel; import java.util.List; -import fr.romanet.vj.apps.myrealestateagency.repository.MyRealEstateAgencyRepository; import fr.romanet.vj.apps.myrealestateagency.entities.Agent; +import fr.romanet.vj.apps.myrealestateagency.repository.AgentRepository; -public final class AgentsActivityViewModel extends AndroidViewModel implements LifecycleObserver { +public class AgentsActivityViewModel extends AndroidViewModel { - public MutableLiveData> agents = new MutableLiveData<>(); - - private MyRealEstateAgencyRepository myRealEstateAgencyRepository; + public LiveData> agents = new MutableLiveData<>(); + public AgentRepository agentRepository; public AgentsActivityViewModel(@NonNull Application application) { super(application); + agentRepository = new AgentRepository(application); + agents = agentRepository.getAllAgents(); } - - @OnLifecycleEvent(Lifecycle.Event.ON_RESUME) - private void start_counter_on_activity_start(){ - agents.postValue(MyRealEstateAgencyRepository.getInstance(getApplication()).getAgents()); - } - }