Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
8bdcd81
Apply Fabric sample
chrisglein Apr 6, 2023
b4dba08
Stub out all the things
chrisglein Apr 6, 2023
677aef8
Move all stubs to a Dependencies file
chrisglein Apr 6, 2023
11bd18e
appName needs to match json
chrisglein Apr 6, 2023
2b51d94
Fill in a working JS version of Picker
chrisglein Apr 6, 2023
5539124
Move from RNTesterApp-Fabric to artificialChat
chrisglein Apr 6, 2023
7f5d3d0
Remove .npmrc
chrisglein Apr 6, 2023
1942ae8
Delete generated file
chrisglein Apr 6, 2023
d37233e
Rename from RNTesterApp-Fabric
chrisglein Apr 6, 2023
593797a
Rename SLN
chrisglein Apr 6, 2023
0711eec
Add back deleted files (particularly android/ios)
chrisglein Apr 7, 2023
bccc8de
Restore some more deleted files
chrisglein Apr 7, 2023
846224c
Restore old package.json
chrisglein Apr 7, 2023
49f7d9f
Patch in a workaround for PlatformColor
chrisglein Apr 7, 2023
6832218
Patch in a workaround for double typed characters
chrisglein Apr 7, 2023
98920b4
Add back in postinstall to apply packages
chrisglein Apr 7, 2023
25d7601
Bring back JS-only modules
chrisglein Apr 7, 2023
b6f4674
Attempt to bring back local VersionInfo module
chrisglein Apr 10, 2023
e282b61
Rename SLN
chrisglein Apr 10, 2023
c4b26d7
Add version info to exe
chrisglein Apr 10, 2023
b9352d7
Merge pull request #121 from chrisglein/fabricLocalModule
chrisglein Apr 10, 2023
2e5a1a9
Expand PlatformColors for hyperlink
chrisglein Apr 12, 2023
55944b4
Fix Picker collapsed key warning
chrisglein Apr 12, 2023
c874976
Remove windows patches
chrisglein Apr 29, 2023
829d566
Fix title and icon
chrisglein Apr 29, 2023
7c0f129
Add Win32 implementation of Clipboard
chrisglein May 3, 2023
e512690
Update to latest canary to get ActivityIndicator
chrisglein May 5, 2023
14760f4
Patch border colors
chrisglein May 5, 2023
f0469b7
Update to latest canary
chrisglein Jun 14, 2023
9e4d09c
Release builds load bundle from filesystem
chrisglein Jun 15, 2023
6cb3753
Create a packaging project
chrisglein Jun 21, 2023
8149255
Try manually adding Bundle to package
chrisglein Jun 30, 2023
0c3cf06
Bundle behavior depends on packaged or not
chrisglein Jul 12, 2023
9f6c037
Remove ARM from appx bundle
chrisglein Jul 12, 2023
b2aac2a
Add tile/store assets to bundle
chrisglein Jul 12, 2023
1e48256
Update to new 693 canary
chrisglein Aug 16, 2023
4ad5a3b
Update to canary.694
chrisglein Aug 22, 2023
d4a078b
Update to canary 695
chrisglein Aug 24, 2023
a44c2e2
Add XAML-style textBox style
chrisglein Aug 25, 2023
c6d967c
Update to canary 698
chrisglein Aug 29, 2023
096beb2
Update to canary 700
chrisglein Aug 31, 2023
6e78588
Build Fabric app from new init template
chrisglein Oct 25, 2023
cadc448
Update to 760 canary
chrisglein Jan 29, 2024
2c0d4dd
Remove DeviceInfo
chrisglein Jan 29, 2024
20c43ba
Refresh from new app template
chrisglein Feb 5, 2024
af707e8
Remaining changes to get Windows build unblocked
chrisglein Feb 6, 2024
d104b05
Update to canary 764
chrisglein Feb 7, 2024
2d8bb0d
Reset lock file
chrisglein Feb 7, 2024
a0e8715
Restore UseHermes
chrisglein Feb 7, 2024
1209f94
Update to canary 769
chrisglein Feb 21, 2024
2e0f58a
Update to canary 776
chrisglein Feb 24, 2024
257a82a
Restore store association
chrisglein Feb 26, 2024
3457000
Add GPT4 turbo preview
chrisglein Feb 26, 2024
17cb149
Restore original project settings
chrisglein Feb 26, 2024
1753bc5
Restore package project guid
chrisglein Feb 27, 2024
28adefb
Merge pull request #137 from chrisglein/fabric_updatedTemplate
chrisglein Feb 27, 2024
4c7aa49
Merge pull request #138 from chrisglein/fabric_packaged
chrisglein Feb 27, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
root: true,
extends: '@react-native-community',
extends: '@react-native',
};
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,8 @@ yarn-error.log
# Temporary files created by Metro to check the health of the file watcher
.metro-health-check*

# testing
/coverage

# Build logs
*.binlog
1 change: 0 additions & 1 deletion .node-version

This file was deleted.

1 change: 0 additions & 1 deletion .ruby-version

This file was deleted.

202 changes: 0 additions & 202 deletions .vscode/.react/debuggerWorker.js

This file was deleted.

2 changes: 1 addition & 1 deletion .watchmanconfig
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{}
{}
5 changes: 3 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
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
ruby ">= 2.6.10"

gem 'cocoapods', '~> 1.11', '>= 1.11.3'
gem 'cocoapods', '~> 1.13'
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
5 changes: 4 additions & 1 deletion __tests__/App-test.tsx → __tests__/App.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@

import 'react-native';
import React from 'react';
import App from '../App';
import App from '../src/App';

// Note: import explicitly to use the types shipped with jest.
import {it} from '@jest/globals';

// Note: test renderer must be required after react-native.
import renderer from 'react-test-renderer';
Expand Down
64 changes: 6 additions & 58 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
apply plugin: "com.android.application"
apply plugin: "org.jetbrains.kotlin.android"
apply plugin: "com.facebook.react"

import com.android.build.OutputFile

/**
* This is the configuration block to customize your React Native Android app.
* By default you don't need to apply any configuration, just uncomment the lines you need.
Expand All @@ -12,9 +11,9 @@ react {
// The root of your project, i.e. where "package.json" lives. Default is '..'
// root = file("../")
// The folder where the react-native NPM package is. Default is ../node_modules/react-native
// reactNativeDir = file("../node-modules/react-native")
// The folder where the react-native Codegen package is. Default is ../node_modules/react-native-codegen
// codegenDir = file("../node-modules/react-native-codegen")
// reactNativeDir = file("../node_modules/react-native")
// The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
// codegenDir = file("../node_modules/@react-native/codegen")
// The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
// cliFile = file("../node_modules/react-native/cli.js")

Expand Down Expand Up @@ -52,14 +51,6 @@ react {
// hermesFlags = ["-O", "-output-source-map"]
}

/**
* Set this to true to create four separate APKs instead of one,
* one for each native architecture. This is useful if you don't
* use App Bundles (https://developer.android.com/guide/app-bundle/)
* and want to have separate APKs to upload to the Play Store.
*/
def enableSeparateBuildPerCPUArchitecture = false

/**
* Set this to true to Run Proguard on Release builds to minify the Java bytecode.
*/
Expand All @@ -78,20 +69,10 @@ def enableProguardInReleaseBuilds = false
*/
def jscFlavor = 'org.webkit:android-jsc:+'

/**
* Private function to get the list of Native Architectures you want to build.
* This reads the value from reactNativeArchitectures in your gradle.properties
* file and works together with the --active-arch-only flag of react-native run-android.
*/
def reactNativeArchitectures() {
def value = project.getProperties().get("reactNativeArchitectures")
return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
}

android {
ndkVersion rootProject.ext.ndkVersion

compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
compileSdk rootProject.ext.compileSdkVersion

namespace "com.artificialchat"
defaultConfig {
Expand All @@ -101,15 +82,6 @@ android {
versionCode 1
versionName "1.0"
}

splits {
abi {
reset()
enable enableSeparateBuildPerCPUArchitecture
universalApk false // If true, also generate a universal APK
include (*reactNativeArchitectures())
}
}
signingConfigs {
debug {
storeFile file('debug.keystore')
Expand All @@ -130,36 +102,12 @@ android {
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
}
}

// applicationVariants are e.g. debug, release
applicationVariants.all { variant ->
variant.outputs.each { output ->
// For each separate APK per architecture, set a unique version code as described here:
// https://developer.android.com/studio/build/configure-apk-splits.html
// Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc.
def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]
def abi = output.getFilter(OutputFile.ABI)
if (abi != null) { // null for the universal-debug, universal-release variants
output.versionCodeOverride =
defaultConfig.versionCode * 1000 + versionCodes.get(abi)
}

}
}
}

dependencies {
// The version of react-native is set by the React Native Gradle Plugin
implementation("com.facebook.react:react-android")

implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0")

debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
exclude group:'com.squareup.okhttp3', module:'okhttp'
}

debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
if (hermesEnabled.toBoolean()) {
implementation("com.facebook.react:hermes-android")
} else {
Expand Down
6 changes: 1 addition & 5 deletions android/app/src/debug/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>

<application
android:usesCleartextTraffic="true"
tools:targetApi="28"
tools:ignore="GoogleAppIndexingWarning">
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
</application>
tools:ignore="GoogleAppIndexingWarning"/>
</manifest>
Loading