Skip to content
This repository was archived by the owner on Aug 22, 2024. It is now read-only.

Commit 39356f1

Browse files
hossain-khanhossain-khan
authored
Merge pull request #82 from amardeshbd/package-reorganization
REFACTOR - Package reorganization
2 parents 025437d + e97b1bc commit 39356f1

30 files changed

+60
-61
lines changed

‎app/src/main/AndroidManifest.xml

+11-11
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,28 @@
1212
android:supportsRtl="true"
1313
android:theme="@style/AppTheme"
1414
tools:ignore="AllowBackup,GoogleAppIndexingWarning">
15-
<activity android:name=".browse.LayoutBrowseActivity">
15+
<activity android:name="com.hossainkhan.android.demo.ui.browse.LayoutBrowseActivity">
1616
<intent-filter>
1717
<action android:name="android.intent.action.MAIN" />
1818

1919
<category android:name="android.intent.category.LAUNCHER" />
2020
</intent-filter>
2121
</activity>
2222
<activity
23-
android:name=".layoutpreview.LayoutPreviewBaseActivity"
24-
android:parentActivityName=".browse.LayoutBrowseActivity" />
23+
android:name="com.hossainkhan.android.demo.ui.layoutpreview.LayoutPreviewBaseActivity"
24+
android:parentActivityName="com.hossainkhan.android.demo.ui.browse.LayoutBrowseActivity" />
2525
<activity
26-
android:name=".layoutpreview.LayoutVisibilityGoneActivity"
27-
android:parentActivityName=".browse.LayoutBrowseActivity" />
26+
android:name="com.hossainkhan.android.demo.ui.layoutpreview.LayoutVisibilityGoneActivity"
27+
android:parentActivityName="com.hossainkhan.android.demo.ui.browse.LayoutBrowseActivity" />
2828
<activity
29-
android:name=".layoutpreview.LayoutChainStyleActivity"
30-
android:parentActivityName=".browse.LayoutBrowseActivity" />
29+
android:name="com.hossainkhan.android.demo.ui.layoutpreview.LayoutChainStyleActivity"
30+
android:parentActivityName="com.hossainkhan.android.demo.ui.browse.LayoutBrowseActivity" />
3131
<activity
32-
android:name=".layoutpreview.LayoutGuidelineBarrierActivity"
33-
android:parentActivityName=".browse.LayoutBrowseActivity" />
32+
android:name="com.hossainkhan.android.demo.ui.layoutpreview.LayoutGuidelineBarrierActivity"
33+
android:parentActivityName="com.hossainkhan.android.demo.ui.browse.LayoutBrowseActivity" />
3434
<activity
35-
android:name=".layoutpreview.LayoutGuidelineGroupActivity"
36-
android:parentActivityName=".browse.LayoutBrowseActivity" />
35+
android:name="com.hossainkhan.android.demo.ui.layoutpreview.LayoutGuidelineGroupActivity"
36+
android:parentActivityName="com.hossainkhan.android.demo.ui.browse.LayoutBrowseActivity" />
3737
</application>
3838

3939
</manifest>

‎app/src/main/java/com/hossainkhan/android/demo/base/DemoApplication.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package com.hossainkhan.android.demo.base
1919
import android.app.Activity
2020
import android.app.Application
2121
import com.hossainkhan.android.demo.BuildConfig
22-
import com.hossainkhan.android.demo.dagger.DaggerDemoApplicationComponent
22+
import com.hossainkhan.android.demo.di.DaggerDemoApplicationComponent
2323
import com.squareup.leakcanary.LeakCanary
2424
import dagger.android.AndroidInjector
2525
import dagger.android.DispatchingAndroidInjector

‎app/src/main/java/com/hossainkhan/android/demo/dagger/ActivityBindingModule.kt renamed to ‎app/src/main/java/com/hossainkhan/android/demo/di/ActivityBindingModule.kt

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

17-
package com.hossainkhan.android.demo.dagger
17+
package com.hossainkhan.android.demo.di
1818

19-
import com.hossainkhan.android.demo.browse.LayoutBrowseActivity
20-
import com.hossainkhan.android.demo.layoutpreview.LayoutChainStyleActivity
21-
import com.hossainkhan.android.demo.layoutpreview.LayoutGuidelineBarrierActivity
22-
import com.hossainkhan.android.demo.layoutpreview.LayoutGuidelineGroupActivity
23-
import com.hossainkhan.android.demo.layoutpreview.LayoutPreviewBaseActivity
24-
import com.hossainkhan.android.demo.layoutpreview.LayoutVisibilityGoneActivity
19+
import com.hossainkhan.android.demo.ui.layoutpreview.LayoutChainStyleActivity
20+
import com.hossainkhan.android.demo.ui.layoutpreview.LayoutGuidelineBarrierActivity
21+
import com.hossainkhan.android.demo.ui.layoutpreview.LayoutGuidelineGroupActivity
22+
import com.hossainkhan.android.demo.ui.layoutpreview.LayoutPreviewBaseActivity
23+
import com.hossainkhan.android.demo.ui.layoutpreview.LayoutVisibilityGoneActivity
2524
import dagger.Module
2625
import dagger.android.ContributesAndroidInjector
2726

‎app/src/main/java/com/hossainkhan/android/demo/dagger/ActivityScope.kt renamed to ‎app/src/main/java/com/hossainkhan/android/demo/di/ActivityScope.kt

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

17-
package com.hossainkhan.android.demo.dagger
17+
package com.hossainkhan.android.demo.di
1818

1919
import javax.inject.Scope
2020

‎app/src/main/java/com/hossainkhan/android/demo/dagger/ApplicationModule.kt renamed to ‎app/src/main/java/com/hossainkhan/android/demo/di/ApplicationModule.kt

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

17-
package com.hossainkhan.android.demo.dagger
17+
package com.hossainkhan.android.demo.di
1818

1919
import android.app.Application
2020
import android.content.Context

‎app/src/main/java/com/hossainkhan/android/demo/dagger/DataStoreModule.kt renamed to ‎app/src/main/java/com/hossainkhan/android/demo/di/DataStoreModule.kt

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

17-
package com.hossainkhan.android.demo.dagger
17+
package com.hossainkhan.android.demo.di
1818

1919
import android.content.Context
2020
import android.content.SharedPreferences

‎app/src/main/java/com/hossainkhan/android/demo/dagger/DemoApplicationComponent.kt renamed to ‎app/src/main/java/com/hossainkhan/android/demo/di/DemoApplicationComponent.kt

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

17-
package com.hossainkhan.android.demo.dagger
17+
package com.hossainkhan.android.demo.di
1818

1919
import android.app.Application
2020
import com.hossainkhan.android.demo.base.DemoApplication

‎app/src/main/java/com/hossainkhan/android/demo/dagger/LayoutBrowseActivityModule.kt renamed to ‎app/src/main/java/com/hossainkhan/android/demo/di/LayoutBrowseActivityModule.kt

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

17-
package com.hossainkhan.android.demo.dagger
17+
package com.hossainkhan.android.demo.di
1818

1919
import android.app.Activity
20-
import com.hossainkhan.android.demo.browse.LayoutBrowseActivity
20+
import com.hossainkhan.android.demo.ui.browse.LayoutBrowseActivity
2121
import dagger.Binds
2222
import dagger.Module
2323
import dagger.android.ActivityKey

‎app/src/main/java/com/hossainkhan/android/demo/dagger/LayoutBrowseSubcomponent.kt renamed to ‎app/src/main/java/com/hossainkhan/android/demo/di/LayoutBrowseSubcomponent.kt

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

17-
package com.hossainkhan.android.demo.dagger
17+
package com.hossainkhan.android.demo.di
1818

19-
import com.hossainkhan.android.demo.browse.LayoutBrowseActivity
19+
import com.hossainkhan.android.demo.ui.browse.LayoutBrowseActivity
2020
import dagger.Subcomponent
2121
import dagger.android.AndroidInjector
2222

‎app/src/main/java/com/hossainkhan/android/demo/dagger/NavigatorModule.kt renamed to ‎app/src/main/java/com/hossainkhan/android/demo/di/NavigatorModule.kt

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

17-
package com.hossainkhan.android.demo.dagger
17+
package com.hossainkhan.android.demo.di
1818

1919
import android.content.Context
20-
import com.hossainkhan.android.demo.browse.DefaultLayoutBrowseNavigator
21-
import com.hossainkhan.android.demo.browse.LayoutBrowseNavigator
20+
import com.hossainkhan.android.demo.ui.browse.DefaultLayoutBrowseNavigator
21+
import com.hossainkhan.android.demo.ui.browse.LayoutBrowseNavigator
2222
import dagger.Module
2323
import dagger.Provides
2424

‎app/src/main/java/com/hossainkhan/android/demo/browse/DefaultLayoutBrowseNavigator.kt renamed to ‎app/src/main/java/com/hossainkhan/android/demo/ui/browse/DefaultLayoutBrowseNavigator.kt

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

17-
package com.hossainkhan.android.demo.browse
17+
package com.hossainkhan.android.demo.ui.browse
1818

1919
import android.content.Context
2020
import android.content.Intent
21-
import com.hossainkhan.android.demo.layoutpreview.LayoutPreviewBaseActivity
21+
import com.hossainkhan.android.demo.ui.layoutpreview.LayoutPreviewBaseActivity
2222
import javax.inject.Inject
2323

2424
class DefaultLayoutBrowseNavigator @Inject constructor(private val context: Context) : LayoutBrowseNavigator {

‎app/src/main/java/com/hossainkhan/android/demo/browse/LayoutBrowseActivity.kt renamed to ‎app/src/main/java/com/hossainkhan/android/demo/ui/browse/LayoutBrowseActivity.kt

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

17-
package com.hossainkhan.android.demo.browse
17+
package com.hossainkhan.android.demo.ui.browse
1818

1919
import android.os.Bundle
2020
import androidx.appcompat.app.AppCompatActivity

‎app/src/main/java/com/hossainkhan/android/demo/browse/LayoutBrowseAdapter.kt renamed to ‎app/src/main/java/com/hossainkhan/android/demo/ui/browse/LayoutBrowseAdapter.kt

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

17-
package com.hossainkhan.android.demo.browse
17+
package com.hossainkhan.android.demo.ui.browse
1818

1919
import androidx.lifecycle.LifecycleOwner
2020
import androidx.lifecycle.Observer

‎app/src/main/java/com/hossainkhan/android/demo/browse/LayoutBrowseNavigator.kt renamed to ‎app/src/main/java/com/hossainkhan/android/demo/ui/browse/LayoutBrowseNavigator.kt

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

17-
package com.hossainkhan.android.demo.browse
17+
package com.hossainkhan.android.demo.ui.browse
1818

1919
import androidx.annotation.LayoutRes
2020

‎app/src/main/java/com/hossainkhan/android/demo/browse/LayoutBrowseViewModel.kt renamed to ‎app/src/main/java/com/hossainkhan/android/demo/ui/browse/LayoutBrowseViewModel.kt

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

17-
package com.hossainkhan.android.demo.browse
17+
package com.hossainkhan.android.demo.ui.browse
1818

1919
import androidx.lifecycle.LiveData
2020
import androidx.lifecycle.MutableLiveData
2121
import androidx.lifecycle.ViewModel
2222
import com.hossainkhan.android.demo.R
2323
import com.hossainkhan.android.demo.data.AppDataStore
2424
import com.hossainkhan.android.demo.data.LayoutInformation
25-
import com.hossainkhan.android.demo.layoutpreview.LayoutChainStyleActivity
26-
import com.hossainkhan.android.demo.layoutpreview.LayoutGuidelineBarrierActivity
27-
import com.hossainkhan.android.demo.layoutpreview.LayoutGuidelineGroupActivity
28-
import com.hossainkhan.android.demo.layoutpreview.LayoutVisibilityGoneActivity
25+
import com.hossainkhan.android.demo.ui.layoutpreview.LayoutChainStyleActivity
26+
import com.hossainkhan.android.demo.ui.layoutpreview.LayoutGuidelineBarrierActivity
27+
import com.hossainkhan.android.demo.ui.layoutpreview.LayoutGuidelineGroupActivity
28+
import com.hossainkhan.android.demo.ui.layoutpreview.LayoutVisibilityGoneActivity
2929
import timber.log.Timber
3030

3131
class LayoutBrowseViewModel(

‎app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutChainStyleActivity.kt renamed to ‎app/src/main/java/com/hossainkhan/android/demo/ui/layoutpreview/LayoutChainStyleActivity.kt

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

17-
package com.hossainkhan.android.demo.layoutpreview
17+
package com.hossainkhan.android.demo.ui.layoutpreview
1818

1919
import android.os.Bundle
2020
import android.view.View

‎app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutGuidelineBarrierActivity.kt renamed to ‎app/src/main/java/com/hossainkhan/android/demo/ui/layoutpreview/LayoutGuidelineBarrierActivity.kt

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

17-
package com.hossainkhan.android.demo.layoutpreview
17+
package com.hossainkhan.android.demo.ui.layoutpreview
1818

1919
import android.os.Bundle
2020
import android.widget.Button

‎app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutGuidelineGroupActivity.kt renamed to ‎app/src/main/java/com/hossainkhan/android/demo/ui/layoutpreview/LayoutGuidelineGroupActivity.kt

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

17-
package com.hossainkhan.android.demo.layoutpreview
17+
package com.hossainkhan.android.demo.ui.layoutpreview
1818

1919
import android.os.Bundle
2020
import android.view.View

‎app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutInfoViewModel.kt renamed to ‎app/src/main/java/com/hossainkhan/android/demo/ui/layoutpreview/LayoutInfoViewModel.kt

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

17-
package com.hossainkhan.android.demo.layoutpreview
17+
package com.hossainkhan.android.demo.ui.layoutpreview
1818

1919
import androidx.lifecycle.LiveData
2020
import androidx.lifecycle.MutableLiveData

‎app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutPreviewBaseActivity.kt renamed to ‎app/src/main/java/com/hossainkhan/android/demo/ui/layoutpreview/LayoutPreviewBaseActivity.kt

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

17-
package com.hossainkhan.android.demo.layoutpreview
17+
package com.hossainkhan.android.demo.ui.layoutpreview
1818

1919
import androidx.lifecycle.Observer
2020
import androidx.lifecycle.ViewModelProvider

‎app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutVisibilityGoneActivity.kt renamed to ‎app/src/main/java/com/hossainkhan/android/demo/ui/layoutpreview/LayoutVisibilityGoneActivity.kt

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

17-
package com.hossainkhan.android.demo.layoutpreview
17+
package com.hossainkhan.android.demo.ui.layoutpreview
1818

1919
import android.os.Bundle
2020
import android.view.View

‎app/src/main/java/com/hossainkhan/android/demo/viewmodel/LayoutPreviewViewModelFactory.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ package com.hossainkhan.android.demo.viewmodel
1818

1919
import androidx.lifecycle.ViewModel
2020
import androidx.lifecycle.ViewModelProvider
21-
import com.hossainkhan.android.demo.browse.LayoutBrowseNavigator
22-
import com.hossainkhan.android.demo.browse.LayoutBrowseViewModel
21+
import com.hossainkhan.android.demo.ui.browse.LayoutBrowseNavigator
22+
import com.hossainkhan.android.demo.ui.browse.LayoutBrowseViewModel
2323
import com.hossainkhan.android.demo.data.AppDataStore
24-
import com.hossainkhan.android.demo.layoutpreview.LayoutInfoViewModel
24+
import com.hossainkhan.android.demo.ui.layoutpreview.LayoutInfoViewModel
2525
import javax.inject.Inject
2626

2727
/**

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
7-
tools:context="com.hossainkhan.android.demo.browse.LayoutBrowseActivity">
7+
tools:context="com.hossainkhan.android.demo.ui.browse.LayoutBrowseActivity">
88

99
<androidx.recyclerview.widget.RecyclerView
1010
android:id="@+id/recycler_view"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
android:layout_height="match_parent"
2424
android:foreground="@drawable/ic_grid_overlay"
2525
android:foregroundTint="@color/grid_tint"
26-
tools:context=".layoutpreview.LayoutPreviewBaseActivity">
26+
tools:context="com.hossainkhan.android.demo.ui.layoutpreview.LayoutPreviewBaseActivity">
2727

2828

2929
<!--

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
android:layout_height="match_parent"
2222
android:foreground="@drawable/ic_grid_overlay"
2323
android:foregroundTint="@color/grid_tint"
24-
tools:context=".layoutpreview.LayoutPreviewBaseActivity">
24+
tools:context="com.hossainkhan.android.demo.ui.layoutpreview.LayoutPreviewBaseActivity">
2525

2626

2727
<!--

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
android:layout_height="match_parent"
2222
android:foreground="@drawable/ic_grid_overlay"
2323
android:foregroundTint="@color/grid_tint"
24-
tools:context=".layoutpreview.LayoutPreviewBaseActivity">
24+
tools:context="com.hossainkhan.android.demo.ui.layoutpreview.LayoutPreviewBaseActivity">
2525

2626
<!--
2727
1st view that is horizontally biased towards the bottom using 85% bias

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
android:layout_height="match_parent"
2323
android:foreground="@drawable/ic_grid_overlay"
2424
android:foregroundTint="@color/grid_tint"
25-
tools:context=".layoutpreview.LayoutPreviewBaseActivity">
25+
tools:context="com.hossainkhan.android.demo.ui.layoutpreview.LayoutPreviewBaseActivity">
2626

2727

2828
<!--

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
android:layout_height="match_parent"
2222
android:foreground="@drawable/ic_grid_overlay"
2323
android:foregroundTint="@color/grid_tint"
24-
tools:context=".layoutpreview.LayoutPreviewBaseActivity">
24+
tools:context="com.hossainkhan.android.demo.ui.layoutpreview.LayoutPreviewBaseActivity">
2525

2626

2727
<!--

‎app/src/test/java/com/hossainkhan/android/demo/browse/LayoutBrowseViewModelTest.kt renamed to ‎app/src/test/java/com/hossainkhan/android/demo/ui/browse/LayoutBrowseViewModelTest.kt

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

17-
package com.hossainkhan.android.demo.browse
17+
package com.hossainkhan.android.demo.ui.browse
1818

1919
import android.content.SharedPreferences
2020
import android.content.res.Resources
2121
import androidx.arch.core.executor.testing.InstantTaskExecutorRule
2222
import com.hossainkhan.android.demo.R
2323
import com.hossainkhan.android.demo.data.AppDataStore
2424
import com.hossainkhan.android.demo.data.LayoutDataStore
25-
import com.hossainkhan.android.demo.layoutpreview.LayoutChainStyleActivity
26-
import com.hossainkhan.android.demo.layoutpreview.LayoutGuidelineBarrierActivity
27-
import com.hossainkhan.android.demo.layoutpreview.LayoutGuidelineGroupActivity
28-
import com.hossainkhan.android.demo.layoutpreview.LayoutVisibilityGoneActivity
25+
import com.hossainkhan.android.demo.ui.layoutpreview.LayoutChainStyleActivity
26+
import com.hossainkhan.android.demo.ui.layoutpreview.LayoutGuidelineBarrierActivity
27+
import com.hossainkhan.android.demo.ui.layoutpreview.LayoutGuidelineGroupActivity
28+
import com.hossainkhan.android.demo.ui.layoutpreview.LayoutVisibilityGoneActivity
2929
import org.junit.Before
3030
import org.junit.Rule
3131
import org.junit.Test

‎app/src/test/java/com/hossainkhan/android/demo/layoutpreview/LayoutInfoViewModelTest.kt renamed to ‎app/src/test/java/com/hossainkhan/android/demo/ui/layoutpreview/LayoutInfoViewModelTest.kt

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

17-
package com.hossainkhan.android.demo.layoutpreview
17+
package com.hossainkhan.android.demo.ui.layoutpreview
1818

1919
import android.content.SharedPreferences
2020
import android.content.res.Resources

0 commit comments

Comments
 (0)