From fa0b30ff01420b6157878ec7f1b9e12a9a7016a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yi=C4=9Fit=20=C3=87olako=C4=9Flu?=
 <yigitcolakoglu@hotmail.com>
Date: Thu, 28 Mar 2019 11:05:11 +0300
Subject: [PATCH] Ratings page in progress

---
 MyCity/app/src/main/AndroidManifest.xml       |   1 +
 .../java/gq/yigit/mycity/MainActivity.java    |  22 ++-
 .../java/gq/yigit/mycity/RateFragment.java    | 146 ++++++++++++++++++
 .../mycity/votesFragment/VoteFragment.java    |   1 -
 .../app/src/main/res/layout/fragment_rate.xml |  50 ++++++
 .../app/src/main/res/layout/fragment_vote.xml |   3 +-
 .../__pycache__/rating_system.cpython-37.pyc  | Bin 3227 -> 2894 bytes
 .../api/modules/databases/ratings.json        |   6 +
 server_side/api/modules/rating_system.py      |  29 +---
 9 files changed, 225 insertions(+), 33 deletions(-)
 create mode 100644 MyCity/app/src/main/java/gq/yigit/mycity/RateFragment.java
 create mode 100644 MyCity/app/src/main/res/layout/fragment_rate.xml

diff --git a/MyCity/app/src/main/AndroidManifest.xml b/MyCity/app/src/main/AndroidManifest.xml
index cd1f147..49ce08d 100644
--- a/MyCity/app/src/main/AndroidManifest.xml
+++ b/MyCity/app/src/main/AndroidManifest.xml
@@ -2,6 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 		  package="gq.yigit.mycity">
  	<uses-permission android:name="android.permission.INTERNET" />
+	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 	<application
 			android:allowBackup="true"
 			android:icon="@mipmap/ic_launcher"
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 cd84487..365a747 100644
--- a/MyCity/app/src/main/java/gq/yigit/mycity/MainActivity.java
+++ b/MyCity/app/src/main/java/gq/yigit/mycity/MainActivity.java
@@ -1,5 +1,6 @@
 package gq.yigit.mycity;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.graphics.Bitmap;
@@ -23,6 +24,7 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
+import gq.yigit.mycity.navigation.MapsFragment;
 import gq.yigit.mycity.tools.*;
 import gq.yigit.mycity.tools.WebRequest.responseListener;
 import gq.yigit.mycity.votesFragment.VoteFragment;
@@ -42,16 +44,19 @@ public class MainActivity extends AppCompatActivity
 		OnNavigationItemSelectedListener,
 		OnListFragmentInteractionListener,
 		MainFragment.OnFragmentInteractionListener,
+		RateFragment.OnFragmentInteractionListener,
+		MapsFragment.OnFragmentInteractionListener,
 		OnFragmentInteractionListener,
 		responseListener,
 		imageListener {
 
-	private Context cntxt;
+	public static Context cntxt;
 	public static JSONObject userData;
 	public static Bitmap userAvatar;
 	private String url;
 	private ImageView avatarView;
 	private TextView userName;
+	public static Activity mainActivity;
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		Log.d("[BOOKMARK]","Started creating activity");
@@ -92,7 +97,7 @@ public class MainActivity extends AppCompatActivity
 
 		avatarView = header.findViewById(R.id.avatar);
 		userName = header.findViewById(R.id.uname);
-
+		mainActivity = this;
 		FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
 		transaction.replace(R.id.app_bar_main, fragment);
 		transaction.addToBackStack(null);
@@ -163,19 +168,26 @@ public class MainActivity extends AppCompatActivity
 			fragmentTransaction.replace(R.id.app_bar_main, fragment);
 			fragmentTransaction.commit();
 			fragmentTransaction.addToBackStack(null);
-
 		} else if (id == R.id.parking) {
 
 		} else if (id == R.id.transit) {
 
 		} else if (id == R.id.navigation) {
-
+			MapsFragment fragment = new MapsFragment();
+			fragmentTransaction.replace(R.id.app_bar_main, fragment);
+			fragmentTransaction.commit();
+			fragmentTransaction.addToBackStack(null);
 		} else if (id == R.id.rating) {
-
+			RateFragment fragment = new RateFragment();
+			fragmentTransaction.replace(R.id.app_bar_main, fragment);
+			fragmentTransaction.commit();
+			fragmentTransaction.addToBackStack(null);
 		} else if (id == R.id.utilities) {
 
 		}
 
+
+
 		DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
 		drawer.closeDrawer(GravityCompat.START);
 		return true;
diff --git a/MyCity/app/src/main/java/gq/yigit/mycity/RateFragment.java b/MyCity/app/src/main/java/gq/yigit/mycity/RateFragment.java
new file mode 100644
index 0000000..f5ef62c
--- /dev/null
+++ b/MyCity/app/src/main/java/gq/yigit/mycity/RateFragment.java
@@ -0,0 +1,146 @@
+package gq.yigit.mycity;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.location.*;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.app.Fragment;
+import android.support.v4.content.ContextCompat;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+import gq.yigit.mycity.tools.FileActions;
+import gq.yigit.mycity.tools.ImageDownload;
+import gq.yigit.mycity.tools.WebRequest;
+import org.json.JSONArray;
+import org.json.JSONException;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+
+import static android.content.Context.CONTEXT_IGNORE_SECURITY;
+import static gq.yigit.mycity.MainActivity.cntxt;
+
+
+public class RateFragment extends Fragment implements WebRequest.responseListener, ImageDownload.imageListener,LocationListener {
+
+
+	private OnFragmentInteractionListener mListener;
+	private String url;
+	private int i = 0;
+	private JSONArray ratings;
+	public RateFragment() {
+		// Required empty public constructor
+	}
+
+
+	public static RateFragment newInstance(String param1, String param2) {
+		RateFragment fragment = new RateFragment();
+		Bundle args = new Bundle();
+		fragment.setArguments(args);
+		return fragment;
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		LocationManager locationManager = (LocationManager)
+				cntxt.getSystemService(cntxt.LOCATION_SERVICE);
+
+		LocationListener locationListener = this;
+		if ( ContextCompat.checkSelfPermission( cntxt, android.Manifest.permission.ACCESS_FINE_LOCATION ) != PackageManager.PERMISSION_GRANTED ) {
+			ActivityCompat.requestPermissions(MainActivity.mainActivity, new String[] {  Manifest.permission.ACCESS_FINE_LOCATION  },1);
+		}
+		locationManager.requestLocationUpdates(
+				LocationManager.NETWORK_PROVIDER, 0, 10, locationListener);
+
+	}
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container,
+	                         Bundle savedInstanceState) {
+		// Inflate the layout for this fragment
+		return inflater.inflate(R.layout.fragment_rate, container, false);
+	}
+
+	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;
+	}
+
+	public interface OnFragmentInteractionListener {
+		// TODO: Update argument type and name
+		void onFragmentInteraction(Uri uri);
+	}
+
+	@Override
+	public void receivedResponse(boolean success, String response) {
+		if(success){
+			try {
+				ratings = new JSONArray(response);
+				ratings.get(i);
+			}catch (JSONException e){
+				Log.i("[ERROR]","Received an invalid response");
+			}
+
+		}
+	}
+	@Override
+	public void imageDownloaded(Bitmap img){
+
+	}
+
+	@Override
+	public void onLocationChanged(Location loc) {
+		String longitude = "Longitude: " + loc.getLongitude();
+		String latitude = "Latitude: " + loc.getLatitude();
+		FileActions file_manager = new FileActions();
+		url = file_manager.readFromFile(cntxt,"server.config").trim();
+
+		HashMap<String,String> request = new HashMap<>();
+		request.put("longitude",longitude);
+		request.put("latitude","latitude");
+		WebRequest web_manager = new WebRequest(url + "/ratings",false,request);
+		web_manager.addListener(this);
+		web_manager.execute();
+	}
+
+	@Override
+	public void onProviderDisabled(String provider) {}
+
+	@Override
+	public void onProviderEnabled(String provider) {
+		Log.i("[INFO]",provider);
+	}
+
+	@Override
+	public void onStatusChanged(String provider, int status, Bundle extras) {}
+}
+
+
diff --git a/MyCity/app/src/main/java/gq/yigit/mycity/votesFragment/VoteFragment.java b/MyCity/app/src/main/java/gq/yigit/mycity/votesFragment/VoteFragment.java
index 11bb0c1..94a9308 100644
--- a/MyCity/app/src/main/java/gq/yigit/mycity/votesFragment/VoteFragment.java
+++ b/MyCity/app/src/main/java/gq/yigit/mycity/votesFragment/VoteFragment.java
@@ -45,7 +45,6 @@ public class VoteFragment extends Fragment implements responseListener, imageLis
 		// Required empty public constructor
 	}
 
-	// TODO: Rename and change types and number of parameters
 	public static VoteFragment newInstance(String voteid) {
 		VoteFragment fragment = new VoteFragment();
 		Bundle args = new Bundle();
diff --git a/MyCity/app/src/main/res/layout/fragment_rate.xml b/MyCity/app/src/main/res/layout/fragment_rate.xml
new file mode 100644
index 0000000..7523181
--- /dev/null
+++ b/MyCity/app/src/main/res/layout/fragment_rate.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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=".RateFragment" android:layout_marginTop="60dp">
+
+	<!-- TODO: Update blank fragment layout -->
+
+	<Spinner
+			android:layout_width="368dp"
+			android:layout_height="wrap_content"
+			android:id="@+id/rate_spinner" app:layout_constraintTop_toTopOf="parent" android:layout_marginTop="8dp"
+			android:layout_marginEnd="8dp" app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent" android:layout_marginStart="8dp"/>
+	<ImageView
+			android:src="@color/colorAccent"
+			android:layout_width="0dp"
+			android:layout_height="182dp"
+			android:id="@+id/rate_img" app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="8dp"
+			app:layout_constraintStart_toStartOf="parent" android:layout_marginStart="8dp"
+			android:layout_marginTop="8dp" app:layout_constraintTop_toBottomOf="@+id/rate_spinner"/>
+	<RatingBar
+			android:layout_width="240dp"
+			android:layout_height="46dp"
+			android:id="@+id/rate_star"
+			style="@style/Widget.AppCompat.RatingBar" android:layout_marginTop="16dp"
+			app:layout_constraintTop_toBottomOf="@+id/rate_img" app:layout_constraintEnd_toEndOf="@+id/rate_img"
+			android:layout_marginEnd="8dp" app:layout_constraintStart_toStartOf="@+id/rate_img"
+			android:layout_marginStart="8dp" app:layout_constraintHorizontal_bias="0.0"/>
+	<EditText
+			android:layout_width="0dp"
+			android:layout_height="126dp"
+			android:inputType="textMultiLine"
+			android:ems="10"
+			android:id="@+id/rate_note"
+			app:layout_constraintStart_toStartOf="parent" android:layout_marginStart="8dp"
+			android:layout_marginTop="20dp" app:layout_constraintTop_toBottomOf="@+id/rate_star"
+			app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="8dp"
+			app:layout_constraintHorizontal_bias="0.0" app:layout_constraintBottom_toBottomOf="parent"
+			android:layout_marginBottom="8dp" app:layout_constraintVertical_bias="0.0"/>
+	<Button
+			android:text="Submit"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:id="@+id/rate_submit" android:layout_marginTop="8dp"
+			app:layout_constraintTop_toBottomOf="@+id/rate_note" app:layout_constraintEnd_toEndOf="parent"
+			android:layout_marginEnd="8dp" app:layout_constraintStart_toStartOf="parent"
+			android:layout_marginStart="8dp"/>
+</android.support.constraint.ConstraintLayout>
\ 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 c1e6ef8..2bc0590 100644
--- a/MyCity/app/src/main/res/layout/fragment_vote.xml
+++ b/MyCity/app/src/main/res/layout/fragment_vote.xml
@@ -3,7 +3,8 @@
 											 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">
+											 tools:context=".votesFragment.VoteFragment" android:orientation="vertical"
+											 android:layout_marginTop="60dp">
 
 	<!-- TODO: Update blank fragment layout -->
 	<ImageView
diff --git a/server_side/api/modules/__pycache__/rating_system.cpython-37.pyc b/server_side/api/modules/__pycache__/rating_system.cpython-37.pyc
index d660d3afb7703903a0568089248c32facb5457a5..09609254c9115ec86a517d146f841a020d7b57eb 100644
GIT binary patch
delta 1467
zcmZ`&&2Jk;6rb6h{qXuDZc`ka1Ta<Nut*?LL{Uqd17F8VBt<PLm9_DVUAy+KnH`HN
ztmT7GAP|Q|fK(37kqZ(Wxo|=tAyu45{Rb-b#F28~&Fnf&k=WJz_I=L0x9>N18~19J
zH_K%Y!Sna8cRzgO{aE=8r+-=NGiNst{je8zuyVrV=Ibr^#y<lHB=EqXxPj()igV4-
zn$bg3^Uhbod>h^Td`c2R%?6^Rfu>e2L)O&JWyqO2iJe$=lwg8PbQ|$tpbTqDY=s1)
zk6MYN1B^W2Go?S_Hy7$4tAPM*jgCeajxKyhj<DM08cNJP<a>wh^jmjxHiRa{gtE(*
zmeNkkYv#`|3VTcMQrtQAN_Uwe3&)XQj5@Gq6iPz--L5qHRFW_lG0<7uk!F9?^9irO
z|KlrY23S?%DFEM+R(BW$f)mgr=|+4c9iELr+QE3tLh8Gc#BA8*YG%9$u<vpv+B6V>
zw6kDdR_2vVX)mkXuPzPCUcN^Luctp5S9c^CN3p0uTKp^kvMacPiQ(ardW|M-VuEe`
zo;D9lyID;ytE4MFN$1wqOHV@@uRjS5r4|65f)yJ8F4lVb3$6jnW~B#;UDATeSe$-h
zU%Y$<bnYmlt@;myZ*o<aEacVqDPL1DkB?HPNVCVpx%8pEd1+mFHxxXhprzn(u$FXP
zs?k?qE$dRcuIs=#Kl>9DffiU83-bsGGO!fSj|~31u(g))9OoLa8}5KXNs`gi;_p)H
zw#Bb1>V}?hs7;-@f%Q%cm%2xIYKlUFX`zmQo?ZhjJW)Khe4tHpaIYO7o*0Qqiy4na
zNt9`6ZhTpr5>XkfKq8@KTKU4n=o+Fc@1b3E9nmU1)yI2?o~Enn>z_INCM}cA^bdDh
z;#<(7wBk<0S$eZ@?iL9n!T57v<xPN`r2Bd{oWG##F9JyX@dL$AA4|I*QWlCU(iyQh
z4th*Fdy`HFWd1xv9In0}Gv1^Ti^FZvWOw?pi2Z8%PoXtiRXdseQ0Q4_L(-#HOp)f0
z!TpJV@6w?M?QtM(NivA_rJ9V!zNIOlJ2+Wb_r#p_h!rQ_fR&NjtpTYkxQ;!HOX&|@
z^TL0q^1l?`hCME-eR2wKr%v%x`z%=a>*?3Uckp_8zqqx39t_f%K+|n{z+Y4D3(7>`
yQd6$mQ-squfGfIjwXrM(l(spGqY3XYY4S;UqK}NP>5bB><&A2gy5Z>_D#pK$?oU?$

delta 1752
zcmZ`(&2Jnv6t_Jd&&Pf=X`7ENg>FKUG6f}25QsJe0Y#z`B+x`EihyXco@_Vl&MqDY
zM6}T!QdQyr5t?I*lw6Q{;J^*RAHWT9_J7b5J#avrc+a~eAqq3{&-U~4v)_Ba=if%}
zSITdeN+E&ohoA0$bi43l`BzFW=6~>!p5%AQDwpmuiG=ZP#k!H!vl>NR_}HMm1$}lF
zKvK!>5>0N9UAjZN6t+2w|55iqYZ=wA0MtpBd_0MYl2iyFwa6?w6(Zl^5BRt2GY)oK
z!y3}?G;Sq^%OtBAr_riMT;au40ilRc0(eLwX4vfWhJLQfC@klHIxD@u!}(?-)3tW1
zvoH?g4DT<*_N9Sev-L#J&Nth&xS1`$;9uQ{8c+3I2fI8=nj1#+1q1VV#xQ_!z{Dt;
z7660^;j`_+z<dww9|psP^#GcU-3AOa*@T#Brkz~~#2DFOT?Qes!Pw{0Ie;)h&ktyw
zNcVxe<7j8!?Sh;VEwm@aF54U3;o9E}wA1C%lm6EZCAWzTJ|MTqhXLt25Xf-*n_PQS
zJ&fdQ^L;ngaI!EHRtF!(_izm-3p3THt4r^%++13G<K06wNWh^Mj6tb-n%X1e%ZU_4
zJ@>TC85b^;WQKn6h{Gm`ylA8{N%dkBDwG($(N-<vG?P@FL$erdBjQdcNr4`1=!_@V
z*E+GjWB6v)PJu03txn{s^LBfz>X`{tyn<9-Ye+SMV!ClMlf2W;^dzihcmnYREiy(0
z_3?K?R-_l$c5#r}SyWz(-25J&egXB>3__oKha+T&!kpug8F~YziYmz86EEd~D?>Gg
z8c5CjOZVC<);}y5BhcwsM~-zuO`#eZId+0Ijz?e5AG=epUdGjD5F!M7r_-*3Wq1vm
ztp%T|D{z@5`d9v)81FsSLb6??m#6urE1@E>tU=0;NnI;tAQdQ;UYBv=kWXFpiSz-R
zDW@b2wJ!r1?lL5+EZF^Eb3c&90}50YvSei;P`*44uYo*sr$Y7%x~Pwd@F-axBlbG@
zSg@`mhaNypfZ38R%i%!{oY@?LeO#WE=LR)!-qrw-BXYC>?~)vo<Jd=)?eFv7*_4<=
z;=P{ldG|&PjctexT{mu4YpcZ2T0Y@lU8eW~wKdF>qg)N%pjAs<rLJPUUq+}PTmXou
zdIGvd<F%43i|dK;mbYp(7^`RV1HVFt^I!a#-bK(cZbvmz4Ub!@73RL5I!lG8aQY;|
zC4?%%1On1@K=3{{j_xpx>qm*VEJ1GGfR-UYNH7YFE<-CJjMEUXNc}txswY|Wzoec6
zJN6;N7Zq4Em;W4mC7y$cn#ga4Z_~^9UO2s41%dIlvP7-P^}Z8$Kf{~tSoX{LI_|+5
rQOHb%hD|Y+a!n;!drQ?4<EX9lm`B#P;k;aUu{1pt3{8gM3;gUK&Pi<|

diff --git a/server_side/api/modules/databases/ratings.json b/server_side/api/modules/databases/ratings.json
index fdeafe3..80245d4 100644
--- a/server_side/api/modules/databases/ratings.json
+++ b/server_side/api/modules/databases/ratings.json
@@ -33,6 +33,12 @@
                 "rater": "9vard12ty0ad2yvwp3q53rsf3h43r2vq",
                 "score": 3,
                 "note": "Not bad boiii"
+            },
+            {
+                "id": 5,
+                "rater": "9vard12ty0ad2yvwp3q53rsf3h43r2vq",
+                "score": 3,
+                "note": "Not bad boiii"
             }
         ]
     }
diff --git a/server_side/api/modules/rating_system.py b/server_side/api/modules/rating_system.py
index b8a069b..b98e992 100644
--- a/server_side/api/modules/rating_system.py
+++ b/server_side/api/modules/rating_system.py
@@ -19,14 +19,14 @@ with open(user_db, 'r') as f:
     users = json.load(f)
 
 class Ratings(Resource):
-    def get(self):
+    def post(self):
         """
         Example URL Query:
         latitude=<latitude>&
         longitude=<longitude>
         """
-        latitude = float(request.args['latitude'])
-        longitude = float(request.args['longitude'])
+        latitude = float(request.form['latitude'])
+        longitude = float(request.form['longitude'])
         ret_data = []
 
         for rating in ratings:
@@ -45,29 +45,6 @@ class Ratings(Resource):
 
         return ret_data
 
-    def post(self):
-        """
-        Example POST Data:
-        name=<rating_name>&
-        desc=<rating_desc>& # OPTIONAL
-        img=<rating_img>&   # OPTIONAL
-        """
-        args = request.form
-        rating_id = len(ratings) + 1
-        rating = {
-            'id': rating_id,
-            'name': args['name'],
-            'desc': args.get('desc'),
-            'img' : args.get('img'),
-            'rates': []
-        }
-
-        ratings.append(rating)
-
-        with open(db_path, 'w') as f:
-            json.dump(ratings, f, indent=4)
-
-        return rating
 
 class Rating(Resource):
     def get(self, rating_id):