kylefang/react-navigation
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-navigation.git synced 2026-02-10 17:23:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade from android support v4 to androidX (#68)

Browse Source
This commit is contained in:
bpeyrou
2019-07-04 10:57:58 +02:00
committed by Krzysztof Magiera
parent 0627e742c8
commit ed826d7b91
6 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
android/src/main/java/com/swmansion/rnscreens/LifecycleHelper.java
View File

@@ -1,16 +1,12 @@
package com.swmansion.rnscreens;
import android.arch.lifecycle.Lifecycle;
import android.arch.lifecycle.LifecycleObserver;
import android.support.v4.app.Fragment;
import android.util.Log;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleObserver;
import androidx.fragment.app.Fragment;
import android.view.View;
import android.view.ViewParent;
import com.facebook.react.modules.core.ChoreographerCompat;
import com.facebook.react.modules.core.ReactChoreographer;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;

7
android/src/main/java/com/swmansion/rnscreens/Screen.java
View File

@@ -1,15 +1,16 @@
package com.swmansion.rnscreens;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import android.annotation.SuppressLint;
import android.content.Context;
import android.graphics.Paint;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import com.facebook.react.uimanager.PointerEvents;
import com.facebook.react.uimanager.ReactPointerEventsView;

12
android/src/main/java/com/swmansion/rnscreens/ScreenContainer.java
View File

@@ -1,18 +1,16 @@
package com.swmansion.rnscreens;
import android.app.Activity;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentTransaction;
import android.content.Context;
import android.content.ContextWrapper;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import android.view.ViewGroup;
import android.view.ViewParent;
import com.facebook.react.ReactRootView;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.modules.core.ChoreographerCompat;
import com.facebook.react.modules.core.ReactChoreographer;