Arreglado login con nuevo usuario

Close #53
martinlaizg · Jun 17, 2019 · e485a4b · e485a4b
1 parent b0f2897
commit e485a4b
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 8 deletions.
diff --git a/app/src/main/java/com/martinlaizg/geofind/views/activity/MainActivity.java b/app/src/main/java/com/martinlaizg/geofind/views/activity/MainActivity.java
@@ -61,12 +61,11 @@ protected void onCreate(Bundle savedInstanceState) {
 
 	public void setDrawerHeader(String username, String name, String image) {
 		View headerView = navigationView.getHeaderView(0);
-		if(username == null || name == null) {
-			((TextView) headerView.findViewById(R.id.drawer_header_name))
-					.setText(getString(R.string.your_account));
-			((TextView) headerView.findViewById(R.id.drawer_header_username))
-					.setText(getString(R.string.configure));
-			return;
+		if(name == null) {
+			name = getString(R.string.your_account);
+		}
+		if(username == null) {
+			username = getString(R.string.configure);
 		}
 		((TextView) headerView.findViewById(R.id.drawer_header_name)).setText(name);
 		((TextView) headerView.findViewById(R.id.drawer_header_username)).setText(username);

diff --git a/app/src/main/java/com/martinlaizg/geofind/views/fragment/list/TourListFragment.java b/app/src/main/java/com/martinlaizg/geofind/views/fragment/list/TourListFragment.java
@@ -1,5 +1,6 @@
 package com.martinlaizg.geofind.views.fragment.list;
 
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -12,14 +13,18 @@
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProviders;
 import androidx.navigation.Navigation;
+import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.martinlaizg.geofind.R;
+import com.martinlaizg.geofind.config.Preferences;
 import com.martinlaizg.geofind.data.access.api.error.ErrorType;
 import com.martinlaizg.geofind.data.access.api.service.exceptions.APIException;
+import com.martinlaizg.geofind.data.access.database.entities.User;
+import com.martinlaizg.geofind.data.enums.UserType;
 import com.martinlaizg.geofind.views.adapter.TourListAdapter;
 import com.martinlaizg.geofind.views.viewmodel.TourListViewModel;
 
@@ -61,8 +66,16 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 		viewModel = ViewModelProviders.of(this).get(TourListViewModel.class);
 		swipe_refresh.setRefreshing(true);
 		refreshTours();
-		create_tour_button
-				.setOnClickListener(Navigation.createNavigateOnClickListener(R.id.toCreator));
+		SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(requireContext());
+		User u = Preferences.getLoggedUser(sp);
+		if(u.getUser_type() != null && u.getUser_type() != UserType.USER) {
+			create_tour_button
+					.setOnClickListener(Navigation.createNavigateOnClickListener(R.id.toCreator));
+		} else {
+			create_tour_button.setOnClickListener(v -> Toast
+					.makeText(requireContext(), getString(R.string.no_permissions),
+					          Toast.LENGTH_SHORT).show());
+		}
 		swipe_refresh.setOnRefreshListener(this::refreshTours);
 	}
 

diff --git a/app/src/main/java/com/martinlaizg/geofind/views/fragment/login/LoginFragment.java b/app/src/main/java/com/martinlaizg/geofind/views/fragment/login/LoginFragment.java
@@ -121,6 +121,8 @@ private void login(Login login) {
 						password_input.setError(getString(R.string.wrong_password));
 						break;
 					case SECURE:
+						Toast.makeText(requireContext(), getString(R.string.wrong_login),
+						               Toast.LENGTH_SHORT).show();
 						break;
 					default:
 						Toast.makeText(requireContext(), getString(R.string.other_error),

diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
@@ -101,4 +101,5 @@
     <string name="wrong_answer">Wrong answer</string>
     <string name="ok">Ok</string>
     <string name="at_least_one_place">At least one place</string>
+    <string name="no_permissions">No has permission</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -101,4 +101,5 @@
     <string name="ok">Vale</string>
     <string name="wrong_answer">Respuesta incorrecta</string>
     <string name="wrong_tour">Tour incorrecto</string>
+    <string name="no_permissions">No tienes permisos</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -111,4 +111,5 @@
     <string name="wrong_answer">Wrong answer</string>
     <string name="ok">Ok</string>
     <string name="at_least_one_place">At least one place</string>
+    <string name="no_permissions">No has permission</string>
 </resources>