NotificationCounterView to core

app/src/main/java/org/futo/circles/feature/settings/SettingsNavigator.kt

@@ -21,7 +21,7 @@ class SettingsNavigator(private val fragment: SettingsFragment) {
 
     fun navigateToSystemNotices() {
         val systemNoticesRoomId = getSystemNoticesRoomId() ?: run {
-            fragment.showError(fragment.getString(R.string.system_notices_room_not_found))
+            fragment.showError(fragment.getString(org.futo.circles.core.R.string.system_notices_room_not_found))
             return
         }
         fragment.findNavController().navigateSafe(

app/src/main/res/layout/fragment_settings.xml

@@ -153,7 +153,7 @@
                     app:layout_constraintTop_toTopOf="parent"
                     tools:ignore="RtlSymmetry" />
 
-                <org.futo.circles.view.NotificationCounterView
+                <org.futo.circles.core.view.NotificationCounterView
                     android:id="@+id/ivNoticesCount"
                     android:layout_width="18dp"
                     android:layout_height="0dp"

app/src/main/res/layout/list_item_joined_circle.xml

@@ -71,7 +71,7 @@
         app:layout_constraintTop_toBottomOf="@id/tvFollowing"
         tools:text="texsdt" />
 
-    <org.futo.circles.view.NotificationCounterView
+    <org.futo.circles.core.view.NotificationCounterView
         android:id="@+id/vNotificationsCount"
         android:layout_width="24dp"
         android:layout_height="wrap_content"

app/src/main/res/layout/list_item_joined_group.xml

@@ -89,7 +89,7 @@
         app:layout_constraintTop_toBottomOf="@id/tvTopic"
         tools:text="texsdt" />
 
-    <org.futo.circles.view.NotificationCounterView
+    <org.futo.circles.core.view.NotificationCounterView
         android:id="@+id/vNotificationsCount"
         android:layout_width="24dp"
         android:layout_height="wrap_content"

app/src/main/res/values/attrs.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <declare-styleable name="LoadingButton">
-        <attr name="android:text" />
-        <attr name="android:textSize" />
-        <attr name="textPadding" format="dimension" />
-        <attr name="android:enabled" />
-    </declare-styleable>
-
     <declare-styleable name="GroupPostHeaderView">
         <attr name="optionsVisible" format="boolean" />
     </declare-styleable>
@@ -17,9 +10,7 @@
         <attr name="readMoreText" format="string" />
         <attr name="readMoreTextColor" format="reference|color" />
     </declare-styleable>
+
     <attr name="readMoreTextViewStyle" format="reference" />
 
-    <declare-styleable name="NotificationCounterView">
-        <attr name="notificationCircleBackground" format="reference|color" />
-    </declare-styleable>
 </resources>
\ No newline at end of file

app/src/main/res/values/strings.xml

@@ -160,7 +160,6 @@
     <string name="poll_closed_not_voted">Result will be visible when the poll is ended</string>
     <string name="end_poll">End poll</string>
     <string name="end_poll_message">This will stop people from being able to vote and will display the final results of the poll.</string>
-    <string name="system_notices_room_not_found">System notices room not found.</string>
     <string name="you_are_signed_out">You’re signed out</string>
     <string name="create_your_first_circle_to_be_able_to_accept_invite">Create your first Circle to be able to accept invite</string>
     <string name="show_more">Show more</string>

app/src/main/java/org/futo/circles/view/NotificationCounterView.kt → core/src/main/java/org/futo/circles/core/view/NotificationCounterView.kt

-package org.futo.circles.view
+package org.futo.circles.core.view
 
 import android.content.Context
 import android.graphics.Color
@@ -7,10 +7,10 @@ import android.view.LayoutInflater
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
 import com.amulyakhare.textdrawable.TextDrawable
-import org.futo.circles.R
+import org.futo.circles.core.R
+import org.futo.circles.core.databinding.ViewNotificationCounterBinding
 import org.futo.circles.core.extensions.getAttributes
 import org.futo.circles.core.extensions.setIsVisible
-import org.futo.circles.databinding.ViewNotificationCounterBinding
 
 class NotificationCounterView(
     context: Context,

core/src/main/res/values/attrs.xml

@@ -8,4 +8,8 @@
         <attr name="android:enabled" />
     </declare-styleable>
 
+    <declare-styleable name="NotificationCounterView">
+        <attr name="notificationCircleBackground" format="reference|color" />
+    </declare-styleable>
+
 </resources>
\ No newline at end of file

core/src/main/res/values/strings.xml

@@ -57,5 +57,6 @@
     <string name="pick_media">Pick media</string>
     <string name="change_icon">Change icon</string>
     <string name="system_notices">System notices</string>
+    <string name="system_notices_room_not_found">System notices room not found.</string>
 
 </resources>
\ No newline at end of file