hossain-khan · hossain-khan · Apr 8, 2019 · Apr 8, 2019 · Apr 8, 2019
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -12,28 +12,28 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="AllowBackup,GoogleAppIndexingWarning">
-        <activity android:name=".browse.LayoutBrowseActivity">
+        <activity android:name="com.hossainkhan.android.demo.ui.browse.LayoutBrowseActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
-            android:name=".layoutpreview.LayoutPreviewBaseActivity"
-            android:parentActivityName=".browse.LayoutBrowseActivity" />
+            android:name="com.hossainkhan.android.demo.ui.layoutpreview.LayoutPreviewBaseActivity"
+            android:parentActivityName="com.hossainkhan.android.demo.ui.browse.LayoutBrowseActivity" />
         <activity
-            android:name=".layoutpreview.LayoutVisibilityGoneActivity"
-            android:parentActivityName=".browse.LayoutBrowseActivity" />
+            android:name="com.hossainkhan.android.demo.ui.layoutpreview.LayoutVisibilityGoneActivity"
+            android:parentActivityName="com.hossainkhan.android.demo.ui.browse.LayoutBrowseActivity" />
         <activity
-            android:name=".layoutpreview.LayoutChainStyleActivity"
-            android:parentActivityName=".browse.LayoutBrowseActivity" />
+            android:name="com.hossainkhan.android.demo.ui.layoutpreview.LayoutChainStyleActivity"
+            android:parentActivityName="com.hossainkhan.android.demo.ui.browse.LayoutBrowseActivity" />
         <activity
-            android:name=".layoutpreview.LayoutGuidelineBarrierActivity"
-            android:parentActivityName=".browse.LayoutBrowseActivity" />
+            android:name="com.hossainkhan.android.demo.ui.layoutpreview.LayoutGuidelineBarrierActivity"
+            android:parentActivityName="com.hossainkhan.android.demo.ui.browse.LayoutBrowseActivity" />
         <activity
-            android:name=".layoutpreview.LayoutGuidelineGroupActivity"
-            android:parentActivityName=".browse.LayoutBrowseActivity" />
+            android:name="com.hossainkhan.android.demo.ui.layoutpreview.LayoutGuidelineGroupActivity"
+            android:parentActivityName="com.hossainkhan.android.demo.ui.browse.LayoutBrowseActivity" />
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/hossainkhan/android/demo/base/DemoApplication.kt b/app/src/main/java/com/hossainkhan/android/demo/base/DemoApplication.kt
@@ -19,7 +19,7 @@ package com.hossainkhan.android.demo.base
 import android.app.Activity
 import android.app.Application
 import com.hossainkhan.android.demo.BuildConfig
-import com.hossainkhan.android.demo.dagger.DaggerDemoApplicationComponent
+import com.hossainkhan.android.demo.di.DaggerDemoApplicationComponent
 import com.squareup.leakcanary.LeakCanary
 import dagger.android.AndroidInjector
 import dagger.android.DispatchingAndroidInjector

diff --git a/...roid/demo/dagger/ActivityBindingModule.kt → .../android/demo/di/ActivityBindingModule.kt b/...roid/demo/dagger/ActivityBindingModule.kt → .../android/demo/di/ActivityBindingModule.kt
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.dagger
+package com.hossainkhan.android.demo.di
 
-import com.hossainkhan.android.demo.browse.LayoutBrowseActivity
-import com.hossainkhan.android.demo.layoutpreview.LayoutChainStyleActivity
-import com.hossainkhan.android.demo.layoutpreview.LayoutGuidelineBarrierActivity
-import com.hossainkhan.android.demo.layoutpreview.LayoutGuidelineGroupActivity
-import com.hossainkhan.android.demo.layoutpreview.LayoutPreviewBaseActivity
-import com.hossainkhan.android.demo.layoutpreview.LayoutVisibilityGoneActivity
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutChainStyleActivity
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutGuidelineBarrierActivity
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutGuidelineGroupActivity
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutPreviewBaseActivity
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutVisibilityGoneActivity
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 

diff --git a/...khan/android/demo/dagger/ActivityScope.kt → ...sainkhan/android/demo/di/ActivityScope.kt b/...khan/android/demo/dagger/ActivityScope.kt → ...sainkhan/android/demo/di/ActivityScope.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.dagger
+package com.hossainkhan.android.demo.di
 
 import javax.inject.Scope
 

diff --git a/.../android/demo/dagger/ApplicationModule.kt → ...khan/android/demo/di/ApplicationModule.kt b/.../android/demo/dagger/ApplicationModule.kt → ...khan/android/demo/di/ApplicationModule.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.dagger
+package com.hossainkhan.android.demo.di
 
 import android.app.Application
 import android.content.Context

diff --git a/...an/android/demo/dagger/DataStoreModule.kt → ...inkhan/android/demo/di/DataStoreModule.kt b/...an/android/demo/dagger/DataStoreModule.kt → ...inkhan/android/demo/di/DataStoreModule.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.dagger
+package com.hossainkhan.android.demo.di
 
 import android.content.Context
 import android.content.SharedPreferences

diff --git a/...d/demo/dagger/DemoApplicationComponent.kt → ...droid/demo/di/DemoApplicationComponent.kt b/...d/demo/dagger/DemoApplicationComponent.kt → ...droid/demo/di/DemoApplicationComponent.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.dagger
+package com.hossainkhan.android.demo.di
 
 import android.app.Application
 import com.hossainkhan.android.demo.base.DemoApplication

diff --git a/...demo/dagger/LayoutBrowseActivityModule.kt → ...oid/demo/di/LayoutBrowseActivityModule.kt b/...demo/dagger/LayoutBrowseActivityModule.kt → ...oid/demo/di/LayoutBrowseActivityModule.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.dagger
+package com.hossainkhan.android.demo.di
 
 import android.app.Activity
-import com.hossainkhan.android.demo.browse.LayoutBrowseActivity
+import com.hossainkhan.android.demo.ui.browse.LayoutBrowseActivity
 import dagger.Binds
 import dagger.Module
 import dagger.android.ActivityKey

diff --git a/...d/demo/dagger/LayoutBrowseSubcomponent.kt → ...droid/demo/di/LayoutBrowseSubcomponent.kt b/...d/demo/dagger/LayoutBrowseSubcomponent.kt → ...droid/demo/di/LayoutBrowseSubcomponent.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.dagger
+package com.hossainkhan.android.demo.di
 
-import com.hossainkhan.android.demo.browse.LayoutBrowseActivity
+import com.hossainkhan.android.demo.ui.browse.LayoutBrowseActivity
 import dagger.Subcomponent
 import dagger.android.AndroidInjector
 

diff --git a/...an/android/demo/dagger/NavigatorModule.kt → ...inkhan/android/demo/di/NavigatorModule.kt b/...an/android/demo/dagger/NavigatorModule.kt → ...inkhan/android/demo/di/NavigatorModule.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.dagger
+package com.hossainkhan.android.demo.di
 
 import android.content.Context
-import com.hossainkhan.android.demo.browse.DefaultLayoutBrowseNavigator
-import com.hossainkhan.android.demo.browse.LayoutBrowseNavigator
+import com.hossainkhan.android.demo.ui.browse.DefaultLayoutBrowseNavigator
+import com.hossainkhan.android.demo.ui.browse.LayoutBrowseNavigator
 import dagger.Module
 import dagger.Provides
 

diff --git a/...mo/browse/DefaultLayoutBrowseNavigator.kt → ...ui/browse/DefaultLayoutBrowseNavigator.kt b/...mo/browse/DefaultLayoutBrowseNavigator.kt → ...ui/browse/DefaultLayoutBrowseNavigator.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.browse
+package com.hossainkhan.android.demo.ui.browse
 
 import android.content.Context
 import android.content.Intent
-import com.hossainkhan.android.demo.layoutpreview.LayoutPreviewBaseActivity
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutPreviewBaseActivity
 import javax.inject.Inject
 
 class DefaultLayoutBrowseNavigator @Inject constructor(private val context: Context) : LayoutBrowseNavigator {

diff --git a/...droid/demo/browse/LayoutBrowseActivity.kt → ...id/demo/ui/browse/LayoutBrowseActivity.kt b/...droid/demo/browse/LayoutBrowseActivity.kt → ...id/demo/ui/browse/LayoutBrowseActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.browse
+package com.hossainkhan.android.demo.ui.browse
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity

diff --git a/...ndroid/demo/browse/LayoutBrowseAdapter.kt → ...oid/demo/ui/browse/LayoutBrowseAdapter.kt b/...ndroid/demo/browse/LayoutBrowseAdapter.kt → ...oid/demo/ui/browse/LayoutBrowseAdapter.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.browse
+package com.hossainkhan.android.demo.ui.browse
 
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.Observer

diff --git a/...roid/demo/browse/LayoutBrowseNavigator.kt → ...d/demo/ui/browse/LayoutBrowseNavigator.kt b/...roid/demo/browse/LayoutBrowseNavigator.kt → ...d/demo/ui/browse/LayoutBrowseNavigator.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.browse
+package com.hossainkhan.android.demo.ui.browse
 
 import androidx.annotation.LayoutRes
 

diff --git a/...roid/demo/browse/LayoutBrowseViewModel.kt → ...d/demo/ui/browse/LayoutBrowseViewModel.kt b/...roid/demo/browse/LayoutBrowseViewModel.kt → ...d/demo/ui/browse/LayoutBrowseViewModel.kt
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.browse
+package com.hossainkhan.android.demo.ui.browse
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.hossainkhan.android.demo.R
 import com.hossainkhan.android.demo.data.AppDataStore
 import com.hossainkhan.android.demo.data.LayoutInformation
-import com.hossainkhan.android.demo.layoutpreview.LayoutChainStyleActivity
-import com.hossainkhan.android.demo.layoutpreview.LayoutGuidelineBarrierActivity
-import com.hossainkhan.android.demo.layoutpreview.LayoutGuidelineGroupActivity
-import com.hossainkhan.android.demo.layoutpreview.LayoutVisibilityGoneActivity
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutChainStyleActivity
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutGuidelineBarrierActivity
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutGuidelineGroupActivity
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutVisibilityGoneActivity
 import timber.log.Timber
 
 class LayoutBrowseViewModel(

diff --git a/...layoutpreview/LayoutChainStyleActivity.kt → ...layoutpreview/LayoutChainStyleActivity.kt b/...layoutpreview/LayoutChainStyleActivity.kt → ...layoutpreview/LayoutChainStyleActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.layoutpreview
+package com.hossainkhan.android.demo.ui.layoutpreview
 
 import android.os.Bundle
 import android.view.View

diff --git a/...preview/LayoutGuidelineBarrierActivity.kt → ...preview/LayoutGuidelineBarrierActivity.kt b/...preview/LayoutGuidelineBarrierActivity.kt → ...preview/LayoutGuidelineBarrierActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.layoutpreview
+package com.hossainkhan.android.demo.ui.layoutpreview
 
 import android.os.Bundle
 import android.widget.Button

diff --git a/...utpreview/LayoutGuidelineGroupActivity.kt → ...utpreview/LayoutGuidelineGroupActivity.kt b/...utpreview/LayoutGuidelineGroupActivity.kt → ...utpreview/LayoutGuidelineGroupActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.layoutpreview
+package com.hossainkhan.android.demo.ui.layoutpreview
 
 import android.os.Bundle
 import android.view.View

diff --git a/...demo/layoutpreview/LayoutInfoViewModel.kt → ...o/ui/layoutpreview/LayoutInfoViewModel.kt b/...demo/layoutpreview/LayoutInfoViewModel.kt → ...o/ui/layoutpreview/LayoutInfoViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.layoutpreview
+package com.hossainkhan.android.demo.ui.layoutpreview
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData

diff --git a/...ayoutpreview/LayoutPreviewBaseActivity.kt → ...ayoutpreview/LayoutPreviewBaseActivity.kt b/...ayoutpreview/LayoutPreviewBaseActivity.kt → ...ayoutpreview/LayoutPreviewBaseActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.layoutpreview
+package com.hossainkhan.android.demo.ui.layoutpreview
 
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider

diff --git a/...utpreview/LayoutVisibilityGoneActivity.kt → ...utpreview/LayoutVisibilityGoneActivity.kt b/...utpreview/LayoutVisibilityGoneActivity.kt → ...utpreview/LayoutVisibilityGoneActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.layoutpreview
+package com.hossainkhan.android.demo.ui.layoutpreview
 
 import android.os.Bundle
 import android.view.View

diff --git a/app/src/main/java/com/hossainkhan/android/demo/viewmodel/LayoutPreviewViewModelFactory.kt b/app/src/main/java/com/hossainkhan/android/demo/viewmodel/LayoutPreviewViewModelFactory.kt
@@ -18,10 +18,10 @@ package com.hossainkhan.android.demo.viewmodel
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import com.hossainkhan.android.demo.browse.LayoutBrowseNavigator
-import com.hossainkhan.android.demo.browse.LayoutBrowseViewModel
+import com.hossainkhan.android.demo.ui.browse.LayoutBrowseNavigator
+import com.hossainkhan.android.demo.ui.browse.LayoutBrowseViewModel
 import com.hossainkhan.android.demo.data.AppDataStore
-import com.hossainkhan.android.demo.layoutpreview.LayoutInfoViewModel
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutInfoViewModel
 import javax.inject.Inject
 
 /**

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.hossainkhan.android.demo.browse.LayoutBrowseActivity">
+    tools:context="com.hossainkhan.android.demo.ui.browse.LayoutBrowseActivity">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"

diff --git a/app/src/main/res/layout/preview_dimension_percent.xml b/app/src/main/res/layout/preview_dimension_percent.xml
@@ -23,7 +23,7 @@
     android:layout_height="match_parent"
     android:foreground="@drawable/ic_grid_overlay"
     android:foregroundTint="@color/grid_tint"
-    tools:context=".layoutpreview.LayoutPreviewBaseActivity">
+    tools:context="com.hossainkhan.android.demo.ui.layoutpreview.LayoutPreviewBaseActivity">
 
 
     <!--

diff --git a/app/src/main/res/layout/preview_dimension_ratio.xml b/app/src/main/res/layout/preview_dimension_ratio.xml
@@ -21,7 +21,7 @@
     android:layout_height="match_parent"
     android:foreground="@drawable/ic_grid_overlay"
     android:foregroundTint="@color/grid_tint"
-    tools:context=".layoutpreview.LayoutPreviewBaseActivity">
+    tools:context="com.hossainkhan.android.demo.ui.layoutpreview.LayoutPreviewBaseActivity">
 
 
     <!--

diff --git a/app/src/main/res/layout/preview_positioning_bias.xml b/app/src/main/res/layout/preview_positioning_bias.xml
@@ -21,7 +21,7 @@
     android:layout_height="match_parent"
     android:foreground="@drawable/ic_grid_overlay"
     android:foregroundTint="@color/grid_tint"
-    tools:context=".layoutpreview.LayoutPreviewBaseActivity">
+    tools:context="com.hossainkhan.android.demo.ui.layoutpreview.LayoutPreviewBaseActivity">
 
     <!--
         1st view that is horizontally biased towards the bottom using 85% bias

diff --git a/app/src/main/res/layout/preview_positioning_centered.xml b/app/src/main/res/layout/preview_positioning_centered.xml
@@ -22,7 +22,7 @@
     android:layout_height="match_parent"
     android:foreground="@drawable/ic_grid_overlay"
     android:foregroundTint="@color/grid_tint"
-    tools:context=".layoutpreview.LayoutPreviewBaseActivity">
+    tools:context="com.hossainkhan.android.demo.ui.layoutpreview.LayoutPreviewBaseActivity">
 
 
     <!--

diff --git a/app/src/main/res/layout/preview_positioning_top_left.xml b/app/src/main/res/layout/preview_positioning_top_left.xml
@@ -21,7 +21,7 @@
     android:layout_height="match_parent"
     android:foreground="@drawable/ic_grid_overlay"
     android:foregroundTint="@color/grid_tint"
-    tools:context=".layoutpreview.LayoutPreviewBaseActivity">
+    tools:context="com.hossainkhan.android.demo.ui.layoutpreview.LayoutPreviewBaseActivity">
 
 
     <!--

diff --git a/.../demo/browse/LayoutBrowseViewModelTest.kt → ...mo/ui/browse/LayoutBrowseViewModelTest.kt b/.../demo/browse/LayoutBrowseViewModelTest.kt → ...mo/ui/browse/LayoutBrowseViewModelTest.kt
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.browse
+package com.hossainkhan.android.demo.ui.browse
 
 import android.content.SharedPreferences
 import android.content.res.Resources
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import com.hossainkhan.android.demo.R
 import com.hossainkhan.android.demo.data.AppDataStore
 import com.hossainkhan.android.demo.data.LayoutDataStore
-import com.hossainkhan.android.demo.layoutpreview.LayoutChainStyleActivity
-import com.hossainkhan.android.demo.layoutpreview.LayoutGuidelineBarrierActivity
-import com.hossainkhan.android.demo.layoutpreview.LayoutGuidelineGroupActivity
-import com.hossainkhan.android.demo.layoutpreview.LayoutVisibilityGoneActivity
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutChainStyleActivity
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutGuidelineBarrierActivity
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutGuidelineGroupActivity
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutVisibilityGoneActivity
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test

diff --git a/.../layoutpreview/LayoutInfoViewModelTest.kt → .../layoutpreview/LayoutInfoViewModelTest.kt b/.../layoutpreview/LayoutInfoViewModelTest.kt → .../layoutpreview/LayoutInfoViewModelTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.layoutpreview
+package com.hossainkhan.android.demo.ui.layoutpreview
 
 import android.content.SharedPreferences
 import android.content.res.Resources