Merge pull request #224 from apptentive/develop

Release 6.1.0

Author: frankus

CHANGELOG.md

@@ -5,7 +5,7 @@ This document lets you know what has changed in the React Native module. For cha
 - [Android Changelog](https://github.com/apptentive/apptentive-android/blob/master/CHANGELOG.md)
 - [iOS Changelog](https://github.com/apptentive/apptentive-kit-ios/blob/main/CHANGELOG.md)
 
-# 2023-02-08 - v6.1.0
+# 2023-02-14 - v6.1.0
 
 - Apptentive Android SDK: 5.8.4
 - Apptentive iOS SDK: 6.1.0

android/gradle.properties

@@ -1,3 +1,3 @@
-Apptentive_kotlinVersion=1.3.50
+Apptentive_kotlinVersion=1.5.20
 Apptentive_compileSdkVersion=31
 Apptentive_targetSdkVersion=31

apptentive-react-native.podspec

@@ -15,6 +15,6 @@ Pod::Spec.new do |s|
 
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
-  s.dependency 'ApptentiveKit', '~> 6.0.9'
+  s.dependency 'ApptentiveKit', '~> 6.1.0'
   s.dependency "React-Core"
 end

example/.bundle/config

@@ -0,0 +1,2 @@
+BUNDLE_PATH: "vendor/bundle"
+BUNDLE_FORCE_RUBY_PLATFORM: 1

example/.eslintrc.js

@@ -0,0 +1,4 @@
+module.exports = {
+  root: true,
+  extends: '@react-native-community',
+};

example/.node-version

@@ -0,0 +1 @@
+18

example/.prettierrc.js

@@ -0,0 +1,7 @@
+module.exports = {
+  arrowParens: 'avoid',
+  bracketSameLine: true,
+  bracketSpacing: false,
+  singleQuote: true,
+  trailingComma: 'all',
+};

example/.ruby-version

@@ -0,0 +1 @@
+2.7.6

example/.watchmanconfig

@@ -0,0 +1 @@
+{}

example/src/App.tsx example/App.tsx

@@ -1,11 +1,40 @@
-import * as React from 'react';
+/**
+ * Sample React Native App
+ * https://github.com/facebook/react-native
+ *
+ * @format
+ */
 
-import { StyleSheet, Button, View, Text, TextInput, Platform } from 'react-native';
-import { Apptentive, ApptentiveConfiguration } from 'apptentive-react-native';
+import React from 'react';
+import type {PropsWithChildren} from 'react';
+import {
+  SafeAreaView,
+  ScrollView,
+  StatusBar,
+  StyleSheet,
+  Text,
+  useColorScheme,
+  View,
+  TextInput,
+  Button
+} from 'react-native';
 
-interface State {
-  eventName: string;
-}
+import {
+  Colors,
+  DebugInstructions,
+  Header,
+  LearnMoreLinks,
+  ReloadInstructions,
+} from 'react-native/Libraries/NewAppScreen';
+
+import {
+  Apptentive,
+  ApptentiveConfiguration
+} from 'apptentive-react-native'
+
+type SectionProps = PropsWithChildren<{
+  title: string;
+}>;
 
 // Set your Apptentive Dashboard Credentials
 const credentials = Platform.select({
@@ -68,10 +97,20 @@ export class App extends React.Component<{}, State> {
   }
 
   render() {
+    const backgroundStyle = {
+      backgroundColor: Colors.lighter,
+    };
+    
     return (
-      <View style={styles.root}>
-        <View style={styles.container}>
-
+      <SafeAreaView style={backgroundStyle}>
+        <StatusBar
+          barStyle={'dark-content'}
+          backgroundColor={backgroundStyle.backgroundColor}
+        />
+        <ScrollView
+          contentInsetAdjustmentBehavior="automatic"
+          style={backgroundStyle}>
+          <Header />
           {/* Test Events */}
           <View style={[styles.container, { flexDirection: "row" }]}>
             <TextInput
@@ -296,28 +335,29 @@ export class App extends React.Component<{}, State> {
               title="Type-Specific Custom Data"
             />
           </View>
-
-        </View>
-      </View>
+        </ScrollView>
+      </SafeAreaView>
     );
   }
 }
 
 const styles = StyleSheet.create({
-  root: {
-    alignItems: 'center',
-    alignSelf: 'center'
+  sectionContainer: {
+    marginTop: 32,
+    paddingHorizontal: 24,
   },
-  container: {
-    flex: 1,
-    alignItems: 'center',
-    justifyContent: 'center',
+  sectionTitle: {
+    fontSize: 24,
+    fontWeight: '600',
+  },
+  sectionDescription: {
+    marginTop: 8,
+    fontSize: 18,
+    fontWeight: '400',
+  },
+  highlight: {
+    fontWeight: '700',
   },
-  textinput: {
-    flex: 3,
-    height: 40,
-    backgroundColor: 'floralwhite',
-  }
 });
 
 export default App;

example/Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
+ruby File.read(File.join(__dir__, '.ruby-version')).strip
+
+gem 'cocoapods', '~> 1.11', '>= 1.11.3'

example/__tests__/App-test.tsx

@@ -0,0 +1,14 @@
+/**
+ * @format
+ */
+
+import 'react-native';
+import React from 'react';
+import App from '../App';
+
+// Note: test renderer must be required after react-native.
+import renderer from 'react-test-renderer';
+
+it('renders correctly', () => {
+  renderer.create(<App />);
+});