Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrating to slate-ready thread. Adds desktop pairing flow. #2

Merged
merged 12 commits into from
May 27, 2019
Merged

Migrating to slate-ready thread. Adds desktop pairing flow. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
12bf975
pre pod
andrewxhill May 1, 2019
1a6d5bc
redux/saga cleanup
andrewxhill May 2, 2019
3bb5181
migrates to more robust schema to match desktop
andrewxhill May 2, 2019
ea35713
drop value when on mobile
andrewxhill May 2, 2019
8001d33
migration complete, deepLink waiting
andrewxhill May 2, 2019
2e88d17
mostly android
andrewxhill May 2, 2019
4401241
adds
andrewxhill May 2, 2019
1e4fa22
updated rn lib
andrewxhill May 3, 2019
87eef76
working migration
andrewxhill May 27, 2019
90ff687
Working iOS build
andrewxhill May 27, 2019
3dc28dd
simple landing
andrewxhill May 27, 2019
309cdef
mv to docs
andrewxhill May 27, 2019
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ android/**/*.classpath
# OSX
#
.DS_Store
ios/pods/

.tmp

Expand Down
14 changes: 7 additions & 7 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,18 +152,18 @@ android {
}

dependencies {
compile project(':react-native-shake')
compile project(':react-native-config')
compile project(':react-native-background-fetch')
compile project(':react-native-fs')
compile project(':react-native-background-timer')
compile project(':@textile_react-native-sdk')
implementation 'com.android.support:multidex:1.0.3'
implementation project(':@textile_react-native-sdk')
implementation project(':react-native-shake')
implementation project(':react-native-config')
implementation project(':react-native-background-fetch')
implementation project(':react-native-fs')
implementation project(':react-native-background-timer')
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 'com.facebook.fresco:fresco:1.10.0'
implementation 'com.facebook.fresco:animated-gif:1.10.0'
compile project(':mobile')
}

// Run this once to be able to run the application with BUCK
Expand Down
6 changes: 6 additions & 0 deletions android/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="textileNotes" />
</intent-filter>
</activity>
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
</application>
Expand Down
6 changes: 3 additions & 3 deletions android/app/src/main/java/io/textile/notes/MainApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
import android.app.Application;

import com.facebook.react.ReactApplication;
import io.textile.rnmobile.RNTextilePackage;
import com.clipsub.RNShake.RNShakeEventPackage;
import com.lugg.ReactNativeConfig.ReactNativeConfigPackage;
import com.transistorsoft.rnbackgroundfetch.RNBackgroundFetchPackage;
import com.rnfs.RNFSPackage;
import com.ocetnik.timer.BackgroundTimerPackage;
import io.textile.rnmobile.RNTextilePackage;
import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
import com.facebook.react.shell.MainReactPackage;
Expand All @@ -29,12 +29,12 @@ public boolean getUseDeveloperSupport() {
protected List<ReactPackage> getPackages() {
return Arrays.<ReactPackage>asList(
new MainReactPackage(),
new RNTextilePackage(),
new RNShakeEventPackage(),
new ReactNativeConfigPackage(),
new RNBackgroundFetchPackage(),
new RNFSPackage(),
new BackgroundTimerPackage(),
new RNTextilePackage()
new BackgroundTimerPackage()
);
}

Expand Down
5 changes: 2 additions & 3 deletions android/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
rootProject.name = 'Textile Notes'
include ':@textile_react-native-sdk'
project(':@textile_react-native-sdk').projectDir = new File(rootProject.projectDir, '../node_modules/@textile/react-native-sdk/android')
include ':react-native-shake'
project(':react-native-shake').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-shake/android')
include ':react-native-config'
Expand All @@ -9,7 +11,4 @@ include ':react-native-fs'
project(':react-native-fs').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fs/android')
include ':react-native-background-timer'
project(':react-native-background-timer').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-background-timer/android')
include ':@textile_react-native-sdk'
project(':@textile_react-native-sdk').projectDir = new File(rootProject.projectDir, '../node_modules/@textile/react-native-sdk/android')
include ':app'
include ':mobile'
Loading