odrling/norn-talk
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Augmenter la version du SDK

Browse source
This commit is contained in:
odrling 2018-03-11 17:11:40 +01:00
parent 48ac044e66
commit d93c453ab5
4 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/build.gradle
View file

@ -5,11 +5,11 @@ apply plugin: 'kotlin-android-extensions'
apply plugin: 'org.jetbrains.dokka'
android {
compileSdkVersion 26
compileSdkVersion 27
defaultConfig {
applicationId "xyz.johnny.norntalk"
minSdkVersion 21
targetSdkVersion 26
targetSdkVersion 27
versionCode 9
versionName "1.0.8"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@ -34,17 +34,22 @@ android {
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "com.android.support:appcompat-v7:$supportLibVersion"
implementation "com.android.support:design:$supportLibVersion"
implementation "com.android.support:support-v4:$supportLibVersion"
implementation "com.android.support:recyclerview-v7:$supportLibVersion"
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
implementation "android.arch.persistence.room:runtime:$archRoomVersion"
implementation 'com.android.support:support-v4:26.1.0'
implementation 'com.android.support:recyclerview-v7:26.1.0'
kapt "android.arch.persistence.room:compiler:$archRoomVersion"
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
implementation 'org.bouncycastle:bcprov-jdk15on:1.58'
implementation 'org.whispersystems:curve25519-android:0.4.1'
implementation 'com.journeyapps:zxing-android-embedded:3.5.0'

2
app/src/main/java/xyz/johnny/norntalk/messages/NornContact.kt
View file

@ -162,7 +162,7 @@ class NornContact private constructor(val number: String, context: Context) {
// retourner un avatar arrondi
val drawable = RoundedBitmapDrawableFactory.create(context.resources, stream)
drawable.cornerRadius = Math.max(drawable.bitmap.width, drawable.bitmap.height) / 2f
drawable.cornerRadius = Math.max(drawable.bitmap!!.width, drawable.bitmap!!.height) / 2f
return drawable
}

5
app/src/main/java/xyz/johnny/norntalk/ui_components/BaseFragment.kt
View file

@ -16,9 +16,8 @@ abstract class BaseFragment : Fragment() {
*/
protected abstract val layout: Int
override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?,
savedInstanceState: Bundle?): View? {
return inflater?.inflate(this.layout, container, false)
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater.inflate(this.layout, container, false)
}
}

2
build.gradle
View file

@ -5,7 +5,7 @@ buildscript {
ext {
kotlin_version = '1.2.30'
archRoomVersion = '1.0.0'
supportLibVersion = '26.1.0'
supportLibVersion = '27.0.2'
dokka_version = '0.9.15'
}