diff --git a/app/build.gradle b/app/build.gradle index 1d45f11..41b9321 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -51,7 +51,7 @@ android { //ext.jabitVersion = '2.0.4' ext.jabitVersion = 'feature-refactoring-SNAPSHOT' -ext.supportVersion = '27.0.2' +ext.supportVersion = '27.1.0' dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" @@ -65,7 +65,7 @@ dependencies { implementation "com.android.support:support-v13:$supportVersion" implementation "com.android.support:preference-v14:$supportVersion" implementation "com.android.support:design:$supportVersion" - implementation "com.android.support:multidex:1.0.2" + implementation "com.android.support:multidex:1.0.3" implementation "ch.dissem.jabit:jabit-core:$jabitVersion" implementation "ch.dissem.jabit:jabit-networking:$jabitVersion" @@ -77,21 +77,21 @@ dependencies { implementation 'org.slf4j:slf4j-android:1.7.25' implementation 'com.mikepenz:materialize:1.1.2@aar' - implementation('com.mikepenz:materialdrawer:6.0.2@aar') { + implementation('com.mikepenz:materialdrawer:6.0.6@aar') { transitive = true } - implementation('com.mikepenz:aboutlibraries:6.0.2@aar') { + implementation('com.mikepenz:aboutlibraries:6.0.6@aar') { transitive = true } - implementation "com.mikepenz:iconics-core:3.0.0@aar" - implementation "com.mikepenz:iconics-views:3.0.0@aar" + implementation "com.mikepenz:iconics-core:3.0.3@aar" + implementation "com.mikepenz:iconics-views:3.0.3@aar" implementation 'com.mikepenz:google-material-typeface:3.0.1.2.original@aar' implementation 'com.mikepenz:community-material-typeface:2.0.46.1@aar' - implementation 'com.journeyapps:zxing-android-embedded:3.5.0@aar' - implementation 'com.google.zxing:core:3.3.1' + implementation 'com.journeyapps:zxing-android-embedded:3.6.0@aar' + implementation 'com.google.zxing:core:3.3.2' - implementation 'com.github.kobakei:MaterialFabSpeedDial:1.1.8' + implementation 'com.github.kobakei:MaterialFabSpeedDial:1.2.0' implementation 'com.github.amlcurran.showcaseview:library:5.4.3' implementation('com.github.h6ah4i:android-advancedrecyclerview:0.11.0@aar') { transitive = true @@ -100,14 +100,14 @@ dependencies { implementation 'com.android.support.constraint:constraint-layout:1.0.2' testImplementation 'junit:junit:4.12' - testImplementation 'org.mockito:mockito-core:2.13.0' + testImplementation 'org.mockito:mockito-core:2.15.0' testImplementation 'org.hamcrest:hamcrest-library:1.3' testImplementation 'com.nhaarman:mockito-kotlin-kt1.1:1.5.0' testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - testImplementation 'org.robolectric:robolectric:3.6.1' - testImplementation "org.robolectric:shadows-multidex:3.6.1" + testImplementation 'org.robolectric:robolectric:3.7.1' + testImplementation "org.robolectric:shadows-multidex:3.7.1" - androidTestImplementation "com.android.support:multidex:1.0.2" + androidTestImplementation "com.android.support:multidex:1.0.3" } idea.module { diff --git a/app/src/main/java/ch/dissem/apps/abit/AddressListFragment.kt b/app/src/main/java/ch/dissem/apps/abit/AddressListFragment.kt index 80db0e4..e7dc2db 100644 --- a/app/src/main/java/ch/dissem/apps/abit/AddressListFragment.kt +++ b/app/src/main/java/ch/dissem/apps/abit/AddressListFragment.kt @@ -48,7 +48,8 @@ class AddressListFragment : AbstractItemListFragment() activity, R.layout.subscription_row, R.id.name, - LinkedList()) { + LinkedList() + ) { override fun getView(position: Int, convertView: View?, parent: ViewGroup): View { val result: View val v: ViewHolder @@ -72,7 +73,8 @@ class AddressListFragment : AbstractItemListFragment() v.avatar.setImageDrawable(Identicon(item)) v.name.text = item.toString() v.streamNumber.text = v.ctx.getString(R.string.stream_number, item.stream) - v.subscribed.visibility = if (item.isSubscribed) View.VISIBLE else View.INVISIBLE + v.subscribed.visibility = + if (item.isSubscribed) View.VISIBLE else View.INVISIBLE } return result } @@ -109,7 +111,7 @@ class AddressListFragment : AbstractItemListFragment() .addOnMenuItemClickListener { _, _, itemId -> when (itemId) { 1 -> IntentIntegrator.forSupportFragment(this@AddressListFragment) - .setDesiredBarcodeFormats(IntentIntegrator.QR_CODE_TYPES) + .setDesiredBarcodeFormats(IntentIntegrator.QR_CODE) .initiateScan() 2 -> { val intent = Intent(getActivity(), CreateAddressActivity::class.java) @@ -121,7 +123,11 @@ class AddressListFragment : AbstractItemListFragment() } } - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View = + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View = inflater.inflate(R.layout.fragment_address_list, container, false) override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { diff --git a/build.gradle b/build.gradle index 9232626..bcaecb5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.2.21' + ext.kotlin_version = '1.2.30' ext.anko_version = '0.10.4' repositories { jcenter() diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7a3265e..9352c13 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4eb3cdf..cefb6bf 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Oct 23 08:19:50 CEST 2017 +#Sat Mar 03 14:35:52 CET 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/gradlew b/gradlew index cccdd3d..4453cce 100755 --- a/gradlew +++ b/gradlew @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn () { +warn ( ) { echo "$*" } -die () { +die ( ) { echo echo "$*" echo @@ -155,7 +155,7 @@ if $cygwin ; then fi # Escape application args -save () { +save ( ) { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " }