From 7fdafbd30c769779774e973871e406200741f3c1 Mon Sep 17 00:00:00 2001 From: Areeb Jamal Date: Tue, 25 Dec 2018 13:16:11 +0530 Subject: [PATCH] chore: Migrate to AndroidX and Koin 1.X --- .travis.yml | 4 +- app/build.gradle | 56 ++++++++++--------- .../general/ExampleInstrumentedTest.java | 4 +- .../openevent/general/AuthActivity.kt | 6 +- .../openevent/general/MainActivity.kt | 6 +- .../openevent/general/OpenEventDatabase.kt | 6 +- .../openevent/general/OpenEventGeneral.kt | 2 +- .../general/SearchResultsActivity.kt | 8 +-- .../general/about/AboutEventActivity.kt | 8 +-- .../general/about/AboutEventViewModel.kt | 4 +- .../openevent/general/attendees/Attendee.kt | 8 +-- .../general/attendees/AttendeeDao.kt | 8 +-- .../general/attendees/AttendeeFragment.kt | 17 +++--- .../general/attendees/AttendeeIdConverter.kt | 2 +- .../attendees/AttendeeRecyclerAdapter.kt | 2 +- .../general/attendees/AttendeeViewHolder.kt | 4 +- .../general/attendees/AttendeeViewModel.kt | 4 +- .../attendees/ListAttendeeIdConverter.kt | 2 +- .../general/attendees/forms/CustomForm.kt | 6 +- .../general/auth/EditProfileFragment.kt | 10 ++-- .../general/auth/EditProfileViewModel.kt | 4 +- .../openevent/general/auth/LoginFragment.kt | 6 +- .../openevent/general/auth/LoginViewModel.kt | 4 +- .../openevent/general/auth/ProfileFragment.kt | 20 +++---- .../general/auth/ProfileViewModel.kt | 4 +- .../openevent/general/auth/SignUpFragment.kt | 6 +- .../openevent/general/auth/SignUpViewModel.kt | 4 +- .../fossasia/openevent/general/auth/User.kt | 4 +- .../openevent/general/auth/UserDao.kt | 8 +-- .../general/common/SingleLiveEvent.kt | 10 ++-- .../openevent/general/data/Resource.kt | 2 +- .../fossasia/openevent/general/di/Modules.kt | 46 +++++++-------- .../fossasia/openevent/general/event/Event.kt | 6 +- .../openevent/general/event/EventDao.kt | 8 +-- .../general/event/EventDetailsFragment.kt | 17 +++--- .../general/event/EventDetailsViewModel.kt | 4 +- .../general/event/EventIdConverter.kt | 2 +- .../general/event/EventViewHolder.kt | 2 +- .../openevent/general/event/EventsFragment.kt | 8 +-- .../general/event/EventsRecyclerAdapter.kt | 2 +- .../general/event/EventsViewModel.kt | 4 +- .../general/event/topic/EventTopic.kt | 8 +-- .../event/topic/EventTopicIdConverter.kt | 2 +- .../general/event/topic/EventTopicsDao.kt | 8 +-- .../event/topic/SimilarEventsFragment.kt | 8 +-- .../event/topic/SimilarEventsViewModel.kt | 4 +- .../favorite/FavoriteEventsRecyclerAdapter.kt | 2 +- .../general/favorite/FavoriteFragment.kt | 14 ++--- .../favorite/FavouriteEventsViewModel.kt | 4 +- .../fossasia/openevent/general/order/Order.kt | 8 +-- .../general/order/OrderCompletedFragment.kt | 15 +++-- .../general/order/OrderCompletedViewModel.kt | 4 +- .../openevent/general/order/OrderDao.kt | 6 +- .../general/order/OrderDetailsFragment.kt | 10 ++-- .../order/OrderDetailsRecyclerAdapter.kt | 2 +- .../general/order/OrderDetailsViewHolder.kt | 2 +- .../general/order/OrderDetailsViewModel.kt | 4 +- .../general/order/OrdersRecyclerAdapter.kt | 2 +- .../general/order/OrdersUnderUserFragment.kt | 13 +++-- .../general/order/OrdersUnderUserVM.kt | 4 +- .../general/order/OrdersViewHolder.kt | 2 +- .../general/search/SearchFragment.kt | 20 +++---- .../general/search/SearchLocationActivity.kt | 6 +- .../general/search/SearchLocationViewModel.kt | 2 +- .../general/search/SearchTimeActivity.kt | 4 +- .../general/search/SearchTimeViewModel.kt | 2 +- .../general/search/SearchViewModel.kt | 4 +- .../general/settings/SettingsFragment.kt | 6 +- .../general/settings/SettingsViewModel.kt | 2 +- .../openevent/general/social/SocialLink.kt | 10 ++-- .../general/social/SocialLinksDao.kt | 8 +-- .../general/social/SocialLinksFragment.kt | 8 +-- .../social/SocialLinksRecyclerAdapter.kt | 2 +- .../general/social/SocialLinksViewHolder.kt | 4 +- .../general/social/SocialLinksViewModel.kt | 4 +- .../openevent/general/ticket/Ticket.kt | 10 ++-- .../openevent/general/ticket/TicketDao.kt | 8 +-- .../ticket/TicketDetailsRecyclerAdapter.kt | 2 +- .../general/ticket/TicketDetailsViewHolder.kt | 2 +- .../general/ticket/TicketIdConverter.kt | 2 +- .../general/ticket/TicketViewHolder.kt | 2 +- .../general/ticket/TicketsFragment.kt | 13 +++-- .../general/ticket/TicketsRecyclerAdapter.kt | 2 +- .../general/ticket/TicketsViewModel.kt | 4 +- .../openevent/general/utils/JWTUtils.java | 4 +- .../fossasia/openevent/general/utils/Utils.kt | 8 +-- .../main/res/layout/activity_about_event.xml | 22 ++++---- app/src/main/res/layout/activity_auth.xml | 6 +- app/src/main/res/layout/activity_main.xml | 6 +- .../res/layout/activity_search_location.xml | 2 +- .../res/layout/activity_search_results.xml | 10 ++-- app/src/main/res/layout/content_event.xml | 4 +- .../main/res/layout/content_no_internet.xml | 6 +- app/src/main/res/layout/fragment_attendee.xml | 46 +++++++-------- .../main/res/layout/fragment_edit_profile.xml | 10 ++-- app/src/main/res/layout/fragment_event.xml | 8 +-- app/src/main/res/layout/fragment_events.xml | 10 ++-- app/src/main/res/layout/fragment_favorite.xml | 6 +- app/src/main/res/layout/fragment_login.xml | 10 ++-- app/src/main/res/layout/fragment_order.xml | 6 +- .../res/layout/fragment_order_details.xml | 4 +- .../res/layout/fragment_orders_under_user.xml | 6 +- app/src/main/res/layout/fragment_search.xml | 2 +- app/src/main/res/layout/fragment_signup.xml | 22 ++++---- .../res/layout/fragment_similar_events.xml | 2 +- .../main/res/layout/fragment_social_links.xml | 4 +- app/src/main/res/layout/fragment_tickets.xml | 8 +-- app/src/main/res/layout/item_attendee.xml | 18 +++--- app/src/main/res/layout/item_card_events.xml | 10 ++-- .../res/layout/item_card_favorite_event.xml | 14 ++--- app/src/main/res/layout/item_card_order.xml | 6 +- .../res/layout/item_card_order_details.xml | 10 ++-- .../res/layout/item_card_similar_events.xml | 10 ++-- .../layout/placeholder_item_card_events.xml | 6 +- .../layout/placeholder_item_card_search.xml | 8 +-- build.gradle | 2 + gradle.properties | 2 + 117 files changed, 445 insertions(+), 440 deletions(-) diff --git a/.travis.yml b/.travis.yml index 12eb7f3363..d92027f4fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,11 +17,9 @@ cache: - "$HOME/.gradle/caches/" - "$HOME/.gradle/wrapper/" install: - - echo yes | ${ANDROID_HOME}/tools/bin/sdkmanager "platforms;android-27" + - echo yes | ${ANDROID_HOME}/tools/bin/sdkmanager "platforms;android-28" script: - ./gradlew build after_success: - bash scripts/prep-key.sh - bash scripts/update-apk.sh -before_install: -- yes | sdkmanager "platforms;android-28" diff --git a/app/build.gradle b/app/build.gradle index 7bb92c7d22..af676d098f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,14 +6,14 @@ apply plugin: 'kotlin-android-extensions' def STRIPE_API_TOKEN = System.getenv('STRIPE_API_TOKEN') ?: "YOUR_API_KEY" android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { applicationId "com.eventyay.attendee" minSdkVersion 16 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 3 versionName "0.0.3a" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true multiDexEnabled true manifestPlaceholders = [ @@ -61,36 +61,36 @@ android { } repositories { + google() mavenCentral() } dependencies { - def lifecycle_version = "1.1.1" - def koin_version = "0.9.3" - def roomVersion = '1.1.1' + def lifecycle_version = "2.1.0-alpha01" + def koin_version = "1.0.2" + def roomVersion = '2.1.0-alpha03' implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:multidex:1.0.3' - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' - implementation 'com.android.support:cardview-v7:27.1.1' - implementation 'com.android.support:recyclerview-v7:27.1.1' - implementation 'com.android.support:design:27.1.1' - implementation "com.android.support:customtabs:27.1.1" - implementation 'com.android.support:exifinterface:27.1.1' - implementation "com.takisoft.fix:preference-v7:27.1.1.2" + implementation 'androidx.multidex:multidex:2.0.1' + implementation 'androidx.appcompat:appcompat:1.1.0-alpha01' + implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha01' + implementation 'com.google.android.material:material:1.1.0-alpha02' + implementation "androidx.browser:browser:1.0.0" + implementation 'androidx.exifinterface:exifinterface:1.0.0' + implementation "androidx.lifecycle:lifecycle-extensions:${lifecycle_version}" + implementation "androidx.lifecycle:lifecycle-common-java8:${lifecycle_version}" + implementation "androidx.lifecycle:lifecycle-reactivestreams:${lifecycle_version}" + implementation "androidx.room:room-runtime:${roomVersion}" + implementation "androidx.room:room-rxjava2:${roomVersion}" + kapt "androidx.room:room-compiler:${roomVersion}" + testImplementation "androidx.room:room-testing:${roomVersion}" + implementation "com.takisoft.fix:preference-v7:28.0.0.0" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.koin:koin-android:$koin_version" - implementation "org.koin:koin-android-architecture:$koin_version" - testImplementation "org.koin:koin-test:$koin_version" - implementation "android.arch.lifecycle:extensions:$lifecycle_version" - implementation "android.arch.lifecycle:common-java8:$lifecycle_version" - implementation "android.arch.lifecycle:reactivestreams:$lifecycle_version" - testImplementation "android.arch.core:core-testing:$lifecycle_version" - implementation "android.arch.persistence.room:runtime:$roomVersion" - kapt "android.arch.persistence.room:compiler:$roomVersion" - implementation "android.arch.persistence.room:rxjava2:$roomVersion" - testImplementation "android.arch.persistence.room:testing:$roomVersion" + implementation "org.koin:koin-androidx-scope:$koin_version" + implementation "org.koin:koin-androidx-viewmodel:$koin_version" //Timber implementation 'com.jakewharton.timber:timber:4.7.1' @@ -122,6 +122,8 @@ dependencies { testImplementation 'junit:junit:4.12' testImplementation "io.mockk:mockk:1.8.13" testImplementation 'org.threeten:threetenbp:1.3.8' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + testImplementation "org.koin:koin-test:$koin_version" + testImplementation 'androidx.arch.core:core-testing:2.0.0' + androidTestImplementation 'androidx.test:runner:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' } diff --git a/app/src/androidTest/java/org/fossasia/openevent/general/ExampleInstrumentedTest.java b/app/src/androidTest/java/org/fossasia/openevent/general/ExampleInstrumentedTest.java index 35b7aa101e..2e21fa85de 100644 --- a/app/src/androidTest/java/org/fossasia/openevent/general/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/org/fossasia/openevent/general/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package org.fossasia.openevent.general; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/app/src/main/java/org/fossasia/openevent/general/AuthActivity.kt b/app/src/main/java/org/fossasia/openevent/general/AuthActivity.kt index 5b3526dc89..d6e613a729 100644 --- a/app/src/main/java/org/fossasia/openevent/general/AuthActivity.kt +++ b/app/src/main/java/org/fossasia/openevent/general/AuthActivity.kt @@ -2,9 +2,9 @@ package org.fossasia.openevent.general import android.content.Intent import android.os.Bundle -import android.support.design.widget.BottomNavigationView -import android.support.v4.app.Fragment -import android.support.v7.app.AppCompatActivity +import com.google.android.material.bottomnavigation.BottomNavigationView +import androidx.fragment.app.Fragment +import androidx.appcompat.app.AppCompatActivity import android.view.MenuItem import kotlinx.android.synthetic.main.activity_auth.* import org.fossasia.openevent.general.auth.LoginFragment diff --git a/app/src/main/java/org/fossasia/openevent/general/MainActivity.kt b/app/src/main/java/org/fossasia/openevent/general/MainActivity.kt index ee9fbef02d..3de1a50f81 100644 --- a/app/src/main/java/org/fossasia/openevent/general/MainActivity.kt +++ b/app/src/main/java/org/fossasia/openevent/general/MainActivity.kt @@ -1,9 +1,9 @@ package org.fossasia.openevent.general import android.os.Bundle -import android.support.design.widget.BottomNavigationView -import android.support.v4.app.Fragment -import android.support.v7.app.AppCompatActivity +import com.google.android.material.bottomnavigation.BottomNavigationView +import androidx.fragment.app.Fragment +import androidx.appcompat.app.AppCompatActivity import android.view.Menu import kotlinx.android.synthetic.main.activity_main.* import org.fossasia.openevent.general.R.id.* diff --git a/app/src/main/java/org/fossasia/openevent/general/OpenEventDatabase.kt b/app/src/main/java/org/fossasia/openevent/general/OpenEventDatabase.kt index e404211940..3a7da8d9b2 100644 --- a/app/src/main/java/org/fossasia/openevent/general/OpenEventDatabase.kt +++ b/app/src/main/java/org/fossasia/openevent/general/OpenEventDatabase.kt @@ -1,8 +1,8 @@ package org.fossasia.openevent.general -import android.arch.persistence.room.Database -import android.arch.persistence.room.RoomDatabase -import android.arch.persistence.room.TypeConverters +import androidx.room.Database +import androidx.room.RoomDatabase +import androidx.room.TypeConverters import org.fossasia.openevent.general.attendees.Attendee import org.fossasia.openevent.general.attendees.AttendeeDao import org.fossasia.openevent.general.attendees.AttendeeIdConverter diff --git a/app/src/main/java/org/fossasia/openevent/general/OpenEventGeneral.kt b/app/src/main/java/org/fossasia/openevent/general/OpenEventGeneral.kt index b65e7fa4a0..eb77f773d7 100644 --- a/app/src/main/java/org/fossasia/openevent/general/OpenEventGeneral.kt +++ b/app/src/main/java/org/fossasia/openevent/general/OpenEventGeneral.kt @@ -1,7 +1,7 @@ package org.fossasia.openevent.general import android.content.Context -import android.support.multidex.MultiDexApplication +import androidx.multidex.MultiDexApplication import com.jakewharton.threetenabp.AndroidThreeTen import org.fossasia.openevent.general.di.* import org.koin.android.ext.android.startKoin diff --git a/app/src/main/java/org/fossasia/openevent/general/SearchResultsActivity.kt b/app/src/main/java/org/fossasia/openevent/general/SearchResultsActivity.kt index c3d57e85f2..3126a4a019 100644 --- a/app/src/main/java/org/fossasia/openevent/general/SearchResultsActivity.kt +++ b/app/src/main/java/org/fossasia/openevent/general/SearchResultsActivity.kt @@ -1,10 +1,10 @@ package org.fossasia.openevent.general -import android.arch.lifecycle.Observer +import androidx.lifecycle.Observer import android.content.Intent -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.os.Bundle -import android.support.v7.widget.LinearLayoutManager +import androidx.recyclerview.widget.LinearLayoutManager import android.text.TextUtils import android.view.MenuItem import android.view.View @@ -18,7 +18,7 @@ import org.fossasia.openevent.general.search.QUERY import org.fossasia.openevent.general.search.SearchViewModel import org.fossasia.openevent.general.utils.Utils import org.fossasia.openevent.general.utils.nullToEmpty -import org.koin.android.architecture.ext.viewModel +import org.koin.androidx.viewmodel.ext.android.viewModel import timber.log.Timber class SearchResultsActivity : AppCompatActivity() { diff --git a/app/src/main/java/org/fossasia/openevent/general/about/AboutEventActivity.kt b/app/src/main/java/org/fossasia/openevent/general/about/AboutEventActivity.kt index d23161402b..ef1992d142 100644 --- a/app/src/main/java/org/fossasia/openevent/general/about/AboutEventActivity.kt +++ b/app/src/main/java/org/fossasia/openevent/general/about/AboutEventActivity.kt @@ -1,9 +1,9 @@ package org.fossasia.openevent.general.about -import android.arch.lifecycle.Observer +import androidx.lifecycle.Observer import android.os.Bundle -import android.support.design.widget.AppBarLayout -import android.support.v7.app.AppCompatActivity +import com.google.android.material.appbar.AppBarLayout +import androidx.appcompat.app.AppCompatActivity import android.view.MenuItem import android.view.View import android.widget.Toast @@ -12,7 +12,7 @@ import org.fossasia.openevent.general.R import org.fossasia.openevent.general.event.Event import org.fossasia.openevent.general.event.EventUtils import org.fossasia.openevent.general.utils.Utils -import org.koin.android.architecture.ext.viewModel +import org.koin.androidx.viewmodel.ext.android.viewModel class AboutEventActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedListener { diff --git a/app/src/main/java/org/fossasia/openevent/general/about/AboutEventViewModel.kt b/app/src/main/java/org/fossasia/openevent/general/about/AboutEventViewModel.kt index ac8908cd1c..7159710344 100644 --- a/app/src/main/java/org/fossasia/openevent/general/about/AboutEventViewModel.kt +++ b/app/src/main/java/org/fossasia/openevent/general/about/AboutEventViewModel.kt @@ -1,7 +1,7 @@ package org.fossasia.openevent.general.about -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/org/fossasia/openevent/general/attendees/Attendee.kt b/app/src/main/java/org/fossasia/openevent/general/attendees/Attendee.kt index b5e21f6cd8..66348df128 100644 --- a/app/src/main/java/org/fossasia/openevent/general/attendees/Attendee.kt +++ b/app/src/main/java/org/fossasia/openevent/general/attendees/Attendee.kt @@ -1,9 +1,9 @@ package org.fossasia.openevent.general.attendees -import android.arch.persistence.room.ColumnInfo -import android.arch.persistence.room.Entity -import android.arch.persistence.room.ForeignKey -import android.arch.persistence.room.PrimaryKey +import androidx.room.ColumnInfo +import androidx.room.Entity +import androidx.room.ForeignKey +import androidx.room.PrimaryKey import com.fasterxml.jackson.databind.PropertyNamingStrategy import com.fasterxml.jackson.databind.annotation.JsonNaming import com.github.jasminb.jsonapi.IntegerIdHandler diff --git a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeDao.kt b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeDao.kt index b5fd0bfbf7..ae8ffb36d2 100644 --- a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeDao.kt +++ b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeDao.kt @@ -1,9 +1,9 @@ package org.fossasia.openevent.general.attendees -import android.arch.persistence.room.Dao -import android.arch.persistence.room.Insert -import android.arch.persistence.room.OnConflictStrategy -import android.arch.persistence.room.Query +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.OnConflictStrategy +import androidx.room.Query import io.reactivex.Single import org.fossasia.openevent.general.attendees.forms.CustomForm diff --git a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeFragment.kt b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeFragment.kt index b5ee0406b5..5794c2a7d8 100644 --- a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeFragment.kt @@ -1,15 +1,15 @@ package org.fossasia.openevent.general.attendees import android.app.AlertDialog -import android.arch.lifecycle.Observer +import androidx.lifecycle.Observer import android.content.Intent import android.content.pm.PackageManager import android.os.Bundle -import android.support.design.widget.TextInputLayout -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentManager -import android.support.v7.app.AppCompatActivity -import android.support.v7.widget.LinearLayoutManager +import com.google.android.material.textfield.TextInputLayout +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.appcompat.app.AppCompatActivity +import androidx.recyclerview.widget.LinearLayoutManager import android.text.Editable import android.text.Spannable import android.text.SpannableStringBuilder @@ -24,6 +24,7 @@ import android.widget.AdapterView import android.widget.ArrayAdapter import android.widget.EditText import android.widget.Toast +import androidx.recyclerview.widget.RecyclerView import com.stripe.android.Stripe import com.stripe.android.TokenCallback import com.stripe.android.model.Card @@ -44,7 +45,7 @@ import org.fossasia.openevent.general.ticket.TicketDetailsRecyclerAdapter import org.fossasia.openevent.general.ticket.TicketId import org.fossasia.openevent.general.utils.Utils import org.fossasia.openevent.general.utils.nullToEmpty -import org.koin.android.architecture.ext.viewModel +import org.koin.androidx.viewmodel.ext.android.viewModel import java.util.* import kotlin.collections.ArrayList @@ -149,7 +150,7 @@ class AttendeeFragment : Fragment() { rootView.attendeeRecycler.isNestedScrollingEnabled = false linearLayoutManager = LinearLayoutManager(context) - linearLayoutManager.orientation = LinearLayoutManager.VERTICAL + linearLayoutManager.orientation = RecyclerView.VERTICAL rootView.ticketsRecycler.layoutManager = linearLayoutManager attendeeViewModel.ticketDetails(ticketIdAndQty) diff --git a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeIdConverter.kt b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeIdConverter.kt index 00ed247fbd..02497586fc 100644 --- a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeIdConverter.kt +++ b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeIdConverter.kt @@ -1,6 +1,6 @@ package org.fossasia.openevent.general.attendees -import android.arch.persistence.room.TypeConverter +import androidx.room.TypeConverter class AttendeeIdConverter { diff --git a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeRecyclerAdapter.kt b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeRecyclerAdapter.kt index 6957f511cb..fd3fc8428a 100644 --- a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeRecyclerAdapter.kt +++ b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeRecyclerAdapter.kt @@ -1,6 +1,6 @@ package org.fossasia.openevent.general.attendees -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup import org.fossasia.openevent.general.R diff --git a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewHolder.kt b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewHolder.kt index 879d16816c..f2bd613a88 100644 --- a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewHolder.kt +++ b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewHolder.kt @@ -1,7 +1,7 @@ package org.fossasia.openevent.general.attendees -import android.support.design.widget.TextInputLayout -import android.support.v7.widget.RecyclerView +import com.google.android.material.textfield.TextInputLayout +import androidx.recyclerview.widget.RecyclerView import android.text.Editable import android.text.TextWatcher import android.view.View diff --git a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewModel.kt b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewModel.kt index 7201781ebc..01e8c969d4 100644 --- a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewModel.kt +++ b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewModel.kt @@ -1,7 +1,7 @@ package org.fossasia.openevent.general.attendees -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/org/fossasia/openevent/general/attendees/ListAttendeeIdConverter.kt b/app/src/main/java/org/fossasia/openevent/general/attendees/ListAttendeeIdConverter.kt index e622ffc378..adcb0787e9 100644 --- a/app/src/main/java/org/fossasia/openevent/general/attendees/ListAttendeeIdConverter.kt +++ b/app/src/main/java/org/fossasia/openevent/general/attendees/ListAttendeeIdConverter.kt @@ -1,6 +1,6 @@ package org.fossasia.openevent.general.attendees -import android.arch.persistence.room.TypeConverter +import androidx.room.TypeConverter import com.fasterxml.jackson.core.type.TypeReference import com.fasterxml.jackson.databind.ObjectMapper diff --git a/app/src/main/java/org/fossasia/openevent/general/attendees/forms/CustomForm.kt b/app/src/main/java/org/fossasia/openevent/general/attendees/forms/CustomForm.kt index c90a6a9350..7c2ca8390f 100644 --- a/app/src/main/java/org/fossasia/openevent/general/attendees/forms/CustomForm.kt +++ b/app/src/main/java/org/fossasia/openevent/general/attendees/forms/CustomForm.kt @@ -1,8 +1,8 @@ package org.fossasia.openevent.general.attendees.forms -import android.arch.persistence.room.Entity -import android.arch.persistence.room.ForeignKey -import android.arch.persistence.room.PrimaryKey +import androidx.room.Entity +import androidx.room.ForeignKey +import androidx.room.PrimaryKey import com.fasterxml.jackson.databind.PropertyNamingStrategy import com.fasterxml.jackson.databind.annotation.JsonNaming import com.github.jasminb.jsonapi.IntegerIdHandler diff --git a/app/src/main/java/org/fossasia/openevent/general/auth/EditProfileFragment.kt b/app/src/main/java/org/fossasia/openevent/general/auth/EditProfileFragment.kt index e04b5fcee0..4bc6612e36 100644 --- a/app/src/main/java/org/fossasia/openevent/general/auth/EditProfileFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/auth/EditProfileFragment.kt @@ -2,15 +2,15 @@ package org.fossasia.openevent.general.auth import android.Manifest import android.app.Activity -import android.arch.lifecycle.Observer +import androidx.lifecycle.Observer import android.content.Intent import android.content.pm.PackageManager import android.graphics.Bitmap import android.graphics.BitmapFactory import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v7.app.AppCompatActivity -import android.support.v7.content.res.AppCompatResources +import androidx.fragment.app.Fragment +import androidx.appcompat.app.AppCompatActivity +import androidx.appcompat.content.res.AppCompatResources import android.util.Base64 import android.view.LayoutInflater import android.view.MenuItem @@ -24,7 +24,7 @@ import org.fossasia.openevent.general.R import org.fossasia.openevent.general.utils.Utils import org.fossasia.openevent.general.utils.Utils.hideSoftKeyboard import org.fossasia.openevent.general.utils.nullToEmpty -import org.koin.android.architecture.ext.viewModel +import org.koin.androidx.viewmodel.ext.android.viewModel import timber.log.Timber import java.io.ByteArrayOutputStream import java.io.FileNotFoundException diff --git a/app/src/main/java/org/fossasia/openevent/general/auth/EditProfileViewModel.kt b/app/src/main/java/org/fossasia/openevent/general/auth/EditProfileViewModel.kt index 9d3a9de554..75f10fe167 100644 --- a/app/src/main/java/org/fossasia/openevent/general/auth/EditProfileViewModel.kt +++ b/app/src/main/java/org/fossasia/openevent/general/auth/EditProfileViewModel.kt @@ -1,7 +1,7 @@ package org.fossasia.openevent.general.auth -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/org/fossasia/openevent/general/auth/LoginFragment.kt b/app/src/main/java/org/fossasia/openevent/general/auth/LoginFragment.kt index 08f18e98b5..dab464c154 100644 --- a/app/src/main/java/org/fossasia/openevent/general/auth/LoginFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/auth/LoginFragment.kt @@ -1,9 +1,9 @@ package org.fossasia.openevent.general.auth -import android.arch.lifecycle.Observer +import androidx.lifecycle.Observer import android.content.Intent import android.os.Bundle -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment import android.text.Editable import android.text.TextWatcher import android.view.LayoutInflater @@ -19,7 +19,7 @@ import org.fossasia.openevent.general.ticket.EVENT_ID import org.fossasia.openevent.general.ticket.TICKET_ID_AND_QTY import org.fossasia.openevent.general.utils.Utils import org.fossasia.openevent.general.utils.Utils.hideSoftKeyboard -import org.koin.android.architecture.ext.viewModel +import org.koin.androidx.viewmodel.ext.android.viewModel const val LAUNCH_ATTENDEE: String = "LAUNCH_ATTENDEE" class LoginFragment : Fragment() { diff --git a/app/src/main/java/org/fossasia/openevent/general/auth/LoginViewModel.kt b/app/src/main/java/org/fossasia/openevent/general/auth/LoginViewModel.kt index 3c4a12f640..7f668587c4 100644 --- a/app/src/main/java/org/fossasia/openevent/general/auth/LoginViewModel.kt +++ b/app/src/main/java/org/fossasia/openevent/general/auth/LoginViewModel.kt @@ -1,7 +1,7 @@ package org.fossasia.openevent.general.auth -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import android.util.Patterns import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable diff --git a/app/src/main/java/org/fossasia/openevent/general/auth/ProfileFragment.kt b/app/src/main/java/org/fossasia/openevent/general/auth/ProfileFragment.kt index 11b2077d1e..b1e8b4bf7d 100644 --- a/app/src/main/java/org/fossasia/openevent/general/auth/ProfileFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/auth/ProfileFragment.kt @@ -1,14 +1,14 @@ package org.fossasia.openevent.general.auth -import android.arch.lifecycle.Observer +import androidx.lifecycle.Observer import android.content.ActivityNotFoundException import android.content.Context import android.content.Intent import android.net.Uri import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v7.app.AppCompatActivity -import android.support.v7.content.res.AppCompatResources +import androidx.fragment.app.Fragment +import androidx.appcompat.app.AppCompatActivity +import androidx.appcompat.content.res.AppCompatResources import android.view.* import android.widget.Toast import com.squareup.picasso.Picasso @@ -20,7 +20,7 @@ import org.fossasia.openevent.general.R import org.fossasia.openevent.general.settings.SettingsFragment import org.fossasia.openevent.general.utils.Utils import org.fossasia.openevent.general.utils.nullToEmpty -import org.koin.android.architecture.ext.viewModel +import org.koin.androidx.viewmodel.ext.android.viewModel class ProfileFragment : Fragment() { private val profileViewModel by viewModel() @@ -38,7 +38,7 @@ class ProfileFragment : Fragment() { startActivity(Intent(activity, MainActivity::class.java).setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)) } - override fun onAttach(context: Context?) { + override fun onAttach(context: Context) { super.onAttach(context) if (!profileViewModel.isLoggedIn()) { Toast.makeText(context, "You need to Login!", Toast.LENGTH_LONG).show() @@ -82,8 +82,8 @@ class ProfileFragment : Fragment() { return rootView } - override fun onOptionsItemSelected(item: MenuItem?): Boolean { - when (item?.getItemId()) { + override fun onOptionsItemSelected(item: MenuItem): Boolean { + when (item.itemId) { R.id.edit_profile -> { val fragment = EditProfileFragment() activity?.supportFragmentManager?.beginTransaction()?.replace(R.id.frameContainer, fragment)?.addToBackStack(null)?.commit() @@ -117,8 +117,8 @@ class ProfileFragment : Fragment() { } } - override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) { - inflater?.inflate(R.menu.profile, menu) + override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { + inflater.inflate(R.menu.profile, menu) super.onCreateOptionsMenu(menu, inflater) } diff --git a/app/src/main/java/org/fossasia/openevent/general/auth/ProfileViewModel.kt b/app/src/main/java/org/fossasia/openevent/general/auth/ProfileViewModel.kt index a30ee234b5..5aa998bc3f 100644 --- a/app/src/main/java/org/fossasia/openevent/general/auth/ProfileViewModel.kt +++ b/app/src/main/java/org/fossasia/openevent/general/auth/ProfileViewModel.kt @@ -1,7 +1,7 @@ package org.fossasia.openevent.general.auth -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/org/fossasia/openevent/general/auth/SignUpFragment.kt b/app/src/main/java/org/fossasia/openevent/general/auth/SignUpFragment.kt index 2aae0fc8f0..e95aaed83b 100644 --- a/app/src/main/java/org/fossasia/openevent/general/auth/SignUpFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/auth/SignUpFragment.kt @@ -1,9 +1,9 @@ package org.fossasia.openevent.general.auth -import android.arch.lifecycle.Observer +import androidx.lifecycle.Observer import android.content.Intent import android.os.Bundle -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment import android.text.Editable import android.text.TextWatcher import android.view.LayoutInflater @@ -15,7 +15,7 @@ import kotlinx.android.synthetic.main.fragment_signup.view.* import org.fossasia.openevent.general.MainActivity import org.fossasia.openevent.general.R import org.fossasia.openevent.general.utils.Utils -import org.koin.android.architecture.ext.viewModel +import org.koin.androidx.viewmodel.ext.android.viewModel class SignUpFragment : Fragment() { diff --git a/app/src/main/java/org/fossasia/openevent/general/auth/SignUpViewModel.kt b/app/src/main/java/org/fossasia/openevent/general/auth/SignUpViewModel.kt index 2d6dc7879a..c895a43f40 100644 --- a/app/src/main/java/org/fossasia/openevent/general/auth/SignUpViewModel.kt +++ b/app/src/main/java/org/fossasia/openevent/general/auth/SignUpViewModel.kt @@ -1,7 +1,7 @@ package org.fossasia.openevent.general.auth -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/org/fossasia/openevent/general/auth/User.kt b/app/src/main/java/org/fossasia/openevent/general/auth/User.kt index 4a6468b33e..3cc2c2f930 100644 --- a/app/src/main/java/org/fossasia/openevent/general/auth/User.kt +++ b/app/src/main/java/org/fossasia/openevent/general/auth/User.kt @@ -1,7 +1,7 @@ package org.fossasia.openevent.general.auth -import android.arch.persistence.room.Entity -import android.arch.persistence.room.PrimaryKey +import androidx.room.Entity +import androidx.room.PrimaryKey import com.fasterxml.jackson.databind.PropertyNamingStrategy import com.fasterxml.jackson.databind.annotation.JsonNaming import com.github.jasminb.jsonapi.IntegerIdHandler diff --git a/app/src/main/java/org/fossasia/openevent/general/auth/UserDao.kt b/app/src/main/java/org/fossasia/openevent/general/auth/UserDao.kt index fb0d6d4ee6..e2352fedf7 100644 --- a/app/src/main/java/org/fossasia/openevent/general/auth/UserDao.kt +++ b/app/src/main/java/org/fossasia/openevent/general/auth/UserDao.kt @@ -1,9 +1,9 @@ package org.fossasia.openevent.general.auth -import android.arch.persistence.room.Dao -import android.arch.persistence.room.Insert -import android.arch.persistence.room.OnConflictStrategy.REPLACE -import android.arch.persistence.room.Query +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.OnConflictStrategy.REPLACE +import androidx.room.Query import io.reactivex.Single @Dao diff --git a/app/src/main/java/org/fossasia/openevent/general/common/SingleLiveEvent.kt b/app/src/main/java/org/fossasia/openevent/general/common/SingleLiveEvent.kt index 0b2ead52d8..83e2cb6091 100644 --- a/app/src/main/java/org/fossasia/openevent/general/common/SingleLiveEvent.kt +++ b/app/src/main/java/org/fossasia/openevent/general/common/SingleLiveEvent.kt @@ -16,10 +16,10 @@ package org.fossasia.openevent.general.common * limitations under the License. */ -import android.arch.lifecycle.LifecycleOwner -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.Observer -import android.support.annotation.MainThread +import androidx.lifecycle.LifecycleOwner +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.Observer +import androidx.annotation.MainThread import timber.log.Timber import java.util.concurrent.atomic.AtomicBoolean @@ -40,7 +40,7 @@ class SingleLiveEvent : MutableLiveData() { private val mPending = AtomicBoolean(false) @MainThread - override fun observe(owner: LifecycleOwner, observer: Observer) { + override fun observe(owner: LifecycleOwner, observer: Observer) { if (hasActiveObservers()) { Timber.w("Multiple observers registered but only one will be notified of changes.") diff --git a/app/src/main/java/org/fossasia/openevent/general/data/Resource.kt b/app/src/main/java/org/fossasia/openevent/general/data/Resource.kt index d718a7d122..e2589dc74f 100644 --- a/app/src/main/java/org/fossasia/openevent/general/data/Resource.kt +++ b/app/src/main/java/org/fossasia/openevent/general/data/Resource.kt @@ -1,6 +1,6 @@ package org.fossasia.openevent.general.data -import android.support.annotation.StringRes +import androidx.annotation.StringRes import org.fossasia.openevent.general.OpenEventGeneral class Resource { diff --git a/app/src/main/java/org/fossasia/openevent/general/di/Modules.kt b/app/src/main/java/org/fossasia/openevent/general/di/Modules.kt index 9c18457db8..c1da43ae46 100644 --- a/app/src/main/java/org/fossasia/openevent/general/di/Modules.kt +++ b/app/src/main/java/org/fossasia/openevent/general/di/Modules.kt @@ -1,6 +1,6 @@ package org.fossasia.openevent.general.di -import android.arch.persistence.room.Room +import androidx.room.Room import com.fasterxml.jackson.databind.DeserializationFeature import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper @@ -33,49 +33,49 @@ import org.fossasia.openevent.general.social.SocialLinkApi import org.fossasia.openevent.general.social.SocialLinksService import org.fossasia.openevent.general.social.SocialLinksViewModel import org.fossasia.openevent.general.ticket.* -import org.koin.android.architecture.ext.viewModel import org.koin.android.ext.koin.androidApplication -import org.koin.dsl.module.applicationContext +import org.koin.androidx.viewmodel.ext.koin.viewModel +import org.koin.dsl.module.module import retrofit2.Retrofit import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory import retrofit2.converter.jackson.JacksonConverterFactory import java.util.concurrent.TimeUnit -val commonModule = applicationContext { - bean { Preference() } - bean { Network() } +val commonModule = module { + single { Preference() } + single { Network() } } -val apiModule = applicationContext { - bean { +val apiModule = module { + single { val retrofit: Retrofit = get() retrofit.create(EventApi::class.java) } - bean { + single { val retrofit: Retrofit = get() retrofit.create(AuthApi::class.java) } - bean { + single { val retrofit: Retrofit = get() retrofit.create(TicketApi::class.java) } - bean { + single { val retrofit: Retrofit = get() retrofit.create(SocialLinkApi::class.java) } - bean { + single { val retrofit: Retrofit = get() retrofit.create(EventTopicApi::class.java) } - bean { + single { val retrofit: Retrofit = get() retrofit.create(AttendeeApi::class.java) } - bean { + single { val retrofit: Retrofit = get() retrofit.create(OrderApi::class.java) } - bean { + single { val retrofit: Retrofit = get() retrofit.create(PaypalApi::class.java) } @@ -90,7 +90,7 @@ val apiModule = applicationContext { factory { OrderService(get(), get(), get()) } } -val viewModelModule = applicationContext { +val viewModelModule = module { viewModel { LoginViewModel(get(), get()) } viewModel { EventsViewModel(get(), get()) } viewModel { ProfileViewModel(get()) } @@ -112,17 +112,17 @@ val viewModelModule = applicationContext { viewModel { EditProfileViewModel(get(), get()) } } -val networkModule = applicationContext { +val networkModule = module { - bean { + single { val objectMapper = jacksonObjectMapper() objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) objectMapper } - bean { RequestAuthenticator(get()) as Authenticator } + single { RequestAuthenticator(get()) as Authenticator } - bean { + single { val connectTimeout = 15 // 15s val readTimeout = 15 // 15s @@ -136,7 +136,7 @@ val networkModule = applicationContext { .build() } - bean { + single { val baseUrl = BuildConfig.DEFAULT_BASE_URL val objectMapper: ObjectMapper = get() @@ -150,9 +150,9 @@ val networkModule = applicationContext { } } -val databaseModule = applicationContext { +val databaseModule = module { - bean { + single { Room.databaseBuilder(androidApplication(), OpenEventDatabase::class.java, "open_event_database") .fallbackToDestructiveMigration() diff --git a/app/src/main/java/org/fossasia/openevent/general/event/Event.kt b/app/src/main/java/org/fossasia/openevent/general/event/Event.kt index 8b4ddcb61b..026c97a303 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/Event.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/Event.kt @@ -1,8 +1,8 @@ package org.fossasia.openevent.general.event -import android.arch.persistence.room.ColumnInfo -import android.arch.persistence.room.Entity -import android.arch.persistence.room.PrimaryKey +import androidx.room.ColumnInfo +import androidx.room.Entity +import androidx.room.PrimaryKey import com.fasterxml.jackson.databind.PropertyNamingStrategy import com.fasterxml.jackson.databind.annotation.JsonNaming import com.github.jasminb.jsonapi.LongIdHandler diff --git a/app/src/main/java/org/fossasia/openevent/general/event/EventDao.kt b/app/src/main/java/org/fossasia/openevent/general/event/EventDao.kt index 7a2d5d790c..c65685a9b3 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/EventDao.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/EventDao.kt @@ -1,9 +1,9 @@ package org.fossasia.openevent.general.event -import android.arch.persistence.room.Dao -import android.arch.persistence.room.Insert -import android.arch.persistence.room.OnConflictStrategy.REPLACE -import android.arch.persistence.room.Query +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.OnConflictStrategy.REPLACE +import androidx.room.Query import io.reactivex.Flowable import io.reactivex.Single diff --git a/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt b/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt index a0194ec45f..09a0dd9d06 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt @@ -1,11 +1,11 @@ package org.fossasia.openevent.general.event -import android.arch.lifecycle.Observer +import androidx.lifecycle.Observer import android.content.Intent import android.net.Uri import android.os.Bundle import android.provider.CalendarContract -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment import android.view.* import android.widget.TextView import android.widget.Toast @@ -15,20 +15,20 @@ import org.fossasia.openevent.general.about.AboutEventActivity import org.fossasia.openevent.general.social.SocialLinksFragment import org.fossasia.openevent.general.ticket.TicketsFragment import org.fossasia.openevent.general.utils.nullToEmpty -import org.koin.android.architecture.ext.viewModel import timber.log.Timber import android.os.Build import org.fossasia.openevent.general.event.topic.SimilarEventsFragment import kotlinx.android.synthetic.main.fragment_event.view.* -import android.support.v4.content.ContextCompat -import android.support.v7.app.AppCompatActivity -import android.support.v7.content.res.AppCompatResources +import androidx.core.content.ContextCompat +import androidx.appcompat.app.AppCompatActivity +import androidx.appcompat.content.res.AppCompatResources import kotlinx.android.synthetic.main.content_event.* import org.fossasia.openevent.general.CircleTransform import org.fossasia.openevent.general.R import org.fossasia.openevent.general.MainActivity import org.fossasia.openevent.general.SearchResultsActivity import org.fossasia.openevent.general.ticket.CURRENCY +import org.koin.androidx.viewmodel.ext.android.viewModel import java.util.* const val EVENT_ID = "EVENT_ID" @@ -278,9 +278,8 @@ class EventDetailsFragment : Fragment() { startActivity(Intent.createChooser(emailIntent, "Chooser Title")) } - override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) { - val inflaterMenu = activity?.menuInflater - inflaterMenu?.inflate(R.menu.event_details, menu) + override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { + inflater.inflate(R.menu.event_details, menu) menuActionBar = menu } diff --git a/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsViewModel.kt b/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsViewModel.kt index 0694299429..c60c825b66 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsViewModel.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsViewModel.kt @@ -1,7 +1,7 @@ package org.fossasia.openevent.general.event -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable diff --git a/app/src/main/java/org/fossasia/openevent/general/event/EventIdConverter.kt b/app/src/main/java/org/fossasia/openevent/general/event/EventIdConverter.kt index 697d05e703..14c5ffd230 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/EventIdConverter.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/EventIdConverter.kt @@ -1,6 +1,6 @@ package org.fossasia.openevent.general.event -import android.arch.persistence.room.TypeConverter +import androidx.room.TypeConverter class EventIdConverter { diff --git a/app/src/main/java/org/fossasia/openevent/general/event/EventViewHolder.kt b/app/src/main/java/org/fossasia/openevent/general/event/EventViewHolder.kt index ec4ebdd4b8..e7b22d9e0a 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/EventViewHolder.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/EventViewHolder.kt @@ -1,7 +1,7 @@ package org.fossasia.openevent.general.event import android.content.Intent -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import com.squareup.picasso.Picasso import kotlinx.android.synthetic.main.item_card_events.view.* diff --git a/app/src/main/java/org/fossasia/openevent/general/event/EventsFragment.kt b/app/src/main/java/org/fossasia/openevent/general/event/EventsFragment.kt index 39e5541eed..67407a0e53 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/EventsFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/EventsFragment.kt @@ -1,13 +1,13 @@ package org.fossasia.openevent.general.event -import android.arch.lifecycle.Observer +import androidx.lifecycle.Observer import android.content.Context import android.content.Intent import android.graphics.Color import android.net.ConnectivityManager import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v7.widget.LinearLayoutManager +import androidx.fragment.app.Fragment +import androidx.recyclerview.widget.LinearLayoutManager import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -16,7 +16,7 @@ import kotlinx.android.synthetic.main.content_no_internet.view.* import kotlinx.android.synthetic.main.fragment_events.view.* import org.fossasia.openevent.general.R import org.fossasia.openevent.general.search.SearchLocationActivity -import org.koin.android.architecture.ext.viewModel +import org.koin.androidx.viewmodel.ext.android.viewModel import timber.log.Timber // String constants for event types diff --git a/app/src/main/java/org/fossasia/openevent/general/event/EventsRecyclerAdapter.kt b/app/src/main/java/org/fossasia/openevent/general/event/EventsRecyclerAdapter.kt index deda73fec5..4532df98f1 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/EventsRecyclerAdapter.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/EventsRecyclerAdapter.kt @@ -1,6 +1,6 @@ package org.fossasia.openevent.general.event -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/app/src/main/java/org/fossasia/openevent/general/event/EventsViewModel.kt b/app/src/main/java/org/fossasia/openevent/general/event/EventsViewModel.kt index 581762f015..d4b5c6b492 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/EventsViewModel.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/EventsViewModel.kt @@ -1,7 +1,7 @@ package org.fossasia.openevent.general.event -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/org/fossasia/openevent/general/event/topic/EventTopic.kt b/app/src/main/java/org/fossasia/openevent/general/event/topic/EventTopic.kt index 0dea032d7e..68cd215459 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/topic/EventTopic.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/topic/EventTopic.kt @@ -1,9 +1,9 @@ package org.fossasia.openevent.general.event.topic -import android.arch.persistence.room.ColumnInfo -import android.arch.persistence.room.Entity -import android.arch.persistence.room.ForeignKey -import android.arch.persistence.room.PrimaryKey +import androidx.room.ColumnInfo +import androidx.room.Entity +import androidx.room.ForeignKey +import androidx.room.PrimaryKey import com.github.jasminb.jsonapi.LongIdHandler import com.github.jasminb.jsonapi.annotations.Id import com.github.jasminb.jsonapi.annotations.Relationship diff --git a/app/src/main/java/org/fossasia/openevent/general/event/topic/EventTopicIdConverter.kt b/app/src/main/java/org/fossasia/openevent/general/event/topic/EventTopicIdConverter.kt index 1b9a84cdf6..c75ce71b60 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/topic/EventTopicIdConverter.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/topic/EventTopicIdConverter.kt @@ -1,6 +1,6 @@ package org.fossasia.openevent.general.event.topic -import android.arch.persistence.room.TypeConverter +import androidx.room.TypeConverter class EventTopicIdConverter { diff --git a/app/src/main/java/org/fossasia/openevent/general/event/topic/EventTopicsDao.kt b/app/src/main/java/org/fossasia/openevent/general/event/topic/EventTopicsDao.kt index fdefe24d71..9b63f816f6 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/topic/EventTopicsDao.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/topic/EventTopicsDao.kt @@ -1,9 +1,9 @@ package org.fossasia.openevent.general.event.topic -import android.arch.persistence.room.Dao -import android.arch.persistence.room.Insert -import android.arch.persistence.room.OnConflictStrategy -import android.arch.persistence.room.Query +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.OnConflictStrategy +import androidx.room.Query import io.reactivex.Flowable @Dao diff --git a/app/src/main/java/org/fossasia/openevent/general/event/topic/SimilarEventsFragment.kt b/app/src/main/java/org/fossasia/openevent/general/event/topic/SimilarEventsFragment.kt index bf1ef55e29..2476a35ff6 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/topic/SimilarEventsFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/topic/SimilarEventsFragment.kt @@ -1,9 +1,9 @@ package org.fossasia.openevent.general.event.topic -import android.arch.lifecycle.Observer +import androidx.lifecycle.Observer import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v7.widget.LinearLayoutManager +import androidx.fragment.app.Fragment +import androidx.recyclerview.widget.LinearLayoutManager import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -13,7 +13,7 @@ import kotlinx.android.synthetic.main.fragment_similar_events.view.* import org.fossasia.openevent.general.R import org.fossasia.openevent.general.event.* import org.fossasia.openevent.general.utils.Utils -import org.koin.android.architecture.ext.viewModel +import org.koin.androidx.viewmodel.ext.android.viewModel import timber.log.Timber class SimilarEventsFragment : Fragment() { diff --git a/app/src/main/java/org/fossasia/openevent/general/event/topic/SimilarEventsViewModel.kt b/app/src/main/java/org/fossasia/openevent/general/event/topic/SimilarEventsViewModel.kt index 933a1aee4a..e7ac792fca 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/topic/SimilarEventsViewModel.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/topic/SimilarEventsViewModel.kt @@ -1,7 +1,7 @@ package org.fossasia.openevent.general.event.topic -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/org/fossasia/openevent/general/favorite/FavoriteEventsRecyclerAdapter.kt b/app/src/main/java/org/fossasia/openevent/general/favorite/FavoriteEventsRecyclerAdapter.kt index fc6f3e076d..05598e84a9 100644 --- a/app/src/main/java/org/fossasia/openevent/general/favorite/FavoriteEventsRecyclerAdapter.kt +++ b/app/src/main/java/org/fossasia/openevent/general/favorite/FavoriteEventsRecyclerAdapter.kt @@ -1,6 +1,6 @@ package org.fossasia.openevent.general.favorite -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup import org.fossasia.openevent.general.R diff --git a/app/src/main/java/org/fossasia/openevent/general/favorite/FavoriteFragment.kt b/app/src/main/java/org/fossasia/openevent/general/favorite/FavoriteFragment.kt index e256c1cc8f..9b8d92059b 100644 --- a/app/src/main/java/org/fossasia/openevent/general/favorite/FavoriteFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/favorite/FavoriteFragment.kt @@ -1,11 +1,11 @@ package org.fossasia.openevent.general.favorite -import android.arch.lifecycle.Observer +import androidx.lifecycle.Observer import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v7.app.AppCompatActivity -import android.support.v7.widget.DividerItemDecoration -import android.support.v7.widget.LinearLayoutManager +import androidx.fragment.app.Fragment +import androidx.appcompat.app.AppCompatActivity +import androidx.recyclerview.widget.DividerItemDecoration +import androidx.recyclerview.widget.LinearLayoutManager import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -14,7 +14,7 @@ import kotlinx.android.synthetic.main.fragment_favorite.* import kotlinx.android.synthetic.main.fragment_favorite.view.* import org.fossasia.openevent.general.R import org.fossasia.openevent.general.event.* -import org.koin.android.architecture.ext.viewModel +import org.koin.androidx.viewmodel.ext.android.viewModel import timber.log.Timber const val FAVORITE_EVENT_DATE_FORMAT: String = "favoriteEventDateFormat" @@ -38,7 +38,7 @@ class FavoriteFragment : Fragment() { activity?.supportActionBar?.title = "Likes" val dividerItemDecoration = DividerItemDecoration(rootView.favoriteEventsRecycler.context, - LinearLayoutManager.VERTICAL) + LinearLayoutManager.VERTICAL) rootView.favoriteEventsRecycler.addItemDecoration(dividerItemDecoration) val recyclerViewClickListener = object : RecyclerViewClickListener { diff --git a/app/src/main/java/org/fossasia/openevent/general/favorite/FavouriteEventsViewModel.kt b/app/src/main/java/org/fossasia/openevent/general/favorite/FavouriteEventsViewModel.kt index 1b01bf44eb..f45c00d107 100644 --- a/app/src/main/java/org/fossasia/openevent/general/favorite/FavouriteEventsViewModel.kt +++ b/app/src/main/java/org/fossasia/openevent/general/favorite/FavouriteEventsViewModel.kt @@ -1,7 +1,7 @@ package org.fossasia.openevent.general.favorite -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/org/fossasia/openevent/general/order/Order.kt b/app/src/main/java/org/fossasia/openevent/general/order/Order.kt index f1d36931a6..5497c34655 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/Order.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/Order.kt @@ -1,9 +1,9 @@ package org.fossasia.openevent.general.order -import android.arch.persistence.room.ColumnInfo -import android.arch.persistence.room.Entity -import android.arch.persistence.room.ForeignKey -import android.arch.persistence.room.PrimaryKey +import androidx.room.ColumnInfo +import androidx.room.Entity +import androidx.room.ForeignKey +import androidx.room.PrimaryKey import com.fasterxml.jackson.databind.PropertyNamingStrategy import com.fasterxml.jackson.databind.annotation.JsonNaming import com.github.jasminb.jsonapi.IntegerIdHandler diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrderCompletedFragment.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrderCompletedFragment.kt index 2e32c65934..58d15aa62c 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrderCompletedFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrderCompletedFragment.kt @@ -1,12 +1,12 @@ package org.fossasia.openevent.general.order -import android.arch.lifecycle.Observer +import androidx.lifecycle.Observer import android.content.Intent import android.os.Bundle import android.provider.CalendarContract -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentManager -import android.support.v7.app.AppCompatActivity +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.appcompat.app.AppCompatActivity import android.view.* import android.widget.Toast import kotlinx.android.synthetic.main.fragment_order.view.* @@ -16,7 +16,7 @@ import org.fossasia.openevent.general.event.Event import org.fossasia.openevent.general.event.EventDetailsFragment import org.fossasia.openevent.general.event.EventUtils import org.fossasia.openevent.general.ticket.EVENT_ID -import org.koin.android.architecture.ext.viewModel +import org.koin.androidx.viewmodel.ext.android.viewModel const val TICKETS: String = "OpenMyTickets" @@ -140,9 +140,8 @@ class OrderCompletedFragment : Fragment() { super.onDestroyView() } - override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) { - val inflaterMenu = activity?.menuInflater - inflaterMenu?.inflate(R.menu.order_completed, menu) + override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { + inflater.inflate(R.menu.order_completed, menu) } override fun onOptionsItemSelected(item: MenuItem): Boolean { diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrderCompletedViewModel.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrderCompletedViewModel.kt index 2954ae407c..9cd416e1d1 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrderCompletedViewModel.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrderCompletedViewModel.kt @@ -1,7 +1,7 @@ package org.fossasia.openevent.general.order -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrderDao.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrderDao.kt index 6eead270a0..35b2a67c53 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrderDao.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrderDao.kt @@ -1,8 +1,8 @@ package org.fossasia.openevent.general.order -import android.arch.persistence.room.Dao -import android.arch.persistence.room.Insert -import android.arch.persistence.room.OnConflictStrategy +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.OnConflictStrategy @Dao interface OrderDao { diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrderDetailsFragment.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrderDetailsFragment.kt index 7957f50d0e..9b217d4f9f 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrderDetailsFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrderDetailsFragment.kt @@ -1,10 +1,10 @@ package org.fossasia.openevent.general.order -import android.arch.lifecycle.Observer +import androidx.lifecycle.Observer import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v7.app.AppCompatActivity -import android.support.v7.widget.LinearLayoutManager +import androidx.fragment.app.Fragment +import androidx.appcompat.app.AppCompatActivity +import androidx.recyclerview.widget.LinearLayoutManager import android.view.* import android.widget.Toast import kotlinx.android.synthetic.main.fragment_order_details.view.* @@ -13,7 +13,7 @@ import org.fossasia.openevent.general.R import org.fossasia.openevent.general.event.EventDetailsFragment import org.fossasia.openevent.general.ticket.EVENT_ID import org.fossasia.openevent.general.utils.Utils -import org.koin.android.architecture.ext.viewModel +import org.koin.androidx.viewmodel.ext.android.viewModel import timber.log.Timber class OrderDetailsFragment : Fragment() { diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrderDetailsRecyclerAdapter.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrderDetailsRecyclerAdapter.kt index 58eb67bef2..9e45822d8a 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrderDetailsRecyclerAdapter.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrderDetailsRecyclerAdapter.kt @@ -1,6 +1,6 @@ package org.fossasia.openevent.general.order -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup import org.fossasia.openevent.general.R diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrderDetailsViewHolder.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrderDetailsViewHolder.kt index c92c791b9e..fa8e25ed92 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrderDetailsViewHolder.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrderDetailsViewHolder.kt @@ -3,7 +3,7 @@ package org.fossasia.openevent.general.order import android.content.Intent import android.net.Uri import android.provider.CalendarContract -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import kotlinx.android.synthetic.main.item_card_order_details.view.* import org.fossasia.openevent.general.attendees.Attendee diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrderDetailsViewModel.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrderDetailsViewModel.kt index 28a9bcbd11..8aad9778e4 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrderDetailsViewModel.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrderDetailsViewModel.kt @@ -1,7 +1,7 @@ package org.fossasia.openevent.general.order -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrdersRecyclerAdapter.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrdersRecyclerAdapter.kt index 7433904180..19db164c85 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrdersRecyclerAdapter.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrdersRecyclerAdapter.kt @@ -1,6 +1,6 @@ package org.fossasia.openevent.general.order -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup import org.fossasia.openevent.general.R diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt index c353794c85..dc1056eced 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt @@ -1,15 +1,16 @@ package org.fossasia.openevent.general.order -import android.arch.lifecycle.Observer +import androidx.lifecycle.Observer import android.content.Intent import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v7.app.AppCompatActivity -import android.support.v7.widget.LinearLayoutManager +import androidx.fragment.app.Fragment +import androidx.appcompat.app.AppCompatActivity +import androidx.recyclerview.widget.LinearLayoutManager import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.Toast +import androidx.recyclerview.widget.RecyclerView import kotlinx.android.synthetic.main.content_no_tickets.* import kotlinx.android.synthetic.main.fragment_orders_under_user.* import kotlinx.android.synthetic.main.fragment_orders_under_user.view.* @@ -17,7 +18,7 @@ import org.fossasia.openevent.general.AuthActivity import org.fossasia.openevent.general.R import org.fossasia.openevent.general.event.EVENT_ID import org.fossasia.openevent.general.utils.Utils -import org.koin.android.architecture.ext.viewModel +import org.koin.androidx.viewmodel.ext.android.viewModel import timber.log.Timber const val ORDERS: String = "orders" @@ -44,7 +45,7 @@ class OrdersUnderUserFragment : Fragment() { rootView.ordersRecycler.isNestedScrollingEnabled = false linearLayoutManager = LinearLayoutManager(context) - linearLayoutManager.orientation = LinearLayoutManager.VERTICAL + linearLayoutManager.orientation = RecyclerView.VERTICAL rootView.ordersRecycler.layoutManager = linearLayoutManager if (ordersUnderUserVM.isLoggedIn()) { diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserVM.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserVM.kt index 13eb5cca91..0111334017 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserVM.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserVM.kt @@ -1,7 +1,7 @@ package org.fossasia.openevent.general.order -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrdersViewHolder.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrdersViewHolder.kt index e3ce0a5278..b472f7d842 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrdersViewHolder.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrdersViewHolder.kt @@ -1,6 +1,6 @@ package org.fossasia.openevent.general.order -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import com.squareup.picasso.Picasso import kotlinx.android.synthetic.main.item_card_order.view.* diff --git a/app/src/main/java/org/fossasia/openevent/general/search/SearchFragment.kt b/app/src/main/java/org/fossasia/openevent/general/search/SearchFragment.kt index 774eabbf6b..33713c32f0 100644 --- a/app/src/main/java/org/fossasia/openevent/general/search/SearchFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/search/SearchFragment.kt @@ -2,15 +2,15 @@ package org.fossasia.openevent.general.search import android.content.Intent import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v7.app.AppCompatActivity -import android.support.v7.widget.SearchView +import androidx.fragment.app.Fragment +import androidx.appcompat.app.AppCompatActivity +import androidx.appcompat.widget.SearchView import android.view.* import kotlinx.android.synthetic.main.fragment_search.view.* import org.fossasia.openevent.general.R import org.fossasia.openevent.general.SearchResultsActivity import org.fossasia.openevent.general.utils.nullToEmpty -import org.koin.android.architecture.ext.viewModel +import org.koin.androidx.viewmodel.ext.android.viewModel private const val FROM_SEARCH: String = "FromSearchFragment" const val QUERY: String = "query" @@ -57,18 +57,18 @@ class SearchFragment : Fragment() { return rootView } - override fun onOptionsItemSelected(item: MenuItem?): Boolean { - when (item?.getItemId()) { + override fun onOptionsItemSelected(item: MenuItem): Boolean { + return when (item.itemId) { R.id.search_item -> { - return false + false } - else -> return super.onOptionsItemSelected(item) + else -> super.onOptionsItemSelected(item) } } - override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) { - inflater?.inflate(R.menu.search, menu) + override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { + inflater.inflate(R.menu.search, menu) super.onCreateOptionsMenu(menu, inflater) } diff --git a/app/src/main/java/org/fossasia/openevent/general/search/SearchLocationActivity.kt b/app/src/main/java/org/fossasia/openevent/general/search/SearchLocationActivity.kt index e9ac15989b..74d4b3a4a1 100644 --- a/app/src/main/java/org/fossasia/openevent/general/search/SearchLocationActivity.kt +++ b/app/src/main/java/org/fossasia/openevent/general/search/SearchLocationActivity.kt @@ -1,15 +1,15 @@ package org.fossasia.openevent.general.search import android.content.Intent -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import org.fossasia.openevent.general.R -import android.support.v7.widget.SearchView +import androidx.appcompat.widget.SearchView import android.view.MenuItem import kotlinx.android.synthetic.main.activity_search_location.* import org.fossasia.openevent.general.MainActivity -import org.koin.android.architecture.ext.viewModel +import org.koin.androidx.viewmodel.ext.android.viewModel private const val FROM_SEARCH: String = "FromSearchFragment" private const val TO_SEARCH: String = "ToSearchFragment" diff --git a/app/src/main/java/org/fossasia/openevent/general/search/SearchLocationViewModel.kt b/app/src/main/java/org/fossasia/openevent/general/search/SearchLocationViewModel.kt index a0afac9bdf..4bf2478269 100644 --- a/app/src/main/java/org/fossasia/openevent/general/search/SearchLocationViewModel.kt +++ b/app/src/main/java/org/fossasia/openevent/general/search/SearchLocationViewModel.kt @@ -1,6 +1,6 @@ package org.fossasia.openevent.general.search -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.ViewModel import org.fossasia.openevent.general.data.Preference class SearchLocationViewModel(private val preference: Preference) : ViewModel() { diff --git a/app/src/main/java/org/fossasia/openevent/general/search/SearchTimeActivity.kt b/app/src/main/java/org/fossasia/openevent/general/search/SearchTimeActivity.kt index 104915648f..f2329aea91 100644 --- a/app/src/main/java/org/fossasia/openevent/general/search/SearchTimeActivity.kt +++ b/app/src/main/java/org/fossasia/openevent/general/search/SearchTimeActivity.kt @@ -2,13 +2,13 @@ package org.fossasia.openevent.general.search import android.app.DatePickerDialog import android.content.Intent -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import android.view.MenuItem import kotlinx.android.synthetic.main.activity_search_time.* import org.fossasia.openevent.general.MainActivity import org.fossasia.openevent.general.R -import org.koin.android.architecture.ext.viewModel +import org.koin.androidx.viewmodel.ext.android.viewModel import java.text.SimpleDateFormat import java.util.* diff --git a/app/src/main/java/org/fossasia/openevent/general/search/SearchTimeViewModel.kt b/app/src/main/java/org/fossasia/openevent/general/search/SearchTimeViewModel.kt index f6a5e1c194..06d0f5860b 100644 --- a/app/src/main/java/org/fossasia/openevent/general/search/SearchTimeViewModel.kt +++ b/app/src/main/java/org/fossasia/openevent/general/search/SearchTimeViewModel.kt @@ -1,6 +1,6 @@ package org.fossasia.openevent.general.search -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.ViewModel import org.fossasia.openevent.general.data.Preference class SearchTimeViewModel(private val preference: Preference) : ViewModel() { diff --git a/app/src/main/java/org/fossasia/openevent/general/search/SearchViewModel.kt b/app/src/main/java/org/fossasia/openevent/general/search/SearchViewModel.kt index 3701737551..e42a607fb6 100644 --- a/app/src/main/java/org/fossasia/openevent/general/search/SearchViewModel.kt +++ b/app/src/main/java/org/fossasia/openevent/general/search/SearchViewModel.kt @@ -1,7 +1,7 @@ package org.fossasia.openevent.general.search -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import android.text.TextUtils import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable diff --git a/app/src/main/java/org/fossasia/openevent/general/settings/SettingsFragment.kt b/app/src/main/java/org/fossasia/openevent/general/settings/SettingsFragment.kt index 573a691d4f..9c218945cd 100644 --- a/app/src/main/java/org/fossasia/openevent/general/settings/SettingsFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/settings/SettingsFragment.kt @@ -5,8 +5,8 @@ import android.content.ActivityNotFoundException import android.content.Intent import android.net.Uri import android.os.Bundle -import android.support.v7.app.AppCompatActivity -import android.support.v7.preference.Preference +import androidx.appcompat.app.AppCompatActivity +import androidx.preference.Preference import android.view.MenuItem import com.takisoft.fix.support.v7.preference.PreferenceFragmentCompat import org.fossasia.openevent.general.BuildConfig @@ -14,7 +14,7 @@ import org.fossasia.openevent.general.MainActivity import org.fossasia.openevent.general.R import org.fossasia.openevent.general.utils.Utils import org.fossasia.openevent.general.utils.nullToEmpty -import org.koin.android.architecture.ext.viewModel +import org.koin.androidx.viewmodel.ext.android.viewModel import java.util.prefs.PreferenceChangeEvent import java.util.prefs.PreferenceChangeListener diff --git a/app/src/main/java/org/fossasia/openevent/general/settings/SettingsViewModel.kt b/app/src/main/java/org/fossasia/openevent/general/settings/SettingsViewModel.kt index bb543fb98b..32bc3f6b20 100644 --- a/app/src/main/java/org/fossasia/openevent/general/settings/SettingsViewModel.kt +++ b/app/src/main/java/org/fossasia/openevent/general/settings/SettingsViewModel.kt @@ -1,6 +1,6 @@ package org.fossasia.openevent.general.settings -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.ViewModel import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/org/fossasia/openevent/general/social/SocialLink.kt b/app/src/main/java/org/fossasia/openevent/general/social/SocialLink.kt index 4ce3d07d1e..51747ae3f9 100644 --- a/app/src/main/java/org/fossasia/openevent/general/social/SocialLink.kt +++ b/app/src/main/java/org/fossasia/openevent/general/social/SocialLink.kt @@ -1,10 +1,10 @@ package org.fossasia.openevent.general.social -import android.arch.persistence.room.ColumnInfo -import android.arch.persistence.room.Entity -import android.arch.persistence.room.ForeignKey -import android.arch.persistence.room.ForeignKey.CASCADE -import android.arch.persistence.room.PrimaryKey +import androidx.room.ColumnInfo +import androidx.room.Entity +import androidx.room.ForeignKey +import androidx.room.ForeignKey.CASCADE +import androidx.room.PrimaryKey import com.fasterxml.jackson.databind.PropertyNamingStrategy import com.fasterxml.jackson.databind.annotation.JsonNaming import com.github.jasminb.jsonapi.IntegerIdHandler diff --git a/app/src/main/java/org/fossasia/openevent/general/social/SocialLinksDao.kt b/app/src/main/java/org/fossasia/openevent/general/social/SocialLinksDao.kt index f7b7532df3..699fe43217 100644 --- a/app/src/main/java/org/fossasia/openevent/general/social/SocialLinksDao.kt +++ b/app/src/main/java/org/fossasia/openevent/general/social/SocialLinksDao.kt @@ -1,9 +1,9 @@ package org.fossasia.openevent.general.social -import android.arch.persistence.room.Dao -import android.arch.persistence.room.Insert -import android.arch.persistence.room.OnConflictStrategy -import android.arch.persistence.room.Query +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.OnConflictStrategy +import androidx.room.Query import io.reactivex.Flowable @Dao diff --git a/app/src/main/java/org/fossasia/openevent/general/social/SocialLinksFragment.kt b/app/src/main/java/org/fossasia/openevent/general/social/SocialLinksFragment.kt index 334cd4fd75..3d2af6f4a0 100644 --- a/app/src/main/java/org/fossasia/openevent/general/social/SocialLinksFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/social/SocialLinksFragment.kt @@ -1,9 +1,9 @@ package org.fossasia.openevent.general.social -import android.arch.lifecycle.Observer +import androidx.lifecycle.Observer import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v7.widget.LinearLayoutManager +import androidx.fragment.app.Fragment +import androidx.recyclerview.widget.LinearLayoutManager import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -13,7 +13,7 @@ import kotlinx.android.synthetic.main.fragment_social_links.* import kotlinx.android.synthetic.main.fragment_social_links.view.* import org.fossasia.openevent.general.R import org.fossasia.openevent.general.utils.Utils -import org.koin.android.architecture.ext.viewModel +import org.koin.androidx.viewmodel.ext.android.viewModel import timber.log.Timber class SocialLinksFragment : Fragment() { diff --git a/app/src/main/java/org/fossasia/openevent/general/social/SocialLinksRecyclerAdapter.kt b/app/src/main/java/org/fossasia/openevent/general/social/SocialLinksRecyclerAdapter.kt index b6183688a1..33cc155fcb 100644 --- a/app/src/main/java/org/fossasia/openevent/general/social/SocialLinksRecyclerAdapter.kt +++ b/app/src/main/java/org/fossasia/openevent/general/social/SocialLinksRecyclerAdapter.kt @@ -1,6 +1,6 @@ package org.fossasia.openevent.general.social -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup import org.fossasia.openevent.general.R diff --git a/app/src/main/java/org/fossasia/openevent/general/social/SocialLinksViewHolder.kt b/app/src/main/java/org/fossasia/openevent/general/social/SocialLinksViewHolder.kt index 52dfc7f5ef..d0842cbe52 100644 --- a/app/src/main/java/org/fossasia/openevent/general/social/SocialLinksViewHolder.kt +++ b/app/src/main/java/org/fossasia/openevent/general/social/SocialLinksViewHolder.kt @@ -4,8 +4,8 @@ import android.content.Context import android.graphics.PorterDuff import android.graphics.PorterDuffColorFilter import android.graphics.drawable.Drawable -import android.support.v4.content.ContextCompat -import android.support.v7.widget.RecyclerView +import androidx.core.content.ContextCompat +import androidx.recyclerview.widget.RecyclerView import android.view.View import kotlinx.android.synthetic.main.item_social_link.view.* import org.fossasia.openevent.general.utils.Utils diff --git a/app/src/main/java/org/fossasia/openevent/general/social/SocialLinksViewModel.kt b/app/src/main/java/org/fossasia/openevent/general/social/SocialLinksViewModel.kt index 0df4ce16d6..fa0399e70b 100644 --- a/app/src/main/java/org/fossasia/openevent/general/social/SocialLinksViewModel.kt +++ b/app/src/main/java/org/fossasia/openevent/general/social/SocialLinksViewModel.kt @@ -1,7 +1,7 @@ package org.fossasia.openevent.general.social -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/org/fossasia/openevent/general/ticket/Ticket.kt b/app/src/main/java/org/fossasia/openevent/general/ticket/Ticket.kt index f4f123b939..ecbd620899 100644 --- a/app/src/main/java/org/fossasia/openevent/general/ticket/Ticket.kt +++ b/app/src/main/java/org/fossasia/openevent/general/ticket/Ticket.kt @@ -1,10 +1,10 @@ package org.fossasia.openevent.general.ticket -import android.arch.persistence.room.ColumnInfo -import android.arch.persistence.room.Entity -import android.arch.persistence.room.ForeignKey -import android.arch.persistence.room.ForeignKey.CASCADE -import android.arch.persistence.room.PrimaryKey +import androidx.room.ColumnInfo +import androidx.room.Entity +import androidx.room.ForeignKey +import androidx.room.ForeignKey.CASCADE +import androidx.room.PrimaryKey import com.fasterxml.jackson.databind.PropertyNamingStrategy import com.fasterxml.jackson.databind.annotation.JsonNaming import com.github.jasminb.jsonapi.IntegerIdHandler diff --git a/app/src/main/java/org/fossasia/openevent/general/ticket/TicketDao.kt b/app/src/main/java/org/fossasia/openevent/general/ticket/TicketDao.kt index 4372bf34e9..dbec01fa9a 100644 --- a/app/src/main/java/org/fossasia/openevent/general/ticket/TicketDao.kt +++ b/app/src/main/java/org/fossasia/openevent/general/ticket/TicketDao.kt @@ -1,9 +1,9 @@ package org.fossasia.openevent.general.ticket -import android.arch.persistence.room.Dao -import android.arch.persistence.room.Insert -import android.arch.persistence.room.OnConflictStrategy -import android.arch.persistence.room.Query +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.OnConflictStrategy +import androidx.room.Query import io.reactivex.Flowable import io.reactivex.Single diff --git a/app/src/main/java/org/fossasia/openevent/general/ticket/TicketDetailsRecyclerAdapter.kt b/app/src/main/java/org/fossasia/openevent/general/ticket/TicketDetailsRecyclerAdapter.kt index 4c3dfcc24c..997b6f096f 100644 --- a/app/src/main/java/org/fossasia/openevent/general/ticket/TicketDetailsRecyclerAdapter.kt +++ b/app/src/main/java/org/fossasia/openevent/general/ticket/TicketDetailsRecyclerAdapter.kt @@ -1,6 +1,6 @@ package org.fossasia.openevent.general.ticket -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup import org.fossasia.openevent.general.R diff --git a/app/src/main/java/org/fossasia/openevent/general/ticket/TicketDetailsViewHolder.kt b/app/src/main/java/org/fossasia/openevent/general/ticket/TicketDetailsViewHolder.kt index 2c5bcac690..e8338cb2ab 100644 --- a/app/src/main/java/org/fossasia/openevent/general/ticket/TicketDetailsViewHolder.kt +++ b/app/src/main/java/org/fossasia/openevent/general/ticket/TicketDetailsViewHolder.kt @@ -1,6 +1,6 @@ package org.fossasia.openevent.general.ticket -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import kotlinx.android.synthetic.main.item_ticket_details.view.* diff --git a/app/src/main/java/org/fossasia/openevent/general/ticket/TicketIdConverter.kt b/app/src/main/java/org/fossasia/openevent/general/ticket/TicketIdConverter.kt index f9651a9466..6e0028fb91 100644 --- a/app/src/main/java/org/fossasia/openevent/general/ticket/TicketIdConverter.kt +++ b/app/src/main/java/org/fossasia/openevent/general/ticket/TicketIdConverter.kt @@ -1,6 +1,6 @@ package org.fossasia.openevent.general.ticket -import android.arch.persistence.room.TypeConverter +import androidx.room.TypeConverter class TicketIdConverter { diff --git a/app/src/main/java/org/fossasia/openevent/general/ticket/TicketViewHolder.kt b/app/src/main/java/org/fossasia/openevent/general/ticket/TicketViewHolder.kt index e7d7e51b3d..5f59588136 100644 --- a/app/src/main/java/org/fossasia/openevent/general/ticket/TicketViewHolder.kt +++ b/app/src/main/java/org/fossasia/openevent/general/ticket/TicketViewHolder.kt @@ -1,7 +1,7 @@ package org.fossasia.openevent.general.ticket import android.R -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import android.widget.AdapterView import android.widget.ArrayAdapter diff --git a/app/src/main/java/org/fossasia/openevent/general/ticket/TicketsFragment.kt b/app/src/main/java/org/fossasia/openevent/general/ticket/TicketsFragment.kt index dca98a7fd4..947300375b 100644 --- a/app/src/main/java/org/fossasia/openevent/general/ticket/TicketsFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/ticket/TicketsFragment.kt @@ -1,16 +1,17 @@ package org.fossasia.openevent.general.ticket import android.app.AlertDialog -import android.arch.lifecycle.Observer +import androidx.lifecycle.Observer import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v7.app.AppCompatActivity -import android.support.v7.widget.LinearLayoutManager +import androidx.fragment.app.Fragment +import androidx.appcompat.app.AppCompatActivity +import androidx.recyclerview.widget.LinearLayoutManager import android.view.LayoutInflater import android.view.MenuItem import android.view.View import android.view.ViewGroup import android.widget.Toast +import androidx.recyclerview.widget.RecyclerView import kotlinx.android.synthetic.main.fragment_tickets.view.* import org.fossasia.openevent.general.MainActivity import org.fossasia.openevent.general.R @@ -19,7 +20,7 @@ import org.fossasia.openevent.general.event.Event import org.fossasia.openevent.general.event.EventUtils import org.fossasia.openevent.general.utils.Utils import org.fossasia.openevent.general.utils.nullToEmpty -import org.koin.android.architecture.ext.viewModel +import org.koin.androidx.viewmodel.ext.android.viewModel const val EVENT_ID: String = "EVENT_ID" const val CURRENCY: String = "CURRENCY" @@ -67,7 +68,7 @@ class TicketsFragment : Fragment() { rootView.ticketsRecycler.isNestedScrollingEnabled = false linearLayoutManager = LinearLayoutManager(context) - linearLayoutManager.orientation = LinearLayoutManager.VERTICAL + linearLayoutManager.orientation = RecyclerView.VERTICAL rootView.ticketsRecycler.layoutManager = linearLayoutManager ticketsViewModel.error.observe(this, Observer { diff --git a/app/src/main/java/org/fossasia/openevent/general/ticket/TicketsRecyclerAdapter.kt b/app/src/main/java/org/fossasia/openevent/general/ticket/TicketsRecyclerAdapter.kt index e2ac3a82fa..f5aeebf6be 100644 --- a/app/src/main/java/org/fossasia/openevent/general/ticket/TicketsRecyclerAdapter.kt +++ b/app/src/main/java/org/fossasia/openevent/general/ticket/TicketsRecyclerAdapter.kt @@ -1,6 +1,6 @@ package org.fossasia.openevent.general.ticket -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup import org.fossasia.openevent.general.R diff --git a/app/src/main/java/org/fossasia/openevent/general/ticket/TicketsViewModel.kt b/app/src/main/java/org/fossasia/openevent/general/ticket/TicketsViewModel.kt index a2f3763459..929b03c1ec 100644 --- a/app/src/main/java/org/fossasia/openevent/general/ticket/TicketsViewModel.kt +++ b/app/src/main/java/org/fossasia/openevent/general/ticket/TicketsViewModel.kt @@ -1,7 +1,7 @@ package org.fossasia.openevent.general.ticket -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/org/fossasia/openevent/general/utils/JWTUtils.java b/app/src/main/java/org/fossasia/openevent/general/utils/JWTUtils.java index 72dd1969b9..07c6a6dc5b 100644 --- a/app/src/main/java/org/fossasia/openevent/general/utils/JWTUtils.java +++ b/app/src/main/java/org/fossasia/openevent/general/utils/JWTUtils.java @@ -1,6 +1,6 @@ package org.fossasia.openevent.general.utils; -import android.support.v4.util.SparseArrayCompat; +import androidx.collection.SparseArrayCompat; import org.json.JSONException; import org.json.JSONObject; @@ -92,4 +92,4 @@ private static byte[] decode(String s) { } } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/fossasia/openevent/general/utils/Utils.kt b/app/src/main/java/org/fossasia/openevent/general/utils/Utils.kt index c3ce8fbfa9..cfde007ffa 100644 --- a/app/src/main/java/org/fossasia/openevent/general/utils/Utils.kt +++ b/app/src/main/java/org/fossasia/openevent/general/utils/Utils.kt @@ -4,10 +4,10 @@ import android.app.AlertDialog import android.content.Context import android.graphics.BitmapFactory import android.net.Uri -import android.support.customtabs.CustomTabsIntent -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentManager -import android.support.v4.content.ContextCompat +import androidx.browser.customtabs.CustomTabsIntent +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.core.content.ContextCompat import android.view.View import android.view.inputmethod.InputMethodManager import android.widget.ProgressBar diff --git a/app/src/main/res/layout/activity_about_event.xml b/app/src/main/res/layout/activity_about_event.xml index 4d9cb3c9df..c71a1c7fcb 100644 --- a/app/src/main/res/layout/activity_about_event.xml +++ b/app/src/main/res/layout/activity_about_event.xml @@ -1,4 +1,4 @@ - - - - - + - + - - - + - - + + diff --git a/app/src/main/res/layout/activity_auth.xml b/app/src/main/res/layout/activity_auth.xml index 45a2404ad1..d23749ee2f 100644 --- a/app/src/main/res/layout/activity_auth.xml +++ b/app/src/main/res/layout/activity_auth.xml @@ -1,4 +1,4 @@ - - - + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5c1607ff8d..ea45a384af 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,4 +1,4 @@ - - - + diff --git a/app/src/main/res/layout/activity_search_location.xml b/app/src/main/res/layout/activity_search_location.xml index c1ddf20ea2..743c29173e 100644 --- a/app/src/main/res/layout/activity_search_location.xml +++ b/app/src/main/res/layout/activity_search_location.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - - - + + diff --git a/app/src/main/res/layout/content_event.xml b/app/src/main/res/layout/content_event.xml index 2e2d7435eb..129e48e705 100644 --- a/app/src/main/res/layout/content_event.xml +++ b/app/src/main/res/layout/content_event.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout/content_no_internet.xml b/app/src/main/res/layout/content_no_internet.xml index dad94541a9..fcee542488 100644 --- a/app/src/main/res/layout/content_no_internet.xml +++ b/app/src/main/res/layout/content_no_internet.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - \ No newline at end of file + + diff --git a/app/src/main/res/layout/fragment_attendee.xml b/app/src/main/res/layout/fragment_attendee.xml index 78112e5436..18de60dc83 100644 --- a/app/src/main/res/layout/fragment_attendee.xml +++ b/app/src/main/res/layout/fragment_attendee.xml @@ -1,4 +1,4 @@ - - @@ -189,7 +189,7 @@ android:textColor="@color/black" android:textSize="@dimen/heading_text_size" /> - - + - - + - - + - - + - - @@ -289,7 +289,7 @@ android:textColor="@color/black" android:textSize="@dimen/heading_text_size" /> - - + - - - - - + - - + - - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_edit_profile.xml b/app/src/main/res/layout/fragment_edit_profile.xml index 593fef793f..2f16d7c09b 100644 --- a/app/src/main/res/layout/fragment_edit_profile.xml +++ b/app/src/main/res/layout/fragment_edit_profile.xml @@ -25,7 +25,7 @@ android:paddingBottom="@dimen/padding_large" android:weightSum="2"> - @@ -36,9 +36,9 @@ android:layout_height="wrap_content" android:hint="@string/first_name" android:inputType="textPersonName" /> - + - @@ -49,11 +49,11 @@ android:layout_height="wrap_content" android:hint="@string/last_name" android:inputType="textPersonName" /> - + - - - - + - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_events.xml b/app/src/main/res/layout/fragment_events.xml index d6ba179c58..38f8a4b6ac 100644 --- a/app/src/main/res/layout/fragment_events.xml +++ b/app/src/main/res/layout/fragment_events.xml @@ -1,9 +1,9 @@ - - - - - \ No newline at end of file + + diff --git a/app/src/main/res/layout/fragment_favorite.xml b/app/src/main/res/layout/fragment_favorite.xml index 3ee0c759a5..bf99ae9f17 100644 --- a/app/src/main/res/layout/fragment_favorite.xml +++ b/app/src/main/res/layout/fragment_favorite.xml @@ -1,5 +1,5 @@ - @@ -43,7 +43,7 @@ android:layout_height="wrap_content" > - - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml index d191c3efa4..3304cfcdbb 100644 --- a/app/src/main/res/layout/fragment_login.xml +++ b/app/src/main/res/layout/fragment_login.xml @@ -29,7 +29,7 @@ android:textSize="@dimen/text_size_very_large" android:text="@string/eventyay_logo"/> - - + - - + - - - - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_order_details.xml b/app/src/main/res/layout/fragment_order_details.xml index b1961b2341..aed3188091 100644 --- a/app/src/main/res/layout/fragment_order_details.xml +++ b/app/src/main/res/layout/fragment_order_details.xml @@ -13,10 +13,10 @@ android:layout_gravity="center" android:visibility="gone" /> - - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_orders_under_user.xml b/app/src/main/res/layout/fragment_orders_under_user.xml index 1b1aa67bbf..40f506df78 100644 --- a/app/src/main/res/layout/fragment_orders_under_user.xml +++ b/app/src/main/res/layout/fragment_orders_under_user.xml @@ -1,4 +1,4 @@ - - - + diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml index 1207436569..ac3a0bed27 100644 --- a/app/src/main/res/layout/fragment_search.xml +++ b/app/src/main/res/layout/fragment_search.xml @@ -91,7 +91,7 @@ - - - + - - + - - + - - + - - + - - - - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_tickets.xml b/app/src/main/res/layout/fragment_tickets.xml index fbc0b7183c..07a5a6237c 100644 --- a/app/src/main/res/layout/fragment_tickets.xml +++ b/app/src/main/res/layout/fragment_tickets.xml @@ -1,5 +1,5 @@ - - - - \ No newline at end of file + diff --git a/app/src/main/res/layout/item_attendee.xml b/app/src/main/res/layout/item_attendee.xml index 673683cfb0..3c286ea465 100644 --- a/app/src/main/res/layout/item_attendee.xml +++ b/app/src/main/res/layout/item_attendee.xml @@ -16,7 +16,7 @@ android:textColor="@color/black" android:textSize="@dimen/heading_text_size" /> - - + - - + - - + - - + - \ No newline at end of file + diff --git a/app/src/main/res/layout/item_card_events.xml b/app/src/main/res/layout/item_card_events.xml index 9b7cb5f11d..49973e1b28 100644 --- a/app/src/main/res/layout/item_card_events.xml +++ b/app/src/main/res/layout/item_card_events.xml @@ -5,7 +5,7 @@ android:layout_height="wrap_content" android:background="@android:color/white"> - - - - - \ No newline at end of file + + diff --git a/app/src/main/res/layout/item_card_favorite_event.xml b/app/src/main/res/layout/item_card_favorite_event.xml index e3680be11d..9aea8bc5a1 100644 --- a/app/src/main/res/layout/item_card_favorite_event.xml +++ b/app/src/main/res/layout/item_card_favorite_event.xml @@ -5,14 +5,14 @@ android:layout_height="wrap_content" android:background="@android:color/white"> - - - - - + - - \ No newline at end of file + + diff --git a/app/src/main/res/layout/item_card_order.xml b/app/src/main/res/layout/item_card_order.xml index 4f3c473c37..5cbf72adb6 100644 --- a/app/src/main/res/layout/item_card_order.xml +++ b/app/src/main/res/layout/item_card_order.xml @@ -5,7 +5,7 @@ android:layout_height="wrap_content" android:background="@android:color/white"> - - - \ No newline at end of file + + diff --git a/app/src/main/res/layout/item_card_order_details.xml b/app/src/main/res/layout/item_card_order_details.xml index f27f01b85c..32fcce7780 100644 --- a/app/src/main/res/layout/item_card_order_details.xml +++ b/app/src/main/res/layout/item_card_order_details.xml @@ -5,7 +5,7 @@ android:layout_height="wrap_content" android:elevation="@dimen/card_elevation"> - @@ -15,7 +15,7 @@ android:orientation="vertical" android:paddingBottom="@dimen/padding_extra_small"> - - + - - \ No newline at end of file + + diff --git a/app/src/main/res/layout/item_card_similar_events.xml b/app/src/main/res/layout/item_card_similar_events.xml index 0dcc4f2c02..78a1e66e12 100644 --- a/app/src/main/res/layout/item_card_similar_events.xml +++ b/app/src/main/res/layout/item_card_similar_events.xml @@ -5,7 +5,7 @@ android:layout_height="wrap_content" android:background="@android:color/white"> - - - - - \ No newline at end of file + + diff --git a/app/src/main/res/layout/placeholder_item_card_events.xml b/app/src/main/res/layout/placeholder_item_card_events.xml index e1dd192231..5ddc8fd2f9 100644 --- a/app/src/main/res/layout/placeholder_item_card_events.xml +++ b/app/src/main/res/layout/placeholder_item_card_events.xml @@ -5,7 +5,7 @@ android:layout_height="wrap_content" android:background="@android:color/white"> - - - \ No newline at end of file + + diff --git a/app/src/main/res/layout/placeholder_item_card_search.xml b/app/src/main/res/layout/placeholder_item_card_search.xml index a5c2958632..b2e8dd5715 100644 --- a/app/src/main/res/layout/placeholder_item_card_search.xml +++ b/app/src/main/res/layout/placeholder_item_card_search.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - @@ -16,7 +16,7 @@ android:layout_marginTop="@dimen/layout_margin_medium" android:orientation="horizontal"> - - + - + diff --git a/build.gradle b/build.gradle index 4189a0ca9d..1891961c90 100644 --- a/build.gradle +++ b/build.gradle @@ -5,6 +5,7 @@ buildscript { repositories { google() + mavenCentral() jcenter() } dependencies { @@ -19,6 +20,7 @@ buildscript { allprojects { repositories { google() + mavenCentral() jcenter() } } diff --git a/gradle.properties b/gradle.properties index aac7c9b461..9e6fce102d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,6 +9,8 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode.