From 5e43da31d91eb95373aca6ebd8999ac925e87d73 Mon Sep 17 00:00:00 2001 From: Filipe Bezerra Date: Sun, 27 Sep 2020 18:05:50 -0300 Subject: [PATCH 1/4] Rename .java to .kt --- .../main/java/br/com/alura/leilao/model/{Lance.java => Lance.kt} | 0 .../java/br/com/alura/leilao/model/{Leilao.java => Leilao.kt} | 0 .../java/br/com/alura/leilao/model/{Usuario.java => Usuario.kt} | 0 .../activity/{ListaLeilaoActivity.java => ListaLeilaoActivity.kt} | 0 .../adapter/{ListaLeilaoAdapter.java => ListaLeilaoAdapter.kt} | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename app/src/main/java/br/com/alura/leilao/model/{Lance.java => Lance.kt} (100%) rename app/src/main/java/br/com/alura/leilao/model/{Leilao.java => Leilao.kt} (100%) rename app/src/main/java/br/com/alura/leilao/model/{Usuario.java => Usuario.kt} (100%) rename app/src/main/java/br/com/alura/leilao/ui/activity/{ListaLeilaoActivity.java => ListaLeilaoActivity.kt} (100%) rename app/src/main/java/br/com/alura/leilao/ui/recyclerview/adapter/{ListaLeilaoAdapter.java => ListaLeilaoAdapter.kt} (100%) diff --git a/app/src/main/java/br/com/alura/leilao/model/Lance.java b/app/src/main/java/br/com/alura/leilao/model/Lance.kt similarity index 100% rename from app/src/main/java/br/com/alura/leilao/model/Lance.java rename to app/src/main/java/br/com/alura/leilao/model/Lance.kt diff --git a/app/src/main/java/br/com/alura/leilao/model/Leilao.java b/app/src/main/java/br/com/alura/leilao/model/Leilao.kt similarity index 100% rename from app/src/main/java/br/com/alura/leilao/model/Leilao.java rename to app/src/main/java/br/com/alura/leilao/model/Leilao.kt diff --git a/app/src/main/java/br/com/alura/leilao/model/Usuario.java b/app/src/main/java/br/com/alura/leilao/model/Usuario.kt similarity index 100% rename from app/src/main/java/br/com/alura/leilao/model/Usuario.java rename to app/src/main/java/br/com/alura/leilao/model/Usuario.kt diff --git a/app/src/main/java/br/com/alura/leilao/ui/activity/ListaLeilaoActivity.java b/app/src/main/java/br/com/alura/leilao/ui/activity/ListaLeilaoActivity.kt similarity index 100% rename from app/src/main/java/br/com/alura/leilao/ui/activity/ListaLeilaoActivity.java rename to app/src/main/java/br/com/alura/leilao/ui/activity/ListaLeilaoActivity.kt diff --git a/app/src/main/java/br/com/alura/leilao/ui/recyclerview/adapter/ListaLeilaoAdapter.java b/app/src/main/java/br/com/alura/leilao/ui/recyclerview/adapter/ListaLeilaoAdapter.kt similarity index 100% rename from app/src/main/java/br/com/alura/leilao/ui/recyclerview/adapter/ListaLeilaoAdapter.java rename to app/src/main/java/br/com/alura/leilao/ui/recyclerview/adapter/ListaLeilaoAdapter.kt From b934bcfb2051048126aefa98783b833b3ca68399 Mon Sep 17 00:00:00 2001 From: Filipe Bezerra Date: Sun, 27 Sep 2020 18:05:52 -0300 Subject: [PATCH 2/4] Calcula o maior lance convertendo classes para Kotlin --- .idea/caches/build_file_checksums.ser | Bin 534 -> 545 bytes .idea/codeStyles/Project.xml | 152 +++++++++++++++--- .idea/gradle.xml | 2 + .idea/jarRepositories.xml | 45 ++++++ .idea/misc.xml | 18 ++- app/build.gradle | 5 + .../java/br/com/alura/leilao/model/Lance.kt | 19 +-- .../java/br/com/alura/leilao/model/Leilao.kt | 30 ++-- .../java/br/com/alura/leilao/model/Usuario.kt | 14 +- .../leilao/ui/activity/ListaLeilaoActivity.kt | 78 ++++----- .../adapter/ListaLeilaoAdapter.kt | 99 +++++------- app/src/main/res/values/strings.xml | 1 + build.gradle | 8 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 14 files changed, 304 insertions(+), 171 deletions(-) create mode 100644 .idea/jarRepositories.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index e8607c0e0cc193a829dd2fb51c11ac7e39f73dd1..703e94cfec1f0b95a04a65d4a0a0adbac2fa7eee 100644 GIT binary patch delta 194 zcmbQnvXEuMbk>rKF7-?k=lBN*Bo-9JB$a07r0As=C8p%0mKHHEMLVteEdGOyBjf=S z14Bgt0|SFVe`@-|n68gD*P|C*nfm{%R0#uracW6PW?p(ROk*KK9Ru5BK1MMG181w4 z(Bjmh;+V9|oXmpMq|~a^qN2nYsLGhh{fxSdJd@uuiV55m4a$sIwU71VotJ@5n?zqt m_GXk7zIe`OT}C3W;_K;e9+uu{`BcIn2-G4y`39o^V+8=u8%rDj delta 204 zcmZ3;GL2=zbk^k4W}g@)&haSyHVrs^l=q*kQq zL#@}JT*#=)CQJfBfa(C1 - - - - - - - - - - + + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+
+
+
\ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 7ac24c7..5cd135a 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,8 +1,10 @@ +