Merge pull request #1 from nyu-ossd-s19/SimpleExample

vivfang · web-flow · commit 19f3c5b2e04e · 2019-05-06T17:00:10.000-04:00
Simple example
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "interactive"
+}
diff --git a/README.md b/README.md
@@ -5,6 +5,18 @@
 
 `$ npm install react-native-androidprogressbar --save`
 
+## Example setup
+
+### Android
+1. Install dependencies
+2. Start the server
+3. Build the application
+```
+npm install
+npm run start
+npm run build:android
+```
+
 ### Mostly automatic installation
 
 `$ react-native link react-native-androidprogressbar`
@@ -42,4 +54,4 @@ import RNCAndroidprogressbar from 'react-native-androidprogressbar';
 // TODO: What to do with the module?
 RNCAndroidprogressbar;
 ```
-  
+  
diff --git a/android/.settings/org.eclipse.buildship.core.prefs b/android/.settings/org.eclipse.buildship.core.prefs
@@ -1,2 +1,2 @@
-connection.project.dir=
+connection.project.dir=../example/android
 eclipse.preferences.version=1
diff --git a/android/build.gradle b/android/build.gradle
@@ -12,12 +12,11 @@ buildscript {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion 26
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 22
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
     }
@@ -31,6 +30,6 @@ repositories {
 }
 
 dependencies {
-    compile 'com.facebook.react:react-native:+'
+    implementation 'com.facebook.react:react-native:+'
 }
   
diff --git a/example/ProgressBarAndroidExample.android.js b/example/ProgressBarAndroidExample.android.js
@@ -10,7 +10,7 @@
 
 'use strict';
 
-var ProgressBar = require('../../Libraries/Components/ProgressBarAndroid/ProgressBarAndroid');
+var ProgressBar = require('../js/RNCProgressBarAndroid.android');
 var React = require('react');
 var createReactClass = require('create-react-class');
 var RNTesterBlock = require('./RNTesterBlock');
@@ -40,7 +40,7 @@ var MovingBar = createReactClass({
   },
 });
 
-class ProgressBarAndroidExample extends React.Component<{}> {
+export default class ProgressBarAndroidExample extends React.Component<{}> {
   static title = '<ProgressBarAndroid>';
   static description = 'Horizontal bar to show the progress of some operation.';
 
diff --git a/example/android/app/.classpath b/example/android/app/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-12/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>
diff --git a/example/android/app/.settings/org.eclipse.buildship.core.prefs b/example/android/app/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+connection.project.dir=..
+eclipse.preferences.version=1
diff --git a/example/android/app/.settings/org.eclipse.jdt.core.prefs b/example/android/app/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=13
+org.eclipse.jdt.core.compiler.compliance=13
+org.eclipse.jdt.core.compiler.source=13
diff --git a/example/android/app/BUCK b/example/android/app/BUCK
@@ -35,12 +35,12 @@ android_library(
 
 android_build_config(
     name = "build_config",
-    package = "com.androidprogressbarexample",
+    package = "com.androidprogressbar",
 )
 
 android_resource(
     name = "res",
-    package = "com.androidprogressbarexample",
+    package = "com.androidprogressbar",
     res = "src/main/res",
 )
 
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -73,10 +73,10 @@ import com.android.build.OutputFile
  */
 
 project.ext.react = [
-    entryFile: "example/index.js"
+    entryFile: "index.js"
 ]
 
-apply from: "../../../../node_modules/react-native/react.gradle"
+apply from: "../../../node_modules/react-native/react.gradle"
 
 /**
  * Set this to true to create two separate APKs instead of one:
@@ -102,7 +102,7 @@ android {
     }
 
     defaultConfig {
-        applicationId "com.androidprogressbarexample"
+        applicationId "com.androidprogressbar"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
@@ -141,7 +141,6 @@ dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
     implementation "com.facebook.react:react-native:+"  // From node_modules
-    implementation project(':react-native-progress-bar-android')
 }
 
 // Run this once to be able to run the application with BUCK
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.androidprogressbarexample">
+  package="com.androidprogressbar">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
diff --git a/example/android/app/src/main/java/com/androidprogressbar/MainActivity.java b/example/android/app/src/main/java/com/androidprogressbar/MainActivity.java
@@ -1,4 +1,4 @@
-package com.androidprogressbarexample;
+package com.androidprogressbar;
 
 import com.facebook.react.ReactActivity;
 
diff --git a/example/android/app/src/main/java/com/androidprogressbar/MainApplication.java b/example/android/app/src/main/java/com/androidprogressbar/MainApplication.java
@@ -1,4 +1,4 @@
-package com.androidprogressbarexample;
+package com.androidprogressbar;
 
 import android.app.Application;
 
diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -13,7 +13,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:3.3.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/example/android/settings.gradle b/example/android/settings.gradle
@@ -1,7 +1,7 @@
 rootProject.name = 'AndroidProgressBarExample'
 
-include ':react-native-netinfo'
-project(':react-native-netinfo').projectDir = new File(rootProject.projectDir, '../../android')
+include ':react-native-progress-bar-android'
+project(':react-native-progress-bar-android').projectDir = new File(rootProject.projectDir, '../../android')
 // For your application the line above will most likely be:
 // project(':react-native-netinfo').projectDir = new File(rootProject.projectDir, '../node_modules/!react-native-community/netinfo/android')
 
diff --git a/example/index.js b/example/index.js
@@ -1,144 +1,14 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @flow
- */
-
 import React from 'react';
-import {
-  AppRegistry,
-  Button,
-  SafeAreaView,
-  ScrollView,
-  StyleSheet,
-  Text,
-  View,
-} from 'react-native';
-
-import ProgressBarTestModule from './ProgressBarTestModule.js';
-import ProgressBarAndroidExample from './ProgressBarAndroidExample.android.js';
-import RNTesterBlock from './RNTesterBlock.js';
-import RNTesterPage from './RNTesterPage.js';
-import RNTesterTitle from './RNTesterTitle.js';
-
-// Examples which show the user how to correctly use the library
-const EXAMPLES = [
-  {
-    id: 'ProgressBarTestModule',
-    title: 'Progress Bar Test Module',
-    description: 'Multiple progress bars with different style attributes.',
-    render() {
-      return <ProgressBarTestModule />;
-    },
-  },
-  {
-    id: 'ProgressBarAndroidExample',
-    title: 'Simple progress bar',
-    description: 'Horizontal bar to show the progress of some operation.',
-    render() {
-      return <ProgressBarAndroidExample />;
-    },
-	},
-];
-
-// Test cases for the e2e tests. THESE ARE NOT EXAMPLES OF BEST PRACTICE
-import TEST_CASES from './testCases';
-
-type State = {
-  showExamples: boolean,
-};
-
-class ExampleApp extends React.Component<{}, State> {
-  constructor(props) {
-    super(props);
+import {AppRegistry} from 'react-native';
 
-    this.state = {
-      showExamples: true,
-    };
-  }
-
-  _toggleMode = () => {
-    this.setState(state => ({showExamples: !state.showExamples}));
-  };
+import {name as appName}  from './app.json';
+import ProgressBarAndroidExample from "./ProgressBarAndroidExample.android";
 
+class ExampleApp extends React.Component<{}> {
   render() {
-    const {showExamples} = this.state;
     return (
-      <ScrollView testID="scrollView" style={styles.container}>
-        <SafeAreaView>
-          <Button
-            testID="modeToggle"
-            onPress={this._toggleMode}
-            title={showExamples ? 'Switch to Test Cases' : 'Switch to Examples'}
-          />
-          {showExamples ? (
-            <>
-              <Text testID="examplesTitle" style={styles.sectionTitle}>
-                Examples
-              </Text>
-              {EXAMPLES.map(this._renderExample)}
-            </>
-          ) : (
-            <>
-              <Text testID="testCasesTitle" style={styles.sectionTitle}>
-                Test Cases
-              </Text>
-              {TEST_CASES.map(this._renderExample)}
-            </>
-          )}
-        </SafeAreaView>
-      </ScrollView>
-    );
+        <ProgressBarAndroidExample />
+    )
   }
-
-  _renderExample = example => {
-    return (
-      <View
-        testID={`example-${example.id}`}
-        key={example.title}
-        style={styles.exampleContainer}>
-        <Text style={styles.exampleTitle}>{example.title}</Text>
-        <Text style={styles.exampleDescription}>{example.description}</Text>
-        <View style={styles.exampleInnerContainer}>{example.render()}</View>
-      </View>
-    );
-  };
 }
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    backgroundColor: '#F5FCFF',
-  },
-  sectionTitle: {
-    fontSize: 24,
-    marginHorizontal: 8,
-    marginTop: 24,
-  },
-  exampleContainer: {
-    padding: 16,
-    marginVertical: 4,
-    backgroundColor: '#FFF',
-    borderColor: '#EEE',
-    borderTopWidth: 1,
-    borderBottomWidth: 1,
-  },
-  exampleTitle: {
-    fontSize: 18,
-  },
-  exampleDescription: {
-    color: '#333333',
-    marginBottom: 16,
-  },
-  exampleInnerContainer: {
-    borderColor: '#EEE',
-    borderTopWidth: 1,
-    paddingTop: 16,
-  },
-});
-
-AppRegistry.registerComponent(appName, () => ExampleApp);
+AppRegistry.registerComponent(appName, () => ExampleApp);
diff --git a/package.json b/package.json
@@ -4,8 +4,10 @@
   "description": "React Native Android Progress Bar",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "node node_modules/react-native/local-cli/cli.js start"
+    "start": "node node_modules/react-native/local-cli/cli.js start",
+    "start:android": "adb shell am start -n com.androidprogressbar/.MainActivity",
+    "build:android": "cd example/android && ./gradlew installDebug && cd ../.. && npm run start:android",
+    "test": "jest"
   },
   "keywords": [
     "react-native",
@@ -18,9 +20,10 @@
     "react-native": "^0.41.2"
   },
   "dependencies": {
-    "react": "16.8.3",
-    "react-native": "0.59.4",
-    "babel-plugin-module-resolver": "^3.2.0"
+    "babel-plugin-module-resolver": "^3.2.0",
+    "react": "^16.8.3",
+    "react-native": "^0.59.5",
+    "react-timer-mixin": "^0.13.4"
   },
   "devDependencies": {
     "@babel/core": "^7.4.3",
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "java.configuration.updateBuildConfiguration": "interactive"`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-connection.project.dir=`
	`1`	`+connection.project.dir=../example/android`
`2`	`2`	`eclipse.preferences.version=1`
Original file line number	Diff line number	Diff line change
`@@ -12,12 +12,11 @@ buildscript {`
`12`	`12`	`apply plugin: 'com.android.library'`
`13`	`13`
`14`	`14`	`android {`
`15`		`- compileSdkVersion 23`
`16`		`- buildToolsVersion "23.0.1"`
	`15`	`+ compileSdkVersion 26`
`17`	`16`
`18`	`17`	`defaultConfig {`
`19`	`18`	`minSdkVersion 16`
`20`		`- targetSdkVersion 22`
	`19`	`+ targetSdkVersion 26`
`21`	`20`	`versionCode 1`
`22`	`21`	`versionName "1.0"`
`23`	`22`	`}`
`@@ -31,6 +30,6 @@ repositories {`
`31`	`30`	`}`
`32`	`31`
`33`	`32`	`dependencies {`
`34`		`- compile 'com.facebook.react:react-native:+'`
	`33`	`+ implementation 'com.facebook.react:react-native:+'`
`35`	`34`	`}`
`36`	`35`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+connection.project.dir=..`
	`2`	`+eclipse.preferences.version=1`
Original file line number	Diff line number	Diff line change
`@@ -35,12 +35,12 @@ android_library(`
`35`	`35`
`36`	`36`	`android_build_config(`
`37`	`37`	`name = "build_config",`
`38`		`- package = "com.androidprogressbarexample",`
	`38`	`+ package = "com.androidprogressbar",`
`39`	`39`	`)`
`40`	`40`
`41`	`41`	`android_resource(`
`42`	`42`	`name = "res",`
`43`		`- package = "com.androidprogressbarexample",`
	`43`	`+ package = "com.androidprogressbar",`
`44`	`44`	`res = "src/main/res",`
`45`	`45`	`)`
`46`	`46`