Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #8631 from osmandapp/android_x_migration

Browse source 
AndroidX fixes
This commit is contained in:
max-klaus 2020-03-05 21:01:08 +03:00 committed by GitHub
commit b8ea4f2ab7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/AndroidManifest-free.xml
View file

@ -20,7 +20,7 @@
android:process="net.osmand"/> android:process="net.osmand"/>
<provider <provider
android:name="android.support.v4.content.FileProvider" android:name="androidx.core.content.FileProvider"
tools:replace="android:authorities" tools:replace="android:authorities"
android:authorities="net.osmand.fileprovider"/> android:authorities="net.osmand.fileprovider"/>
</application> </application>

2
OsmAnd/AndroidManifest-freecustom.xml
View file

@ -18,7 +18,7 @@
android:process="net.osmand.freecustom" android:process="net.osmand.freecustom"
tools:replace="android:process"/> tools:replace="android:process"/>
<provider <provider
android:name="android.support.v4.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="net.osmand.freecustom.fileprovider" android:authorities="net.osmand.freecustom.fileprovider"
tools:replace="android:authorities"/> tools:replace="android:authorities"/>
</application> </application>

2
OsmAnd/AndroidManifest-freedev.xml
View file

@ -17,7 +17,7 @@
android:process="net.osmand.dev" android:process="net.osmand.dev"
tools:replace="android:process"/> tools:replace="android:process"/>
<provider <provider
android:name="android.support.v4.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="net.osmand.dev.fileprovider" android:authorities="net.osmand.dev.fileprovider"
tools:replace="android:authorities"/> tools:replace="android:authorities"/>
</application> </application>

2
OsmAnd/AndroidManifest-freehuawei.xml
View file

@ -13,7 +13,7 @@
</activity> </activity>
<provider <provider
android:name="android.support.v4.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="net.osmand.huawei.fileprovider" android:authorities="net.osmand.huawei.fileprovider"
tools:replace="android:authorities" /> tools:replace="android:authorities" />
<service <service

2
OsmAnd/AndroidManifest-huawei.xml
View file

@ -13,7 +13,7 @@
</activity> </activity>
<provider <provider
android:name="android.support.v4.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="net.osmand.plus.huawei.fileprovider" android:authorities="net.osmand.plus.huawei.fileprovider"
tools:replace="android:authorities" /> tools:replace="android:authorities" />
<service <service

4
OsmAnd/build.gradle
View file

@ -459,7 +459,7 @@ dependencies {
implementation 'androidx.gridlayout:gridlayout:1.0.0' implementation 'androidx.gridlayout:gridlayout:1.0.0'
implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.google.android.material:material:1.0.0' implementation 'com.google.android.material:material:1.2.0-alpha05'
implementation 'androidx.browser:browser:1.0.0' implementation 'androidx.browser:browser:1.0.0'
implementation 'androidx.preference:preference:1.1.0' implementation 'androidx.preference:preference:1.1.0'
implementation fileTree(include: ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs') implementation fileTree(include: ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs')
@ -495,7 +495,7 @@ dependencies {
exclude group: 'com.android.support' exclude group: 'com.android.support'
} }
implementation 'com.github.PhilJay:MPAndroidChart:v3.0.1' implementation 'com.github.PhilJay:MPAndroidChart:v3.0.1'
implementation ("com.github.HITGIF:TextFieldBoxes:1.3.5"){ implementation ("com.github.HITGIF:TextFieldBoxes:1.4.5"){
exclude group: 'com.android.support' exclude group: 'com.android.support'
} }

8
OsmAnd/src/net/osmand/plus/mapcontextmenu/other/DestinationReachedMenuFragment.java
View file

@ -12,6 +12,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.appcompat.view.ContextThemeWrapper; import androidx.appcompat.view.ContextThemeWrapper;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import net.osmand.AndroidUtils; import net.osmand.AndroidUtils;
import net.osmand.data.LatLon; import net.osmand.data.LatLon;
@ -204,8 +205,11 @@ public class DestinationReachedMenuFragment extends Fragment {
public void dismissMenu() { public void dismissMenu() {
MapActivity mapActivity = getMapActivity(); MapActivity mapActivity = getMapActivity();
if (mapActivity != null && !mapActivity.isActivityDestroyed()) { if (mapActivity != null) {
mapActivity.getSupportFragmentManager().popBackStack(); FragmentManager fragmentManager = mapActivity.getSupportFragmentManager();
if (!fragmentManager.isStateSaved()) {
fragmentManager.popBackStack();
}
} }
} }