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.

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

[WIP] Share Tab (Shell Profile Only) #15528

Closed
wants to merge 34 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
a3957fc
add share tab for profile inside Shell
siddarthkay Feb 1, 2023
93f64df
create an issue for the todo
siddarthkay Mar 31, 2023
a6215b6
get rid of `js/setTimeout`
siddarthkay Mar 31, 2023
c803d64
move QR component & add constant for baseurl
siddarthkay Apr 3, 2023
7c69bc0
initialize state outside the renderer function
siddarthkay Apr 3, 2023
82a208c
get rid of useless react fragment
siddarthkay Apr 4, 2023
30c1ff2
move copy to events namespace
siddarthkay Apr 4, 2023
a08b41e
`rn/view` -> `:<>`
siddarthkay Apr 4, 2023
ee96acf
`:show-popover` -> `:open-modal`
siddarthkay Apr 4, 2023
f464e11
lint-fix & danglers
siddarthkay Apr 4, 2023
50e7887
get rid of max-width calculations :)
siddarthkay Apr 4, 2023
5b76374
don't pass un-necessary prop
siddarthkay Apr 4, 2023
695b913
make linter happy again
siddarthkay Apr 4, 2023
d7efd9b
kebab-case and get rid of extra line
siddarthkay Apr 6, 2023
24c464c
address valuable feedback
siddarthkay Apr 8, 2023
ffa4412
get rid of comment block
siddarthkay Apr 8, 2023
4cb7ae2
add share tab for profile inside Shell
siddarthkay Feb 1, 2023
cb3be86
create an issue for the todo
siddarthkay Mar 31, 2023
1432591
get rid of `js/setTimeout`
siddarthkay Mar 31, 2023
9971f23
move QR component & add constant for baseurl
siddarthkay Apr 3, 2023
014d516
initialize state outside the renderer function
siddarthkay Apr 3, 2023
41f4943
get rid of useless react fragment
siddarthkay Apr 4, 2023
a091b08
move copy to events namespace
siddarthkay Apr 4, 2023
5289471
`rn/view` -> `:<>`
siddarthkay Apr 4, 2023
ed25dc7
`:show-popover` -> `:open-modal`
siddarthkay Apr 4, 2023
04847ca
lint-fix & danglers
siddarthkay Apr 4, 2023
eefe06e
get rid of max-width calculations :)
siddarthkay Apr 4, 2023
481b571
don't pass un-necessary prop
siddarthkay Apr 4, 2023
736fd43
make linter happy again
siddarthkay Apr 4, 2023
0ea32ed
kebab-case and get rid of extra line
siddarthkay Apr 6, 2023
ea4ffe1
address valuable feedback
siddarthkay Apr 8, 2023
95cb4fb
get rid of comment block
siddarthkay Apr 8, 2023
caf53a2
Merge branch '13439-implement-share-in-shell' of https://github.com/s…
siddarthkay Apr 20, 2023
92c5d3b
Revert "Merge branch '13439-implement-share-in-shell' of https://gith…
siddarthkay Apr 20, 2023
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
20 changes: 1 addition & 19 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,6 @@ project.ext.react = [
* to guard against a hang in the UI thread after invoking status-go.
* Also a clean and rebuild is required when changing this. */
enableHermes: !disableHermes,
/* FIXME: Workaround for crash caused by missing libhermes-executor-release.so.
* https://github.com/facebook/react-native/issues/32928 */
deleteDebugFilesForVariant: { false },
enableVmCleanup: false,
/* Disable 'The first definition was here.' warnings */
hermesFlagsRelease: ["-w"],
bundleInPr: true,
Expand Down Expand Up @@ -136,12 +132,6 @@ def jscFlavor = 'org.webkit:android-jsc:+'
*/
def enableHermes = project.ext.react.get("enableHermes", false);

/**
* Architectures to build native code for in debug.
*/
def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")


def getCommitHash = { ->
if (project.hasProperty("commitHash")) {
return project.commitHash
Expand Down Expand Up @@ -193,8 +183,6 @@ def getEnvOrConfig = { varName ->
}

android {
ndkVersion rootProject.ext.ndkVersion

compileSdkVersion rootProject.ext.compileSdkVersion

compileOptions {
Expand Down Expand Up @@ -276,11 +264,6 @@ android {
versionNameSuffix "-SNAPSHOT"
resValue "string", "build_config_package", "im.status.ethereum"
signingConfig signingConfigs.debug
if (nativeArchitectures) {
ndk {
abiFilters nativeArchitectures.split(',')
}
}
}
release {
minifyEnabled enableProguardInReleaseBuilds
Expand Down Expand Up @@ -324,7 +307,6 @@ android {

dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation "com.facebook.soloader:soloader:0.10.1+"
implementation "com.facebook.react:react-native:+" // From node_modules

implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
Expand Down Expand Up @@ -366,7 +348,7 @@ dependencies {
implementation 'com.github.status-im:function:0.0.1'
implementation 'com.facebook.fresco:fresco:2.2.0'
implementation 'com.facebook.fresco:animated-gif:2.2.0'
implementation "com.squareup.okhttp3:okhttp-tls:4.9.1"
implementation "com.squareup.okhttp3:okhttp-tls:3.12.12"
}

def getLocalNDKDir = { ->
Expand Down
6 changes: 2 additions & 4 deletions android/app/src/debug/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,5 @@
<!-- Remove licensing permission since we don't license our app and it blocks F-Droid submissions. -->
<uses-permission tools:node="remove" android:name="com.android.vending.CHECK_LICENSE"/>

<application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" android:usesCleartextTraffic="true" >
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
</application>
</manifest>
<application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" android:usesCleartextTraffic="true" />
</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import com.facebook.react.bridge.WritableMap;
import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;

import com.facebook.react.ReactFragmentActivity;
import com.reactnativenavigation.NavigationActivity;
import com.facebook.react.modules.core.PermissionListener;
import androidx.core.splashscreen.SplashScreen;
Expand Down
9 changes: 0 additions & 9 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,6 @@ ext {
targetSdkVersion = Integer.valueOf(project.targetSdkVersion)
supportLibVersion = project.supportLibVersion
gradlePluginVersion = project.gradlePluginVersion

if (System.properties['os.arch'] == "aarch64") {
// For M1 Users we need to use the NDK 24 which added support for aarch64
ndkVersion = "24.0.8215888"
} else {
// Otherwise we default to the side-by-side NDK version from AGP.
ndkVersion = "21.4.7075529"
}

}

buildscript {
Expand Down
4 changes: 2 additions & 2 deletions android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ kotlinVersion=1.3.50
minSdkVersion=23
compileSdkVersion=31
targetSdkVersion=31
buildToolsVersion=30.0.0
buildToolsVersion=31.0.0
supportLibVersion=28.0.0
# This should match version from nix/mobile/android/maven-and-npm-deps/maven/default.nix
gradlePluginVersion=4.1.0
gradlePluginVersion=3.5.4

android.useAndroidX=true
android.enableJetifier=true
Expand Down
2 changes: 1 addition & 1 deletion ci/Jenkinsfile.combined
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ pipeline {
}

/* WARNING: Defining parameters here with the ?: trick causes them to remember last value. */
parameters {
parameters {
choice(
name: 'BUILD_TYPE',
description: 'Makefile target to build. Optional Parameter.',
Expand Down
4 changes: 2 additions & 2 deletions ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ abstract_target 'Status' do
# Pods for StatusQuo
config = use_native_modules!

use_react_native!(:path => config[:reactNativePath],
:hermes_enabled => false)
use_react_native!(:path => config["reactNativePath"])

pod 'react-native-image-resizer', :path => '../node_modules/react-native-image-resizer'
pod 'react-native-config', :path => '../node_modules/react-native-config'
Expand Down Expand Up @@ -48,3 +47,4 @@ abstract_target 'Status' do

use_native_modules!
end

Loading