Merge pull request #105 from CityZenApp/release120

Release 1.2.0

CityZenApp/app/build.gradle

@@ -6,20 +6,17 @@ repositories {
     maven { url "https://jitpack.io" }
 }
 
-ext {
-    supportLibraryVersion = '27.1.1'
-}
-
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     defaultConfig {
         applicationId "com.cityzen.cityzen"
-        minSdkVersion 15
-        targetSdkVersion 27
-        versionName "1.1.2"
-        versionCode 10100299
+        minSdkVersion 16
+        targetSdkVersion 28
+        versionName "1.2.0"
+        versionCode 10200099
+
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
@@ -38,25 +35,25 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //OAuth service and OSM API connection
-    implementation "com.android.support:appcompat-v7:${supportLibraryVersion}"
-    implementation "com.android.support:design:${supportLibraryVersion}"
-    implementation "com.android.support:recyclerview-v7:${supportLibraryVersion}"
-    implementation "com.android.support:cardview-v7:${supportLibraryVersion}"
-    implementation "com.android.support:support-vector-drawable:${supportLibraryVersion}"
-    implementation "com.android.support:support-v4:${supportLibraryVersion}"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.1'
+    implementation "androidx.appcompat:appcompat:1.0.2"
+    implementation "com.google.android.material:material:1.0.0"
+    implementation "androidx.recyclerview:recyclerview:1.0.0"
+    implementation "androidx.cardview:cardview:1.0.0"
+    implementation "androidx.vectordrawable:vectordrawable:1.0.1"
+    implementation "androidx.legacy:legacy-support-v4:1.0.0"
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
-    implementation('de.westnordost:osmapi:1.6') {
+    implementation('de.westnordost:osmapi:3.3') {
         exclude group: 'net.sf.kxml', module: 'kxml2' // already included in Android
     }
     implementation 'info.metadude.java.library.overpass:overpass-library:2.0.0'
     implementation 'oauth.signpost:signpost-core:1.2.1.2'
-    implementation 'org.osmdroid:osmdroid-android:6.0.1'
-    implementation 'com.github.MKergall:osmbonuspack:6.3'
-    implementation 'com.google.code.gson:gson:2.8.2'
+    implementation 'org.osmdroid:osmdroid-android:6.1.0'
+    implementation 'com.github.MKergall:osmbonuspack:6.6.0'
+    implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.github.clans:fab:1.6.4'
-    implementation 'com.github.ittianyu:BottomNavigationViewEx:1.1.7'
-    implementation 'pub.devrel:easypermissions:0.4.3'
-    implementation 'io.github.rockerhieu:emojicon:1.4.0'
+    implementation 'com.github.ittianyu:BottomNavigationViewEx:2.0.2'
+    implementation 'pub.devrel:easypermissions:3.0.0'
+    implementation 'io.github.rockerhieu:emojicon:1.4.2'
     testImplementation 'junit:junit:4.12'
 }

CityZenApp/app/src/main/AndroidManifest.xml

@@ -15,7 +15,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:networkSecurityConfig="@xml/network_security_config">
         <receiver android:name="com.cityzen.cityzen.Utils.LocationUtils.LocationProviderChangedReceiver">
             <intent-filter>
                 <action android:name="android.location.PROVIDERS_CHANGED" />

CityZenApp/app/src/main/java/com/cityzen/cityzen/Activities/MainActivity.java

@@ -17,45 +17,35 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.app.AppCompatDelegate;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
-import com.cityzen.cityzen.OsmModule;
-import com.cityzen.cityzen.R;
-import com.cityzen.cityzen.Utils.Development.AppLog;
-import com.cityzen.cityzen.Utils.RecyclerView.CategoryDisplayConfig;
-import com.github.clans.fab.FloatingActionButton;
-import com.github.clans.fab.FloatingActionMenu;
-import com.ittianyu.bottomnavigationviewex.BottomNavigationViewEx;
 import com.cityzen.cityzen.Fragments.CategoriesFragment;
 import com.cityzen.cityzen.Fragments.EditPoiFragment;
-import com.cityzen.cityzen.Fragments.PoiDetailsFragment;
-import com.cityzen.cityzen.Fragments.PoiListFragment;
-
 import com.cityzen.cityzen.Fragments.FavoritesFragment;
 import com.cityzen.cityzen.Fragments.MapFragment;
+import com.cityzen.cityzen.Fragments.PoiDetailsFragment;
+import com.cityzen.cityzen.Fragments.PoiListFragment;
 import com.cityzen.cityzen.Fragments.SearchFragment;
 import com.cityzen.cityzen.Fragments.SettingsFragment;
 import com.cityzen.cityzen.Models.DeviceLocationData;
 import com.cityzen.cityzen.Models.ParcelablePOI;
+import com.cityzen.cityzen.OsmModule;
+import com.cityzen.cityzen.R;
 import com.cityzen.cityzen.Utils.Development.AppToast;
 import com.cityzen.cityzen.Utils.DeviceUtils.DeviceUtils;
+import com.cityzen.cityzen.Utils.RecyclerView.CategoryDisplayConfig;
 import com.cityzen.cityzen.Utils.StorageUtil;
 import com.cityzen.cityzen.oauth.OAuth;
 import com.cityzen.cityzen.oauth.OAuthComponent;
 import com.cityzen.cityzen.oauth.OAuthWebViewDialogFragment;
+import com.github.clans.fab.FloatingActionButton;
+import com.github.clans.fab.FloatingActionMenu;
+import com.ittianyu.bottomnavigationviewex.BottomNavigationViewEx;
 
 import org.osmdroid.views.MapView;
 import org.osmdroid.views.overlay.Marker;
@@ -66,6 +56,14 @@
 import java.util.Timer;
 import java.util.TimerTask;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.core.app.ActivityCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 import de.westnordost.osmapi.OsmConnection;
 import info.metadude.java.library.overpass.models.Element;
 import oauth.signpost.OAuthConsumer;
@@ -103,7 +101,7 @@ public class MainActivity extends AppCompatActivity
     private Marker routeMarker;
     private Polyline mapRoute;
     private ParcelablePOI destinationPoi;
-    private android.support.design.widget.FloatingActionButton fabPoiDetailsAfterRoute;
+    private com.google.android.material.floatingactionbutton.FloatingActionButton fabPoiDetailsAfterRoute;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -165,26 +163,24 @@ private void getStatusBatColor() {
         }
     }
 
-    /*********************************************************************************************/
-    /*********************************************************************************************/
     /**********************************Setup UI elements and their functionality***********************************/
     private void viewSetup() {
-        fabPoiDetailsAfterRoute = (android.support.design.widget.FloatingActionButton) findViewById(R.id.fabPoiDetailsAfterRoute);
-        floatingActionButton = (FloatingActionMenu) findViewById(R.id.mainFab);
+        fabPoiDetailsAfterRoute = findViewById(R.id.fabPoiDetailsAfterRoute);
+        floatingActionButton = findViewById(R.id.mainFab);
         floatingActionButton.setClosedOnTouchOutside(true);
 
-        navigation = (BottomNavigationViewEx) findViewById(R.id.navigation);
+        navigation = findViewById(R.id.navigation);
         //setup bottom navigation
         navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);
         navigation.setSelectedItemId(R.id.navigation_categories);
         navigation.enableAnimation(false);
         navigation.enableShiftingMode(false);
         navigation.enableItemShiftingMode(false);
 
-        FloatingActionButton fabClearMap = (FloatingActionButton) findViewById(R.id.fabClearMap);
-        FloatingActionButton fabLocation = (FloatingActionButton) findViewById(R.id.fabLocation);
-        FloatingActionButton fabAdd = (FloatingActionButton) findViewById(R.id.fabAdd);
-        FloatingActionButton fabSearch = (FloatingActionButton) findViewById(R.id.fabSearch);
+        FloatingActionButton fabClearMap = findViewById(R.id.fabClearMap);
+        FloatingActionButton fabLocation = findViewById(R.id.fabLocation);
+        FloatingActionButton fabAdd = findViewById(R.id.fabAdd);
+        FloatingActionButton fabSearch = findViewById(R.id.fabSearch);
         fabClearMap.setOnClickListener(clickListenerFAB);
         fabLocation.setOnClickListener(clickListenerFAB);
         fabAdd.setOnClickListener(clickListenerFAB);
@@ -202,11 +198,11 @@ public void toggleFabPoiDetailsAfterRoute() {
             public void run() {
                 if (navigation.getSelectedItemId() == R.id.navigation_map) {
                     if (destinationPoi != null && mapRoute != null && routeMarker != null)
-                        fabPoiDetailsAfterRoute.setVisibility(View.VISIBLE);
+                        fabPoiDetailsAfterRoute.show();
                     else
-                        fabPoiDetailsAfterRoute.setVisibility(View.GONE);
+                        fabPoiDetailsAfterRoute.hide();
                 } else {
-                    fabPoiDetailsAfterRoute.setVisibility(View.GONE);
+                    fabPoiDetailsAfterRoute.hide();
                 }
             }
         });
@@ -298,7 +294,7 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
                     transaction.replace(R.id.content, fragment, "CategoriesFragment");
                     transaction.commit();
                     floatingActionButton.setVisibility(View.GONE);
-                    fabPoiDetailsAfterRoute.setVisibility(View.GONE);
+                    fabPoiDetailsAfterRoute.hide();
                     return true;
                 case R.id.navigation_map:
                     if (navigation.getSelectedItemId() != R.id.navigation_map) {
@@ -316,21 +312,21 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
                     transaction.replace(R.id.content, fragment, "SearchFragment");
                     transaction.commit();
                     floatingActionButton.setVisibility(View.GONE);
-                    fabPoiDetailsAfterRoute.setVisibility(View.GONE);
+                    fabPoiDetailsAfterRoute.hide();
                     return true;
                 case R.id.navigation_favorites:
                     fragment = FavoritesFragment.newInstance();
                     transaction.replace(R.id.content, fragment, "FavoritesFragment");
                     transaction.commit();
                     floatingActionButton.setVisibility(View.GONE);
-                    fabPoiDetailsAfterRoute.setVisibility(View.GONE);
+                    fabPoiDetailsAfterRoute.hide();
                     return true;
                 case R.id.navigation_settings:
                     fragment = SettingsFragment.newInstance();
                     transaction.replace(R.id.content, fragment, "SettingsFragment");
                     transaction.commit();
                     floatingActionButton.setVisibility(View.GONE);
-                    fabPoiDetailsAfterRoute.setVisibility(View.GONE);
+                    fabPoiDetailsAfterRoute.hide();
                     return true;
             }
             return false;
@@ -365,8 +361,6 @@ private void requestWriteExternalStoragePermission() {
             // Do not have permissions, request permissions
             EasyPermissions.requestPermissions(MainActivity.this,
                     getString(R.string.write_storage_request),
-                    R.string.allow_permission,
-                    R.string.deny_permission,
                     WRITE_EXTERNAL_STORAGE_PERMISSION,
                     permissions);
         }
@@ -381,8 +375,6 @@ private void requestLocationPermission() {
             // Do not have permissions, request permissions
             EasyPermissions.requestPermissions(MainActivity.this,
                     getString(R.string.location_request),
-                    R.string.allow_permission,
-                    R.string.deny_permission,
                     LOCATION_PERMISSION,
                     permissions);
         }

CityZenApp/app/src/main/java/com/cityzen/cityzen/Activities/SplashScreenActivity.java

@@ -2,14 +2,15 @@
 
 import android.content.Intent;
 import android.os.Build;
-import android.os.Handler;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.os.Handler;
 import android.view.View;
 import android.view.WindowManager;
 
 import com.cityzen.cityzen.R;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 public class SplashScreenActivity extends AppCompatActivity {
 
     private static final long SPLASH_DURATION = 1500;

CityZenApp/app/src/main/java/com/cityzen/cityzen/Adapters/CategoryAdapter.java

@@ -4,7 +4,6 @@
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.Point;
-import android.support.v7.widget.RecyclerView;
 import android.view.Display;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -16,6 +15,8 @@
 import com.cityzen.cityzen.R;
 import com.cityzen.cityzen.Utils.RecyclerView.CategoryDisplayConfig;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 
 /**
  * Created by Valdio Veliu on 25/04/2017.

CityZenApp/app/src/main/java/com/cityzen/cityzen/Adapters/ElementListAdapter.java

@@ -1,21 +1,19 @@
 package com.cityzen.cityzen.Adapters;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-
 import com.cityzen.cityzen.R;
-import com.cityzen.cityzen.Utils.Development.AppLog;
 import com.cityzen.cityzen.Utils.MapUtils.OpeningHours.OpeningHoursUtils;
 import com.cityzen.cityzen.Utils.MapUtils.OsmTags;
 
 import java.util.List;
 import java.util.Map;
 
+import androidx.recyclerview.widget.RecyclerView;
 import info.metadude.java.library.overpass.models.Element;
 
 /**

CityZenApp/app/src/main/java/com/cityzen/cityzen/Adapters/ParcelablePoiListAdapter.java

@@ -1,13 +1,6 @@
 package com.cityzen.cityzen.Adapters;
 
 import android.content.Context;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DrawableRes;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -24,6 +17,8 @@
 import java.util.List;
 import java.util.Map;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * Created by Valdio Veliu on 26/04/2017.
  */

CityZenApp/app/src/main/java/com/cityzen/cityzen/Adapters/PlaceListAdapter.java

@@ -1,11 +1,6 @@
 package com.cityzen.cityzen.Adapters;
 
 import android.content.Context;
-import android.graphics.PorterDuff;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DrawableRes;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -22,6 +17,8 @@
 import java.util.List;
 import java.util.Map;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * Created by Valdio Veliu on 26/04/2017.
  */

CityZenApp/app/src/main/java/com/cityzen/cityzen/Adapters/PoiFeaturesAdapter.java

@@ -1,7 +1,6 @@
 package com.cityzen.cityzen.Adapters;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -10,13 +9,13 @@
 import com.cityzen.cityzen.Models.OsmFeature;
 import com.cityzen.cityzen.R;
 
-
 import java.util.ArrayList;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * Created by Valdio Veliu on 26/04/2017.
  */
-
 public class PoiFeaturesAdapter extends RecyclerView.Adapter<PoiFeaturesAdapter.ViewHolder> {
 
     private Context context;
@@ -65,6 +64,4 @@ public class ViewHolder extends RecyclerView.ViewHolder {
             featureTextView = (TextView) itemView.findViewById(R.id.featureTextView);
         }
     }
-
-
 }