Version 3.1

app/build.gradle

@@ -16,14 +16,14 @@ repositories {
 
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     defaultConfig {
         applicationId "com.niceplaces.niceplaces"
         minSdkVersion 16
-        targetSdkVersion 27
-        versionCode 11
-        versionName "3.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        targetSdkVersion 28
+        versionCode 12
+        versionName "3.1"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
 
@@ -56,27 +56,27 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:support-media-compat:27.1.1'
-    implementation 'com.android.support:cardview-v7:27.1.1'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation 'com.google.android.gms:play-services-maps:16.0.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.media:media:1.1.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'com.google.android.gms:play-services-maps:17.0.0'
     implementation 'com.google.firebase:firebase-crash:16.2.1'
-    implementation 'com.google.android.gms:play-services-location:16.0.0'
+    implementation 'com.google.android.gms:play-services-location:17.0.0'
     implementation 'com.android.volley:volley:1.1.0'
     implementation 'org.apache.commons:commons-collections4:4.1'
-    implementation 'com.google.firebase:firebase-core:16.0.6'
-    implementation 'com.google.firebase:firebase-messaging:17.3.4'
+    implementation 'com.google.firebase:firebase-core:17.2.0'
+    implementation 'com.google.firebase:firebase-messaging:20.0.0'
     implementation("com.github.bumptech.glide:glide:4.6.1") {
         exclude group: "com.android.support"
     }
-    implementation "com.android.support:support-fragment:27.1.1"
-    implementation 'com.android.support:support-v4:27.1.1'
-    implementation 'com.android.support:support-vector-drawable:27.1.1'
+    implementation 'androidx.fragment:fragment:1.1.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.6.1'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     implementation('com.crashlytics.sdk.android:crashlytics:2.9.0@aar') {
         transitive = true
     }

app/src/androidTest/java/com/niceplaces/niceplaces/ExampleInstrumentedTest.java

@@ -1,8 +1,8 @@
 package com.niceplaces.niceplaces;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

app/src/main/java/com/niceplaces/niceplaces/activities/AreaIntroActivity.java

@@ -3,22 +3,15 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
-import android.widget.AdapterView;
 import android.widget.Button;
 import android.widget.LinearLayout;
-import android.widget.ListView;
 import android.widget.TextView;
 
 import com.google.firebase.analytics.FirebaseAnalytics;
 import com.niceplaces.niceplaces.Const;
 import com.niceplaces.niceplaces.R;
-import com.niceplaces.niceplaces.adapters.ExplorePlacesAdapter;
-import com.niceplaces.niceplaces.controllers.AlertController;
-import com.niceplaces.niceplaces.dao.DaoAreas;
-import com.niceplaces.niceplaces.dao.DaoLists;
-import com.niceplaces.niceplaces.utils.MyRunnable;
 
 public class AreaIntroActivity extends AppCompatActivity {
 

app/src/main/java/com/niceplaces/niceplaces/activities/AreasListActivity.java

@@ -2,7 +2,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;

app/src/main/java/com/niceplaces/niceplaces/activities/DebugOptionsActivity.java

@@ -1,7 +1,7 @@
 package com.niceplaces.niceplaces.activities;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.RadioButton;

app/src/main/java/com/niceplaces/niceplaces/activities/ExploreActivity.java

@@ -3,10 +3,9 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
+import androidx.appcompat.app.AppCompatActivity;
+
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.widget.AdapterView;
 import android.widget.ImageView;
@@ -24,7 +23,6 @@
 import com.niceplaces.niceplaces.dao.DaoPlaces;
 import com.niceplaces.niceplaces.dao.DaoRegions;
 import com.niceplaces.niceplaces.models.Place;
-import com.niceplaces.niceplaces.utils.AppUtils;
 import com.niceplaces.niceplaces.utils.ImageUtils;
 import com.niceplaces.niceplaces.utils.MyRunnable;
 import com.niceplaces.niceplaces.utils.NonScrollListView;
@@ -57,7 +55,11 @@ public void run() {
                 ImageUtils.setImageViewWithGlide(context, place.mImage, imageView);
                 textViewName.setText(place.mName);
                 textViewArea.setText(place.mArea + ", " + place.mRegion);
-                textViewDesc.setText(place.mDescription.substring(0, 150) + "...");
+                String desc = place.mDescription;
+                if (desc.length() > 150){
+                    desc = desc.substring(0, 150) + "...";
+                }
+                textViewDesc.setText(desc);
                 placeOfDayLayout.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {

app/src/main/java/com/niceplaces/niceplaces/activities/InfoActivity.java

@@ -4,7 +4,7 @@
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;

app/src/main/java/com/niceplaces/niceplaces/activities/IntroActivity.java

@@ -2,8 +2,8 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.Html;
 import android.view.View;
 import android.widget.Button;

app/src/main/java/com/niceplaces/niceplaces/activities/LatestPlacesActivity.java

@@ -2,7 +2,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;

app/src/main/java/com/niceplaces/niceplaces/activities/LoginActivity.java

@@ -1,21 +1,15 @@
 package com.niceplaces.niceplaces.activities;
 
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.TextView;
 
 import com.google.firebase.analytics.FirebaseAnalytics;
-import com.niceplaces.niceplaces.BuildConfig;
 import com.niceplaces.niceplaces.R;
 
-import java.util.Locale;
-
 public class LoginActivity extends AppCompatActivity {
 
     @Override

app/src/main/java/com/niceplaces/niceplaces/activities/MapsActivity.java

@@ -11,9 +11,9 @@
 import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.Bundle;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.content.ContextCompat;
+import androidx.core.app.ActivityCompat;
+import androidx.fragment.app.FragmentActivity;
+import androidx.core.content.ContextCompat;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -40,7 +40,6 @@
 import com.niceplaces.niceplaces.R;
 import com.niceplaces.niceplaces.adapters.MarkerInfoAdapter;
 import com.niceplaces.niceplaces.adapters.PlacesAdapter;
-import com.niceplaces.niceplaces.controllers.AlertController;
 import com.niceplaces.niceplaces.controllers.PrefsController;
 import com.niceplaces.niceplaces.dao.DaoPlaces;
 import com.niceplaces.niceplaces.models.GeoPoint;

app/src/main/java/com/niceplaces/niceplaces/activities/MenuActivity.java

@@ -3,7 +3,7 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;

app/src/main/java/com/niceplaces/niceplaces/activities/PlaceDetailsActivity.java

@@ -5,7 +5,7 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.view.ViewTreeObserver;
 import android.widget.ImageView;

app/src/main/java/com/niceplaces/niceplaces/activities/PlacesListActivity.java

@@ -2,7 +2,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;

app/src/main/java/com/niceplaces/niceplaces/activities/PrivacyActivity.java

@@ -3,16 +3,13 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
-import android.widget.ImageView;
-import android.widget.TextView;
 
 import com.google.firebase.analytics.FirebaseAnalytics;
-import com.niceplaces.niceplaces.BuildConfig;
 import com.niceplaces.niceplaces.R;
 import com.niceplaces.niceplaces.controllers.PrefsController;
 

app/src/main/java/com/niceplaces/niceplaces/activities/RegisterActivity.java

@@ -2,7 +2,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;

app/src/main/java/com/niceplaces/niceplaces/activities/SettingsActivity.java

@@ -1,8 +1,8 @@
 package com.niceplaces.niceplaces.activities;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.widget.CheckBox;
+import androidx.appcompat.app.AppCompatActivity;
+
 import android.widget.EditText;
 
 import com.niceplaces.niceplaces.R;

app/src/main/java/com/niceplaces/niceplaces/activities/SplashActivity.java

@@ -4,21 +4,18 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.ImageView;
 
 import com.crashlytics.android.Crashlytics;
 import com.niceplaces.niceplaces.BuildConfig;
-import com.niceplaces.niceplaces.Const;
 import com.niceplaces.niceplaces.R;
 import com.niceplaces.niceplaces.controllers.FirebaseMsgHandler;
 import com.niceplaces.niceplaces.controllers.PrefsController;
 
-import java.util.Locale;
-
 import io.fabric.sdk.android.Fabric;
 
 public class SplashActivity extends AppCompatActivity {

app/src/main/java/com/niceplaces/niceplaces/activities/UserListActivity.java

@@ -2,7 +2,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
@@ -11,11 +11,9 @@
 import com.google.firebase.analytics.FirebaseAnalytics;
 import com.niceplaces.niceplaces.Const;
 import com.niceplaces.niceplaces.R;
-import com.niceplaces.niceplaces.adapters.ExplorePlacesAdapter;
 import com.niceplaces.niceplaces.adapters.LatestPlacesAdapter;
 import com.niceplaces.niceplaces.controllers.AlertController;
 import com.niceplaces.niceplaces.controllers.UserListsController;
-import com.niceplaces.niceplaces.dao.DaoAreas;
 import com.niceplaces.niceplaces.dao.DaoPlaces;
 import com.niceplaces.niceplaces.models.Place;
 import com.niceplaces.niceplaces.utils.MyRunnable;

app/src/main/java/com/niceplaces/niceplaces/activities/VirtualTourActivity.java

@@ -5,7 +5,7 @@
 import android.content.Intent;
 import android.location.Location;
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
 import android.util.Log;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;

app/src/main/java/com/niceplaces/niceplaces/adapters/AreasAdapter.java

@@ -1,8 +1,8 @@
 package com.niceplaces.niceplaces.adapters;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -11,7 +11,6 @@
 
 import com.niceplaces.niceplaces.R;
 import com.niceplaces.niceplaces.models.Area;
-import com.niceplaces.niceplaces.models.Event;
 
 import java.util.List;
 

app/src/main/java/com/niceplaces/niceplaces/adapters/EventsAdapter.java

@@ -1,8 +1,8 @@
 package com.niceplaces.niceplaces.adapters;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -11,7 +11,6 @@
 
 import com.niceplaces.niceplaces.R;
 import com.niceplaces.niceplaces.models.Event;
-import com.niceplaces.niceplaces.utils.TextUtils;
 
 import java.util.List;
 

app/src/main/java/com/niceplaces/niceplaces/adapters/ExplorePlacesAdapter.java

@@ -1,10 +1,10 @@
 package com.niceplaces.niceplaces.adapters;
 
 import android.content.Context;
-import android.location.Location;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,7 +14,6 @@
 
 import com.niceplaces.niceplaces.R;
 import com.niceplaces.niceplaces.controllers.UserListsController;
-import com.niceplaces.niceplaces.models.Area;
 import com.niceplaces.niceplaces.models.Place;
 import com.niceplaces.niceplaces.utils.ImageUtils;