From 7347f71f590bf9e18172ec392dd0a82ab5d55db3 Mon Sep 17 00:00:00 2001 From: RussellGk Date: Wed, 15 Jun 2016 06:58:14 +0300 Subject: [PATCH] Google map fragment, configChanges, NetworkStatusChecker --- app/src/main/AndroidManifest.xml | 4 +++ .../ui/fragments/ContactsFragment.java | 31 ++++++++++++++++++- .../utils/NetworkStatusChecker.java | 20 ++++++++++++ app/src/main/res/layout/contacts_fragment.xml | 25 ++++++++++++--- app/src/main/res/values/strings.xml | 1 + 5 files changed, 75 insertions(+), 6 deletions(-) create mode 100644 app/src/main/java/com/hardteam/rg/soundcheckstudio/utils/NetworkStatusChecker.java diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4f28f17..f1c7101 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,6 +13,7 @@ android:theme="@style/AppTheme"> @@ -21,6 +22,9 @@ + diff --git a/app/src/main/java/com/hardteam/rg/soundcheckstudio/ui/fragments/ContactsFragment.java b/app/src/main/java/com/hardteam/rg/soundcheckstudio/ui/fragments/ContactsFragment.java index d96393c..8437b9f 100644 --- a/app/src/main/java/com/hardteam/rg/soundcheckstudio/ui/fragments/ContactsFragment.java +++ b/app/src/main/java/com/hardteam/rg/soundcheckstudio/ui/fragments/ContactsFragment.java @@ -7,12 +7,20 @@ import android.view.View; import android.view.ViewGroup; +import com.google.android.gms.maps.CameraUpdate; +import com.google.android.gms.maps.CameraUpdateFactory; +import com.google.android.gms.maps.GoogleMap; +import com.google.android.gms.maps.MapFragment; +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 com.hardteam.rg.soundcheckstudio.R; /** * Created by rg on 3/22/16. */ -public class ContactsFragment extends Fragment { +public class ContactsFragment extends Fragment implements OnMapReadyCallback { @Nullable @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -20,4 +28,25 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa getActivity().setTitle("Контакты"); return contactsView; } + + @Override + public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + + //SupportMapFragment mapFragment = (SupportMapFragment)getActivity().getSupportFragmentManager().findFragmentById(R.id.map); + SupportMapFragment mapFragment = (SupportMapFragment)getChildFragmentManager().findFragmentById(R.id.map); + mapFragment.getMapAsync(this); + } + + @Override + public void onMapReady(GoogleMap googleMap) + { + LatLng marker = new LatLng(45.022171,38.98648); + googleMap.setTrafficEnabled(true); +// googleMap.animateCamera(CameraUpdateFactory.zoomTo(16)); + googleMap.moveCamera(CameraUpdateFactory.newLatLngZoom(marker, 16)); + googleMap.addMarker(new MarkerOptions().title("Soundcheck - ул. Суворова 60/1").position(marker).snippet("Тел: +7(906)4364115")); + + + } } diff --git a/app/src/main/java/com/hardteam/rg/soundcheckstudio/utils/NetworkStatusChecker.java b/app/src/main/java/com/hardteam/rg/soundcheckstudio/utils/NetworkStatusChecker.java new file mode 100644 index 0000000..7ba4ae9 --- /dev/null +++ b/app/src/main/java/com/hardteam/rg/soundcheckstudio/utils/NetworkStatusChecker.java @@ -0,0 +1,20 @@ +package com.hardteam.rg.soundcheckstudio.utils; + +import android.content.Context; +import android.net.ConnectivityManager; +import android.net.NetworkInfo; + +/** + * Created by rg on 6/15/16. + */ +public class NetworkStatusChecker +{ + + //Returns true if the network is available + public static boolean isNetworkAvailable(Context context) + { + ConnectivityManager cm = (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE); + NetworkInfo activeNetwork = cm.getActiveNetworkInfo(); + return activeNetwork != null && activeNetwork.isConnectedOrConnecting(); + } +} diff --git a/app/src/main/res/layout/contacts_fragment.xml b/app/src/main/res/layout/contacts_fragment.xml index 395c35f..93e6691 100644 --- a/app/src/main/res/layout/contacts_fragment.xml +++ b/app/src/main/res/layout/contacts_fragment.xml @@ -1,11 +1,26 @@ - - + class="com.google.android.gms.maps.SupportMapFragment"/> + + + + + + + + + + + + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b8b8618..1b4b6a5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -12,4 +12,5 @@ roboto-medium roboto-regular + soundcheck-1342