diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000..19e8bd9 Binary files /dev/null and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser new file mode 100644 index 0000000..dee5b09 Binary files /dev/null and b/.idea/caches/gradle_models.ser differ diff --git a/.idea/gradle.xml b/.idea/gradle.xml index cbbf71c..a949855 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,6 +3,9 @@ - + diff --git a/RiskAhead-Android.iml b/RiskAhead-Android.iml index f6c5871..a08d583 100644 --- a/RiskAhead-Android.iml +++ b/RiskAhead-Android.iml @@ -13,7 +13,7 @@ - + \ No newline at end of file diff --git a/app/app.iml b/app/app.iml index c87407b..e6ac627 100644 --- a/app/app.iml +++ b/app/app.iml @@ -17,30 +17,29 @@ - - + + - - + - + - - + - + @@ -86,126 +85,157 @@ - + + + + - - - + + + + - - - - + + + + + + + + + - - + + + + + + + + - - + + - + - + - - - - - - - - - - - - + + + - - - - - - - - - - - + + + + + + + + + - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index db5a17c..e751f5c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,15 +2,15 @@ apply plugin: 'com.android.application' apply plugin: 'io.fabric' android { - compileSdkVersion 27 - buildToolsVersion '27.0.3' + compileSdkVersion 28 + buildToolsVersion '28.0.3' defaultConfig { applicationId "org.deke.risk.riskahead" minSdkVersion 19 - targetSdkVersion 26 - versionCode 50 - versionName "3.1.6" + targetSdkVersion 28 + versionCode 55 + versionName "3.2.0" multiDexEnabled true } buildTypes { @@ -42,8 +42,8 @@ repositories { dependencies { implementation fileTree(dir: 'libs', include: 'Parse-*.jar') - implementation 'com.android.support:multidex:1.0.3' - implementation 'com.facebook.android:facebook-android-sdk:4.31.0' + implementation 'androidx.multidex:multidex:2.0.1' + implementation 'com.facebook.android:facebook-login:4.42.0' implementation('com.twitter.sdk.android:twitter-core:3.3.0@aar') { transitive = true } @@ -54,28 +54,28 @@ dependencies { implementation 'com.mikepenz:iconics-core:3.0.3@aar' implementation 'com.mikepenz:google-material-typeface:3.0.1.2.original@aar' - implementation('com.mikepenz:materialdrawer:6.0.6@aar') { + implementation('com.mikepenz:materialdrawer:6.0.8@aar') { transitive = true } - implementation 'com.android.support:customtabs:27.1.1' - implementation 'com.android.support:cardview-v7:27.1.1' - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support:support-v4:27.1.1' - implementation 'com.android.support:design:27.1.1' + implementation 'androidx.browser:browser:1.0.0' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'com.google.android.material:material:1.0.0' - implementation 'com.google.android.gms:play-services-auth:15.0.1' - implementation 'com.google.android.gms:play-services-gcm:15.0.1' - implementation 'com.google.android.gms:play-services-plus:15.0.1' - implementation 'com.google.android.gms:play-services-location:15.0.1' - implementation 'com.google.android.gms:play-services-ads:15.0.1' - implementation 'com.google.android.gms:play-services-maps:15.0.1' + implementation 'com.google.android.gms:play-services-auth:16.0.1' + implementation 'com.google.android.gms:play-services-gcm:16.1.0' + implementation 'com.google.android.gms:play-services-plus:16.0.0' + implementation 'com.google.android.gms:play-services-location:16.0.0' + implementation 'com.google.android.gms:play-services-ads:17.2.1' + implementation 'com.google.android.gms:play-services-maps:16.1.0' implementation 'com.google.maps.android:android-maps-utils:0.5' - implementation 'com.google.code.gson:gson:2.8.0' + implementation 'com.google.code.gson:gson:2.8.2' implementation 'com.beardedhen:androidbootstrap:2.3.2' implementation 'com.mcxiaoke.volley:library:1.0.19' - implementation 'com.google.firebase:firebase-core:16.0.1' + implementation 'com.google.firebase:firebase-core:16.0.9' } apply plugin: 'com.google.gms.google-services' diff --git a/app/release/app-release.apk b/app/release/app-release.apk index fd28019..921acde 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/release/output.json b/app/release/output.json index 3c3712c..29b5d57 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":50,"versionName":"3.1.6","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":55,"versionName":"3.2.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4236dad..fcf74ad 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -32,6 +32,9 @@ + diff --git a/app/src/main/java/org/deke/risk/riskahead/LoginActivity.java b/app/src/main/java/org/deke/risk/riskahead/LoginActivity.java index abf4de2..022addf 100644 --- a/app/src/main/java/org/deke/risk/riskahead/LoginActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/LoginActivity.java @@ -7,12 +7,12 @@ import android.content.pm.PackageManager; import android.content.res.Resources; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import android.support.design.widget.TextInputLayout; +import com.google.android.material.textfield.TextInputLayout; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.AppCompatActivity; import android.text.method.LinkMovementMethod; import android.util.Log; import android.util.Patterns; @@ -63,6 +63,8 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr private ProgressDialog pDialog; private SessionManager session; + static boolean active = false; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -91,6 +93,18 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr } } + @Override + public void onStart() { + super.onStart(); + active = true; + } + + @Override + public void onStop() { + super.onStop(); + active = false; + } + public void isNetworkAvailable() { NetworkInfo activeNetworkInfo = null; @@ -876,7 +890,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr try { JSONObject jObj = new JSONObject(response); boolean error = jObj.getBoolean("error"); - if (!error) { + if (!error && active) { new AlertDialog.Builder(LoginActivity.this) .setTitle(getString(R.string.alert_accregistration_title)) .setMessage(getString(R.string.alert_accregistration_text)) @@ -890,7 +904,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr }) .setIcon(android.R.drawable.ic_dialog_alert) .show(); - } else { + } else if (error){ String errorMsg = jObj.getString("error_msg"); Crashlytics.log(Log.ERROR, TAG, "Error occured: "+errorMsg); Toast.makeText(getApplicationContext(), getResources().getString(R.string.txt_errormsg_register), Toast.LENGTH_LONG).show(); diff --git a/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java b/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java index c2ed81e..b0255eb 100644 --- a/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java @@ -13,14 +13,14 @@ import android.location.Location; import android.location.LocationManager; import android.location.LocationListener; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.FloatingActionButton; -import android.support.v4.app.ActivityCompat; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.ContextCompat; -import android.support.v4.content.CursorLoader; -import android.support.v4.content.Loader; -import android.support.v7.widget.SearchView; +import androidx.annotation.NonNull; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import androidx.core.app.ActivityCompat; +import androidx.loader.app.LoaderManager; +import androidx.core.content.ContextCompat; +import androidx.loader.content.CursorLoader; +import androidx.loader.content.Loader; +import androidx.appcompat.widget.SearchView; import android.util.Log; import android.util.TypedValue; import android.view.Menu; @@ -826,7 +826,7 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa SearchView searchView = (SearchView) menu.findItem(R.id.location_search).getActionView(); searchView.setSearchableInfo(searchInfo); - EditText txtSearch = searchView.findViewById(android.support.v7.appcompat.R.id.search_src_text); + EditText txtSearch = searchView.findViewById(androidx.appcompat.R.id.search_src_text); txtSearch.setHint(getResources().getString(R.string.search_hint)); txtSearch.setHintTextColor(Color.DKGRAY); txtSearch.setTextColor(Color.BLACK); diff --git a/app/src/main/java/org/deke/risk/riskahead/ProfileActivity.java b/app/src/main/java/org/deke/risk/riskahead/ProfileActivity.java index 747119b..2542a8e 100644 --- a/app/src/main/java/org/deke/risk/riskahead/ProfileActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/ProfileActivity.java @@ -2,9 +2,9 @@ package org.deke.risk.riskahead; import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.TabLayout; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; +import com.google.android.material.tabs.TabLayout; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; import android.util.Log; import org.deke.risk.riskahead.helper.AppConfig; diff --git a/app/src/main/java/org/deke/risk/riskahead/ReportWFActivity.java b/app/src/main/java/org/deke/risk/riskahead/ReportWFActivity.java index f94849b..9dca903 100644 --- a/app/src/main/java/org/deke/risk/riskahead/ReportWFActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/ReportWFActivity.java @@ -7,20 +7,20 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.net.Uri; import android.provider.MediaStore; -import android.support.v4.app.ActivityCompat; -import android.support.v4.app.FragmentTransaction; +import androidx.core.app.ActivityCompat; +import androidx.fragment.app.FragmentTransaction; import android.content.Intent; import android.content.SharedPreferences; import android.location.Address; import android.location.Geocoder; import android.os.Bundle; -import android.support.design.widget.FloatingActionButton; +import com.google.android.material.floatingactionbutton.FloatingActionButton; import android.util.Log; import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.widget.TextView; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.android.volley.Request; import com.android.volley.toolbox.StringRequest; diff --git a/app/src/main/java/org/deke/risk/riskahead/SubscriptionsActivity.java b/app/src/main/java/org/deke/risk/riskahead/SubscriptionsActivity.java index 4408a9d..98935eb 100644 --- a/app/src/main/java/org/deke/risk/riskahead/SubscriptionsActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/SubscriptionsActivity.java @@ -11,7 +11,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.IBinder; import android.os.RemoteException; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.ViewPager; import android.util.Log; import android.widget.ImageView; import android.widget.LinearLayout; diff --git a/app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java b/app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java index c36f90c..ea6cd90 100644 --- a/app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java @@ -7,8 +7,8 @@ import android.graphics.drawable.Drawable; import android.location.Address; import android.location.Geocoder; import android.os.Bundle; -import android.support.design.widget.FloatingActionButton; -import android.support.v4.content.ContextCompat; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import androidx.core.content.ContextCompat; import android.util.Log; import android.view.View; import android.widget.EditText; diff --git a/app/src/main/java/org/deke/risk/riskahead/adapter/ProfilePagerAdapter.java b/app/src/main/java/org/deke/risk/riskahead/adapter/ProfilePagerAdapter.java index dc6c039..2ef5e58 100644 --- a/app/src/main/java/org/deke/risk/riskahead/adapter/ProfilePagerAdapter.java +++ b/app/src/main/java/org/deke/risk/riskahead/adapter/ProfilePagerAdapter.java @@ -1,9 +1,9 @@ package org.deke.risk.riskahead.adapter; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; import org.deke.risk.riskahead.fragment.ProfileStatisticsFragment; import org.deke.risk.riskahead.fragment.ReportListFragment; diff --git a/app/src/main/java/org/deke/risk/riskahead/adapter/SpinnerHintAdapter.java b/app/src/main/java/org/deke/risk/riskahead/adapter/SpinnerHintAdapter.java index 31b03d1..f0685ab 100644 --- a/app/src/main/java/org/deke/risk/riskahead/adapter/SpinnerHintAdapter.java +++ b/app/src/main/java/org/deke/risk/riskahead/adapter/SpinnerHintAdapter.java @@ -2,6 +2,8 @@ package org.deke.risk.riskahead.adapter; import android.content.Context; import android.database.DataSetObserver; +import android.nfc.Tag; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -42,14 +44,16 @@ public class SpinnerHintAdapter implements SpinnerAdapter, ListAdapter { @Override public final View getView(int position, View convertView, ViewGroup parent) { - if (position == 0) { - isInInitialState = true; + isInInitialState = position == 0; + + if (isInInitialState) { return getNothingSelectedView(parent); + }else{ + int numOfItems = adapter.getCount(); + position = (position > numOfItems-1) ? numOfItems-1 : position; + + return adapter.getView(position - EXTRA, null, parent); } - isInInitialState = false; - - return adapter.getView(position - EXTRA, null, parent); // Could re-use - } protected View getNothingSelectedView(ViewGroup parent) { diff --git a/app/src/main/java/org/deke/risk/riskahead/adapter/SubscriptionsPagerAdapter.java b/app/src/main/java/org/deke/risk/riskahead/adapter/SubscriptionsPagerAdapter.java index 1027534..faf845d 100644 --- a/app/src/main/java/org/deke/risk/riskahead/adapter/SubscriptionsPagerAdapter.java +++ b/app/src/main/java/org/deke/risk/riskahead/adapter/SubscriptionsPagerAdapter.java @@ -1,8 +1,8 @@ package org.deke.risk.riskahead.adapter; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; import org.deke.risk.riskahead.fragment.SubscriptionItemFragment; diff --git a/app/src/main/java/org/deke/risk/riskahead/fragment/BaseReportWFFragment.java b/app/src/main/java/org/deke/risk/riskahead/fragment/BaseReportWFFragment.java index 244fbe7..60d2eca 100644 --- a/app/src/main/java/org/deke/risk/riskahead/fragment/BaseReportWFFragment.java +++ b/app/src/main/java/org/deke/risk/riskahead/fragment/BaseReportWFFragment.java @@ -1,8 +1,8 @@ package org.deke.risk.riskahead.fragment; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/org/deke/risk/riskahead/fragment/FacebookButtonFragment.java b/app/src/main/java/org/deke/risk/riskahead/fragment/FacebookButtonFragment.java index bd797af..0088330 100644 --- a/app/src/main/java/org/deke/risk/riskahead/fragment/FacebookButtonFragment.java +++ b/app/src/main/java/org/deke/risk/riskahead/fragment/FacebookButtonFragment.java @@ -4,8 +4,8 @@ import android.app.Activity; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/org/deke/risk/riskahead/fragment/GooglePlusButtonFragment.java b/app/src/main/java/org/deke/risk/riskahead/fragment/GooglePlusButtonFragment.java index 62a9031..6552f05 100644 --- a/app/src/main/java/org/deke/risk/riskahead/fragment/GooglePlusButtonFragment.java +++ b/app/src/main/java/org/deke/risk/riskahead/fragment/GooglePlusButtonFragment.java @@ -4,8 +4,8 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/org/deke/risk/riskahead/fragment/ProfileStatisticsFragment.java b/app/src/main/java/org/deke/risk/riskahead/fragment/ProfileStatisticsFragment.java index cdd7958..1885875 100644 --- a/app/src/main/java/org/deke/risk/riskahead/fragment/ProfileStatisticsFragment.java +++ b/app/src/main/java/org/deke/risk/riskahead/fragment/ProfileStatisticsFragment.java @@ -1,7 +1,7 @@ package org.deke.risk.riskahead.fragment; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import android.os.Bundle; import android.util.Log; import android.view.LayoutInflater; diff --git a/app/src/main/java/org/deke/risk/riskahead/fragment/ReportListFragment.java b/app/src/main/java/org/deke/risk/riskahead/fragment/ReportListFragment.java index 0c3a843..4b27a4b 100644 --- a/app/src/main/java/org/deke/risk/riskahead/fragment/ReportListFragment.java +++ b/app/src/main/java/org/deke/risk/riskahead/fragment/ReportListFragment.java @@ -1,7 +1,7 @@ package org.deke.risk.riskahead.fragment; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import android.os.Bundle; import android.util.Log; import android.view.LayoutInflater; diff --git a/app/src/main/java/org/deke/risk/riskahead/fragment/ReportWF_2_Fragment.java b/app/src/main/java/org/deke/risk/riskahead/fragment/ReportWF_2_Fragment.java index bd10891..d8e1750 100644 --- a/app/src/main/java/org/deke/risk/riskahead/fragment/ReportWF_2_Fragment.java +++ b/app/src/main/java/org/deke/risk/riskahead/fragment/ReportWF_2_Fragment.java @@ -2,12 +2,12 @@ package org.deke.risk.riskahead.fragment; import android.app.DatePickerDialog; import android.app.Dialog; -import android.support.annotation.NonNull; -import android.support.v4.app.DialogFragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.DialogFragment; import android.app.TimePickerDialog; import android.content.Context; import android.os.Bundle; -import android.support.v4.app.FragmentManager; +import androidx.fragment.app.FragmentManager; import android.text.Editable; import android.text.TextWatcher; import android.text.format.DateFormat; diff --git a/app/src/main/java/org/deke/risk/riskahead/fragment/SettingsFragment.java b/app/src/main/java/org/deke/risk/riskahead/fragment/SettingsFragment.java index e082f0a..5f7b430 100644 --- a/app/src/main/java/org/deke/risk/riskahead/fragment/SettingsFragment.java +++ b/app/src/main/java/org/deke/risk/riskahead/fragment/SettingsFragment.java @@ -6,7 +6,7 @@ import android.preference.ListPreference; import android.preference.Preference; import android.preference.PreferenceFragment; import android.preference.SwitchPreference; -import android.support.v7.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.util.Log; import com.android.volley.Request; diff --git a/app/src/main/java/org/deke/risk/riskahead/fragment/SubscriptionItemFragment.java b/app/src/main/java/org/deke/risk/riskahead/fragment/SubscriptionItemFragment.java index 9998f40..6b36b23 100644 --- a/app/src/main/java/org/deke/risk/riskahead/fragment/SubscriptionItemFragment.java +++ b/app/src/main/java/org/deke/risk/riskahead/fragment/SubscriptionItemFragment.java @@ -1,8 +1,8 @@ package org.deke.risk.riskahead.fragment; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/org/deke/risk/riskahead/fragment/Top10Fragment.java b/app/src/main/java/org/deke/risk/riskahead/fragment/Top10Fragment.java index c47bacf..2213f65 100644 --- a/app/src/main/java/org/deke/risk/riskahead/fragment/Top10Fragment.java +++ b/app/src/main/java/org/deke/risk/riskahead/fragment/Top10Fragment.java @@ -1,7 +1,7 @@ package org.deke.risk.riskahead.fragment; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import android.os.Bundle; import android.util.Log; import android.view.LayoutInflater; diff --git a/app/src/main/java/org/deke/risk/riskahead/fragment/TwitterButtonFragment.java b/app/src/main/java/org/deke/risk/riskahead/fragment/TwitterButtonFragment.java index 5cda3dc..b81a116 100644 --- a/app/src/main/java/org/deke/risk/riskahead/fragment/TwitterButtonFragment.java +++ b/app/src/main/java/org/deke/risk/riskahead/fragment/TwitterButtonFragment.java @@ -5,8 +5,8 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/org/deke/risk/riskahead/helper/AppController.java b/app/src/main/java/org/deke/risk/riskahead/helper/AppController.java index 0cc957b..2de37d9 100644 --- a/app/src/main/java/org/deke/risk/riskahead/helper/AppController.java +++ b/app/src/main/java/org/deke/risk/riskahead/helper/AppController.java @@ -1,9 +1,8 @@ package org.deke.risk.riskahead.helper; -import android.app.Application; import android.content.Context; -import android.support.multidex.MultiDex; -import android.support.multidex.MultiDexApplication; +import androidx.multidex.MultiDex; +import androidx.multidex.MultiDexApplication; import android.text.TextUtils; import com.android.volley.DefaultRetryPolicy; diff --git a/app/src/main/java/org/deke/risk/riskahead/helper/BaseActivity.java b/app/src/main/java/org/deke/risk/riskahead/helper/BaseActivity.java index 68111f8..0893373 100644 --- a/app/src/main/java/org/deke/risk/riskahead/helper/BaseActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/helper/BaseActivity.java @@ -18,9 +18,9 @@ import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.net.Uri; import android.os.Bundle; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.text.format.DateUtils; import android.text.method.LinkMovementMethod; import android.util.DisplayMetrics; @@ -289,7 +289,7 @@ public abstract class BaseActivity extends AppCompatActivity { @Override public void onDrawerClosed(View drawerView) { - android.support.v7.app.ActionBar actionBar = getSupportActionBar(); + androidx.appcompat.app.ActionBar actionBar = getSupportActionBar(); if (actionBar != null) actionBar.setTitle(getActivityName()); } diff --git a/app/src/main/java/org/deke/risk/riskahead/helper/NotificationService.java b/app/src/main/java/org/deke/risk/riskahead/helper/NotificationService.java index a4a09d6..3e6a82e 100644 --- a/app/src/main/java/org/deke/risk/riskahead/helper/NotificationService.java +++ b/app/src/main/java/org/deke/risk/riskahead/helper/NotificationService.java @@ -12,9 +12,9 @@ import android.location.Location; import android.location.LocationListener; import android.location.LocationManager; import android.os.*; -import android.support.v4.app.ActivityCompat; -import android.support.v4.app.NotificationCompat; -import android.support.v4.app.TaskStackBuilder; +import androidx.core.app.ActivityCompat; +import androidx.core.app.NotificationCompat; +import androidx.core.app.TaskStackBuilder; import android.util.Log; import com.android.volley.Request; diff --git a/app/src/main/java/org/deke/risk/riskahead/helper/PlaceProvider.java b/app/src/main/java/org/deke/risk/riskahead/helper/PlaceProvider.java index 3f9c937..1deacb5 100644 --- a/app/src/main/java/org/deke/risk/riskahead/helper/PlaceProvider.java +++ b/app/src/main/java/org/deke/risk/riskahead/helper/PlaceProvider.java @@ -21,7 +21,7 @@ import android.content.UriMatcher; import android.database.Cursor; import android.database.MatrixCursor; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import com.crashlytics.android.Crashlytics; diff --git a/app/src/main/java/org/deke/risk/riskahead/helper/TextValidator.java b/app/src/main/java/org/deke/risk/riskahead/helper/TextValidator.java index 371e401..0ebe595 100644 --- a/app/src/main/java/org/deke/risk/riskahead/helper/TextValidator.java +++ b/app/src/main/java/org/deke/risk/riskahead/helper/TextValidator.java @@ -1,7 +1,7 @@ package org.deke.risk.riskahead.helper; import android.content.Context; -import android.support.design.widget.TextInputLayout; +import com.google.android.material.textfield.TextInputLayout; import android.text.Editable; import android.text.TextWatcher; import android.widget.TextView; diff --git a/app/src/main/java/org/deke/risk/riskahead/helper/ValidatedEditTextPreference.java b/app/src/main/java/org/deke/risk/riskahead/helper/ValidatedEditTextPreference.java index 03bc46b..9bdce2d 100644 --- a/app/src/main/java/org/deke/risk/riskahead/helper/ValidatedEditTextPreference.java +++ b/app/src/main/java/org/deke/risk/riskahead/helper/ValidatedEditTextPreference.java @@ -5,7 +5,7 @@ import android.content.Context; import android.os.Bundle; import android.preference.EditTextPreference; import android.app.AlertDialog; -import android.support.design.widget.TextInputLayout; +import com.google.android.material.textfield.TextInputLayout; import android.text.Editable; import android.text.InputType; import android.text.TextWatcher; diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 165cc9b..4772d41 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -27,7 +27,7 @@ android:paddingRight="15dp" android:paddingBottom="20dp"> - - + - - + - - - - - + - - + - - + - - - @@ -52,9 +52,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + @@ -291,7 +291,7 @@ - - diff --git a/app/src/main/res/layout/layout_toolbar_col.xml b/app/src/main/res/layout/layout_toolbar_col.xml index 901f0af..8a493de 100644 --- a/app/src/main/res/layout/layout_toolbar_col.xml +++ b/app/src/main/res/layout/layout_toolbar_col.xml @@ -1,5 +1,5 @@ - - + app:actionViewClass="androidx.appcompat.widget.SearchView" /> diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 0948af4..0282efe 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -234,13 +234,13 @@ (غير جاهز(لا يوجد اشاره من نظام تحديد المواقع عطل اصبح عضو مميز للحصول على الخرائط كامله. - من فضلك أكد انك قرأت وتوافق على بوليصة الخصوصيه و شروط الخدمه + من فضلك أكد انك قرأت وتوافق على بوليصة الخصوصيه و شروط الخدمه لقد قرأت بوليصة الخصوصيه وشروط الخدمه وأؤكد علو موافقتي الحفاظ على خصوصيتك يهمنا كثيراً تم تطويره من قبل - بوليصة الخصوصيه: http://www.riskahead.net/en/privacy/ - شروط الخدمه: http://www.riskahead.net/en/terms/ - الموقع: http://www.riskahead.net + بوليصة الخصوصيه: https://www.riskahead.net/en/privacy/ + شروط الخدمه: https://www.riskahead.net/en/terms/ + الموقع: https://www.riskahead.net RiskAhead لنظام أنرويد اللغه غيِر اللغه diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 618dd2f..8616320 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -229,13 +229,13 @@ NICHT BEREIT (GPS FEHLT) AUS Hole dir die Premium-Mitgliedschaft um die ganze Karte zu sehen! - Bitte bestätige, dass du unsere Datenschutzbestimmungen und Nutzungsbedingungen gelesen hast und damit einverstanden bist. + Bitte bestätige, dass du unsere Datenschutzbestimmungen und Nutzungsbedingungen gelesen hast und damit einverstanden bist. Ich habe die Datenschutzbestimmungen und Nutzungsbedingungen zur Kenntnis genommen und stimme ihnen zu. Deine Privatsphäre ist uns sehr wichtig Entwickelt von - Datenschutzerklärung:\nhttp://www.riskahead.de/datenschutzerklarung/ - Nutzungsbedingungen:\nhttp://www.riskahead.de/impressum/ - Website:\nhttp://www.riskahead.net + Datenschutzerklärung:\nhttps://www.riskahead.de/datenschutzerklarung/ + Nutzungsbedingungen:\nhttps://www.riskahead.de/impressum/ + Website:\nhttps://www.riskahead.net RiskAhead für Android Sprache Ändere Sprache diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 7f9bbcb..f4318ac 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -234,13 +234,13 @@ NO ESTA LISTO (SIN GPS) DESACTIVAR ¡Obtener Premium para ver el mapa completo! - Por favor confirme que ha leído y acepta nuestra Política de Privacidad y Términos de Servicio + Por favor confirme que ha leído y acepta nuestra Política de Privacidad y Términos de Servicio He leído la Política de Privacidad y Términos de Servicio y confirmo su aceptación. Su privacidad es muy importante para nosotros Desarrollado de - Política de Privacidad: http://www.riskahead.net/privacy/ - Términos de Servicio: http://www.riskahead.net/terms/ - Página web: http://www.riskahead.net + Política de Privacidad: https://www.riskahead.net/privacy/ + Términos de Servicio: https://www.riskahead.net/terms/ + Página web: https://www.riskahead.net RiskAhead para Android Idioma Cambiar Idioma diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 8fb3680..3f19472 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -7,7 +7,7 @@ Sisene RiskAhead-i Unustasid salasõna? Vajuta siia - Teenuse tingimused ja Privaatsus pol. + Teenuse tingimused ja Privaatsus pol. Logige sisse ühega neist kontodest Registreeri RiskAhead kasutajaks @@ -235,13 +235,13 @@ Väljas Hankige tasuline versioon, et näha kogu kaarti! - Palun kinnitage, et olete lugenud ja nõustute meie Privaatsus pol. ja Teenuse tingimustega + Palun kinnitage, et olete lugenud ja nõustute meie Privaatsus pol. ja Teenuse tingimustega Ma olen lugenud privaatsus pol. ja teenuse tingimusi ja kinnitan oma nõusolekut. Teie privaatsus on meile väga tähtis Arendatud - privaatsus poliitika: http://www.riskahead.net/privacy/ - Teenuse tingimused: http://www.riskahead.net/terms/ - Veebileht: http://www.riskahead.net + privaatsus poliitika: https://www.riskahead.net/privacy/ + Teenuse tingimused: https://www.riskahead.net/terms/ + Veebileht: https://www.riskahead.net RiskAhead Androidi jaoks Keel Muuda keelt diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 03358f7..3a0116c 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -237,13 +237,13 @@ POIS PÄÄLTÄ Hanki Premium nähdäksesi koko kartan! - Vahvista että olet lukenut ja hyväksyt Yksityisyydensuojan ja Käyttöehdot + Vahvista että olet lukenut ja hyväksyt Yksityisyydensuojan ja Käyttöehdot Olen lukenut yksityisyydensuojan ja käyttöehdot ja vahvistan hyväksyntäni. Yksityisyytesi on hyvin tärkeää meille Kehitetty - Yksityisyydensuoja: http://www.riskahead.de/privacy/ - Käyttöehdot: http://www.riskahead.de/terms/ - Verkkosivu: http://www.riskahead.net + Yksityisyydensuoja: https://www.riskahead.de/privacy/ + Käyttöehdot: https://www.riskahead.de/terms/ + Verkkosivu: https://www.riskahead.net RiskAhead Androidille Kieli Vaihda kieltä diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 7fb57e0..70d0811 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -232,13 +232,13 @@ PAS PRÊT (PAS DE GPS) OFF Devener Premium pour voir la Carte Complète ! - Confirmer svp que vous avez lu et accepté nos mentions légales et conditions de service + Confirmer svp que vous avez lu et accepté nos mentions légales et conditions de service J\'ai lu les termes de la politique de confidentialité et les modalités d\'utilisation et confirme mon accord. Votre droit à la confidentialité est très important pour nous Elaboré par - Politique de confidentialité : http://www.riskahead.net/privacy/ - Modalités d\'utilisation : http://www.riskahead.net/terms/ - Website: http://www.riskahead.net + Politique de confidentialité : https://www.riskahead.net/privacy/ + Modalités d\'utilisation : https://www.riskahead.net/terms/ + Website: https://www.riskahead.net RiskAhead pour Android Langue Changer Langue diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 711c36c..c6a6ad2 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -235,13 +235,13 @@ Izslēgts Lai apskatītu kartes pilno versiju, kļūsti par Premium biedru! - Lūdzu apstiprini, ka esi izlasījis un piekrīti mūsu Privātuma politikai un Pakalpojumu sniegšanas noteikumiem + Lūdzu apstiprini, ka esi izlasījis un piekrīti mūsu Privātuma politikai un Pakalpojumu sniegšanas noteikumiem Esmu iepazinies ar privātuma politiku un pakalpojumu sniegšanas noteikumiem un apstiprinu savu piekrišanu. Jūsu privātums mums ir ļoti svarīgs Izstrādāts no - Privātuma politika: http://www.riskahead.net/privacy/ - Pakalpojumu sniegšanas noteikumi: http://www.riskahead.net/terms/ - Interneta saits: http://www.riskahead.net + Privātuma politika: https://www.riskahead.net/privacy/ + Pakalpojumu sniegšanas noteikumi: https://www.riskahead.net/terms/ + Interneta saits: https://www.riskahead.net RiskAhead Android lietotājiem Valoda Mainīt valodu diff --git a/app/src/main/res/values-mn/strings.xml b/app/src/main/res/values-mn/strings.xml index 06e3575..99c7907 100644 --- a/app/src/main/res/values-mn/strings.xml +++ b/app/src/main/res/values-mn/strings.xml @@ -237,13 +237,13 @@ ХААЛТТАЙ Газрын зургыг бүхлээр нь харахын тулд нэмэгдэл авах! - Бидний хувийн бодлогийг уншиж, хүлээн зөвшөөрсөнөө баталгаажуулна уу Үйлчилгээний нөхцөл + Бидний хувийн бодлогийг уншиж, хүлээн зөвшөөрсөнөө баталгаажуулна уу Үйлчилгээний нөхцөл Би үйлчилгээний нөхцөлтэй танилцсан ба хүлээн зөвшөөрсөнөө баталгаажуулж байна. Таны нууцлал бидэнд маш чухал Хөгжсөн - Хувийн бодлого: http://www.riskahead.net/privacy/ - Үйлчилгээний нөхцөл: http://www.riskahead.net/terms/ - Веб сайт: http://www.riskahead.net + Хувийн бодлого: https://www.riskahead.net/privacy/ + Үйлчилгээний нөхцөл: https://www.riskahead.net/terms/ + Веб сайт: https://www.riskahead.net Андройд-д зориулсан RiskAhead Хэл Хэл солих diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 97ba3b6..44434b2 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -235,13 +235,13 @@ UIT Neem Premium om de volledige kaart te zien! - Bevestig dat u gelezen heeft en akkoord bent met onze Privacybeleid en Servicevoorwaarden + Bevestig dat u gelezen heeft en akkoord bent met onze Privacybeleid en Servicevoorwaarden Ik heb het privacybeleid en de servicevoorwaarden gelezen en bevestig mijn overeenkomst. Uw privacy is zeer belangrijk voor ons Ontwikkeld van - Privacybeleid: http://www.riskahead.de/privacy/ - Servicevoorwaarden: http://www.riskahead.de/terms/ - Webpagina: http://www.riskahead.net + Privacybeleid: https://www.riskahead.de/privacy/ + Servicevoorwaarden: https://www.riskahead.de/terms/ + Webpagina: https://www.riskahead.net RiskAhead voor Android Taal Verander Taal diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 360380e..74d7231 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -235,13 +235,13 @@ WYŁĄCZONE Zdobądź Premium i zobacz całą mapę! - Potwierdź, że przeczytałeś i akceptujesz Politykę prywatności oraz Warunki użytkowania + Potwierdź, że przeczytałeś i akceptujesz Politykę prywatności oraz Warunki użytkowania Zapoznałem się z Polityką prywatności i Warunkami użytkowania i zgadzam się na nie. Twoja prywatność jest dla nas bardzo ważna. Opracowywane od - Polityka prywatności: http://www.riskahead.net/privacy/ - Warunki użytkowania: http://www.riskahead.net/terms/ - Strona internetowa: http://www.riskahead.net + Polityka prywatności: https://www.riskahead.net/privacy/ + Warunki użytkowania: https://www.riskahead.net/terms/ + Strona internetowa: https://www.riskahead.net RiskAhead fna Androida Język Zmień język diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index b1edca5..001eca3 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -248,13 +248,13 @@ Não foi possível recuperar as configurações do perfil Desligado Obter prémio para visualizar o mapa completo! - Please confirm that you have read and agree to our Privacy Policy and Terms of Service + Please confirm that you have read and agree to our Privacy Policy and Terms of Service I have read the privacy policy and terms of service and confirm my agreement. Your privacy is very important to us Developed from - Privacy Policy: http://www.riskahead.net/privacy/ - Terms of Service: http://www.riskahead.net/terms/ - Website: http://www.riskahead.net + Privacy Policy: https://www.riskahead.net/privacy/ + Terms of Service: https://www.riskahead.net/terms/ + Website: https://www.riskahead.net RiskAhead for Android Language Change Language diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 177b8bd..6d762b8 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -233,13 +233,13 @@ нет сигнала GPS выключено Получить ПРЕМИУМ для полного обзора - Ознакомлен и согласен с политикой конфиденциальности и условиями сервиса + Ознакомлен и согласен с политикой конфиденциальности и условиями сервиса Я согласен с условиями Ваше мнение важно разработано - политика конфиденциальности: http://www.riskahead.net/privacy/ - условия соглашения: http://www.riskahead.net/terms/ - Сайт: http://www.riskahead.net + политика конфиденциальности: https://www.riskahead.net/privacy/ + условия соглашения: https://www.riskahead.net/terms/ + Сайт: https://www.riskahead.net RiskAhead для андроид язык изменить язык diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 89b2f12..06edabf 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -235,13 +235,13 @@ KAPALI Haritanın tamamı için Premium Üyelik alınız! - Okuyup kabul ettiğinizi onaylayın Gizlilik Politikası ve Hizmet Şartları + Okuyup kabul ettiğinizi onaylayın Gizlilik Politikası ve Hizmet Şartları Pol. ve şart. okudum, anlaşmayı onaylıyorum. Gizliliğiniz bizim için önemlidir Yardımıyla Geliştirildi - Gizlilik Politikası: http://www.riskahead.net/privacy/ - Hizmet Şartları: http://www.riskahead.net/terms/ - İnternet Sitesi: http://www.riskahead.net + Gizlilik Politikası: https://www.riskahead.net/privacy/ + Hizmet Şartları: https://www.riskahead.net/terms/ + İnternet Sitesi: https://www.riskahead.net RiskAhead Android Sürümü Dil Dili değiştir diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 901d81d..231f7c8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -236,13 +236,13 @@ OFF Get Premium to view the Full Map! - Please confirm that you have read and agree to our Privacy Policy and Terms of Service + Please confirm that you have read and agree to our Privacy Policy and Terms of Service I have read the privacy policy and terms of service and confirm my agreement. Your privacy is very important to us Developed from - Privacy Policy:\nhttp://www.riskahead.net/privacy/ - Terms of Service:\nhttp://www.riskahead.net/terms/ - Website:\nhttp://www.riskahead.net + Privacy Policy:\nhttps://www.riskahead.net/privacy/ + Terms of Service:\nhttps://www.riskahead.net/terms/ + Website:\nhttps://www.riskahead.net RiskAhead for Android Language Change Language diff --git a/build.gradle b/build.gradle index 23df436..9c98d66 100644 --- a/build.gradle +++ b/build.gradle @@ -10,8 +10,8 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.3' - classpath 'com.google.gms:google-services:3.2.0' - classpath 'io.fabric.tools:gradle:1.25.4' + classpath 'com.android.tools.build:gradle:3.4.1' + classpath 'com.google.gms:google-services:4.2.0' + classpath 'io.fabric.tools:gradle:1.29.0' } } diff --git a/gradle.properties b/gradle.properties index 1d3591c..c02c951 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,9 +10,11 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. # Default value: -Xmx10248m -XX:MaxPermSize=256m -# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true +android.enableJetifier=true +android.useAndroidX=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1117fcc..b853321 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,8 @@ -#Sun Apr 08 15:54:58 CEST 2018 +#Sat May 25 17:19:03 CEST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +android.enableJetifier=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip +android.useAndroidX=true diff --git a/java_pid11280.hprof b/java_pid11280.hprof new file mode 100644 index 0000000..5d267eb Binary files /dev/null and b/java_pid11280.hprof differ