Skip to content

Commit 1027af9

Browse files
committed
ref: re-organize all packages from all features
1 parent 80381cf commit 1027af9

39 files changed

+120
-50
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
</activity>
3434

3535
<activity
36-
android:name=".features.movies.MoviesActivity"
36+
android:name=".features.movies.ui.MoviesActivity"
3737
android:label="@string/movies_screen_title">
3838
</activity>
3939

4040
<activity
41-
android:name=".features.movies.MovieDetailsActivity"
41+
android:name=".features.movies.ui.MovieDetailsActivity"
4242
android:label="@string/movie_details_screen_title"
4343
android:theme="@style/AppTheme.Translucent">
4444
</activity>

app/src/main/kotlin/com/fernandocejas/sample/core/Core.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.fernandocejas.sample.core
22

33
import com.fernandocejas.sample.core.di.coreModule
4+
import com.fernandocejas.sample.features.auth.authFeature
45
import com.fernandocejas.sample.features.login.loginFeature
56
import com.fernandocejas.sample.features.movies.moviesFeature
67
import org.koin.core.module.Module
@@ -52,6 +53,7 @@ private fun coreFeature() = object : Feature {
5253

5354
fun allFeatures() = listOf(
5455
coreFeature(),
56+
authFeature(),
5557
loginFeature(),
5658
moviesFeature(),
5759
)

app/src/main/kotlin/com/fernandocejas/sample/core/di/CoreModule.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.fernandocejas.sample.core.di
22

33
import com.fernandocejas.sample.core.navigation.Navigator
4-
import com.fernandocejas.sample.core.platform.NetworkHandler
4+
import com.fernandocejas.sample.core.network.NetworkHandler
55
import okhttp3.OkHttpClient
66
import org.koin.core.module.dsl.singleOf
77
import org.koin.dsl.module

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ import android.widget.ImageView
2424
import androidx.core.app.ActivityOptionsCompat
2525
import androidx.fragment.app.FragmentActivity
2626
import com.fernandocejas.sample.core.extension.emptyString
27-
import com.fernandocejas.sample.features.auth.Authenticator
27+
import com.fernandocejas.sample.features.auth.credentials.Authenticator
2828
import com.fernandocejas.sample.features.login.ui.LoginActivity
29-
import com.fernandocejas.sample.features.movies.MovieDetailsActivity
30-
import com.fernandocejas.sample.features.movies.MovieView
31-
import com.fernandocejas.sample.features.movies.MoviesActivity
29+
import com.fernandocejas.sample.features.movies.ui.MovieDetailsActivity
30+
import com.fernandocejas.sample.features.movies.ui.MovieView
31+
import com.fernandocejas.sample.features.movies.ui.MoviesActivity
3232

3333

3434
class Navigator(private val authenticator: Authenticator) {

app/src/main/kotlin/com/fernandocejas/sample/core/platform/NetworkHandler.kt renamed to app/src/main/kotlin/com/fernandocejas/sample/core/network/NetworkHandler.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.platform
16+
package com.fernandocejas.sample.core.network
1717

1818
import android.content.Context
1919
import android.net.NetworkCapabilities
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.fernandocejas.sample.features.auth
2+
3+
import com.fernandocejas.sample.core.Feature
4+
import com.fernandocejas.sample.features.auth.credentials.Authenticator
5+
import org.koin.core.module.dsl.singleOf
6+
import org.koin.dsl.module
7+
8+
fun authFeature() = object : Feature {
9+
10+
override fun name() = "auth"
11+
12+
override fun diModule() = module {
13+
singleOf(::Authenticator)
14+
}
15+
}

app/src/main/kotlin/com/fernandocejas/sample/features/auth/Authenticator.kt renamed to app/src/main/kotlin/com/fernandocejas/sample/features/auth/credentials/Authenticator.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.auth
16+
package com.fernandocejas.sample.features.auth.credentials
1717

1818

1919
class Authenticator {
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package com.fernandocejas.sample.features.auth.di
2+
3+
import com.fernandocejas.sample.core.navigation.Navigator
4+
import com.fernandocejas.sample.core.network.NetworkHandler
5+
import com.fernandocejas.sample.features.auth.credentials.Authenticator
6+
import okhttp3.OkHttpClient
7+
import org.koin.core.module.dsl.singleOf
8+
import org.koin.dsl.module
9+
import retrofit2.Retrofit
10+
import retrofit2.converter.gson.GsonConverterFactory
11+
12+
val authModule = module {
13+
singleOf(::Authenticator)
14+
}
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
package com.fernandocejas.sample.features.login
22

33
import com.fernandocejas.sample.core.Feature
4-
import com.fernandocejas.sample.features.auth.Authenticator
5-
import org.koin.core.module.dsl.singleOf
64
import org.koin.dsl.module
75

86
fun loginFeature() = object : Feature {
97

108
override fun name() = "login"
119

12-
override fun diModule() = module {
13-
singleOf(::Authenticator)
14-
}
10+
override fun diModule() = module {}
1511
}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
package com.fernandocejas.sample.features.movies
22

33
import com.fernandocejas.sample.core.Feature
4+
import com.fernandocejas.sample.features.movies.data.MoviesRepository
5+
import com.fernandocejas.sample.features.movies.data.MoviesService
6+
import com.fernandocejas.sample.features.movies.interactor.GetMovieDetails
7+
import com.fernandocejas.sample.features.movies.interactor.GetMovies
8+
import com.fernandocejas.sample.features.movies.interactor.PlayMovie
9+
import com.fernandocejas.sample.features.movies.ui.MovieDetailsAnimator
10+
import com.fernandocejas.sample.features.movies.ui.MovieDetailsViewModel
11+
import com.fernandocejas.sample.features.movies.ui.MoviesAdapter
12+
import com.fernandocejas.sample.features.movies.ui.MoviesViewModel
413
import org.koin.androidx.viewmodel.dsl.viewModelOf
514
import org.koin.core.module.dsl.factoryOf
615
import org.koin.dsl.bind

0 commit comments

Comments
 (0)