Skip to content

Commit 80381cf

Browse files
committed
ref: move packages around for Failure and Login
1 parent 5c16112 commit 80381cf

File tree

18 files changed

+29
-32
lines changed

18 files changed

+29
-32
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</activity>
2929

3030
<activity
31-
android:name=".features.login.LoginActivity"
31+
android:name=".features.login.ui.LoginActivity"
3232
android:label="@string/login_screen_title">
3333
</activity>
3434

app/src/main/kotlin/com/fernandocejas/sample/core/extension/Lifecycle.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ package com.fernandocejas.sample.core.extension
1818
import androidx.lifecycle.LifecycleOwner
1919
import androidx.lifecycle.LiveData
2020
import androidx.lifecycle.Observer
21-
import com.fernandocejas.sample.core.exception.Failure
21+
import com.fernandocejas.sample.core.failure.Failure
2222

2323
fun <T : Any, L : LiveData<T>> LifecycleOwner.observe(liveData: L, body: (T?) -> Unit) =
2424
liveData.observe(this, Observer(body))
2525

2626
fun <L : LiveData<Failure>> LifecycleOwner.failure(liveData: L, body: (Failure?) -> Unit) =
27-
liveData.observe(this, Observer(body))
27+
liveData.observe(this, Observer(body))

app/src/main/kotlin/com/fernandocejas/sample/core/exception/Failure.kt renamed to app/src/main/kotlin/com/fernandocejas/sample/core/failure/Failure.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.fernandocejas.sample.core.exception
16+
package com.fernandocejas.sample.core.failure
1717

1818
/**
1919
* Base Class for handling errors/failures/exceptions.

app/src/main/kotlin/com/fernandocejas/sample/core/interactor/UseCase.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package com.fernandocejas.sample.core.interactor
1717

18-
import com.fernandocejas.sample.core.exception.Failure
18+
import com.fernandocejas.sample.core.failure.Failure
1919
import com.fernandocejas.sample.core.functional.Either
2020
import kotlinx.coroutines.*
2121

app/src/main/kotlin/com/fernandocejas/sample/core/navigation/Navigator.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import androidx.core.app.ActivityOptionsCompat
2525
import androidx.fragment.app.FragmentActivity
2626
import com.fernandocejas.sample.core.extension.emptyString
2727
import com.fernandocejas.sample.features.auth.Authenticator
28-
import com.fernandocejas.sample.features.login.LoginActivity
28+
import com.fernandocejas.sample.features.login.ui.LoginActivity
2929
import com.fernandocejas.sample.features.movies.MovieDetailsActivity
3030
import com.fernandocejas.sample.features.movies.MovieView
3131
import com.fernandocejas.sample.features.movies.MoviesActivity

app/src/main/kotlin/com/fernandocejas/sample/core/platform/BaseViewModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package com.fernandocejas.sample.core.platform
1818
import androidx.lifecycle.LiveData
1919
import androidx.lifecycle.MutableLiveData
2020
import androidx.lifecycle.ViewModel
21-
import com.fernandocejas.sample.core.exception.Failure
21+
import com.fernandocejas.sample.core.failure.Failure
2222

2323
/**
2424
* Base ViewModel class with default Failure handling.
@@ -33,4 +33,4 @@ abstract class BaseViewModel : ViewModel() {
3333
protected fun handleFailure(failure: Failure) {
3434
_failure.value = failure
3535
}
36-
}
36+
}

app/src/main/kotlin/com/fernandocejas/sample/features/login/LoginActivity.kt renamed to app/src/main/kotlin/com/fernandocejas/sample/features/login/ui/LoginActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.fernandocejas.sample.features.login
16+
package com.fernandocejas.sample.features.login.ui
1717

1818
import android.content.Context
1919
import android.content.Intent

app/src/main/kotlin/com/fernandocejas/sample/features/login/LoginFragment.kt renamed to app/src/main/kotlin/com/fernandocejas/sample/features/login/ui/LoginFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.fernandocejas.sample.features.login
16+
package com.fernandocejas.sample.features.login.ui
1717

1818
import com.fernandocejas.sample.core.platform.BaseFragment
1919

app/src/main/kotlin/com/fernandocejas/sample/features/movies/MovieDetailsFragment.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import android.view.View
2121
import android.view.ViewGroup
2222
import androidx.core.os.bundleOf
2323
import com.fernandocejas.sample.R
24-
import com.fernandocejas.sample.core.exception.Failure
25-
import com.fernandocejas.sample.core.exception.Failure.NetworkConnection
26-
import com.fernandocejas.sample.core.exception.Failure.ServerError
24+
import com.fernandocejas.sample.core.failure.Failure
25+
import com.fernandocejas.sample.core.failure.Failure.NetworkConnection
26+
import com.fernandocejas.sample.core.failure.Failure.ServerError
2727
import com.fernandocejas.sample.core.extension.close
2828
import com.fernandocejas.sample.core.extension.failure
2929
import com.fernandocejas.sample.core.extension.isVisible

app/src/main/kotlin/com/fernandocejas/sample/features/movies/MovieFailure.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package com.fernandocejas.sample.features.movies
1717

18-
import com.fernandocejas.sample.core.exception.Failure.FeatureFailure
18+
import com.fernandocejas.sample.core.failure.Failure.FeatureFailure
1919

2020
class MovieFailure {
2121
class ListNotAvailable : FeatureFailure()

0 commit comments

Comments
 (0)