Skip to content

Commit

Permalink
Merge pull request #1630 from ecency/development
Browse files Browse the repository at this point in the history
v3.0.0
  • Loading branch information
feruzm authored Aug 1, 2020
2 parents 6b22540 + e16b8b5 commit 7259ed3
Show file tree
Hide file tree
Showing 434 changed files with 13,212 additions and 6,221 deletions.
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
ACTIVITY_WEBSOCKET_URL=
BACKEND_URL=
ECENCY_BACKEND_API=
NEW_IMAGE_API=
OLD_IMAGE_API=
PIN_KEY=
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,10 @@ buck-out/
config.js
!src/screens/steem-connect/config.js
google-services.json
GoogleService-Info.plist
keystore/
.env
package-lock.json
my-release-key.keystore
gradle.properties
ios/eSteem.xcworkspace/xcuserdata/f.xcuserdatad/UserInterfaceState.xcuserstate
ios/Ecency.xcworkspace/xcuserdata/f.xcuserdatad/UserInterfaceState.xcuserstate
6 changes: 4 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"editor.formatOnSave": true,
"eslint.validate": ["javascript", "javascriptreact"]
"eslint.validate": [
"javascript",
"javascriptreact"
]
}
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2018-2019 eSteem https://esteem.app
Copyright (c) 2018-2020 Ecency https://ecency.com

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### eSteem Mobile
### Ecency Mobile

iOS ![iOS](https://build.appcenter.ms/v0.1/apps/ef80aa2a-d4e1-4f43-a4f8-be12ea72ba9b/branches/master/badge)
Android ![Android](https://build.appcenter.ms/v0.1/apps/12aace32-b58a-49da-bf85-5477f89ae16e/branches/master/badge)
Expand All @@ -11,14 +11,14 @@ Android ![Android](https://build.appcenter.ms/v0.1/apps/12aace32-b58a-49da-bf85-

## Download

AppStore iOS: https://ios.esteem.app
PlayStore Android: https://android.esteem.app
AppStore iOS: https://ios.ecency.com
PlayStore Android: https://android.ecency.com

### I. How do I get set up? 🔧

`$ git clone https://github.com/esteemapp/esteem-mobile.git`
`$ git clone https://github.com/ecency/ecency-mobile.git`

`$ cd esteem-mobile`
`$ cd ecency-mobile`

`$ yarn`

Expand Down Expand Up @@ -51,7 +51,7 @@ TODO

1. When you address an issue or a feature, make sure that there doesn't already exist a ISSUES ticket for this work item.

- [Issues](https://github.com/esteemapp/esteem-mobile/issues)
- [Issues](https://github.com/ecency/ecency-mobile/issues)

2. If the item already exists and is in progress, please remove the card or the issue you were assigned and leave a note that it is a duplicate.
3.If the item is not being worked on, please make sure that you put the card or issue as "In Progress" and assign it to yourself so other developers know that you are working on it.
Expand Down Expand Up @@ -102,13 +102,13 @@ What ever you want number of commit. Before create push squash your all commit.

To report a non-critical issue, please file an issue on this GitHub project.

If you find a security issue please report details to: security@esteem.app
If you find a security issue please report details to: security@ecency.com

We will evaluate the risk and make a patch available before filing the issue.

# Sponsors and Collaborators

- Steem community
- Hive community
- React native community
- Bugsnag
- Appcenter
2 changes: 1 addition & 1 deletion android/.project
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>eSteem</name>
<name>Ecency</name>
<comment>Project android created by Buildship.</comment>
<projects>
</projects>
Expand Down
11 changes: 11 additions & 0 deletions android/.settings/org.eclipse.buildship.core.prefs
Original file line number Diff line number Diff line change
@@ -1,2 +1,13 @@
arguments=
auto.sync=false
build.scans.enabled=false
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
connection.project.dir=
eclipse.preferences.version=1
gradle.user.home=
java.home=/Library/Java/JavaVirtualMachines/jdk-12.0.1.jdk/Contents/Home
jvm.arguments=
offline.mode=false
override.workspace.settings=true
show.console.view=true
show.executions.view=true
4 changes: 2 additions & 2 deletions android/app/_BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ android_library(

android_build_config(
name = "build_config",
package = "com.esteem",
package = "com.ecency",
)

android_resource(
name = "res",
package = "com.esteem",
package = "com.ecency",
res = "src/main/res",
)

Expand Down
9 changes: 5 additions & 4 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
apply plugin: "com.android.application"
apply plugin: 'com.google.gms.google-services'
apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle"
apply plugin: 'com.bugsnag.android.gradle'

Expand Down Expand Up @@ -122,7 +123,7 @@ def jscFlavor = 'org.webkit:android-jsc:+'
def enableHermes = project.ext.react.get("enableHermes", false);
configurations.all {
resolutionStrategy {
force "com.facebook.soloader:soloader:0.8.0"
force "com.facebook.soloader:soloader:0.8.1"
}
}
android {
Expand All @@ -142,7 +143,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode versionMajor * 10000 + versionMinor * 100 + versionPatch
versionName "2.2.5"
versionName "3.0.0"
resValue "string", "build_config_package", "app.esteem.mobile.android"
multiDexEnabled true
// react-native-image-crop-picker
Expand Down Expand Up @@ -212,6 +213,7 @@ dependencies {
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02'
implementation 'com.android.support:multidex:2.0.1'
implementation project(':@react-native-community_viewpager')
implementation 'com.google.firebase:firebase-analytics:17.2.3'

if (enableHermes) {
def hermesPath = "../../node_modules/hermes-engine/android/";
Expand All @@ -230,5 +232,4 @@ task copyDownloadableDepsToLibs(type: Copy) {
}

apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"
apply plugin: 'com.google.gms.google-services'
apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"
43 changes: 35 additions & 8 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,38 +28,65 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter android:label="Esteem">
<intent-filter android:label="Ecency">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="esteem" />
<data android:scheme="ecency" />
</intent-filter>
<intent-filter android:label="Esteem">
<intent-filter android:label="Ecency">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="https" android:host="ecency.com" />
</intent-filter>
<intent-filter android:label="Ecency">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="https" android:host="esteem.app" />
</intent-filter>
<intent-filter android:label="Esteem">
<intent-filter android:label="Ecency">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="https" android:host="hive.blog" />
</intent-filter>
<intent-filter android:label="Esteem">
<intent-filter android:label="Ecency">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="https" android:host="peakd.com" />
</intent-filter>
<intent-filter android:label="Ecency">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="https" android:host="leofinance.io" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="text/*" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="image/*" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND_MULTIPLE" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="image/*" />
</intent-filter>
</activity>
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
<meta-data
android:name="com.google.firebase.messaging.default_notification_icon"
android:resource="@mipmap/ic_notification" />
<meta-data
android:resource="@drawable/ic_notification" />
<!-- <meta-data
android:name="com.google.firebase.messaging.default_notification_color"
android:resource="@color/notification_icon" />
android:resource="@color/notification_icon" /> -->
<meta-data
android:name="com.bugsnag.android.API_KEY"
android:value="88a8a25738939a80ba49f1d5289dbc80" />
Expand Down
Loading

0 comments on commit 7259ed3

Please sign in to comment.