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

Dev #554

Merged
merged 20 commits into from
Jan 10, 2019
Merged

Dev #554

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
c2bbf61
修复打包后 emoji 空白
LinXueyuanStdio Oct 17, 2018
e85cc96
修改ChatInputView发送按钮动画后为自动的Icon
Nov 2, 2018
0ec0fb9
Merge pull request #488 from LinXueyuanStdio/dev
JoshLipan Jan 9, 2019
e939180
Merge pull request #504 from gaochengcai/master
JoshLipan Jan 9, 2019
eb0b163
Add style attribute cameraQuality for Android
JoshLipan Jan 9, 2019
4d21aed
Merge branch 'dev' of https://github.com/jpush/aurora-imui into dev
JoshLipan Jan 9, 2019
7ae4c94
Fix Preview Distortion
JoshLipan Jan 9, 2019
7c194b6
Set android.hardware.camera2 unrequired
JoshLipan Jan 9, 2019
eeae022
Update bubble margin
JoshLipan Jan 9, 2019
723d7cc
Update gradle
JoshLipan Jan 9, 2019
aa9f28f
Update sample
JoshLipan Jan 9, 2019
90c3c92
Update Android CameraNew
JoshLipan Jan 9, 2019
92c30a3
Update Android sample
JoshLipan Jan 9, 2019
8b5f24b
Update RN Android gradle
JoshLipan Jan 9, 2019
8ed9e17
Add API cameraQuality for RN Android
JoshLipan Jan 9, 2019
38de230
Update RN Android sample
JoshLipan Jan 9, 2019
8df65bc
Implementation latest chatinput and messagelist version
JoshLipan Jan 10, 2019
f9566b4
Update RN sample
JoshLipan Jan 10, 2019
749ddc9
Update DOC
JoshLipan Jan 10, 2019
ddf7093
Release v0.13.0 for RN
JoshLipan Jan 10, 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
Prev Previous commit
Next Next commit
Update RN Android sample
  • Loading branch information
@JoshLipan
JoshLipan committed Jan 9, 2019
commit 38de2302c76b86a44ed11965e43c183dd83d22e8
5 changes: 3 additions & 2 deletions ReactNative/sample/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,10 +553,11 @@ export default class TestRNIMUI extends Component {
inputPadding={{ left: 30, top: 10, right: 10, bottom: 10 }}
galleryScale={0.6}//default = 0.5
compressionQuality={0.6}
cameraQuality={1}//default = 0.5
customLayoutItems={{
left: [],
right: ['send','emoji']
// bottom: ['voice','gallery','emoji','camera']
right: ['send'],
bottom: ['voice','gallery','emoji','camera']
}}
/>
</View>
Expand Down
24 changes: 12 additions & 12 deletions ReactNative/sample/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,13 @@ def enableSeparateBuildPerCPUArchitecture = false
def enableProguardInReleaseBuilds = false

android {
compileSdkVersion 25
compileSdkVersion 27
buildToolsVersion "27.0.3"

defaultConfig {
applicationId "com.testrnimuiexample"
minSdkVersion 16
targetSdkVersion 25
targetSdkVersion 27
versionCode 1
versionName "1.0"
ndk {
Expand Down Expand Up @@ -154,21 +154,21 @@ android {
}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
implementation fileTree(include: ['*.jar'], dir: 'libs')
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile (project(':aurora-imui-react-native')) {
implementation (project(':aurora-imui-react-native')) {
exclude group: 'com.android.support'
}
compile project(':react-native-fs')
compile ('com.facebook.react:react-native:+') {
implementation project(':react-native-fs')
implementation ('com.facebook.react:react-native:+') {
exclude group: 'com.android.support'
}
implementation 'com.android.support:appcompat-v7:25.4.0'
implementation 'com.android.support:design:25.4.0'
implementation 'com.android.support:support-v4:25.4.0'
implementation 'com.android.support:recyclerview-v7:25.4.0'
testCompile 'junit:junit:4.12'
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:design:27.1.1'
implementation 'com.android.support:support-v4:27.1.1'
implementation 'com.android.support:recyclerview-v7:27.1.1'
testImplementation 'junit:junit:4.12'
}