From 833429dd633b33fff71224a7ce663b60681a7f81 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Wed, 6 Feb 2019 10:14:22 -0800 Subject: [PATCH] ReactSlider extends AppCompatSeekBar (#23304) Summary: Google recommends to use AppCompat widgets, and this PR changes ReactSlider to extend AppCompatSeekBar. [Android] [Changed] - ReactSlider extends AppCompatSeekBar Pull Request resolved: https://github.com/facebook/react-native/pull/23304 Differential Revision: D13973636 Pulled By: cpojer fbshipit-source-id: 9aa160b186fcea593224c5760a2de0fc3a2b6f85 --- .../src/main/java/com/facebook/react/views/slider/BUCK | 5 ++--- .../java/com/facebook/react/views/slider/ReactSlider.java | 4 ++-- .../main/third-party/android/support/v7/appcompat-orig/BUCK | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK index 50e606647ea..aad483852b0 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK @@ -3,14 +3,13 @@ load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "r rn_android_library( name = "slider", srcs = glob(["*.java"]), - provided_deps = [ - react_native_dep("third-party/android/support/v7/appcompat-orig:appcompat"), - ], visibility = [ "PUBLIC", ], deps = [ YOGA_TARGET, + react_native_dep("third-party/android/support/v7/appcompat-orig:appcompat"), + react_native_dep("third-party/android/support/v4:lib-support-v4"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_target("java/com/facebook/react/bridge:bridge"), react_native_target("java/com/facebook/react/common:common"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlider.java b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlider.java index eddc724119d..aefbeacf252 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlider.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlider.java @@ -8,8 +8,8 @@ package com.facebook.react.views.slider; import android.content.Context; import android.os.Build; +import android.support.v7.widget.AppCompatSeekBar; import android.util.AttributeSet; -import android.widget.SeekBar; import javax.annotation.Nullable; /** @@ -20,7 +20,7 @@ import javax.annotation.Nullable; * *

Note that the slider is _not_ a controlled component (setValue isn't called during dragging). */ -public class ReactSlider extends SeekBar { +public class ReactSlider extends AppCompatSeekBar { /** * If step is 0 (unset) we default to this total number of steps. Don't use 100 which leads to diff --git a/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK b/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK index ec356034385..25d67547d21 100644 --- a/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK +++ b/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK @@ -20,7 +20,6 @@ rn_android_library( ], exported_deps = [ ":classes-for-react-native", - react_native_dep("third-party/android/support-annotations:android-support-annotations"), ], )