fix/duplicateRegistration (#38)

* fix/duplicateRegistration

* chore/renameIosFiles

* chore: update snapshots

* fix: remove types/react

Author: Naturalclar

README.md

@@ -47,8 +47,8 @@ $ react-native link @react-native-community/progress-bar-android
 <summary>Manually linking the library - iOS</summary>
 
 1. In XCode, in the project navigator, right click `Libraries` ➜ `Add Files to [your project's name]`
-2. Go to `node_modules` ➜ `@react-native-community/progress-bar-android` and add `RNCAndroidprogressbar.xcodeproj`
-3. In XCode, in the project navigator, select your project. Add `libRNCAndroidprogressbar.a` to your project's `Build Phases` ➜ `Link Binary With Libraries`
+2. Go to `node_modules` ➜ `@react-native-community/progress-bar-android` and add `RNCProgressBar.xcodeproj`
+3. In XCode, in the project navigator, select your project. Add `libRNCProgressBar.a` to your project's `Build Phases` ➜ `Link Binary With Libraries`
 4. Run your project (`Cmd+R`)
 
 </details>
@@ -57,8 +57,8 @@ $ react-native link @react-native-community/progress-bar-android
 <summary>Manually link the library - android</summary>
 
 1. Open up `android/app/src/main/java/[...]/MainActivity.java`
-  - Add `import com.reactnativecommunity.androidprogressbar.RNCAndroidprogressbarPackage;` to the imports at the top of the file
-  - Add `new RNCAndroidprogressbarPackage()` to the list returned by the `getPackages()` method
+  - Add `import com.reactnativecommunity.androidprogressbar.RNCProgressBarPackage;` to the imports at the top of the file
+  - Add `new RNCProgressBarPackage()` to the list returned by the `getPackages()` method
 2. Append the following lines to `android/settings.gradle`:
   	```
   	include ':@react-native-community_progress-bar-android'

android/src/main/java/com/reactnativecommunity/androidprogressbar/RNCAndroidprogressbarPackage.java

@@ -1,22 +1,21 @@
-
 package com.reactnativecommunity.androidprogressbar;
 
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.Callback;
 
-public class RNCAndroidprogressbarModule extends ReactContextBaseJavaModule {
+public class RNCProgressBarModule extends ReactContextBaseJavaModule {
 
   private final ReactApplicationContext reactContext;
 
-  public RNCAndroidprogressbarModule(ReactApplicationContext reactContext) {
+  public RNCProgressBarModule(ReactApplicationContext reactContext) {
     super(reactContext);
     this.reactContext = reactContext;
   }
 
   @Override
   public String getName() {
-    return "RNCAndroidprogressbar";
+    return "RNCProgressBar";
   }
-}
+}

android/src/main/java/com/reactnativecommunity/androidprogressbar/RNCAndroidprogressbarModule.java renamed to android/src/main/java/com/reactnativecommunity/androidprogressbar/RNCProgressBarModule.java

@@ -0,0 +1,29 @@
+
+package com.reactnativecommunity.androidprogressbar;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.ViewManager;
+import com.facebook.react.bridge.JavaScriptModule;
+
+public class RNCProgressBarPackage implements ReactPackage {
+  @Override
+  public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
+    return Arrays.<NativeModule>asList(new RNCProgressBarModule(reactContext));
+  }
+
+  // Deprecated from RN 0.47
+  public List<Class<? extends JavaScriptModule>> createJSModules() {
+    return Collections.emptyList();
+  }
+
+  @Override
+  public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+    return Collections.emptyList();
+  }
+}

android/src/main/java/com/reactnativecommunity/androidprogressbar/RNCProgressBarPackage.java

@@ -20,16 +20,16 @@
 import com.facebook.react.uimanager.ViewProps;
 
 /**
- * Manages instances of ProgressBar. ProgressBar is wrapped in a ProgressBarContainerView because
- * the style of the ProgressBar can only be set in the constructor; whenever the style of a
- * ProgressBar changes, we have to drop the existing ProgressBar (if there is one) and create a new
- * one with the style given.
+ * Manages instances of ProgressBar. ProgressBar is wrapped in a
+ * ProgressBarContainerView because the style of the ProgressBar can only be set
+ * in the constructor; whenever the style of a ProgressBar changes, we have to
+ * drop the existing ProgressBar (if there is one) and create a new one with the
+ * style given.
  */
 @ReactModule(name = ReactProgressBarViewManager.REACT_CLASS)
-public class ReactProgressBarViewManager extends
-    BaseViewManager<ProgressBarContainerView, ProgressBarShadowNode> {
+public class ReactProgressBarViewManager extends BaseViewManager<ProgressBarContainerView, ProgressBarShadowNode> {
 
-  public static final String REACT_CLASS = "AndroidProgressBar";
+  public static final String REACT_CLASS = "RNCProgressBar";
 
   /* package */ static final String PROP_STYLE = "styleAttr";
   /* package */ static final String PROP_INDETERMINATE = "indeterminate";
@@ -41,9 +41,10 @@ public class ReactProgressBarViewManager extends
   private static Object sProgressBarCtorLock = new Object();
 
   /**
-   * We create ProgressBars on both the UI and shadow threads. There is a race condition in the
-   * ProgressBar constructor that may cause crashes when two ProgressBars are constructed at the
-   * same time on two different threads. This static ctor wrapper protects against that.
+   * We create ProgressBars on both the UI and shadow threads. There is a race
+   * condition in the ProgressBar constructor that may cause crashes when two
+   * ProgressBars are constructed at the same time on two different threads. This
+   * static ctor wrapper protects against that.
    */
   public static ProgressBar createProgressBar(Context context, int style) {
     synchronized (sProgressBarCtorLock) {
@@ -108,11 +109,10 @@ protected void onAfterUpdateTransaction(ProgressBarContainerView view) {
 
   /* package */ static int getStyleFromString(@Nullable String styleStr) {
     if (styleStr == null) {
-      throw new JSApplicationIllegalArgumentException(
-          "ProgressBar needs to have a style, null received");
+      throw new JSApplicationIllegalArgumentException("ProgressBar needs to have a style, null received");
     } else if (styleStr.equals("Horizontal")) {
       return android.R.attr.progressBarStyleHorizontal;
-    }  else if (styleStr.equals("Small")) {
+    } else if (styleStr.equals("Small")) {
       return android.R.attr.progressBarStyleSmall;
     } else if (styleStr.equals("Large")) {
       return android.R.attr.progressBarStyleLarge;

android/src/main/java/com/reactnativecommunity/androidprogressbar/ReactProgressBarViewManager.java

@@ -1,34 +1,43 @@
-import React from 'react';
-export type ProgressBarAndroidProps = {
+import * as React from 'react';
+import {ViewProps} from 'react-native';
+
+export type ProgressBarAndroidProps = ViewProps & {
   /**
    * styleAttr: style of ProgressBar
    *
    * default: 'Normal'
    */
-  styleAttr?: 'Normal'| 'Horizontal' | 'Small' | 'Large' | 'Inverse' |'SmallInverse' |'LargeInverse'
+  styleAttr?:
+    | 'Normal'
+    | 'Horizontal'
+    | 'Small'
+    | 'Large'
+    | 'Inverse'
+    | 'SmallInverse'
+    | 'LargeInverse';
   /**
    * color: Color of the ProgressBar
    */
-  color?: string
+  color?: string;
   /**
    * indeterminate: boolean flag for indeterminate mode.
    *
    * Use indeterminate mode for the progress bar when you do not know how long an operation will take. Indeterminate mode is the default for progress bar and shows a cyclic animation without a specific amount of progress indicated.
    *
    * default: false
    */
-  indeterminate?: boolean
+  indeterminate?: boolean;
   /**
    * progress: sets the amount of progress in 0-100.
    *
    * 25 will show that a progress bar is 25% complete
    */
-  progress?: number
+  progress?: number;
   /**
    * animating: weather ProgressBar is animated or not.
    *
    * default: true
    */
-  animating?: boolean
-}
+  animating?: boolean;
+};
 export class ProgressBar extends React.Component<ProgressBarAndroidProps> {}

example/android/app/.settings/org.eclipse.buildship.core.prefs

@@ -1 +1 @@
-export { default as ProgressBar } from './js/RNCProgressBarAndroid'
+export {default as ProgressBar} from './js/RNCProgressBarAndroid';

example/android/app/.settings/org.eclipse.jdt.core.prefs

@@ -5,7 +5,6 @@
 #import <React/RCTBridgeModule.h>
 #endif
 
-@interface RNCAndroidprogressbar : NSObject <RCTBridgeModule>
+@interface RNCProgressBar : NSObject <RCTBridgeModule>
 
 @end
-