Browse Source

Created MapsFragment

old
Yiğit Çolakoğlu 6 years ago
parent
commit
4fccde6716
10 changed files with 137 additions and 8 deletions
  1. +2
    -2
      MyCity/app/src/main/java/gq/yigit/mycity/MainActivity.java
  2. +109
    -0
      MyCity/app/src/main/java/gq/yigit/mycity/navigation/MapsFragment.java
  3. +1
    -1
      MyCity/app/src/main/java/gq/yigit/mycity/votesFragment/VoteFragment.java
  4. +14
    -0
      MyCity/app/src/main/res/layout/fragment_maps.xml
  5. +4
    -4
      MyCity/app/src/main/res/layout/fragment_vote.xml
  6. BIN
      server_side/api/modules/__pycache__/rating_system.cpython-37.pyc
  7. BIN
      server_side/api/modules/__pycache__/user_info.cpython-37.pyc
  8. BIN
      server_side/api/modules/__pycache__/voting_system.cpython-37.pyc
  9. +6
    -0
      server_side/api/modules/databases/ratings.json
  10. +1
    -1
      server_side/api/modules/databases/votings.json

+ 2
- 2
MyCity/app/src/main/java/gq/yigit/mycity/MainActivity.java View File

@ -25,7 +25,7 @@ import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import gq.yigit.mycity.tools.*; import gq.yigit.mycity.tools.*;
import gq.yigit.mycity.tools.WebRequest.responseListener; 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.VotesContent;
import gq.yigit.mycity.votesFragment.VotesFragment; import gq.yigit.mycity.votesFragment.VotesFragment;
import gq.yigit.mycity.votesFragment.VotesFragment.OnListFragmentInteractionListener; import gq.yigit.mycity.votesFragment.VotesFragment.OnListFragmentInteractionListener;
@ -35,7 +35,7 @@ import org.json.JSONObject;
import java.util.HashMap; import java.util.HashMap;
import static gq.yigit.mycity.tools.ImageDownload.*; 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 public class MainActivity extends AppCompatActivity
implements implements


+ 109
- 0
MyCity/app/src/main/java/gq/yigit/mycity/navigation/MapsFragment.java View File

@ -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.
* <p>
* See the Android Training lesson <a href=
* "http://developer.android.com/training/basics/fragments/communicating.html"
* >Communicating with Other Fragments</a> for more information.
*/
public interface OnFragmentInteractionListener {
// TODO: Update argument type and name
void onFragmentInteraction(Uri uri);
}
}

MyCity/app/src/main/java/gq/yigit/mycity/voteFragment/VoteFragment.java → MyCity/app/src/main/java/gq/yigit/mycity/votesFragment/VoteFragment.java View File


+ 14
- 0
MyCity/app/src/main/res/layout/fragment_maps.xml View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".navigation.MapsFragment">
<!-- TODO: Update blank fragment layout -->
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/hello_blank_fragment"/>
</FrameLayout>

+ 4
- 4
MyCity/app/src/main/res/layout/fragment_vote.xml View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
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=".voteFragment.VoteFragment" android:orientation="vertical">
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">
<!-- TODO: Update blank fragment layout --> <!-- TODO: Update blank fragment layout -->
<ImageView <ImageView


BIN
server_side/api/modules/__pycache__/rating_system.cpython-37.pyc View File


BIN
server_side/api/modules/__pycache__/user_info.cpython-37.pyc View File


BIN
server_side/api/modules/__pycache__/voting_system.cpython-37.pyc View File


+ 6
- 0
server_side/api/modules/databases/ratings.json View File

@ -27,6 +27,12 @@
"rater": "9vard12ty0ad2yvwp3q53rsf3h43r2vq", "rater": "9vard12ty0ad2yvwp3q53rsf3h43r2vq",
"score": 5, "score": 5,
"note": null "note": null
},
{
"id": 4,
"rater": "9vard12ty0ad2yvwp3q53rsf3h43r2vq",
"score": 3,
"note": "Not bad boiii"
} }
] ]
} }

+ 1
- 1
server_side/api/modules/databases/votings.json View File

@ -11,7 +11,7 @@
"1": { "1": {
"name": "Sample Vote 1", "name": "Sample Vote 1",
"desc": "Sample description", "desc": "Sample description",
"votes": 1
"votes": 3
}, },
"2": { "2": {
"name": "Sample Vote 2", "name": "Sample Vote 2",


Loading…
Cancel
Save