diff --git a/MyCity/app/src/main/java/gq/yigit/mycity/MainActivity.java b/MyCity/app/src/main/java/gq/yigit/mycity/MainActivity.java index 6ead66f..cd84487 100644 --- a/MyCity/app/src/main/java/gq/yigit/mycity/MainActivity.java +++ b/MyCity/app/src/main/java/gq/yigit/mycity/MainActivity.java @@ -25,7 +25,7 @@ import android.widget.TextView; import android.widget.Toast; import gq.yigit.mycity.tools.*; import gq.yigit.mycity.tools.WebRequest.responseListener; -import gq.yigit.mycity.voteFragment.VoteFragment; +import gq.yigit.mycity.votesFragment.VoteFragment; import gq.yigit.mycity.votesFragment.VotesContent; import gq.yigit.mycity.votesFragment.VotesFragment; import gq.yigit.mycity.votesFragment.VotesFragment.OnListFragmentInteractionListener; @@ -35,7 +35,7 @@ import org.json.JSONObject; import java.util.HashMap; import static gq.yigit.mycity.tools.ImageDownload.*; -import static gq.yigit.mycity.voteFragment.VoteFragment.*; +import static gq.yigit.mycity.votesFragment.VoteFragment.*; public class MainActivity extends AppCompatActivity implements diff --git a/MyCity/app/src/main/java/gq/yigit/mycity/navigation/MapsFragment.java b/MyCity/app/src/main/java/gq/yigit/mycity/navigation/MapsFragment.java new file mode 100644 index 0000000..51e1a30 --- /dev/null +++ b/MyCity/app/src/main/java/gq/yigit/mycity/navigation/MapsFragment.java @@ -0,0 +1,109 @@ +package gq.yigit.mycity.navigation; + +import android.content.Context; +import android.net.Uri; +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import gq.yigit.mycity.R; + +/** + * A simple {@link Fragment} subclass. + * Activities that contain this fragment must implement the + * {@link MapsFragment.OnFragmentInteractionListener} interface + * to handle interaction events. + * Use the {@link MapsFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class MapsFragment extends Fragment { + // TODO: Rename parameter arguments, choose names that match + // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER + private static final String ARG_PARAM1 = "param1"; + private static final String ARG_PARAM2 = "param2"; + + // TODO: Rename and change types of parameters + private String mParam1; + private String mParam2; + + private OnFragmentInteractionListener mListener; + + public MapsFragment() { + // Required empty public constructor + } + + /** + * Use this factory method to create a new instance of + * this fragment using the provided parameters. + * + * @param param1 Parameter 1. + * @param param2 Parameter 2. + * @return A new instance of fragment MapsFragment. + */ + // TODO: Rename and change types and number of parameters + public static MapsFragment newInstance(String param1, String param2) { + MapsFragment fragment = new MapsFragment(); + Bundle args = new Bundle(); + args.putString(ARG_PARAM1, param1); + args.putString(ARG_PARAM2, param2); + fragment.setArguments(args); + return fragment; + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + if (getArguments() != null) { + mParam1 = getArguments().getString(ARG_PARAM1); + mParam2 = getArguments().getString(ARG_PARAM2); + } + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_maps, container, false); + } + + // TODO: Rename method, update argument and hook method into UI event + public void onButtonPressed(Uri uri) { + if (mListener != null) { + mListener.onFragmentInteraction(uri); + } + } + + @Override + public void onAttach(Context context) { + super.onAttach(context); + if (context instanceof OnFragmentInteractionListener) { + mListener = (OnFragmentInteractionListener) context; + } else { + throw new RuntimeException(context.toString() + + " must implement OnFragmentInteractionListener"); + } + } + + @Override + public void onDetach() { + super.onDetach(); + mListener = null; + } + + /** + * This interface must be implemented by activities that contain this + * fragment to allow an interaction in this fragment to be communicated + * to the activity and potentially other fragments contained in that + * activity. + *

+ * See the Android Training lesson Communicating with Other Fragments for more information. + */ + public interface OnFragmentInteractionListener { + // TODO: Update argument type and name + void onFragmentInteraction(Uri uri); + } +} diff --git a/MyCity/app/src/main/java/gq/yigit/mycity/voteFragment/VoteFragment.java b/MyCity/app/src/main/java/gq/yigit/mycity/votesFragment/VoteFragment.java similarity index 99% rename from MyCity/app/src/main/java/gq/yigit/mycity/voteFragment/VoteFragment.java rename to MyCity/app/src/main/java/gq/yigit/mycity/votesFragment/VoteFragment.java index b515d80..11bb0c1 100644 --- a/MyCity/app/src/main/java/gq/yigit/mycity/voteFragment/VoteFragment.java +++ b/MyCity/app/src/main/java/gq/yigit/mycity/votesFragment/VoteFragment.java @@ -1,4 +1,4 @@ -package gq.yigit.mycity.voteFragment; +package gq.yigit.mycity.votesFragment; import android.content.Context; import android.graphics.Bitmap; diff --git a/MyCity/app/src/main/res/layout/fragment_maps.xml b/MyCity/app/src/main/res/layout/fragment_maps.xml new file mode 100644 index 0000000..3fedce4 --- /dev/null +++ b/MyCity/app/src/main/res/layout/fragment_maps.xml @@ -0,0 +1,14 @@ + + + + + + + \ No newline at end of file diff --git a/MyCity/app/src/main/res/layout/fragment_vote.xml b/MyCity/app/src/main/res/layout/fragment_vote.xml index 6c79ff9..c1e6ef8 100644 --- a/MyCity/app/src/main/res/layout/fragment_vote.xml +++ b/MyCity/app/src/main/res/layout/fragment_vote.xml @@ -1,9 +1,9 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context=".votesFragment.VoteFragment" android:orientation="vertical">