seavenois 10 лет назад
Родитель
Сommit
c0b8525abb

+ 3 - 3
app/build.gradle

@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "com.ivalentin.gm"
-        minSdkVersion 9
+        minSdkVersion 12
         targetSdkVersion 22
     }
 
@@ -19,7 +19,7 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:22.2.1'
-    compile 'com.android.support:appcompat-v7:22.2.1'
+    compile 'com.android.support:support-v4:23.4.0'
+    compile 'com.android.support:appcompat-v7:23.4.0'
     compile 'com.google.android.gms:play-services:+'
 }

+ 1 - 1
app/src/main/AndroidManifest.xml

@@ -16,7 +16,7 @@
     <uses-permission android:name="android.permission.VIBRATE"/>
     
     <uses-sdk
-        android:minSdkVersion="8"
+        android:minSdkVersion="12"
         android:targetSdkVersion="22" />
     
     <uses-feature

+ 2 - 2
app/src/main/java/com/ivalentin/gm/AboutLayout.java

@@ -2,7 +2,7 @@ package com.ivalentin.gm;
 
 import android.annotation.SuppressLint;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import android.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -21,7 +21,7 @@ public class AboutLayout extends Fragment{
 
 	/**
 	 * Run when the fragment is inflated.
-	 * Assigns views, gets the date and does the first call to the {@link populate function}.
+	 * Assigns views, gets the date and does the first call to the {@link @populate function}.
 	 * 
 	 * @param inflater A LayoutInflater to manage views
 	 * @param container The container View

+ 8 - 14
app/src/main/java/com/ivalentin/gm/ActivityFutureLayout.java

@@ -7,17 +7,14 @@ import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import android.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebView;
-import android.widget.Button;
-import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import java.io.File;
 import java.util.Locale;
@@ -27,9 +24,6 @@ import java.util.Locale;
  */
 public class ActivityFutureLayout extends Fragment {
 
-    //Main View
-    private View view;
-
     String currLang;
 
     Context context;
@@ -39,7 +33,7 @@ public class ActivityFutureLayout extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
         //Load the layout
-        view = inflater.inflate(R.layout.fragment_layout_activity_future, null);
+        View view = inflater.inflate(R.layout.fragment_layout_activity_future, null);
         context = view.getContext();
 
         //Get bundled id
@@ -89,18 +83,18 @@ public class ActivityFutureLayout extends Fragment {
 
             //Check if image exists
             File f;
-            f = new File(this.getContext().getFilesDir().toString() + "/img/actividades/preview/" + image);
+            f = new File(this.getActivity().getFilesDir().toString() + "/img/actividades/preview/" + image);
             if (f.exists()){
                 //If the image exists, set it.
-                Bitmap myBitmap = BitmapFactory.decodeFile(this.getContext().getFilesDir().toString() + "/img/actividades/preview/" + image);
+                Bitmap myBitmap = BitmapFactory.decodeFile(this.getActivity().getFilesDir().toString() + "/img/actividades/preview/" + image);
                 images[i].setImageBitmap(myBitmap);
             }
             else {
                 //If not, create directories and download asynchronously
                 File fpath;
-                fpath = new File(this.getContext().getFilesDir().toString() + "/img/actividades/preview/");
+                fpath = new File(this.getActivity().getFilesDir().toString() + "/img/actividades/preview/");
                 fpath.mkdirs();
-                new DownloadImage(GM.SERVER + "/img/actividades/preview/" + image, this.getContext().getFilesDir().toString() + "/img/actividades/preview/" + image, images[i]).execute();
+                new DownloadImage(GM.SERVER + "/img/actividades/preview/" + image, this.getActivity().getFilesDir().toString() + "/img/actividades/preview/" + image, images[i]).execute();
             }
             images[i].setVisibility(View.VISIBLE);
             i ++;
@@ -137,7 +131,7 @@ public class ActivityFutureLayout extends Fragment {
 
                 //Set description
                 TextView tvSchDescription = (TextView) entry.findViewById(R.id.tv_row_activity_itinerary_description);
-                if (cursor.getString(1).equals(cursor.getString(2)) == false){
+                if (!cursor.getString(1).equals(cursor.getString(2))){
                     tvSchDescription.setVisibility(View.GONE);
                 }
                 else {
@@ -150,7 +144,7 @@ public class ActivityFutureLayout extends Fragment {
 
                 //Set address
                 TextView tvSchAddress = (TextView) entry.findViewById(R.id.tv_row_activity_itinerary_address);
-                if (cursor.getString(4).equals(cursor.getString(5)) == false){
+                if (!cursor.getString(4).equals(cursor.getString(5))){
                     tvSchAddress.setVisibility(View.GONE);
                 }
                 else {

+ 13 - 13
app/src/main/java/com/ivalentin/gm/ActivityLayout.java

@@ -8,9 +8,9 @@ import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -128,17 +128,17 @@ public class ActivityLayout extends Fragment{
 
                     //Check if image exists
                     File f;
-                    f = new File(this.getContext().getFilesDir().toString() + "/img/actividades/miniature/" + image);
+                    f = new File(this.getActivity().getFilesDir().toString() + "/img/actividades/miniature/" + image);
                     if (f.exists()) {
                         //If the image exists, set it.
-                        Bitmap myBitmap = BitmapFactory.decodeFile(this.getContext().getFilesDir().toString() + "/img/actividades/miniature/" + image);
+                        Bitmap myBitmap = BitmapFactory.decodeFile(this.getActivity().getFilesDir().toString() + "/img/actividades/miniature/" + image);
                         iv.setImageBitmap(myBitmap);
                     } else {
                         //If not, create directories and download asynchronously
                         File fpath;
-                        fpath = new File(this.getContext().getFilesDir().toString() + "/img/actividades/miniature/");
+                        fpath = new File(this.getActivity().getFilesDir().toString() + "/img/actividades/miniature/");
                         fpath.mkdirs();
-                        new DownloadImage(GM.SERVER + "/img/actividades/miniature/" + image, this.getContext().getFilesDir().toString() + "/img/actividades/miniature/" + image, iv).execute();
+                        new DownloadImage(GM.SERVER + "/img/actividades/miniature/" + image, this.getActivity().getFilesDir().toString() + "/img/actividades/miniature/" + image, iv).execute();
                     }
                 }
 
@@ -154,7 +154,7 @@ public class ActivityLayout extends Fragment{
                         bundle.putInt("activity", id);
                         fragment.setArguments(bundle);
 
-                        FragmentManager fm = ActivityLayout.this.getActivity().getSupportFragmentManager();
+                        FragmentManager fm = ActivityLayout.this.getActivity().getFragmentManager();
                         FragmentTransaction ft = fm.beginTransaction();
 
                         ft.replace(R.id.activity_main_content_fragment, fragment);
@@ -219,17 +219,17 @@ public class ActivityLayout extends Fragment{
 
                 //Check if image exists
                 File f;
-                f = new File(this.getContext().getFilesDir().toString() + "/img/actividades/miniature/" + image);
+                f = new File(this.getActivity().getFilesDir().toString() + "/img/actividades/miniature/" + image);
                 if (f.exists()) {
                     //If the image exists, set it.
-                    Bitmap myBitmap = BitmapFactory.decodeFile(this.getContext().getFilesDir().toString() + "/img/actividades/miniature/" + image);
+                    Bitmap myBitmap = BitmapFactory.decodeFile(this.getActivity().getFilesDir().toString() + "/img/actividades/miniature/" + image);
                     iv.setImageBitmap(myBitmap);
                 } else {
                     //If not, create directories and download asynchronously
                     File fpath;
-                    fpath = new File(this.getContext().getFilesDir().toString() + "/img/actividades/miniature/");
+                    fpath = new File(this.getActivity().getFilesDir().toString() + "/img/actividades/miniature/");
                     fpath.mkdirs();
-                    new DownloadImage(GM.SERVER + "/img/actividades/miniature/" + image, this.getContext().getFilesDir().toString() + "/img/actividades/miniature/" + image, iv).execute();
+                    new DownloadImage(GM.SERVER + "/img/actividades/miniature/" + image, this.getActivity().getFilesDir().toString() + "/img/actividades/miniature/" + image, iv).execute();
                 }
             }
 
@@ -245,7 +245,7 @@ public class ActivityLayout extends Fragment{
                 bundle.putInt("activity", id);
                 fragment.setArguments(bundle);
 
-                FragmentManager fm = ActivityLayout.this.getActivity().getSupportFragmentManager();
+                FragmentManager fm = ActivityLayout.this.getActivity().getFragmentManager();
                 FragmentTransaction ft = fm.beginTransaction();
 
                 ft.replace(R.id.activity_main_content_fragment, fragment);

+ 5 - 9
app/src/main/java/com/ivalentin/gm/ActivityPastLayout.java

@@ -7,17 +7,13 @@ import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import android.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebView;
-import android.widget.Button;
-import android.widget.EditText;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import java.io.File;
 import java.util.Locale;
@@ -93,18 +89,18 @@ public class ActivityPastLayout extends Fragment {
 
             //Check if image exists
             File f;
-            f = new File(this.getContext().getFilesDir().toString() + "/img/actividades/preview/" + image);
+            f = new File(this.getActivity().getFilesDir().toString() + "/img/actividades/preview/" + image);
             if (f.exists()){
                 //If the image exists, set it.
-                Bitmap myBitmap = BitmapFactory.decodeFile(this.getContext().getFilesDir().toString() + "/img/actividades/preview/" + image);
+                Bitmap myBitmap = BitmapFactory.decodeFile(this.getActivity().getFilesDir().toString() + "/img/actividades/preview/" + image);
                 images[i].setImageBitmap(myBitmap);
             }
             else {
                 //If not, create directories and download asynchronously
                 File fpath;
-                fpath = new File(this.getContext().getFilesDir().toString() + "/img/actividades/preview/");
+                fpath = new File(this.getActivity().getFilesDir().toString() + "/img/actividades/preview/");
                 fpath.mkdirs();
-                new DownloadImage(GM.SERVER + "/img/actividades/preview/" + image, this.getContext().getFilesDir().toString() + "/img/actividades/preview/" + image, images[i]).execute();
+                new DownloadImage(GM.SERVER + "/img/actividades/preview/" + image, this.getActivity().getFilesDir().toString() + "/img/actividades/preview/" + image, images[i]).execute();
             }
             images[i].setVisibility(View.VISIBLE);
             i ++;

+ 5 - 3
app/src/main/java/com/ivalentin/gm/AlarmReceiver.java

@@ -17,19 +17,21 @@ import android.content.pm.PackageManager;
 import android.graphics.BitmapFactory;
 import android.media.RingtoneManager;
 import android.support.v4.app.NotificationCompat;
+//import android.app.Notification;
 import android.support.v4.app.TaskStackBuilder;
-import android.support.v4.content.WakefulBroadcastReceiver;
+//import android.content.WakefulBroadcastReceiver;
+import android.content.BroadcastReceiver;
 import android.util.Log;
 
 /**
  * Manages alarms to perform actions in the background, such as sync and receive notifications.
  * 
- * @see WakefulBroadcastReceiver
+ * @see BroadcastReceiver
  * 
  * @author Iñigo Valentin
  *
  */
-public class AlarmReceiver extends WakefulBroadcastReceiver {
+public class AlarmReceiver extends BroadcastReceiver {
 	
     // The app's AlarmManager, which provides access to the system alarm services.
     private AlarmManager alarmMgr;

+ 13 - 13
app/src/main/java/com/ivalentin/gm/AlbumLayout.java

@@ -7,9 +7,9 @@ import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -110,18 +110,18 @@ public class AlbumLayout extends Fragment {
 
             //Check if image exists
             File f;
-            f = new File(this.getContext().getFilesDir().toString() + "/img/galeria/preview/" + image);
+            f = new File(this.getActivity().getFilesDir().toString() + "/img/galeria/preview/" + image);
             if (f.exists()){
                 //If the image exists, set it.
-                Bitmap myBitmap = BitmapFactory.decodeFile(this.getContext().getFilesDir().toString() + "/img/galeria/preview/" + image);
+                Bitmap myBitmap = BitmapFactory.decodeFile(this.getActivity().getFilesDir().toString() + "/img/galeria/preview/" + image);
                 ivLeft.setImageBitmap(myBitmap);
             }
             else {
                 //If not, create directories and download asynchronously
                 File fpath;
-                fpath = new File(this.getContext().getFilesDir().toString() + "/img/galeria/preview/");
+                fpath = new File(this.getActivity().getFilesDir().toString() + "/img/galeria/preview/");
                 fpath.mkdirs();
-                new DownloadImage(GM.SERVER + "/img/galeria/preview/" + image, this.getContext().getFilesDir().toString() + "/img/galeria/preview/" + image, ivLeft).execute();
+                new DownloadImage(GM.SERVER + "/img/galeria/preview/" + image, this.getActivity().getFilesDir().toString() + "/img/galeria/preview/" + image, ivLeft).execute();
             }
 
 			//Count comments
@@ -143,7 +143,7 @@ public class AlbumLayout extends Fragment {
 				bundle.putString("albumName", albumName);
 				fragment.setArguments(bundle);
 
-				FragmentManager fm = AlbumLayout.this.getActivity().getSupportFragmentManager();
+				FragmentManager fm = AlbumLayout.this.getActivity().getFragmentManager();
 				FragmentTransaction ft = fm.beginTransaction();
 
 				ft.replace(R.id.activity_main_content_fragment, fragment);
@@ -175,18 +175,18 @@ public class AlbumLayout extends Fragment {
                 ImageView ivRight = (ImageView) entry.findViewById(R.id.iv_row_album_right);
                 image = imageCursor.getString(2);
                 //Check if image exists
-                f = new File(this.getContext().getFilesDir().toString() + "/img/galeria/preview/" + image);
+                f = new File(this.getActivity().getFilesDir().toString() + "/img/galeria/preview/" + image);
                 if (f.exists()){
                     //If the image exists, set it.
-                    Bitmap myBitmap = BitmapFactory.decodeFile(this.getContext().getFilesDir().toString() + "/img/galeria/preview/" + image);
+                    Bitmap myBitmap = BitmapFactory.decodeFile(this.getActivity().getFilesDir().toString() + "/img/galeria/preview/" + image);
                     ivRight.setImageBitmap(myBitmap);
                 }
                 else {
                     //If not, create directories and download asynchronously
                     File fpath;
-                    fpath = new File(this.getContext().getFilesDir().toString() + "/img/galeria/preview/");
+                    fpath = new File(this.getActivity().getFilesDir().toString() + "/img/galeria/preview/");
                     fpath.mkdirs();
-                    new DownloadImage(GM.SERVER + "/img/galeria/preview/" + image, this.getContext().getFilesDir().toString() + "/img/galeria/preview/" + image, ivRight).execute();
+                    new DownloadImage(GM.SERVER + "/img/galeria/preview/" + image, this.getActivity().getFilesDir().toString() + "/img/galeria/preview/" + image, ivRight).execute();
                 }
 
 				//Count comments
@@ -207,7 +207,7 @@ public class AlbumLayout extends Fragment {
 					bundle.putString("albumName", albumName);
 					fragment.setArguments(bundle);
 
-					FragmentManager fm = AlbumLayout.this.getActivity().getSupportFragmentManager();
+					FragmentManager fm = AlbumLayout.this.getActivity().getFragmentManager();
 					FragmentTransaction ft = fm.beginTransaction();
 
 					ft.replace(R.id.activity_main_content_fragment, fragment);

+ 10 - 8
app/src/main/java/com/ivalentin/gm/AroundLayout.java

@@ -1,3 +1,5 @@
+//TODO: Rework this file
+
 package com.ivalentin.gm;
 
 import java.text.DecimalFormat;
@@ -33,8 +35,8 @@ import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.res.ResourcesCompat;
+import android.app.Fragment;
+//import android.support.v4.content.res.ResourcesCompat;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -106,7 +108,7 @@ public class AroundLayout extends Fragment implements LocationListener, OnMapRea
 	
 	/**
 	 * Run when the fragment is inflated.
-	 * Assigns views, gets the date and does the first call to the {@link populate function}.
+	 * Assigns views, gets the date and does the first call to the {@link @populate function}.
 	 * 
 	 * @param inflater A LayoutInflater to manage views
 	 * @param container The container View
@@ -209,7 +211,7 @@ public class AroundLayout extends Fragment implements LocationListener, OnMapRea
         TextView tvRowTitle, tvRowDescription, tvRowAddress, tvRowDistance, tvRowTime, tvRowId;
         
         //Icon next to the location text
-        Drawable icon = ResourcesCompat.getDrawable(getResources(), R.drawable.pinpoint, null);
+        Drawable icon = getResources().getDrawable(R.drawable.pinpoint);
         icon.setBounds(0, 0, 80, 80);
 				
 		//Read from database
@@ -271,7 +273,7 @@ public class AroundLayout extends Fragment implements LocationListener, OnMapRea
 				
 			}
 			catch (ParseException e){
-				Log.e("Error parsing date for around event", e.toString());
+				Log.e("Error parsing date", e.toString());
 			}
         }
         
@@ -424,7 +426,7 @@ public class AroundLayout extends Fragment implements LocationListener, OnMapRea
 				}
 			}
 			catch (Exception ex){
-				Log.e("Error parsing around event date", ex.toString());
+				Log.e("Error parsing date", ex.toString());
 			}
 			
 			//Set time
@@ -435,7 +437,7 @@ public class AroundLayout extends Fragment implements LocationListener, OnMapRea
 					tvTime.setText(timeFormat.format(dateFormat.parse(cursor.getString(3))) + " - " + timeFormat.format(timeFormat.parse(cursor.getString(4))));
 			}
 			catch (ParseException ex){
-				Log.e("Error parsing around event time", ex.toString());
+				Log.e("Error parsing time", ex.toString());
 			}
 			
 			//Set place
@@ -570,7 +572,7 @@ public class AroundLayout extends Fragment implements LocationListener, OnMapRea
 			CameraUpdate cameraUpdate = CameraUpdateFactory.newLatLngZoom(location, 14);
 			map.animateCamera(cameraUpdate);
 		} catch (Exception e) {
-			Log.e("Error initializing mapss", e.toString());
+			Log.e("Error initializing maps", e.toString());
 		}
 		//Set GM marker
 		MarkerOptions mo = new MarkerOptions();

+ 8 - 10
app/src/main/java/com/ivalentin/gm/BlogLayout.java

@@ -7,11 +7,10 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.location.LocationManager;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
 import android.text.Html;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -21,7 +20,6 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.view.ViewGroup;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import java.io.File;
 import java.util.Locale;
@@ -197,18 +195,18 @@ public class BlogLayout extends Fragment{
 
                 //Check if image exists
                 File f;
-                f = new File(this.getContext().getFilesDir().toString() + "/img/blog/miniature/" + image);
+                f = new File(this.getActivity().getFilesDir().toString() + "/img/blog/miniature/" + image);
                 if (f.exists()){
                     //If the image exists, set it.
-                    Bitmap myBitmap = BitmapFactory.decodeFile(this.getContext().getFilesDir().toString() + "/img/blog/miniature/" + image);
+                    Bitmap myBitmap = BitmapFactory.decodeFile(this.getActivity().getFilesDir().toString() + "/img/blog/miniature/" + image);
                     iv.setImageBitmap(myBitmap);
                 }
                 else {
                     //If not, create directories and download asynchronously
                     File fpath;
-                    fpath = new File(this.getContext().getFilesDir().toString() + "/img/blog/miniature/");
+                    fpath = new File(this.getActivity().getFilesDir().toString() + "/img/blog/miniature/");
                     fpath.mkdirs();
-                    new DownloadImage(GM.SERVER + "/img/blog/miniature/" + image, this.getContext().getFilesDir().toString() + "/img/blog/miniature/" + image, iv).execute();
+                    new DownloadImage(GM.SERVER + "/img/blog/miniature/" + image, this.getActivity().getFilesDir().toString() + "/img/blog/miniature/" + image, iv).execute();
                 }
             }
 
@@ -229,7 +227,7 @@ public class BlogLayout extends Fragment{
                 bundle.putInt("post", id);
                 fragment.setArguments(bundle);
 
-                FragmentManager fm = BlogLayout.this.getActivity().getSupportFragmentManager();
+                FragmentManager fm = BlogLayout.this.getActivity().getFragmentManager();
                 FragmentTransaction ft = fm.beginTransaction();
 
                 ft.replace(R.id.activity_main_content_fragment, fragment);

+ 1 - 1
app/src/main/java/com/ivalentin/gm/BootReceiver.java

@@ -7,7 +7,7 @@ import android.content.Intent;
 /**
  * Broadcast receiver that receives the BOOT_COMPLETED event and sets an alarm.
  * 
- * @see BroadCastReceiver
+ * @see @android.content.BroadCastReceiver
  * 
  * @author Iñigo Valentin
  *

+ 8 - 11
app/src/main/java/com/ivalentin/gm/GalleryLayout.java

@@ -8,10 +8,9 @@ import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.text.Html;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -117,18 +116,18 @@ public class GalleryLayout extends Fragment{
 
                 //Check if image exists
                 File f;
-                f = new File(this.getContext().getFilesDir().toString() + "/img/galeria/miniature/" + image);
+                f = new File(this.getActivity().getFilesDir().toString() + "/img/galeria/miniature/" + image);
                 if (f.exists()){
                     //If the image exists, set it.
-                    Bitmap myBitmap = BitmapFactory.decodeFile(this.getContext().getFilesDir().toString() + "/img/galeria/miniature/" + image);
+                    Bitmap myBitmap = BitmapFactory.decodeFile(this.getActivity().getFilesDir().toString() + "/img/galeria/miniature/" + image);
                     preview[i].setImageBitmap(myBitmap);
                 }
                 else {
                     //If not, create directories and download asynchronously
                     File fpath;
-                    fpath = new File(this.getContext().getFilesDir().toString() + "/img/galeria/miniature/");
+                    fpath = new File(this.getActivity().getFilesDir().toString() + "/img/galeria/miniature/");
                     fpath.mkdirs();
-                    new DownloadImage(GM.SERVER + "/img/galeria/miniature/" + image, this.getContext().getFilesDir().toString() + "/img/galeria/miniature/" + image, preview[i]).execute();
+                    new DownloadImage(GM.SERVER + "/img/galeria/miniature/" + image, this.getActivity().getFilesDir().toString() + "/img/galeria/miniature/" + image, preview[i]).execute();
                 }
                 i ++;
 
@@ -139,8 +138,6 @@ public class GalleryLayout extends Fragment{
             entry.setOnClickListener(new View.OnClickListener(){
                 @Override
                 public void onClick(View v) {
-                    //Toast.makeText(getActivity(), "OPENING POST", Toast.LENGTH_LONG).show();
-                    //TODO: Change
                     Fragment fragment = new AlbumLayout();
                     Bundle bundle = new Bundle();
                     //Pass post id
@@ -148,7 +145,7 @@ public class GalleryLayout extends Fragment{
                     bundle.putInt("album", id);
                     fragment.setArguments(bundle);
 
-                    FragmentManager fm = GalleryLayout.this.getActivity().getSupportFragmentManager();
+                    FragmentManager fm = GalleryLayout.this.getActivity().getFragmentManager();
                     FragmentTransaction ft = fm.beginTransaction();
 
                     ft.replace(R.id.activity_main_content_fragment, fragment);

+ 23 - 23
app/src/main/java/com/ivalentin/gm/HomeLayout.java

@@ -24,13 +24,13 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.support.v4.app.Fragment;
+import android.app.Fragment;
 import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.Bundle;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
 import android.text.Html;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -228,17 +228,17 @@ public class HomeLayout extends Fragment implements LocationListener, OnMapReady
 			String image = cursor.getString(2);
 			//Check if image exists
 			File f;
-			f = new File(this.getContext().getFilesDir().toString() + "/img/galeria/preview/" + image);
+			f = new File(this.getActivity().getFilesDir().toString() + "/img/galeria/preview/" + image);
 			if (f.exists()) {
 				//If the image exists, set it.
-				Bitmap myBitmap = BitmapFactory.decodeFile(this.getContext().getFilesDir().toString() + "/img/galeria/preview/" + image);
+				Bitmap myBitmap = BitmapFactory.decodeFile(this.getActivity().getFilesDir().toString() + "/img/galeria/preview/" + image);
 				ivPhoto[counter].setImageBitmap(myBitmap);
 			} else {
 				//If not, create directories and download asynchronously
 				File fpath;
-				fpath = new File(this.getContext().getFilesDir().toString() + "/img/galeria/preview/");
+				fpath = new File(this.getActivity().getFilesDir().toString() + "/img/galeria/preview/");
 				fpath.mkdirs();
-				new DownloadImage(GM.SERVER + "/img/galeria/preview/" + image, this.getContext().getFilesDir().toString() + "/img/galeria/preview/" + image, ivPhoto[counter]).execute();
+				new DownloadImage(GM.SERVER + "/img/galeria/preview/" + image, this.getActivity().getFilesDir().toString() + "/img/galeria/preview/" + image, ivPhoto[counter]).execute();
 			}
 
 			//Set listeners for images
@@ -256,7 +256,7 @@ public class HomeLayout extends Fragment implements LocationListener, OnMapReady
 
 					fragment.setArguments(bundle);
 
-					FragmentManager fm = HomeLayout.this.getActivity().getSupportFragmentManager();
+					FragmentManager fm = HomeLayout.this.getActivity().getFragmentManager();
 					FragmentTransaction ft = fm.beginTransaction();
 
 					ft.replace(R.id.activity_main_content_fragment, fragment);
@@ -361,17 +361,17 @@ public class HomeLayout extends Fragment implements LocationListener, OnMapReady
 
 				//Check if image exists
 				File f;
-				f = new File(this.getContext().getFilesDir().toString() + "/img/actividades/miniature/" + image);
+				f = new File(this.getActivity().getFilesDir().toString() + "/img/actividades/miniature/" + image);
 				if (f.exists()) {
 					//If the image exists, set it.
-					Bitmap myBitmap = BitmapFactory.decodeFile(this.getContext().getFilesDir().toString() + "/img/actividades/miniature/" + image);
+					Bitmap myBitmap = BitmapFactory.decodeFile(this.getActivity().getFilesDir().toString() + "/img/actividades/miniature/" + image);
 					iv.setImageBitmap(myBitmap);
 				} else {
 					//If not, create directories and download asynchronously
 					File fpath;
-					fpath = new File(this.getContext().getFilesDir().toString() + "/img/actividades/miniature/");
+					fpath = new File(this.getActivity().getFilesDir().toString() + "/img/actividades/miniature/");
 					fpath.mkdirs();
-					new DownloadImage(GM.SERVER + "/img/actividades/miniature/" + image, this.getContext().getFilesDir().toString() + "/img/actividades/miniature/" + image, iv).execute();
+					new DownloadImage(GM.SERVER + "/img/actividades/miniature/" + image, this.getActivity().getFilesDir().toString() + "/img/actividades/miniature/" + image, iv).execute();
 				}
 			}
 			cursorImage.close();
@@ -388,7 +388,7 @@ public class HomeLayout extends Fragment implements LocationListener, OnMapReady
 				bundle.putInt("activity", id);
 				fragment.setArguments(bundle);
 
-				FragmentManager fm = HomeLayout.this.getActivity().getSupportFragmentManager();
+				FragmentManager fm = HomeLayout.this.getActivity().getFragmentManager();
 				FragmentTransaction ft = fm.beginTransaction();
 
 				ft.replace(R.id.activity_main_content_fragment, fragment);
@@ -492,17 +492,17 @@ public class HomeLayout extends Fragment implements LocationListener, OnMapReady
 
 					//Check if image exists
 					File f;
-					f = new File(this.getContext().getFilesDir().toString() + "/img/actividades/miniature/" + image);
+					f = new File(this.getActivity().getFilesDir().toString() + "/img/actividades/miniature/" + image);
 					if (f.exists()) {
 						//If the image exists, set it.
-						Bitmap myBitmap = BitmapFactory.decodeFile(this.getContext().getFilesDir().toString() + "/img/actividades/miniature/" + image);
+						Bitmap myBitmap = BitmapFactory.decodeFile(this.getActivity().getFilesDir().toString() + "/img/actividades/miniature/" + image);
 						iv.setImageBitmap(myBitmap);
 					} else {
 						//If not, create directories and download asynchronously
 						File fpath;
-						fpath = new File(this.getContext().getFilesDir().toString() + "/img/actividades/miniature/");
+						fpath = new File(this.getActivity().getFilesDir().toString() + "/img/actividades/miniature/");
 						fpath.mkdirs();
-						new DownloadImage(GM.SERVER + "/img/actividades/miniature/" + image, this.getContext().getFilesDir().toString() + "/img/actividades/miniature/" + image, iv).execute();
+						new DownloadImage(GM.SERVER + "/img/actividades/miniature/" + image, this.getActivity().getFilesDir().toString() + "/img/actividades/miniature/" + image, iv).execute();
 					}
 				}
 
@@ -520,7 +520,7 @@ public class HomeLayout extends Fragment implements LocationListener, OnMapReady
 						bundle.putInt("activity", id);
 						fragment.setArguments(bundle);
 
-						FragmentManager fm = HomeLayout.this.getActivity().getSupportFragmentManager();
+						FragmentManager fm = HomeLayout.this.getActivity().getFragmentManager();
 						FragmentTransaction ft = fm.beginTransaction();
 
 						ft.replace(R.id.activity_main_content_fragment, fragment);
@@ -613,18 +613,18 @@ public class HomeLayout extends Fragment implements LocationListener, OnMapReady
 
 				//Check if image exists
 				File f;
-				f = new File(this.getContext().getFilesDir().toString() + "/img/blog/miniature/" + image);
+				f = new File(this.getActivity().getFilesDir().toString() + "/img/blog/miniature/" + image);
 				if (f.exists()){
 					//If the image exists, set it.
-					Bitmap myBitmap = BitmapFactory.decodeFile(this.getContext().getFilesDir().toString() + "/img/blog/miniature/" + image);
+					Bitmap myBitmap = BitmapFactory.decodeFile(this.getActivity().getFilesDir().toString() + "/img/blog/miniature/" + image);
 					iv.setImageBitmap(myBitmap);
 				}
 				else {
 					//If not, create directories and download asynchronously
 					File fpath;
-					fpath = new File(this.getContext().getFilesDir().toString() + "/img/blog/miniature/");
+					fpath = new File(this.getActivity().getFilesDir().toString() + "/img/blog/miniature/");
 					fpath.mkdirs();
-					new DownloadImage(GM.SERVER + "/img/blog/miniature/" + image, this.getContext().getFilesDir().toString() + "/img/blog/miniature/" + image, iv).execute();
+					new DownloadImage(GM.SERVER + "/img/blog/miniature/" + image, this.getActivity().getFilesDir().toString() + "/img/blog/miniature/" + image, iv).execute();
 				}
 			}
 
@@ -641,7 +641,7 @@ public class HomeLayout extends Fragment implements LocationListener, OnMapReady
 				bundle.putInt("post", id);
 				fragment.setArguments(bundle);
 
-				FragmentManager fm = HomeLayout.this.getActivity().getSupportFragmentManager();
+				FragmentManager fm = HomeLayout.this.getActivity().getFragmentManager();
 				FragmentTransaction ft = fm.beginTransaction();
 
 				ft.replace(R.id.activity_main_content_fragment, fragment);

+ 1 - 1
app/src/main/java/com/ivalentin/gm/LablancaLayout.java

@@ -1,6 +1,6 @@
 package com.ivalentin.gm;
 
-import android.support.v4.app.Fragment;
+import android.app.Fragment;
 
 /**
  * Created by seavenois on 09/06/16.

+ 1 - 1
app/src/main/java/com/ivalentin/gm/LocationLayout.java

@@ -20,7 +20,7 @@ import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import android.app.Fragment;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

+ 20 - 15
app/src/main/java/com/ivalentin/gm/MainActivity.java

@@ -4,10 +4,11 @@ import java.io.File;
 import java.math.BigInteger;
 import java.security.SecureRandom;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.content.res.ResourcesCompat;
+import android.app.Activity;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
+//import android.content.res.ResourcesCompat;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -18,7 +19,7 @@ import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+//import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.view.Window;
@@ -34,9 +35,11 @@ import android.widget.TextView;
  * @author Iñigo Valentin
  *
  */
-public class MainActivity extends AppCompatActivity implements LocationListener{
-		
-	//Set of GPS coordinates
+public class MainActivity extends Activity implements LocationListener{
+	//public class MainActivity extends AppCompatActivity implements LocationListener{
+
+
+		//Set of GPS coordinates
 	private double[] coordinates = new double[2];
 	
 	//The main layout of the app
@@ -58,7 +61,7 @@ public class MainActivity extends AppCompatActivity implements LocationListener{
 	 * @param fromSliderMenu Indicates if the call has been made from the slider menu, so it can be closed.
 	 */
 	public void loadSection (byte section, boolean fromSliderMenu){
-		FragmentManager fm = MainActivity.this.getSupportFragmentManager();
+		FragmentManager fm = MainActivity.this.getFragmentManager();
 		FragmentTransaction ft = fm.beginTransaction();
 		Fragment fragment = null;
 		String title = "";
@@ -158,7 +161,7 @@ public class MainActivity extends AppCompatActivity implements LocationListener{
 	 * @param title The title of the current section.
 	 */
 	public void setSectionTitle(String title){
-		TextView tvTitle = (TextView) findViewById(R.id.activity_main_content_title); 
+		TextView tvTitle = (TextView) findViewById(R.id.activity_main_content_title);
 		tvTitle.setText(title);
 	}
 	
@@ -266,7 +269,7 @@ public class MainActivity extends AppCompatActivity implements LocationListener{
 		alarm.onReceive(this, this.getIntent());
 		
 		//Remove title bar.
-	    this.supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
+	    this.requestWindowFeature(Window.FEATURE_NO_TITLE);
 	    super.onCreate(savedInstanceState);
 	    
 	    //Set layout.
@@ -408,10 +411,12 @@ public class MainActivity extends AppCompatActivity implements LocationListener{
 					btDialogAction = (Button) dialog.findViewById(R.id.bt_dialog_notification_action);
 					if (action != null){
 						switch (action) {
+
+							//TODO: In here, load the icon the same way I do with photos
 							//If the notification action opens the GM schedule
 							case GM.EXTRA_ACTION_GM:
 								//Set the icon
-								dialogIcon = ResourcesCompat.getDrawable(getResources(), R.drawable.icon_gm, null);
+								dialogIcon = getResources().getDrawable(R.drawable.icon_gm);
 								dialogIcon.setBounds(0, 0, (int) (tvDialogTitle.getTextSize() * 1.4), (int) (tvDialogTitle.getTextSize() * 1.4));
 								tvDialogTitle.setCompoundDrawables(dialogIcon, null, null, null);
 								tvDialogTitle.setCompoundDrawablePadding(20);
@@ -432,7 +437,7 @@ public class MainActivity extends AppCompatActivity implements LocationListener{
 							//If the notification action opens the city schedule
 							case GM.EXTRA_ACTION_SCHEDULE:
 								//Set the icon
-								dialogIcon = ResourcesCompat.getDrawable(getResources(), R.drawable.icon_program, null);
+								dialogIcon = getResources().getDrawable(R.drawable.icon_program);
 								dialogIcon.setBounds(0, 0, (int) (tvDialogTitle.getTextSize() * 1.4), (int) (tvDialogTitle.getTextSize() * 1.4));
 								tvDialogTitle.setCompoundDrawables(dialogIcon, null, null, null);
 								tvDialogTitle.setCompoundDrawablePadding(20);
@@ -453,7 +458,7 @@ public class MainActivity extends AppCompatActivity implements LocationListener{
 							//If the notification is just text
 							default:
 								//Set the icon
-								dialogIcon = ResourcesCompat.getDrawable(getResources(), R.drawable.icon_about, null);
+								dialogIcon = getResources().getDrawable(R.drawable.icon_about);
 								dialogIcon.setBounds(0, 0, (int) (tvDialogTitle.getTextSize() * 1.4), (int) (tvDialogTitle.getTextSize() * 1.4));
 								tvDialogTitle.setCompoundDrawables(dialogIcon, null, null, null);
 								tvDialogTitle.setCompoundDrawablePadding(20);
@@ -557,7 +562,7 @@ public class MainActivity extends AppCompatActivity implements LocationListener{
 	 */
 	@Override
 	public void onBackPressed(){
-		FragmentManager fm = getSupportFragmentManager();
+		FragmentManager fm = getFragmentManager();
 		if (fm.getBackStackEntryCount() > 1){
 			fm.popBackStack();
 		}

+ 32 - 5
app/src/main/java/com/ivalentin/gm/PhotoLayout.java

@@ -1,13 +1,13 @@
 package com.ivalentin.gm;
 
 import android.annotation.SuppressLint;
+import android.app.Fragment;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -58,6 +58,27 @@ public class PhotoLayout extends Fragment {
 		photos = loadPhotos(id);
 		position = getPosition(photos, id);
 
+		//Assign next/previous buttons listener
+		Button btnPrevious = (Button) view.findViewById(R.id.bt_photo_previous);
+		Button btnNext = (Button) view.findViewById(R.id.bt_photo_next);
+		btnPrevious.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				if (position > 0){
+					position --;
+					populate(position);
+				}
+			}
+		});
+		btnNext.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				if (position < photos.length - 1){
+					position ++;
+					populate(position);
+				}
+			}
+		});
 
 		populate(id, view);
 
@@ -117,9 +138,15 @@ public class PhotoLayout extends Fragment {
 		cursor.close();
 		db.close();
 
+		//Set listeners for previous, next buttons
+
 		return list;
 	}
 
+	private void populate(int id){
+		populate(id, view);
+	}
+
 	private void populate(int id, View v){
 
 		final int photoId = id;
@@ -168,18 +195,18 @@ public class PhotoLayout extends Fragment {
 
 		//Check if image exists
 		File f;
-		f = new File(this.getContext().getFilesDir().toString() + "/img/galeria/preview/" + image);
+		f = new File(this.getActivity().getFilesDir().toString() + "/img/galeria/preview/" + image);
 		if (f.exists()){
 			//If the image exists, set it.
-			Bitmap myBitmap = BitmapFactory.decodeFile(this.getContext().getFilesDir().toString() + "/img/galeria/preview/" + image);
+			Bitmap myBitmap = BitmapFactory.decodeFile(this.getActivity().getFilesDir().toString() + "/img/galeria/preview/" + image);
 			imageView.setImageBitmap(myBitmap);
 		}
 		else {
 			//If not, create directories and download asynchronously
 			File fpath;
-			fpath = new File(this.getContext().getFilesDir().toString() + "/img/galeria/preview/");
+			fpath = new File(this.getActivity().getFilesDir().toString() + "/img/galeria/preview/");
 			fpath.mkdirs();
-			new DownloadImage(GM.SERVER + "/img/galeria/preview/" + image, this.getContext().getFilesDir().toString() + "/img/galeria/preview/" + image, imageView).execute();
+			new DownloadImage(GM.SERVER + "/img/galeria/preview/" + image, this.getActivity().getFilesDir().toString() + "/img/galeria/preview/" + image, imageView).execute();
 		}
 
 

+ 0 - 2
app/src/main/java/com/ivalentin/gm/PostComment.java

@@ -9,7 +9,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
@@ -18,7 +17,6 @@ import java.io.DataOutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.util.Date;
 
 class PostComment extends AsyncTask<String, String, Integer> {

+ 5 - 6
app/src/main/java/com/ivalentin/gm/PostLayout.java

@@ -7,8 +7,7 @@ import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.util.Log;
+import android.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -94,18 +93,18 @@ public class PostLayout extends Fragment {
 
             //Check if image exists
             File f;
-            f = new File(this.getContext().getFilesDir().toString() + "/img/blog/preview/" + image);
+            f = new File(this.getActivity().getFilesDir().toString() + "/img/blog/preview/" + image);
             if (f.exists()){
                 //If the image exists, set it.
-                Bitmap myBitmap = BitmapFactory.decodeFile(this.getContext().getFilesDir().toString() + "/img/blog/preview/" + image);
+                Bitmap myBitmap = BitmapFactory.decodeFile(this.getActivity().getFilesDir().toString() + "/img/blog/preview/" + image);
                 images[i].setImageBitmap(myBitmap);
             }
             else {
                 //If not, create directories and download asynchronously
                 File fpath;
-                fpath = new File(this.getContext().getFilesDir().toString() + "/img/blog/preview/");
+                fpath = new File(this.getActivity().getFilesDir().toString() + "/img/blog/preview/");
                 fpath.mkdirs();
-                new DownloadImage(GM.SERVER + "/img/blog/preview/" + image, this.getContext().getFilesDir().toString() + "/img/blog/preview/" + image, images[i]).execute();
+                new DownloadImage(GM.SERVER + "/img/blog/preview/" + image, this.getActivity().getFilesDir().toString() + "/img/blog/preview/" + image, images[i]).execute();
             }
             images[i].setVisibility(View.VISIBLE);
             i ++;

+ 3 - 3
app/src/main/java/com/ivalentin/gm/ScheduleLayout.java

@@ -26,8 +26,8 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.res.ResourcesCompat;
+import android.app.Fragment;
+//import android.content.res.ResourcesCompat;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
@@ -236,7 +236,7 @@ public class ScheduleLayout extends Fragment implements OnMapReadyCallback{
         TextView tvRowTitle, tvRowTime, tvRowDesc, tvRowPlace, tvRowId;
         
         //Icon next to the location text
-        Drawable icon = ResourcesCompat.getDrawable(getResources(), R.drawable.pinpoint, null);
+        Drawable icon = getResources().getDrawable(R.drawable.pinpoint);
         //icon.setBounds(0, 0, 80, 80);
 		
 		//Set date selector texts

+ 1 - 1
app/src/main/java/com/ivalentin/gm/SettingsLayout.java

@@ -7,7 +7,7 @@ import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.content.res.ColorStateList;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import android.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;