Skip to content

Commit 8d11ec6

Browse files
erikjhordan-reyerikjhordan-rey
committedJul 15, 2020
Upgrade project to AS 4
1 parent a65c2fe commit 8d11ec6

28 files changed

+62
-66
lines changed
 

‎app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apply plugin: 'kotlin-kapt'
55
android {
66
compileSdkVersion versions.compileSdk
77
defaultConfig {
8-
applicationId "erikjhordanrey.android_kotlin_devises"
8+
applicationId "io.github.erikjhordanrey.kotlin_devises"
99
minSdkVersion versions.minSdk
1010
targetSdkVersion versions.targetSdk
1111
versionCode 1

‎app/src/main/AndroidManifest.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="erikjhordanrey.android_kotlin_devises">
3+
package="io.github.erikjhordanrey.kotlin_devises">
44

55
<uses-permission android:name="android.permission.INTERNET" />
66
<application
7-
android:name=".di.App"
7+
android:name="io.github.erikjhordanrey.kotlin_devises.di.App"
88
android:allowBackup="true"
99
android:icon="@mipmap/ic_launcher"
1010
android:label="@string/app_name"
1111
android:supportsRtl="true"
1212
android:theme="@style/AppTheme"
1313
android:usesCleartextTraffic="true">
1414
<activity
15-
android:name=".view.HomeActivity"
15+
android:name="io.github.erikjhordanrey.kotlin_devises.view.HomeActivity"
1616
android:label="@string/app_name">
1717
<intent-filter>
1818
<action android:name="android.intent.action.MAIN" />

‎app/src/main/kotlin/erikjhordanrey/android_kotlin_devises/data/remote/CurrencyResponse.kt renamed to ‎app/src/main/kotlin/io/github/erikjhordanrey/kotlin_devises/data/remote/CurrencyResponse.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package erikjhordanrey.android_kotlin_devises.data.remote
17+
package io.github.erikjhordanrey.kotlin_devises.data.remote
1818

1919
import com.google.gson.annotations.SerializedName
2020

‎app/src/main/kotlin/erikjhordanrey/android_kotlin_devises/data/remote/RemoteContract.kt renamed to ‎app/src/main/kotlin/io/github/erikjhordanrey/kotlin_devises/data/remote/RemoteContract.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package erikjhordanrey.android_kotlin_devises.data.remote
17+
package io.github.erikjhordanrey.kotlin_devises.data.remote
1818

1919
class RemoteContract {
2020

‎app/src/main/kotlin/erikjhordanrey/android_kotlin_devises/data/remote/RemoteCurrencyDataSource.kt renamed to ‎app/src/main/kotlin/io/github/erikjhordanrey/kotlin_devises/data/remote/RemoteCurrencyDataSource.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package erikjhordanrey.android_kotlin_devises.data.remote
17+
package io.github.erikjhordanrey.kotlin_devises.data.remote
1818

1919
import javax.inject.Inject
2020

‎app/src/main/kotlin/erikjhordanrey/android_kotlin_devises/data/remote/RemoteCurrencyService.kt renamed to ‎app/src/main/kotlin/io/github/erikjhordanrey/kotlin_devises/data/remote/RemoteCurrencyService.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package erikjhordanrey.android_kotlin_devises.data.remote
17+
package io.github.erikjhordanrey.kotlin_devises.data.remote
1818

1919
import io.reactivex.Observable
2020
import retrofit2.http.GET

‎app/src/main/kotlin/erikjhordanrey/android_kotlin_devises/data/repository/CurrencyRepository.kt renamed to ‎app/src/main/kotlin/io/github/erikjhordanrey/kotlin_devises/data/repository/CurrencyRepository.kt

+7-7
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
* limitations under the License.
1515
*/
1616

17-
package erikjhordanrey.android_kotlin_devises.data.repository
17+
package io.github.erikjhordanrey.kotlin_devises.data.repository
1818

1919
import androidx.lifecycle.LiveData
2020
import androidx.lifecycle.MutableLiveData
21-
import erikjhordanrey.android_kotlin_devises.data.remote.CurrencyResponse
22-
import erikjhordanrey.android_kotlin_devises.data.remote.RemoteCurrencyDataSource
23-
import erikjhordanrey.android_kotlin_devises.data.room.CurrencyEntity
24-
import erikjhordanrey.android_kotlin_devises.data.room.LocalCurrencyDataSource
25-
import erikjhordanrey.android_kotlin_devises.domain.AvailableExchange
26-
import erikjhordanrey.android_kotlin_devises.domain.Currency
21+
import io.github.erikjhordanrey.kotlin_devises.data.remote.CurrencyResponse
22+
import io.github.erikjhordanrey.kotlin_devises.data.remote.RemoteCurrencyDataSource
23+
import io.github.erikjhordanrey.kotlin_devises.data.room.CurrencyEntity
24+
import io.github.erikjhordanrey.kotlin_devises.data.room.LocalCurrencyDataSource
25+
import io.github.erikjhordanrey.kotlin_devises.domain.AvailableExchange
26+
import io.github.erikjhordanrey.kotlin_devises.domain.Currency
2727
import io.reactivex.android.schedulers.AndroidSchedulers
2828
import io.reactivex.disposables.Disposable
2929
import io.reactivex.schedulers.Schedulers

‎app/src/main/kotlin/erikjhordanrey/android_kotlin_devises/data/repository/Repository.kt renamed to ‎app/src/main/kotlin/io/github/erikjhordanrey/kotlin_devises/data/repository/Repository.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
package erikjhordanrey.android_kotlin_devises.data.repository
17+
package io.github.erikjhordanrey.kotlin_devises.data.repository
1818

1919
import androidx.lifecycle.LiveData
20-
import erikjhordanrey.android_kotlin_devises.domain.AvailableExchange
21-
import erikjhordanrey.android_kotlin_devises.domain.Currency
20+
import io.github.erikjhordanrey.kotlin_devises.domain.AvailableExchange
21+
import io.github.erikjhordanrey.kotlin_devises.domain.Currency
2222
import io.reactivex.Flowable
2323

2424
interface Repository {

‎app/src/main/kotlin/erikjhordanrey/android_kotlin_devises/data/room/CurrencyDatabase.kt renamed to ‎app/src/main/kotlin/io/github/erikjhordanrey/kotlin_devises/data/room/CurrencyDatabase.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package erikjhordanrey.android_kotlin_devises.data.room
17+
package io.github.erikjhordanrey.kotlin_devises.data.room
1818

1919
import android.content.Context
2020
import androidx.room.Database

‎app/src/main/kotlin/erikjhordanrey/android_kotlin_devises/data/room/CurrencyEntity.kt renamed to ‎app/src/main/kotlin/io/github/erikjhordanrey/kotlin_devises/data/room/CurrencyEntity.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package erikjhordanrey.android_kotlin_devises.data.room
17+
package io.github.erikjhordanrey.kotlin_devises.data.room
1818

1919
import androidx.room.Entity
2020
import androidx.room.PrimaryKey

‎app/src/main/kotlin/erikjhordanrey/android_kotlin_devises/data/room/LocalCurrencyDataSource.kt renamed to ‎app/src/main/kotlin/io/github/erikjhordanrey/kotlin_devises/data/room/LocalCurrencyDataSource.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package erikjhordanrey.android_kotlin_devises.data.room
1+
package io.github.erikjhordanrey.kotlin_devises.data.room
22

33
class LocalCurrencyDataSource(private val currencyDatabase: CurrencyDatabase) {
44

‎app/src/main/kotlin/erikjhordanrey/android_kotlin_devises/data/room/RoomContract.kt renamed to ‎app/src/main/kotlin/io/github/erikjhordanrey/kotlin_devises/data/room/RoomContract.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package erikjhordanrey.android_kotlin_devises.data.room
17+
package io.github.erikjhordanrey.kotlin_devises.data.room
1818

1919
class RoomContract {
2020

‎app/src/main/kotlin/erikjhordanrey/android_kotlin_devises/data/room/RoomCurrencyDao.kt renamed to ‎app/src/main/kotlin/io/github/erikjhordanrey/kotlin_devises/data/room/RoomCurrencyDao.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package erikjhordanrey.android_kotlin_devises.data.room
17+
package io.github.erikjhordanrey.kotlin_devises.data.room
1818

1919
import androidx.room.Dao
2020
import androidx.room.Insert

‎app/src/main/kotlin/erikjhordanrey/android_kotlin_devises/di/App.kt renamed to ‎app/src/main/kotlin/io/github/erikjhordanrey/kotlin_devises/di/App.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package erikjhordanrey.android_kotlin_devises.di
17+
package io.github.erikjhordanrey.kotlin_devises.di
1818

1919
import android.app.Application
2020

‎app/src/main/kotlin/erikjhordanrey/android_kotlin_devises/di/AppComponent.kt renamed to ‎app/src/main/kotlin/io/github/erikjhordanrey/kotlin_devises/di/AppComponent.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
package erikjhordanrey.android_kotlin_devises.di
17+
package io.github.erikjhordanrey.kotlin_devises.di
1818

1919
import android.app.Application
2020
import dagger.BindsInstance
2121
import dagger.Component
22-
import erikjhordanrey.android_kotlin_devises.data.repository.CurrencyRepository
2322
import retrofit2.Retrofit
2423
import javax.inject.Singleton
2524

‎app/src/main/kotlin/erikjhordanrey/android_kotlin_devises/di/CurrencyComponent.kt renamed to ‎app/src/main/kotlin/io/github/erikjhordanrey/kotlin_devises/di/CurrencyComponent.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
package erikjhordanrey.android_kotlin_devises.di
17+
package io.github.erikjhordanrey.kotlin_devises.di
1818

1919
import dagger.BindsInstance
2020
import dagger.Component
21-
import erikjhordanrey.android_kotlin_devises.view.CurrencyFragment
21+
import io.github.erikjhordanrey.kotlin_devises.view.CurrencyFragment
2222

2323
@Component(modules = [CurrencyModule::class], dependencies = [AppComponent::class])
2424
@FeatureScope

‎app/src/main/kotlin/erikjhordanrey/android_kotlin_devises/di/CurrencyModule.kt renamed to ‎app/src/main/kotlin/io/github/erikjhordanrey/kotlin_devises/di/CurrencyModule.kt

+9-10
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,20 @@
1414
* limitations under the License.
1515
*/
1616

17-
package erikjhordanrey.android_kotlin_devises.di
17+
package io.github.erikjhordanrey.kotlin_devises.di
1818

1919
import android.app.Application
20-
import android.content.Context
2120
import androidx.lifecycle.ViewModelProvider
2221
import dagger.Module
2322
import dagger.Provides
24-
import erikjhordanrey.android_kotlin_devises.data.remote.RemoteCurrencyDataSource
25-
import erikjhordanrey.android_kotlin_devises.data.remote.RemoteCurrencyService
26-
import erikjhordanrey.android_kotlin_devises.data.repository.CurrencyRepository
27-
import erikjhordanrey.android_kotlin_devises.data.room.CurrencyDatabase
28-
import erikjhordanrey.android_kotlin_devises.data.room.LocalCurrencyDataSource
29-
import erikjhordanrey.android_kotlin_devises.view.CurrencyFragment
30-
import erikjhordanrey.android_kotlin_devises.view.CurrencyViewModel
31-
import erikjhordanrey.android_kotlin_devises.view.CurrencyViewModelFactory
23+
import io.github.erikjhordanrey.kotlin_devises.data.remote.RemoteCurrencyDataSource
24+
import io.github.erikjhordanrey.kotlin_devises.data.remote.RemoteCurrencyService
25+
import io.github.erikjhordanrey.kotlin_devises.data.repository.CurrencyRepository
26+
import io.github.erikjhordanrey.kotlin_devises.data.room.CurrencyDatabase
27+
import io.github.erikjhordanrey.kotlin_devises.data.room.LocalCurrencyDataSource
28+
import io.github.erikjhordanrey.kotlin_devises.view.CurrencyFragment
29+
import io.github.erikjhordanrey.kotlin_devises.view.CurrencyViewModel
30+
import io.github.erikjhordanrey.kotlin_devises.view.CurrencyViewModelFactory
3231
import retrofit2.Retrofit
3332

3433
@Module

‎app/src/main/kotlin/erikjhordanrey/android_kotlin_devises/di/FeatureScope.kt renamed to ‎app/src/main/kotlin/io/github/erikjhordanrey/kotlin_devises/di/FeatureScope.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package erikjhordanrey.android_kotlin_devises.di
1+
package io.github.erikjhordanrey.kotlin_devises.di
22

33
import javax.inject.Scope
44
import kotlin.annotation.AnnotationRetention.RUNTIME

‎app/src/main/kotlin/erikjhordanrey/android_kotlin_devises/di/RemoteModule.kt renamed to ‎app/src/main/kotlin/io/github/erikjhordanrey/kotlin_devises/di/RemoteModule.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

17-
package erikjhordanrey.android_kotlin_devises.di
17+
package io.github.erikjhordanrey.kotlin_devises.di
1818

1919
import com.google.gson.Gson
2020
import com.google.gson.GsonBuilder
2121
import dagger.Module
2222
import dagger.Provides
23-
import erikjhordanrey.android_kotlin_devises.data.remote.RemoteContract
23+
import io.github.erikjhordanrey.kotlin_devises.data.remote.RemoteContract
2424
import okhttp3.OkHttpClient
2525
import okhttp3.logging.HttpLoggingInterceptor
2626
import retrofit2.Retrofit

‎app/src/main/kotlin/erikjhordanrey/android_kotlin_devises/domain/AvailableExchange.kt renamed to ‎app/src/main/kotlin/io/github/erikjhordanrey/kotlin_devises/domain/AvailableExchange.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package erikjhordanrey.android_kotlin_devises.domain
17+
package io.github.erikjhordanrey.kotlin_devises.domain
1818

1919
import java.io.Serializable
2020

‎app/src/main/kotlin/erikjhordanrey/android_kotlin_devises/domain/Currency.kt renamed to ‎app/src/main/kotlin/io/github/erikjhordanrey/kotlin_devises/domain/Currency.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

17-
package erikjhordanrey.android_kotlin_devises.domain
17+
package io.github.erikjhordanrey.kotlin_devises.domain
1818

1919
data class Currency(var code: String, var country: String)

‎app/src/main/kotlin/erikjhordanrey/android_kotlin_devises/view/AboutFragment.kt renamed to ‎app/src/main/kotlin/io/github/erikjhordanrey/kotlin_devises/view/AboutFragment.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package erikjhordanrey.android_kotlin_devises.view
17+
package io.github.erikjhordanrey.kotlin_devises.view
1818

1919
import android.content.Intent
2020
import android.net.Uri
@@ -23,7 +23,7 @@ import android.view.LayoutInflater
2323
import android.view.View
2424
import android.view.ViewGroup
2525
import androidx.fragment.app.Fragment
26-
import erikjhordanrey.android_kotlin_devises.databinding.AboutFragmentBinding
26+
import io.github.erikjhordanrey.kotlin_devises.databinding.AboutFragmentBinding
2727

2828
class AboutFragment : Fragment() {
2929

‎app/src/main/kotlin/erikjhordanrey/android_kotlin_devises/view/CurrencyFragment.kt renamed to ‎app/src/main/kotlin/io/github/erikjhordanrey/kotlin_devises/view/CurrencyFragment.kt

+6-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package erikjhordanrey.android_kotlin_devises.view
17+
package io.github.erikjhordanrey.kotlin_devises.view
1818

1919
import android.os.Build
2020
import android.os.Bundle
@@ -28,10 +28,11 @@ import android.widget.Toast
2828
import androidx.appcompat.app.AlertDialog
2929
import androidx.fragment.app.Fragment
3030
import androidx.lifecycle.Observer
31-
import erikjhordanrey.android_kotlin_devises.R
32-
import erikjhordanrey.android_kotlin_devises.databinding.CurrencyFragmentBinding
33-
import erikjhordanrey.android_kotlin_devises.di.App
34-
import erikjhordanrey.android_kotlin_devises.di.DaggerCurrencyComponent
31+
32+
import io.github.erikjhordanrey.kotlin_devises.R
33+
import io.github.erikjhordanrey.kotlin_devises.databinding.CurrencyFragmentBinding
34+
import io.github.erikjhordanrey.kotlin_devises.di.App
35+
import io.github.erikjhordanrey.kotlin_devises.di.DaggerCurrencyComponent
3536
import javax.inject.Inject
3637

3738
class CurrencyFragment : Fragment() {

‎app/src/main/kotlin/erikjhordanrey/android_kotlin_devises/view/CurrencyViewModel.kt renamed to ‎app/src/main/kotlin/io/github/erikjhordanrey/kotlin_devises/view/CurrencyViewModel.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package erikjhordanrey.android_kotlin_devises.view
17+
package io.github.erikjhordanrey.kotlin_devises.view
1818

1919
import android.util.Log
2020
import androidx.lifecycle.Lifecycle.Event.ON_DESTROY
@@ -23,9 +23,9 @@ import androidx.lifecycle.LiveData
2323
import androidx.lifecycle.MutableLiveData
2424
import androidx.lifecycle.OnLifecycleEvent
2525
import androidx.lifecycle.ViewModel
26-
import erikjhordanrey.android_kotlin_devises.data.repository.CurrencyRepository
27-
import erikjhordanrey.android_kotlin_devises.domain.AvailableExchange
28-
import erikjhordanrey.android_kotlin_devises.domain.Currency
26+
import io.github.erikjhordanrey.kotlin_devises.data.repository.CurrencyRepository
27+
import io.github.erikjhordanrey.kotlin_devises.domain.AvailableExchange
28+
import io.github.erikjhordanrey.kotlin_devises.domain.Currency
2929
import io.reactivex.Completable
3030
import io.reactivex.CompletableObserver
3131
import io.reactivex.android.schedulers.AndroidSchedulers

‎app/src/main/kotlin/erikjhordanrey/android_kotlin_devises/view/CurrencyViewModelFactory.kt renamed to ‎app/src/main/kotlin/io/github/erikjhordanrey/kotlin_devises/view/CurrencyViewModelFactory.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package erikjhordanrey.android_kotlin_devises.view
1+
package io.github.erikjhordanrey.kotlin_devises.view
22

33
import androidx.lifecycle.ViewModel
44
import androidx.lifecycle.ViewModelProvider
5-
import erikjhordanrey.android_kotlin_devises.data.repository.CurrencyRepository
5+
import io.github.erikjhordanrey.kotlin_devises.data.repository.CurrencyRepository
66
import javax.inject.Inject
77

88
@Suppress("UNCHECKED_CAST")

‎app/src/main/kotlin/erikjhordanrey/android_kotlin_devises/view/HomeActivity.kt renamed to ‎app/src/main/kotlin/io/github/erikjhordanrey/kotlin_devises/view/HomeActivity.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
* limitations under the License.
1515
*/
1616

17-
package erikjhordanrey.android_kotlin_devises.view
17+
package io.github.erikjhordanrey.kotlin_devises.view
1818

1919
import android.os.Bundle
2020
import android.view.MenuItem
2121
import androidx.appcompat.app.AppCompatActivity
2222
import androidx.fragment.app.Fragment
2323
import com.google.android.material.bottomnavigation.BottomNavigationView
24-
import erikjhordanrey.android_kotlin_devises.R
25-
import erikjhordanrey.android_kotlin_devises.databinding.ActivityHomeBinding
24+
import io.github.erikjhordanrey.kotlin_devises.R
25+
import io.github.erikjhordanrey.kotlin_devises.databinding.ActivityHomeBinding
2626

2727
class HomeActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemSelectedListener {
2828

‎app/src/main/res/layout/activity_home.xml

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<RelativeLayout
3-
xmlns:android="http://schemas.android.com/apk/res/android"
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
43
xmlns:app="http://schemas.android.com/apk/res-auto"
5-
xmlns:tools="http://schemas.android.com/tools"
64
android:layout_width="match_parent"
7-
android:layout_height="match_parent"
8-
tools:context="erikjhordanrey.android_kotlin_devises.view.HomeActivity">
5+
android:layout_height="match_parent">
96

107
<FrameLayout
118
android:id="@+id/content"

‎build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
buildscript {
22

33
ext.versions = [
4-
'compileSdk' : 28,
4+
'compileSdk' : 29,
55
'minSdk' : 15,
6-
'targetSdk' : 28,
6+
'targetSdk' : 29,
77
'androidGradle' : '4.0.1',
88
'androidx' : '1.1.0',
99
'androidxAppcompat': '1.0.2',

0 commit comments

Comments
 (0)
Please sign in to comment.