From a4427b98dc07ef1d09b06bad453c0c725c5b2c00 Mon Sep 17 00:00:00 2001 From: BGbaderguet <48762010+BGbaderguet@users.noreply.github.com> Date: Sat, 26 Dec 2020 09:07:46 +0100 Subject: [PATCH] Deleting some files --- app/src/main/AndroidManifest.xml | 10 --- .../dao/AgencyWithPropertiesDao.java | 16 ---- .../repository/MainActivityRepository.java | 7 -- .../repository/MapsActivityRepository.java | 15 ---- .../myrealestateagency/view/MainActivity.java | 76 ------------------- .../myrealestateagency/view/MapsActivity.java | 53 ------------- .../viewmodel/MainActivityViewModel.java | 40 ---------- app/src/main/res/layout/activity_main.xml | 43 ----------- app/src/main/res/layout/activity_maps.xml | 9 --- 9 files changed, 269 deletions(-) delete mode 100644 app/src/main/java/fr/romanet/vj/apps/myrealestateagency/dao/AgencyWithPropertiesDao.java delete mode 100644 app/src/main/java/fr/romanet/vj/apps/myrealestateagency/repository/MainActivityRepository.java delete mode 100644 app/src/main/java/fr/romanet/vj/apps/myrealestateagency/repository/MapsActivityRepository.java delete mode 100644 app/src/main/java/fr/romanet/vj/apps/myrealestateagency/view/MainActivity.java delete mode 100644 app/src/main/java/fr/romanet/vj/apps/myrealestateagency/view/MapsActivity.java delete mode 100644 app/src/main/java/fr/romanet/vj/apps/myrealestateagency/viewmodel/MainActivityViewModel.java delete mode 100644 app/src/main/res/layout/activity_main.xml delete mode 100644 app/src/main/res/layout/activity_maps.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0fa014a..df727c7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -30,16 +30,6 @@ android:name="com.google.android.geo.API_KEY" android:value="@string/google_maps_key" /> - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/dao/AgencyWithPropertiesDao.java b/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/dao/AgencyWithPropertiesDao.java deleted file mode 100644 index e64d168..0000000 --- a/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/dao/AgencyWithPropertiesDao.java +++ /dev/null @@ -1,16 +0,0 @@ -package fr.romanet.vj.apps.myrealestateagency.dao; - -import androidx.room.Dao; -import androidx.room.Query; -import androidx.room.Transaction; - -import java.util.List; - -//import fr.romanet.vj.apps.myrealestateagency.entities.AgencyWithProperties; - -//@Dao -//public interface AgencyWithPropertiesDao { -// @Transaction -// @Query("SELECT * FROM agency") -// List getAgenciesAndProperties(); -//} diff --git a/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/repository/MainActivityRepository.java b/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/repository/MainActivityRepository.java deleted file mode 100644 index 8f20d29..0000000 --- a/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/repository/MainActivityRepository.java +++ /dev/null @@ -1,7 +0,0 @@ -package fr.romanet.vj.apps.myrealestateagency.repository; - -import androidx.lifecycle.LifecycleObserver; - -public class MainActivityRepository implements LifecycleObserver { - -} diff --git a/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/repository/MapsActivityRepository.java b/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/repository/MapsActivityRepository.java deleted file mode 100644 index fe2ee1b..0000000 --- a/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/repository/MapsActivityRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package fr.romanet.vj.apps.myrealestateagency.repository; - -import android.content.Context; -import android.location.Address; -import android.location.Geocoder; - -import java.io.IOException; -import java.util.List; - -public class MapsActivityRepository { - public List
get_lat_long_from_address(String address, Context context) throws IOException { - Geocoder gc = new Geocoder(context); - return gc.getFromLocationName(address, 1); - } -} diff --git a/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/view/MainActivity.java b/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/view/MainActivity.java deleted file mode 100644 index 2705ef0..0000000 --- a/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/view/MainActivity.java +++ /dev/null @@ -1,76 +0,0 @@ -package fr.romanet.vj.apps.myrealestateagency.view; - -import androidx.appcompat.app.AppCompatActivity; -import androidx.lifecycle.ViewModelProvider; - -import android.content.Intent; -import android.view.View; - -import android.os.Bundle; -import android.widget.TextView; - -import fr.romanet.vj.apps.myrealestateagency.R; -import fr.romanet.vj.apps.myrealestateagency.repository.MyRealEstateAgencyRepository; -import fr.romanet.vj.apps.myrealestateagency.entities.Agency; -import fr.romanet.vj.apps.myrealestateagency.entities.Agent; -import fr.romanet.vj.apps.myrealestateagency.viewmodel.MainActivityViewModel; - -public class MainActivity extends AppCompatActivity { - - private static final String TAG = "MyActivity"; - - // - Init ViewModel - MainActivityViewModel mainActivityViewModel; - - // - Init widgets - private TextView tv1; - - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - - // - Define widget - tv1 = (TextView) findViewById(R.id.tv1); - - // - Link the ViewModel - mainActivityViewModel = new ViewModelProvider(this).get(MainActivityViewModel.class); - getLifecycle().addObserver(mainActivityViewModel); - observe_counter(); - } - - public void insertSingleTodo(View view) { - Agency test1 = new Agency("AgenceOFParis"); - - Agency test2 = new Agency("AgenceOFMarseille"); - - Agent test = new Agent("Bader", "Guetari", 1); - - Agent test3 = new Agent("Khalil", "Guetari", 2); - - Agent test10 = new Agent("Achref", "Guetari", 1); - - MyRealEstateAgencyRepository.getInstance(this).addAgency(test1); - MyRealEstateAgencyRepository.getInstance(this).addAgency(test2); - MyRealEstateAgencyRepository.getInstance(this).addAgent(test); - MyRealEstateAgencyRepository.getInstance(this).addAgent(test3); - MyRealEstateAgencyRepository.getInstance(this).addAgent(test10); - - String query = "SELECT agency_id FROM agency INNER JOIN agent ON agency.agency_id = agent.agent_id WHERE agency_name =" + "AgenceOFParis" + "GROUP BY agency_name"; - String query1 = "SELECT agency_id FROM agent INNER JOIN agency ON agency.agency_id = agent.agent_id WHERE agency_name =" + "AgenceOFParis" + "GROUP BY agency_name"; - } - - public void BTN_go_to_map(View view){ - Intent i = new Intent(MainActivity.this, MapsActivity.class); - MainActivity.this.startActivity(i); - } - - public void observe_counter(){ - mainActivityViewModel.counter.observe(this, counter -> - { - tv1.setText(counter.toString()); - }); - } - -} \ No newline at end of file diff --git a/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/view/MapsActivity.java b/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/view/MapsActivity.java deleted file mode 100644 index 1a3d523..0000000 --- a/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/view/MapsActivity.java +++ /dev/null @@ -1,53 +0,0 @@ -package fr.romanet.vj.apps.myrealestateagency.view; - -import androidx.fragment.app.FragmentActivity; - -import android.os.Bundle; - -import com.google.android.gms.maps.CameraUpdateFactory; -import com.google.android.gms.maps.GoogleMap; -import com.google.android.gms.maps.OnMapReadyCallback; -import com.google.android.gms.maps.SupportMapFragment; -import com.google.android.gms.maps.model.LatLng; -import com.google.android.gms.maps.model.MarkerOptions; - -import java.util.List; - -import fr.romanet.vj.apps.myrealestateagency.R; -import fr.romanet.vj.apps.myrealestateagency.repository.MapsActivityRepository; - -public class MapsActivity extends FragmentActivity implements OnMapReadyCallback { - - private GoogleMap mMap; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_maps); - // Obtain the SupportMapFragment and get notified when the map is ready to be used. - SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager() - .findFragmentById(R.id.map); - mapFragment.getMapAsync(this); - } - - /** - * Manipulates the map once available. - * This callback is triggered when the map is ready to be used. - * This is where we can add markers or lines, add listeners or move the camera. In this case, - * we just add a marker near Sydney, Australia. - * If Google Play services is not installed on the device, the user will be prompted to install - * it inside the SupportMapFragment. This method will only be triggered once the user has - * installed Google Play services and returned to the app. - */ - @Override - public void onMapReady(GoogleMap googleMap) { - mMap = googleMap; - - // Add a marker in Sydney and move the camera - LatLng sydney = new LatLng(-34, 151); -// mMap.addMarker(new MarkerOptions().position(sydney).title("Marker in Sydney")); - mMap.addMarker(new MarkerOptions().position(sydney).title("Marker in Sydney")); - mMap.moveCamera(CameraUpdateFactory.newLatLng(sydney)); -// List ll = MapsActivityRepository.get - } -} \ No newline at end of file diff --git a/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/viewmodel/MainActivityViewModel.java b/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/viewmodel/MainActivityViewModel.java deleted file mode 100644 index b829646..0000000 --- a/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/viewmodel/MainActivityViewModel.java +++ /dev/null @@ -1,40 +0,0 @@ -package fr.romanet.vj.apps.myrealestateagency.viewmodel; - -import android.os.Handler; -import android.os.SystemClock; - -import androidx.lifecycle.Lifecycle; -import androidx.lifecycle.LifecycleObserver; -import androidx.lifecycle.MutableLiveData; -import androidx.lifecycle.OnLifecycleEvent; -import androidx.lifecycle.ViewModel; - -import fr.romanet.vj.apps.myrealestateagency.view.MainActivity; - -public final class MainActivityViewModel extends ViewModel implements LifecycleObserver { - - public enum LoadingState - { - Loading, Loaded - } - - public MutableLiveData loadingState = new MutableLiveData<>(); - public MutableLiveData counter = new MutableLiveData<>(); - - @OnLifecycleEvent(Lifecycle.Event.ON_RESUME) - private void start_counter_on_activity_start(){ - counter.postValue(0); - for (int i = 0; i<10; i++){ - new Handler().postDelayed(() -> - { - counter.postValue(15); - }, i*1000); -// counter.postValue(i); -// SystemClock.sleep(1000); - } - - - } - - -} diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index ad335c2..0000000 --- a/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - -