From 7dffdd59c70ca16f6af069f70343df6209e272bd Mon Sep 17 00:00:00 2001
From: Taras <tarassmakula@gmail.com>
Date: Tue, 1 Mar 2022 13:38:14 +0200
Subject: [PATCH] Move views to root package
---
.../feature/groups/timeline/GroupTimelineFragment.kt | 2 +-
.../feature/groups/timeline/list/GroupTimelineAdapter.kt | 2 +-
.../feature/groups/timeline/list/GroupTimelineViewHolder.kt | 4 ++--
.../futo/circles/{feature => }/view/AdvancedOptionsView.kt | 2 +-
.../com/futo/circles/{feature => }/view/CirclesLogoView.kt | 2 +-
.../futo/circles/{feature => }/view/ExpandContentButton.kt | 2 +-
.../futo/circles/{feature => }/view/GroupPostFooterView.kt | 2 +-
.../futo/circles/{feature => }/view/GroupPostHeaderView.kt | 2 +-
.../com/futo/circles/{feature => }/view/LoadingButton.kt | 2 +-
.../java/com/futo/circles/{feature => }/view/PostLayout.kt | 2 +-
app/src/main/res/layout/advanced_options_view.xml | 2 +-
app/src/main/res/layout/image_post_view.xml | 4 ++--
app/src/main/res/layout/log_in_fragment.xml | 6 +++---
app/src/main/res/layout/post_layout.xml | 6 +++---
app/src/main/res/layout/text_post_view.xml | 4 ++--
15 files changed, 22 insertions(+), 22 deletions(-)
rename app/src/main/java/com/futo/circles/{feature => }/view/AdvancedOptionsView.kt (96%)
rename app/src/main/java/com/futo/circles/{feature => }/view/CirclesLogoView.kt (98%)
rename app/src/main/java/com/futo/circles/{feature => }/view/ExpandContentButton.kt (97%)
rename app/src/main/java/com/futo/circles/{feature => }/view/GroupPostFooterView.kt (96%)
rename app/src/main/java/com/futo/circles/{feature => }/view/GroupPostHeaderView.kt (96%)
rename app/src/main/java/com/futo/circles/{feature => }/view/LoadingButton.kt (97%)
rename app/src/main/java/com/futo/circles/{feature => }/view/PostLayout.kt (98%)
diff --git a/app/src/main/java/com/futo/circles/feature/groups/timeline/GroupTimelineFragment.kt b/app/src/main/java/com/futo/circles/feature/groups/timeline/GroupTimelineFragment.kt
index b721b89ab..fe2c6c817 100644
--- a/app/src/main/java/com/futo/circles/feature/groups/timeline/GroupTimelineFragment.kt
+++ b/app/src/main/java/com/futo/circles/feature/groups/timeline/GroupTimelineFragment.kt
@@ -21,7 +21,7 @@ import com.futo.circles.extensions.setToolbarTitle
import com.futo.circles.model.Post
import com.futo.circles.feature.groups.timeline.list.GroupPostViewHolder
import com.futo.circles.feature.groups.timeline.list.GroupTimelineAdapter
-import com.futo.circles.feature.view.GroupPostListener
+import com.futo.circles.view.GroupPostListener
import org.koin.androidx.viewmodel.ext.android.viewModel
import org.koin.core.parameter.parametersOf
diff --git a/app/src/main/java/com/futo/circles/feature/groups/timeline/list/GroupTimelineAdapter.kt b/app/src/main/java/com/futo/circles/feature/groups/timeline/list/GroupTimelineAdapter.kt
index f3e933048..b3e14c851 100644
--- a/app/src/main/java/com/futo/circles/feature/groups/timeline/list/GroupTimelineAdapter.kt
+++ b/app/src/main/java/com/futo/circles/feature/groups/timeline/list/GroupTimelineAdapter.kt
@@ -6,7 +6,7 @@ import com.futo.circles.model.Post
import com.futo.circles.model.PostContentType
import com.futo.circles.model.PostItemPayload
import com.futo.circles.model.RootPost
-import com.futo.circles.feature.view.GroupPostListener
+import com.futo.circles.view.GroupPostListener
class GroupTimelineAdapter(
private val postListener: GroupPostListener,
diff --git a/app/src/main/java/com/futo/circles/feature/groups/timeline/list/GroupTimelineViewHolder.kt b/app/src/main/java/com/futo/circles/feature/groups/timeline/list/GroupTimelineViewHolder.kt
index 521217943..63cbe5662 100644
--- a/app/src/main/java/com/futo/circles/feature/groups/timeline/list/GroupTimelineViewHolder.kt
+++ b/app/src/main/java/com/futo/circles/feature/groups/timeline/list/GroupTimelineViewHolder.kt
@@ -12,8 +12,8 @@ import com.futo.circles.model.ImageContent
import com.futo.circles.model.Post
import com.futo.circles.model.PostItemPayload
import com.futo.circles.model.TextContent
-import com.futo.circles.feature.view.GroupPostListener
-import com.futo.circles.feature.view.PostLayout
+import com.futo.circles.view.GroupPostListener
+import com.futo.circles.view.PostLayout
sealed class GroupPostViewHolder(view: View) :
RecyclerView.ViewHolder(view) {
diff --git a/app/src/main/java/com/futo/circles/feature/view/AdvancedOptionsView.kt b/app/src/main/java/com/futo/circles/view/AdvancedOptionsView.kt
similarity index 96%
rename from app/src/main/java/com/futo/circles/feature/view/AdvancedOptionsView.kt
rename to app/src/main/java/com/futo/circles/view/AdvancedOptionsView.kt
index c47b3700e..83cfc68e5 100644
--- a/app/src/main/java/com/futo/circles/feature/view/AdvancedOptionsView.kt
+++ b/app/src/main/java/com/futo/circles/view/AdvancedOptionsView.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.view
+package com.futo.circles.view
import android.content.Context
import android.util.AttributeSet
diff --git a/app/src/main/java/com/futo/circles/feature/view/CirclesLogoView.kt b/app/src/main/java/com/futo/circles/view/CirclesLogoView.kt
similarity index 98%
rename from app/src/main/java/com/futo/circles/feature/view/CirclesLogoView.kt
rename to app/src/main/java/com/futo/circles/view/CirclesLogoView.kt
index 240ce5400..dd715b39a 100644
--- a/app/src/main/java/com/futo/circles/feature/view/CirclesLogoView.kt
+++ b/app/src/main/java/com/futo/circles/view/CirclesLogoView.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.view
+package com.futo.circles.view
import android.content.Context
import android.graphics.*
diff --git a/app/src/main/java/com/futo/circles/feature/view/ExpandContentButton.kt b/app/src/main/java/com/futo/circles/view/ExpandContentButton.kt
similarity index 97%
rename from app/src/main/java/com/futo/circles/feature/view/ExpandContentButton.kt
rename to app/src/main/java/com/futo/circles/view/ExpandContentButton.kt
index df4d97746..f55302e98 100644
--- a/app/src/main/java/com/futo/circles/feature/view/ExpandContentButton.kt
+++ b/app/src/main/java/com/futo/circles/view/ExpandContentButton.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.view
+package com.futo.circles.view
import android.content.Context
import android.graphics.drawable.Drawable
diff --git a/app/src/main/java/com/futo/circles/feature/view/GroupPostFooterView.kt b/app/src/main/java/com/futo/circles/view/GroupPostFooterView.kt
similarity index 96%
rename from app/src/main/java/com/futo/circles/feature/view/GroupPostFooterView.kt
rename to app/src/main/java/com/futo/circles/view/GroupPostFooterView.kt
index 618291185..357609f01 100644
--- a/app/src/main/java/com/futo/circles/feature/view/GroupPostFooterView.kt
+++ b/app/src/main/java/com/futo/circles/view/GroupPostFooterView.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.view
+package com.futo.circles.view
import android.content.Context
import android.util.AttributeSet
diff --git a/app/src/main/java/com/futo/circles/feature/view/GroupPostHeaderView.kt b/app/src/main/java/com/futo/circles/view/GroupPostHeaderView.kt
similarity index 96%
rename from app/src/main/java/com/futo/circles/feature/view/GroupPostHeaderView.kt
rename to app/src/main/java/com/futo/circles/view/GroupPostHeaderView.kt
index 15d8cd1db..532d19391 100644
--- a/app/src/main/java/com/futo/circles/feature/view/GroupPostHeaderView.kt
+++ b/app/src/main/java/com/futo/circles/view/GroupPostHeaderView.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.view
+package com.futo.circles.view
import android.content.Context
import android.util.AttributeSet
diff --git a/app/src/main/java/com/futo/circles/feature/view/LoadingButton.kt b/app/src/main/java/com/futo/circles/view/LoadingButton.kt
similarity index 97%
rename from app/src/main/java/com/futo/circles/feature/view/LoadingButton.kt
rename to app/src/main/java/com/futo/circles/view/LoadingButton.kt
index 31e8f8bd5..70cdbe35e 100644
--- a/app/src/main/java/com/futo/circles/feature/view/LoadingButton.kt
+++ b/app/src/main/java/com/futo/circles/view/LoadingButton.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.view
+package com.futo.circles.view
import android.content.Context
import android.util.AttributeSet
diff --git a/app/src/main/java/com/futo/circles/feature/view/PostLayout.kt b/app/src/main/java/com/futo/circles/view/PostLayout.kt
similarity index 98%
rename from app/src/main/java/com/futo/circles/feature/view/PostLayout.kt
rename to app/src/main/java/com/futo/circles/view/PostLayout.kt
index 5a41293e5..5313f93f0 100644
--- a/app/src/main/java/com/futo/circles/feature/view/PostLayout.kt
+++ b/app/src/main/java/com/futo/circles/view/PostLayout.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.view
+package com.futo.circles.view
import android.content.Context
import android.util.AttributeSet
diff --git a/app/src/main/res/layout/advanced_options_view.xml b/app/src/main/res/layout/advanced_options_view.xml
index 3ecea53b4..ed6f3ddc0 100644
--- a/app/src/main/res/layout/advanced_options_view.xml
+++ b/app/src/main/res/layout/advanced_options_view.xml
@@ -6,7 +6,7 @@
android:layout_height="wrap_content"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
- <com.futo.circles.feature.view.ExpandContentButton
+ <com.futo.circles.view.ExpandContentButton
android:id="@+id/btnAdvanced"
style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/image_post_view.xml b/app/src/main/res/layout/image_post_view.xml
index 23af4547e..db0ef1403 100644
--- a/app/src/main/res/layout/image_post_view.xml
+++ b/app/src/main/res/layout/image_post_view.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<com.futo.circles.feature.view.PostLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.futo.circles.view.PostLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/lImagePost"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -9,4 +9,4 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
-</com.futo.circles.feature.view.PostLayout>
\ No newline at end of file
+</com.futo.circles.view.PostLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/log_in_fragment.xml b/app/src/main/res/layout/log_in_fragment.xml
index dbe6798df..b1cdfbdbf 100644
--- a/app/src/main/res/layout/log_in_fragment.xml
+++ b/app/src/main/res/layout/log_in_fragment.xml
@@ -42,7 +42,7 @@
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.3" />
- <com.futo.circles.feature.view.CirclesLogoView
+ <com.futo.circles.view.CirclesLogoView
android:id="@+id/ivLogo"
android:layout_width="0dp"
android:layout_height="0dp"
@@ -120,7 +120,7 @@
</com.google.android.material.textfield.TextInputLayout>
- <com.futo.circles.feature.view.AdvancedOptionsView
+ <com.futo.circles.view.AdvancedOptionsView
android:id="@+id/tvAdvancedOptions"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -130,7 +130,7 @@
app:layout_constraintStart_toStartOf="@id/guidelineStart"
app:layout_constraintTop_toBottomOf="@id/tilPassword" />
- <com.futo.circles.feature.view.LoadingButton
+ <com.futo.circles.view.LoadingButton
android:id="@+id/btnLogin"
android:layout_width="0dp"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/post_layout.xml b/app/src/main/res/layout/post_layout.xml
index 0bceb6f15..fc8aa255d 100644
--- a/app/src/main/res/layout/post_layout.xml
+++ b/app/src/main/res/layout/post_layout.xml
@@ -51,7 +51,7 @@
android:orientation="horizontal"
app:layout_constraintGuide_begin="8dp" />
- <com.futo.circles.feature.view.GroupPostHeaderView
+ <com.futo.circles.view.GroupPostHeaderView
android:id="@+id/postHeader"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -70,7 +70,7 @@
app:layout_constraintTop_toBottomOf="@id/postHeader" />
- <com.futo.circles.feature.view.GroupPostFooterView
+ <com.futo.circles.view.GroupPostFooterView
android:id="@+id/postFooter"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -84,7 +84,7 @@
</androidx.cardview.widget.CardView>
- <com.futo.circles.feature.view.ExpandContentButton
+ <com.futo.circles.view.ExpandContentButton
android:id="@+id/btnShowReplies"
style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/text_post_view.xml b/app/src/main/res/layout/text_post_view.xml
index 48d973dca..fc91bd6b3 100644
--- a/app/src/main/res/layout/text_post_view.xml
+++ b/app/src/main/res/layout/text_post_view.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<com.futo.circles.feature.view.PostLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.futo.circles.view.PostLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/lTextPost"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -11,4 +11,4 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/post_text_side_margin" />
-</com.futo.circles.feature.view.PostLayout>
\ No newline at end of file
+</com.futo.circles.view.PostLayout>
\ No newline at end of file
--
GitLab