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

增加英语环境 value-en #84

Open
wants to merge 86 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
5a6adba
增加英语环境
liukefu2050 Feb 4, 2017
a1449a6
发布新库到jcenter
liukefu2050 Feb 17, 2017
9fbc80c
upload to jcenter
liukefu2050 Feb 23, 2017
7a237cb
language change
liukefu2050 Feb 24, 2017
b3a7b02
增加直接调用相机功能
liukefu2050 Apr 20, 2017
fbb17eb
add 0.0.6
liukefu2050 Apr 20, 2017
cf5074e
过滤临时目录,增加设置标题
liukefu2050 Oct 12, 2017
2619db6
增加拍照后直接返回参数
liukefu2050 Oct 12, 2017
74dc167
增加jcenter新版本0.0.7
liukefu2050 Oct 12, 2017
1116350
remove ucorp
liukefu2050 Oct 25, 2017
4204aeb
update
liukefu2050 Oct 25, 2017
b033dc0
update
liukefu2050 Oct 25, 2017
2eeef18
update
liukefu2050 Oct 26, 2017
fb562f5
update
liukefu2050 Oct 27, 2017
3148c17
update
liukefu2050 Oct 27, 2017
0f85f23
update
liukefu2050 Oct 27, 2017
baee021
update
liukefu2050 Oct 27, 2017
ed69695
update base
liukefu2050 Oct 27, 2017
32040a8
update base
liukefu2050 Oct 27, 2017
10b710f
update base
liukefu2050 Oct 27, 2017
d11a1f7
update base
liukefu2050 Oct 27, 2017
a98477b
vesion 0.0.8
liukefu2050 Oct 27, 2017
7442ffa
add param
liukefu2050 Oct 30, 2017
26c3e48
add param
liukefu2050 Oct 30, 2017
f21e4c9
add param
liukefu2050 Oct 30, 2017
947f243
new version 0.0.9
liukefu2050 Oct 30, 2017
99730bf
fixed bug,中文写死问题
liukefu2050 Dec 19, 2017
7c0b56d
fixed bug,中文写死问题
liukefu2050 Dec 19, 2017
80abce3
增加 multipleShot 参数
liukefu2050 Jan 10, 2018
5d5f401
version 12
liukefu2050 Jan 10, 2018
7b9b504
new image not show up issue for "multipleShot"
liukefu2050 Jan 15, 2018
532f2ea
the total image checked number is wrong
liukefu2050 Jan 17, 2018
0a67994
add style gallery_checkBox
liukefu2050 Jan 18, 2018
dade957
modify camera option
liukefu2050 Jan 24, 2018
8b163ce
modify camera option
liukefu2050 Jan 24, 2018
f5bca7f
cut bug
liukefu2050 Jan 24, 2018
83710e6
cut bug
liukefu2050 Jan 24, 2018
d7bd31f
permissions bug
liukefu2050 Jan 24, 2018
c6e613d
permissions bug
liukefu2050 Jan 24, 2018
1a7df07
0.0.20 add spanCount
liukefu2050 Apr 8, 2018
3e7dd7b
0.0.20 add spanCount
liukefu2050 Apr 8, 2018
6b855af
0.0.21 load more
liukefu2050 May 28, 2018
cca1e53
0.0.22 add option selectBoth
liukefu2050 May 29, 2018
45faf33
0.0.23 add option selectBoth
liukefu2050 May 30, 2018
4a47370
update to 8
liukefu2050 Nov 9, 2018
3366d80
update to 8
liukefu2050 Nov 9, 2018
ab205a5
update to api 28
liukefu2050 Nov 9, 2018
b3d6f85
update to api 28
liukefu2050 Nov 11, 2018
63417c2
add video quality
Nov 16, 2019
bc77820
video quality
Nov 16, 2019
b68328d
Merge pull request #1 from NaughtyHotpot/master
liukefu2050 Dec 3, 2019
23c7a47
Refresh gallery after one or multiple photo taken
liukefu2050 Dec 3, 2019
7700374
Crashes on android P
liukefu2050 Dec 3, 2019
2f49584
0.0.27
liukefu2050 Dec 3, 2019
1aa7db8
0.0.28 读写存储空间权限
liukefu2050 Dec 3, 2019
bdaef98
android x
liukefu2050 Dec 4, 2019
3172dfd
FileProvider7
liukefu2050 Dec 4, 2019
219e92c
FileProvider7
liukefu2050 Dec 4, 2019
92c703a
ucrop 2.2.4
liukefu2050 Dec 5, 2019
3fd3ff0
ucrop 2.2.4
liukefu2050 Dec 5, 2019
b2a6909
0.0.29
liukefu2050 Dec 5, 2019
b9b8a8a
0.1.0
liukefu2050 Jun 30, 2020
a51339c
0.1.0
liukefu2050 Jun 30, 2020
6b66b80
0.1.0
liukefu2050 Jul 1, 2020
528f959
0.1.0
liukefu2050 Jul 1, 2020
1da4417
0.1.0
liukefu2050 Jul 2, 2020
e80f686
0.1.0
liukefu2050 Jul 2, 2020
fee20f9
0.1.1
liukefu2050 Jul 3, 2020
9fd5930
0.1.2
liukefu2050 Jul 3, 2020
2679dd4
0.1.3
liukefu2050 Jul 3, 2020
1dbf254
0.1.4
liukefu2050 Jul 3, 2020
e912704
0.1.5
liukefu2050 Jul 7, 2020
1201cf2
0.1.5
liukefu2050 Aug 7, 2020
009ae15
0.1.6
liukefu2050 Aug 8, 2020
39f56f1
0.1.7
liukefu2050 Aug 26, 2020
e0ab6e7
1.0.1
liukefu2050 Dec 21, 2020
316eacb
1.0.2
liukefu2050 Dec 21, 2020
013a293
1.0.2
liukefu2050 Dec 21, 2020
a1b2c15
fix android 11 permission
liukefu2050 Jan 13, 2022
5c50aed
fix android 11 permission
liukefu2050 Jan 13, 2022
395fee9
fix android 11 permission readme
liukefu2050 Jan 13, 2022
36b14e6
fix android 11 permission and publish to maven
liukefu2050 Jan 14, 2022
e9f7e47
fix android 11 permission and publish to maven
liukefu2050 Jan 14, 2022
977b893
fix android 11 permission and publish to maven
liukefu2050 Jan 14, 2022
ec158bf
fix android 11 permission readme
liukefu2050 Mar 12, 2022
984ec45
fix android 11 permission readme
liukefu2050 Mar 12, 2022
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
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,21 @@ RxGalleryFinal是一个android图片/视频文件选择器。其支持多选、
* 添加权限

```xml
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.CAMERA" />

<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />

```
* 注册activity

```xml
<application
...
android:requestLegacyExternalStorage="true"
android:theme="@style/Theme_Light">
<meta-data android:name="ScopedStorage" android:value="true" />
<activity
android:name="cn.finalteam.rxgalleryfinal.ui.activity.MediaActivity"
android:screenOrientation="portrait"
Expand Down
22 changes: 16 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,31 @@

buildscript {
repositories {
google()
jcenter()
mavenCentral()
maven {
url "https://maven.google.com"
}
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.3'
classpath 'me.tatarka:gradle-retrolambda:3.2.5'
classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.5.0'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'
classpath 'com.android.tools.build:gradle:3.5.2'
classpath 'me.tatarka:gradle-retrolambda:3.7.0'
classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.4'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
}


// Exclude the version that the android plugin depends on.
configurations.classpath.exclude group: 'com.android.tools.external.lombok'
}

allprojects {
repositories {
mavenLocal()
jcenter()
maven { url "https://jitpack.io" }
google()
}
}

Expand Down
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@
# header note.
#Thu May 12 09:33:07 CST 2016

android.useDeprecatedNdk=true
android.enableJetifier=true
android.useAndroidX=true
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Aug 18 16:32:43 CST 2016
#Tue Dec 03 13:46:45 GMT+08:00 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
201 changes: 156 additions & 45 deletions library/build.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
apply plugin: 'com.android.library'
apply plugin: 'me.tatarka.retrolambda'
apply plugin: 'com.github.dcendents.android-maven'
apply plugin: "com.jfrog.bintray"
//apply plugin: 'me.tatarka.retrolambda'
//apply plugin: 'com.github.dcendents.android-maven'
//apply plugin: "com.jfrog.bintray"

version = "0.0.3"
apply plugin: 'maven'
apply plugin: 'signing'

android {
compileSdkVersion 24
buildToolsVersion '24.0.1'
compileSdkVersion 30
buildToolsVersion '30.0.3'

defaultConfig {
minSdkVersion 14
targetSdkVersion 24
minSdkVersion 16
targetSdkVersion 30
versionCode 3
versionName version

Expand All @@ -36,67 +37,171 @@ android {
}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
testCompile 'junit:junit:4.12'
compile 'io.reactivex:rxandroid:1.2.1'
compile 'io.reactivex:rxjava:1.1.9'
compile 'com.android.support:recyclerview-v7:24.2.0'
compile 'com.android.support:appcompat-v7:24.2.0'

provided 'com.squareup.picasso:picasso:2.5.2'
provided 'com.facebook.fresco:fresco:0.12.0'
provided 'com.github.bumptech.glide:glide:3.7.0'
provided 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
api fileTree(include: ['*.jar'], dir: 'libs')
testImplementation 'junit:junit:4.12'
api 'io.reactivex.rxjava2:rxandroid:2.0.1'
api 'io.reactivex.rxjava2:rxjava:2.1.0'
api 'com.github.yalantis:ucrop:2.2.5'
api 'androidx.recyclerview:recyclerview:1.0.0'
api 'androidx.appcompat:appcompat:1.0.0'
api 'androidx.exifinterface:exifinterface:1.0.0'
api 'com.squareup.picasso:picasso:2.5.2'
api 'com.facebook.fresco:fresco:1.3.0'
api 'com.facebook.fresco:animated-gif:1.3.0'
api 'com.github.bumptech.glide:glide:3.7.0'
//api 'com.mg.RxCustomizedImagePicker:fileprovider:1.0.0'
implementation 'com.github.shijingsh:fileprovider:1.1.0'
api 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'

implementation 'com.github.getActivity:XXPermissions:13.2'
}

//===================================upload jcenter=================================================
def siteUrl = 'https://github.com/FinalTeam/RxGalleryFinal'
def gitUrl = 'https://github.com/FinalTeam/RxGalleryFinal.git'
group = "cn.finalteam.rxgalleryfinal"
//===================================upload maven===================================================

install {
repositories.mavenInstaller {
pom {
project {
packaging 'aar'
Properties properties = new Properties()
properties.load(project.rootProject.file('local.properties').newDataInputStream())

// Add your description here
name 'RxGalleryFinal'
description = 'android gallery'
url siteUrl
def ossrhUsername = properties.getProperty("ossrhUsername") //在SonaType上申请的账号
def ossrhPassword = properties.getProperty("ossrhPassword") //在SonaType上申请的密码

def PUBLISH_GROUP_ID = 'com.github.shijingsh' //这里可以不是直接申请时候的groupId只要开头是就可以

def PUBLISH_ARTIFACT_ID = "RxCustomizedImagePicker" //引用库的artifactId

def PUBLISH_VERSION = "1.3.1" //这个是直接获取的库gradle里配置好的版本号,不用到处修改版本号,只需要维护一份就可以。

//签名
signing {
required { gradle.taskGraph.hasTask("uploadArchives") }
sign configurations.archives
}

uploadArchives {
repositories {
mavenDeployer {

beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }

repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
authentication(userName: ossrhUsername, password: ossrhPassword)
}

snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
authentication(userName: ossrhUsername, password: ossrhPassword)
}

pom.groupId = PUBLISH_GROUP_ID
pom.artifactId = PUBLISH_ARTIFACT_ID
pom.version = PUBLISH_VERSION

pom.project {
name 'RxCustomizedImagePicker'
packaging 'aar' //我这里发布的是安卓的包,所以写的aar
// optionally artifactId can be defined here
description 'Android image picker with support for camera, video compression, multiple images and cropping'
url 'https://github.com/shijingsh/RxGalleryFinal'

scm {
connection 'https://github.com/shijingsh/RxGalleryFinal'
developerConnection 'scm:git:[email protected]:shijingsh/RxGalleryFinal.git'
url 'https://github.com/shijingsh'
}

// Set your license
licenses {
license {
name 'The Apache Software License, Version 2.0'
name 'The Apache License, Version 2.0'
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
}
}

developers {
developer {
id 'pengjianbo'
name 'pengjianbo'
email '172340021@qq.com'
id 'liukefu'
name 'liukefu'
email 'liukefu2050@sina.com'
}
}
scm {
connection gitUrl
developerConnection gitUrl
url siteUrl

}
}
}
}
}
//===================================upload jcenter=================================================
/*
def siteUrl = 'https://github.com/liukefu2050/RxGalleryFinal'
def gitUrl = 'https://github.com/liukefu2050/RxGalleryFinal.git'

group = "com.mg.RxCustomizedImagePicker"
version = "1.0.3"
project.archivesBaseName = "library"

task sourcesJar(type: Jar) {
from android.sourceSets.main.java.srcDirs
classifier = 'sources'
}
tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
}
task javadoc(type: Javadoc) {
source = android.sourceSets.main.java.srcDirs
classpath += configurations.compile
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
}

task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
from javadoc.destinationDir
}

javadoc {
options{
encoding "UTF-8"
charSet 'UTF-8'
author true
version true
links "https://androiddoc.qiniudn.com/reference/"
title "RxCustomizedImagePicker 1.0.3"
}
}

artifacts {
archives sourcesJar
// archives javadocJar
}

install {
repositories.mavenInstaller {
pom.project {
name "RxCustomizedImagePicker"
description "android gallery"
url siteUrl
inceptionYear '2017'

packaging 'aar'
groupId "com.mg.RxCustomizedImagePicker"
artifactId "library"
version "1.0.3"
licenses {
license {
name 'The Apache Software License, Version 2.0'
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
distribution 'repo'
}
}
developers {
developer {
id "liukefu2020"
name "liukefu2020"
email "[email protected]"
}
}
scm {
connection gitUrl
developerConnection gitUrl
url siteUrl
}

}
}
}

Properties properties = new Properties()
Expand All @@ -109,15 +214,21 @@ bintray {
configurations = ['archives']
pkg {
repo = "maven"
name = "RxGalleryFinal"
name = "RxCustomizedImagePicker"
userOrg = user
websiteUrl = siteUrl
vcsUrl = gitUrl
licenses = ["Apache-2.0"]
publish = true
version {
name = '1.0.3'
desc = 'android gallery'
released = new Date()
vcsTag = '1.0.3'
attributes = ['gradle-plugin': 'com.use.less:com.use.less.gradle:gradle-useless-plugin']
gpg {
passphrase = properties.getProperty("bintray.gpg.password")
}
}
}
}
}*/

This file was deleted.

Loading