Skip to content

chore: Migrate to AndroidX and Koin 1.X #767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 25, 2018
Merged

chore: Migrate to AndroidX and Koin 1.X #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
56 changes: 29 additions & 27 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

@nikit19 nikit19 Dec 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess travis.yml needs to be updated as well

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 = [
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
}
4 changes: 2 additions & 2 deletions app/src/androidTest/java/org/fossasia/openevent/general/ExampleInstrumentedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/org/fossasia/openevent/general/AuthActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/org/fossasia/openevent/general/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.*
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/org/fossasia/openevent/general/OpenEventDatabase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/fossasia/openevent/general/OpenEventGeneral.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/org/fossasia/openevent/general/SearchResultsActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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() {
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/org/fossasia/openevent/general/about/AboutEventActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/fossasia/openevent/general/about/AboutEventViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/org/fossasia/openevent/general/attendees/Attendee.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
17 changes: 9 additions & 8 deletions app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeIdConverter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.fossasia.openevent.general.attendees

import android.arch.persistence.room.TypeConverter
import androidx.room.TypeConverter

class AttendeeIdConverter {

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeRecyclerAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/fossasia/openevent/general/attendees/ListAttendeeIdConverter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/org/fossasia/openevent/general/attendees/forms/CustomForm.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/org/fossasia/openevent/general/auth/EditProfileFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/fossasia/openevent/general/auth/EditProfileViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading