From d1738e371197e8cad8941967038e39d51bbeef99 Mon Sep 17 00:00:00 2001 From: Michael Girgis Date: Thu, 20 Dec 2018 18:02:43 +0200 Subject: [PATCH] - convert to koltin. --- .gitignore | 4 - .idea/caches/build_file_checksums.ser | Bin 594 -> 591 bytes .idea/codeStyles/Project.xml | 29 - .idea/encodings.xml | 4 + .idea/misc.xml | 30 +- app/build.gradle | 61 +- .../java/com/libandexample/Main2Activity.java | 49 -- .../java/com/libandexample/Main2Activity.kt | 45 ++ .../Calculator/CalculatorActivity.kt | 8 +- .../findmyage/MainActivity.kt | 5 +- .../udemy/{Kotlin => kotlin}/foodapp/Food.kt | 2 +- .../foodapp/FoodAppMainActivity.kt | 2 +- .../{Kotlin => kotlin}/foodapp/FoodDetails.kt | 4 +- .../getsunset/GetSunSetMainActivity.kt | 8 +- .../{Kotlin => kotlin}/noteapp/AddNotes.kt | 5 +- .../{Kotlin => kotlin}/noteapp/DbManager.kt | 2 +- .../udemy/{Kotlin => kotlin}/noteapp/Note.kt | 2 +- .../noteapp/NoteAppMainActivity.kt | 2 +- .../pockemon/MapsActivity.kt | 2 +- .../{Kotlin => kotlin}/pockemon/Pockemon.kt | 2 +- .../tictactoylocal/TicTacToyLocalActivity.kt | 2 +- .../tictactoyonline/Login.kt | 7 +- .../tictactoyonline/MvvmMainActivity.kt | 18 +- .../tictactoyonline/Notifications.kt | 2 +- .../udemy/{Kotlin => kotlin}/zooapp/Animal.kt | 2 +- .../{Kotlin => kotlin}/zooapp/AnimalInfo.kt | 6 +- .../zooapp/ZooAppMainActivity.kt | 2 +- .../intentservice/ExampleIntentService.java | 64 -- .../intentservice/ExampleIntentService.kt | 62 ++ .../IntentServiceMainActivity.java | 31 - .../IntentServiceMainActivity.kt | 29 + .../mvvm/AddEditNoteActivity.java | 99 --- .../codinginflow/mvvm/AddEditNoteActivity.kt | 96 +++ .../codinginflow/mvvm/MvvmMainActivity.java | 124 ---- .../codinginflow/mvvm/MvvmMainActivity.kt | 125 ++++ .../tutorials/codinginflow/mvvm/Note.java | 44 -- .../tutorials/codinginflow/mvvm/Note.kt | 12 + .../codinginflow/mvvm/NoteAdapter.java | 76 --- .../codinginflow/mvvm/NoteAdapter.kt | 69 ++ .../tutorials/codinginflow/mvvm/NoteDao.java | 30 - .../tutorials/codinginflow/mvvm/NoteDao.kt | 28 + .../codinginflow/mvvm/NoteDatabase.java | 53 -- .../codinginflow/mvvm/NoteDatabase.kt | 54 ++ .../codinginflow/mvvm/NoteRepository.java | 95 --- .../codinginflow/mvvm/NoteRepository.kt | 65 ++ .../codinginflow/mvvm/NoteViewModel.java | 40 -- .../codinginflow/mvvm/NoteViewModel.kt | 32 + .../AndroidNotificationMainActivity.java | 127 ---- .../AndroidNotificationMainActivity.kt | 129 ++++ .../MyFirebaseMessagingService.java | 19 - .../MyFirebaseMessagingService.kt | 18 + .../NotificationHelper.java | 25 - .../NotificationHelper.kt | 24 + .../ProfileActivity.java | 61 -- .../ProfileActivity.kt | 59 ++ .../androidnotificationtutorial/User.java | 12 - .../androidnotificationtutorial/User.kt | 3 + .../res/layout/activity_main_food_app.xml | 2 +- .../res/layout/activity_main_getsunset.xml | 2 +- .../res/layout/activity_main_note_app.xml | 2 +- app/src/main/res/layout/activity_maps.xml | 2 +- .../layout/activity_search_repositories.xml | 1 - app/src/main/res/layout/activity_zoo_app.xml | 2 +- build.gradle | 4 +- gradle/wrapper/gradle-wrapper.properties | 4 +- liband/build.gradle | 35 +- .../com/liband/ExampleInstrumentedTest.java | 3 - liband/src/main/java/com/liband/App.kt | 5 - .../main/java/com/liband/BaseActivity.java | 125 ---- .../src/main/java/com/liband/BaseActivity.kt | 111 ++++ .../java/com/liband/custom/CircleImageView.kt | 14 +- .../custom/GridSpacingItemDecoration.kt | 2 +- .../liband/custom/RecyclerViewEmptySupport.kt | 6 +- .../com/liband/custom/SpacesItemDecoration.kt | 2 +- .../java/com/liband/fragments/BaseFragment.kt | 14 +- ...dapterViewModel.kt => AdapterViewModel.kt} | 2 +- .../java/com/liband/interfaces/ApiCallback.kt | 4 +- .../liband/interfaces/ApiDetailCallback.kt | 2 +- .../com/liband/interfaces/FailureListener.kt | 2 +- .../main/java/com/liband/models/BaseModel.kt | 4 +- .../main/java/com/liband/utils/DateUtil.kt | 21 +- .../java/com/liband/utils/ExceptionHandler.kt | 21 +- .../main/java/com/liband/utils/ImageUtil.java | 64 -- .../main/java/com/liband/utils/ImageUtil.kt | 24 + .../main/java/com/liband/utils/LangUtils.kt | 5 +- .../com/liband/utils/SharedPrefceUtils.kt | 30 +- .../main/java/com/liband/utils/StringUtils.kt | 382 ----------- .../src/main/java/com/liband/utils/Utils.kt | 14 +- .../drawable-v24/ic_launcher_foreground.xml | 34 + .../res/layout/dailog_fragment_edit_text.xml | 3 +- .../res/values-sw1080dp/negative_sdps.xml | 63 -- .../res/values-sw1080dp/positive_sdps.xml | 603 ------------------ .../main/res/values-sw300dp/negative_sdps.xml | 63 -- .../main/res/values-sw300dp/positive_sdps.xml | 603 ------------------ .../main/res/values-sw330dp/negative_sdps.xml | 63 -- .../main/res/values-sw330dp/positive_sdps.xml | 603 ------------------ .../main/res/values-sw360dp/negative_sdps.xml | 63 -- .../main/res/values-sw360dp/positive_sdps.xml | 603 ------------------ .../main/res/values-sw390dp/negative_sdps.xml | 63 -- .../main/res/values-sw390dp/positive_sdps.xml | 603 ------------------ .../main/res/values-sw420dp/negative_sdps.xml | 63 -- .../main/res/values-sw420dp/positive_sdps.xml | 603 ------------------ .../main/res/values-sw450dp/negative_sdps.xml | 63 -- .../main/res/values-sw450dp/positive_sdps.xml | 603 ------------------ .../main/res/values-sw480dp/negative_sdps.xml | 63 -- .../main/res/values-sw480dp/positive_sdps.xml | 603 ------------------ .../main/res/values-sw510dp/negative_sdps.xml | 63 -- .../main/res/values-sw510dp/positive_sdps.xml | 603 ------------------ .../main/res/values-sw540dp/negative_sdps.xml | 63 -- .../main/res/values-sw540dp/positive_sdps.xml | 603 ------------------ .../main/res/values-sw570dp/negative_sdps.xml | 63 -- .../main/res/values-sw570dp/positive_sdps.xml | 603 ------------------ .../main/res/values-sw600dp/negative_sdps.xml | 63 -- .../main/res/values-sw600dp/positive_sdps.xml | 603 ------------------ .../main/res/values-sw630dp/negative_sdps.xml | 63 -- .../main/res/values-sw630dp/positive_sdps.xml | 603 ------------------ .../main/res/values-sw660dp/negative_sdps.xml | 63 -- .../main/res/values-sw660dp/positive_sdps.xml | 603 ------------------ .../main/res/values-sw690dp/negative_sdps.xml | 63 -- .../main/res/values-sw690dp/positive_sdps.xml | 603 ------------------ .../main/res/values-sw720dp/negative_sdps.xml | 63 -- .../main/res/values-sw720dp/positive_sdps.xml | 603 ------------------ .../main/res/values-sw750dp/negative_sdps.xml | 63 -- .../main/res/values-sw750dp/positive_sdps.xml | 603 ------------------ .../main/res/values-sw780dp/negative_sdps.xml | 63 -- .../main/res/values-sw780dp/positive_sdps.xml | 603 ------------------ 126 files changed, 1209 insertions(+), 13737 deletions(-) delete mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/encodings.xml delete mode 100644 app/src/main/java/com/libandexample/Main2Activity.java create mode 100644 app/src/main/java/com/libandexample/Main2Activity.kt rename app/src/main/java/com/libandexample/courses/udemy/{Kotlin => kotlin}/Calculator/CalculatorActivity.kt (95%) rename app/src/main/java/com/libandexample/courses/udemy/{Kotlin => kotlin}/findmyage/MainActivity.kt (84%) rename app/src/main/java/com/libandexample/courses/udemy/{Kotlin => kotlin}/foodapp/Food.kt (71%) rename app/src/main/java/com/libandexample/courses/udemy/{Kotlin => kotlin}/foodapp/FoodAppMainActivity.kt (98%) rename app/src/main/java/com/libandexample/courses/udemy/{Kotlin => kotlin}/foodapp/FoodDetails.kt (84%) rename app/src/main/java/com/libandexample/courses/udemy/{Kotlin => kotlin}/getsunset/GetSunSetMainActivity.kt (94%) rename app/src/main/java/com/libandexample/courses/udemy/{Kotlin => kotlin}/noteapp/AddNotes.kt (93%) rename app/src/main/java/com/libandexample/courses/udemy/{Kotlin => kotlin}/noteapp/DbManager.kt (97%) rename app/src/main/java/com/libandexample/courses/udemy/{Kotlin => kotlin}/noteapp/Note.kt (74%) rename app/src/main/java/com/libandexample/courses/udemy/{Kotlin => kotlin}/noteapp/NoteAppMainActivity.kt (99%) rename app/src/main/java/com/libandexample/courses/udemy/{Kotlin => kotlin}/pockemon/MapsActivity.kt (99%) rename app/src/main/java/com/libandexample/courses/udemy/{Kotlin => kotlin}/pockemon/Pockemon.kt (89%) rename app/src/main/java/com/libandexample/courses/udemy/{Kotlin => kotlin}/tictactoylocal/TicTacToyLocalActivity.kt (98%) rename app/src/main/java/com/libandexample/courses/udemy/{Kotlin => kotlin}/tictactoyonline/Login.kt (92%) rename app/src/main/java/com/libandexample/courses/udemy/{Kotlin => kotlin}/tictactoyonline/MvvmMainActivity.kt (94%) rename app/src/main/java/com/libandexample/courses/udemy/{Kotlin => kotlin}/tictactoyonline/Notifications.kt (95%) rename app/src/main/java/com/libandexample/courses/udemy/{Kotlin => kotlin}/zooapp/Animal.kt (77%) rename app/src/main/java/com/libandexample/courses/udemy/{Kotlin => kotlin}/zooapp/AnimalInfo.kt (85%) rename app/src/main/java/com/libandexample/courses/udemy/{Kotlin => kotlin}/zooapp/ZooAppMainActivity.kt (98%) delete mode 100644 app/src/main/java/com/libandexample/tutorials/codinginflow/intentservice/ExampleIntentService.java create mode 100644 app/src/main/java/com/libandexample/tutorials/codinginflow/intentservice/ExampleIntentService.kt delete mode 100644 app/src/main/java/com/libandexample/tutorials/codinginflow/intentservice/IntentServiceMainActivity.java create mode 100644 app/src/main/java/com/libandexample/tutorials/codinginflow/intentservice/IntentServiceMainActivity.kt delete mode 100644 app/src/main/java/com/libandexample/tutorials/codinginflow/mvvm/AddEditNoteActivity.java create mode 100644 app/src/main/java/com/libandexample/tutorials/codinginflow/mvvm/AddEditNoteActivity.kt delete mode 100644 app/src/main/java/com/libandexample/tutorials/codinginflow/mvvm/MvvmMainActivity.java create mode 100644 app/src/main/java/com/libandexample/tutorials/codinginflow/mvvm/MvvmMainActivity.kt delete mode 100644 app/src/main/java/com/libandexample/tutorials/codinginflow/mvvm/Note.java create mode 100644 app/src/main/java/com/libandexample/tutorials/codinginflow/mvvm/Note.kt delete mode 100644 app/src/main/java/com/libandexample/tutorials/codinginflow/mvvm/NoteAdapter.java create mode 100644 app/src/main/java/com/libandexample/tutorials/codinginflow/mvvm/NoteAdapter.kt delete mode 100644 app/src/main/java/com/libandexample/tutorials/codinginflow/mvvm/NoteDao.java create mode 100644 app/src/main/java/com/libandexample/tutorials/codinginflow/mvvm/NoteDao.kt delete mode 100644 app/src/main/java/com/libandexample/tutorials/codinginflow/mvvm/NoteDatabase.java create mode 100644 app/src/main/java/com/libandexample/tutorials/codinginflow/mvvm/NoteDatabase.kt delete mode 100644 app/src/main/java/com/libandexample/tutorials/codinginflow/mvvm/NoteRepository.java create mode 100644 app/src/main/java/com/libandexample/tutorials/codinginflow/mvvm/NoteRepository.kt delete mode 100644 app/src/main/java/com/libandexample/tutorials/codinginflow/mvvm/NoteViewModel.java create mode 100644 app/src/main/java/com/libandexample/tutorials/codinginflow/mvvm/NoteViewModel.kt delete mode 100644 app/src/main/java/com/libandexample/tutorials/simplifiedcoding/androidnotificationtutorial/AndroidNotificationMainActivity.java create mode 100644 app/src/main/java/com/libandexample/tutorials/simplifiedcoding/androidnotificationtutorial/AndroidNotificationMainActivity.kt delete mode 100644 app/src/main/java/com/libandexample/tutorials/simplifiedcoding/androidnotificationtutorial/MyFirebaseMessagingService.java create mode 100644 app/src/main/java/com/libandexample/tutorials/simplifiedcoding/androidnotificationtutorial/MyFirebaseMessagingService.kt delete mode 100644 app/src/main/java/com/libandexample/tutorials/simplifiedcoding/androidnotificationtutorial/NotificationHelper.java create mode 100644 app/src/main/java/com/libandexample/tutorials/simplifiedcoding/androidnotificationtutorial/NotificationHelper.kt delete mode 100644 app/src/main/java/com/libandexample/tutorials/simplifiedcoding/androidnotificationtutorial/ProfileActivity.java create mode 100644 app/src/main/java/com/libandexample/tutorials/simplifiedcoding/androidnotificationtutorial/ProfileActivity.kt delete mode 100644 app/src/main/java/com/libandexample/tutorials/simplifiedcoding/androidnotificationtutorial/User.java create mode 100644 app/src/main/java/com/libandexample/tutorials/simplifiedcoding/androidnotificationtutorial/User.kt delete mode 100644 liband/src/main/java/com/liband/BaseActivity.java create mode 100644 liband/src/main/java/com/liband/BaseActivity.kt rename liband/src/main/java/com/liband/interfaces/{adapterViewModel.kt => AdapterViewModel.kt} (66%) delete mode 100644 liband/src/main/java/com/liband/utils/ImageUtil.java create mode 100644 liband/src/main/java/com/liband/utils/ImageUtil.kt delete mode 100644 liband/src/main/java/com/liband/utils/StringUtils.kt create mode 100644 liband/src/main/res/drawable-v24/ic_launcher_foreground.xml delete mode 100644 liband/src/main/res/values-sw1080dp/negative_sdps.xml delete mode 100644 liband/src/main/res/values-sw1080dp/positive_sdps.xml delete mode 100644 liband/src/main/res/values-sw300dp/negative_sdps.xml delete mode 100644 liband/src/main/res/values-sw300dp/positive_sdps.xml delete mode 100644 liband/src/main/res/values-sw330dp/negative_sdps.xml delete mode 100644 liband/src/main/res/values-sw330dp/positive_sdps.xml delete mode 100644 liband/src/main/res/values-sw360dp/negative_sdps.xml delete mode 100644 liband/src/main/res/values-sw360dp/positive_sdps.xml delete mode 100644 liband/src/main/res/values-sw390dp/negative_sdps.xml delete mode 100644 liband/src/main/res/values-sw390dp/positive_sdps.xml delete mode 100644 liband/src/main/res/values-sw420dp/negative_sdps.xml delete mode 100644 liband/src/main/res/values-sw420dp/positive_sdps.xml delete mode 100644 liband/src/main/res/values-sw450dp/negative_sdps.xml delete mode 100644 liband/src/main/res/values-sw450dp/positive_sdps.xml delete mode 100644 liband/src/main/res/values-sw480dp/negative_sdps.xml delete mode 100644 liband/src/main/res/values-sw480dp/positive_sdps.xml delete mode 100644 liband/src/main/res/values-sw510dp/negative_sdps.xml delete mode 100644 liband/src/main/res/values-sw510dp/positive_sdps.xml delete mode 100644 liband/src/main/res/values-sw540dp/negative_sdps.xml delete mode 100644 liband/src/main/res/values-sw540dp/positive_sdps.xml delete mode 100644 liband/src/main/res/values-sw570dp/negative_sdps.xml delete mode 100644 liband/src/main/res/values-sw570dp/positive_sdps.xml delete mode 100644 liband/src/main/res/values-sw600dp/negative_sdps.xml delete mode 100644 liband/src/main/res/values-sw600dp/positive_sdps.xml delete mode 100644 liband/src/main/res/values-sw630dp/negative_sdps.xml delete mode 100644 liband/src/main/res/values-sw630dp/positive_sdps.xml delete mode 100644 liband/src/main/res/values-sw660dp/negative_sdps.xml delete mode 100644 liband/src/main/res/values-sw660dp/positive_sdps.xml delete mode 100644 liband/src/main/res/values-sw690dp/negative_sdps.xml delete mode 100644 liband/src/main/res/values-sw690dp/positive_sdps.xml delete mode 100644 liband/src/main/res/values-sw720dp/negative_sdps.xml delete mode 100644 liband/src/main/res/values-sw720dp/positive_sdps.xml delete mode 100644 liband/src/main/res/values-sw750dp/negative_sdps.xml delete mode 100644 liband/src/main/res/values-sw750dp/positive_sdps.xml delete mode 100644 liband/src/main/res/values-sw780dp/negative_sdps.xml delete mode 100644 liband/src/main/res/values-sw780dp/positive_sdps.xml diff --git a/.gitignore b/.gitignore index 5edb4ee..f8ec12b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,3 @@ /.idea/libraries /.idea/modules.xml /.idea/workspace.xml -.DS_Store -/build -/captures -.externalNativeBuild diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 9ca708d871fb204cbf4851617231a1ddaaf5cbe5..ecb3036fcd8df4b0bf8e31a1dfba0b4171005cb1 100644 GIT binary patch delta 271 zcmcb_a-Lyx+j?Rl=aBA6lGR zRIHzynVgZBnvKNE28!(DZKF=ub zJ|lUm>%5nIrmL^if0z+j%2L80kdvRBn1i8%fq_B5W0mTMud)iO&sZ{DUA6z#hY|+i zoXn)eycGS(7Z}A{%d(4iK5>`gzZLiE;CH>?XC(}RIIIU5HpePw)2X>~Gf%xcvZZ|T hp@l%36AKE!CJDY#c)jrP%&9Fo0d^t>h3AV^001O%Z7To( delta 321 zcmX@la*1Wabk>wm+x0vX=lCZWI$Onr7N-^!$K+-vXC$WP=%uIT7p14h=%p7WrsSl? zKq$R}qWpr?qLR$i;?g1prf8=%pT&Q$afCczVqmB!U|?VnxFXwgv!7uT%gYAN8E<|# z)s-*^Bo-9JOfFy)b6fw`|3I&fZHsle^PD~Gb3#iP_={6ZN;31(i=oz(7BbW^uz}2Z z!!up~x%^C3*E97M9u_Q%N*IK5GLsVXQou$DFkCFOU1Dpxd;aO>J34QywocAvl+0P& z8T&)U{gX=aU+o1|sf%lXcIV_LC*~l#8g9YK&5Q0RZZmcZC1| diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 30aa626..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..15a15b2 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index c0f68ed..9387dad 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -25,7 +25,35 @@ - + + + + + + + + + Android + + + CorrectnessLintAndroid + + + HTML + + + LintAndroid + + + + + Android + + + + + + diff --git a/app/build.gradle b/app/build.gradle index c63c621..416e856 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,55 +37,52 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation project(':liband') implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.appcompat:appcompat:1.1.0-alpha01' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2' - implementation 'androidx.room:room-runtime:2.1.0-alpha02' - annotationProcessor "androidx.room:room-compiler:2.1.0-alpha02" - testImplementation 'androidx.room:room-testing:2.1.0-alpha02' + implementation 'androidx.room:room-runtime:2.1.0-alpha03' + annotationProcessor "androidx.room:room-compiler:2.1.0-alpha03" + testImplementation 'androidx.room:room-testing:2.1.0-alpha03' - implementation "androidx.lifecycle:lifecycle-extensions:2.0.0" - implementation "androidx.lifecycle:lifecycle-common-java8:2.0.0" - implementation "androidx.lifecycle:lifecycle-reactivestreams:2.0.0" + implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0-alpha01' + implementation 'androidx.lifecycle:lifecycle-common-java8:2.1.0-alpha01' + implementation 'androidx.lifecycle:lifecycle-reactivestreams:2.1.0-alpha01' testImplementation "androidx.arch.core:core-testing:2.0.0" implementation 'com.google.android.gms:play-services-maps:16.0.0' implementation 'androidx.cardview:cardview:1.0.0' - implementation 'androidx.recyclerview:recyclerview:1.0.0' - implementation 'com.google.android.material:material:1.0.0' - implementation 'com.google.firebase:firebase-core:16.0.5' - implementation 'com.google.firebase:firebase-auth:16.0.5' + implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha01' + implementation 'com.google.android.material:material:1.1.0-alpha02' + implementation 'com.google.firebase:firebase-core:16.0.6' + implementation 'com.google.firebase:firebase-auth:16.1.0' implementation 'com.google.firebase:firebase-database:16.0.5' implementation 'com.google.firebase:firebase-messaging:17.3.4' - implementation 'com.google.firebase:firebase-auth:16.0.5' + implementation 'com.google.firebase:firebase-auth:16.1.0' - - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.10' - implementation "androidx.appcompat:appcompat:1.0.2" - implementation "androidx.constraintlayout:constraintlayout:1.1.3" - implementation "com.google.android.material:material:1.0.0" + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.11' + implementation 'androidx.appcompat:appcompat:1.1.0-alpha01' + implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2' + implementation 'com.google.android.material:material:1.1.0-alpha02' // architecture components - implementation "androidx.lifecycle:lifecycle-extensions:2.0.0" - implementation "androidx.lifecycle:lifecycle-runtime:2.0.0" - implementation "androidx.room:room-runtime:2.1.0-alpha02" - implementation "androidx.paging:paging-runtime:2.1.0-beta01" - kapt "androidx.lifecycle:lifecycle-compiler:2.0.0" - kapt "androidx.room:room-compiler:2.1.0-alpha02" + implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0-alpha01' + implementation 'androidx.lifecycle:lifecycle-runtime:2.1.0-alpha01' + implementation "androidx.room:room-runtime:2.1.0-alpha03" + implementation "androidx.paging:paging-runtime:2.1.0-rc01" + kapt 'androidx.lifecycle:lifecycle-compiler:2.1.0-alpha01' + kapt "androidx.room:room-compiler:2.1.0-alpha03" // retrofit - implementation "com.squareup.retrofit2:retrofit:2.4.0" - implementation"com.squareup.retrofit2:converter-gson:2.4.0" - implementation "com.squareup.retrofit2:retrofit-mock:2.4.0" - implementation "com.squareup.okhttp3:logging-interceptor:3.10.0" + implementation 'com.squareup.retrofit2:retrofit:2.5.0' + implementation 'com.squareup.retrofit2:converter-gson:2.5.0' + implementation 'com.squareup.retrofit2:retrofit-mock:2.5.0' + implementation 'com.squareup.okhttp3:logging-interceptor:3.12.0' // testing - testImplementation "junit:junit:4.12" - androidTestImplementation "androidx.test:runner:1.1.0" - androidTestImplementation "androidx.test.espresso:espresso-core:3.1.0" - - + testImplementation 'junit:junit:4.13-beta-1' + androidTestImplementation "androidx.test:runner:1.1.1" + androidTestImplementation "androidx.test.espresso:espresso-core:3.1.1" } diff --git a/app/src/main/java/com/libandexample/Main2Activity.java b/app/src/main/java/com/libandexample/Main2Activity.java deleted file mode 100644 index 43fd7bb..0000000 --- a/app/src/main/java/com/libandexample/Main2Activity.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.libandexample; - -import android.app.Activity; -import android.content.Intent; -import android.net.Uri; -import android.os.Bundle; -import android.os.Environment; -import android.widget.Button; -import android.widget.ImageView; - -import java.io.File; - -import androidx.annotation.Nullable; - - -public class Main2Activity extends Activity { - private ImageView imageView; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main2); - - Button button = findViewById(R.id.button); - imageView = findViewById(R.id.imageView); - button.setOnClickListener(v -> { - Intent intent = new Intent("com.intsig.camscanner.ACTION_SCAN"); - // Or content uri picked from gallery - - Uri uri = Uri.fromFile(new File(Environment.getExternalStorageDirectory().getPath() + "/source.jpg")); - intent.putExtra(Intent.EXTRA_STREAM, uri); - intent.putExtra("scanned_image", Environment.getExternalStorageDirectory().getPath() + "/source.jpg"); -// intent.putExtra("pdf_path", Environment.getExternalStorageDirectory().getPath() + "/source.jpg"); -// intent.putExtra("org_image", Environment.getExternalStorageDirectory().getPath() + "/source.jpg"); - startActivityForResult(intent, 100); - }); - } - - @Override - protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { - super.onActivityResult(requestCode, resultCode, data); - if (requestCode == 100) { - int responseCode = data.getIntExtra("RESULT_OK", -1); - if (resultCode == Activity.RESULT_FIRST_USER) { - // Fail - } - } - } -} diff --git a/app/src/main/java/com/libandexample/Main2Activity.kt b/app/src/main/java/com/libandexample/Main2Activity.kt new file mode 100644 index 0000000..f9e3af5 --- /dev/null +++ b/app/src/main/java/com/libandexample/Main2Activity.kt @@ -0,0 +1,45 @@ +package com.libandexample + +import android.app.Activity +import android.content.Intent +import android.net.Uri +import android.os.Bundle +import android.os.Environment +import android.widget.Button +import android.widget.ImageView + +import java.io.File + + +class Main2Activity : Activity() { + private var imageView: ImageView? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main2) + + val button = findViewById