Merge branch 'main' into 7-assign-team-to-repo

# Conflicts:
#	app/src/main/res/values/strings.xml

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

@@ -116,6 +116,18 @@
                 android:layout_marginStart="64dp"
                 android:background="?attr/dividerColor" />
 
+            <TextView
+                android:id="@+id/assignTeam"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/assignTeamTitle"
+                android:drawableStart="@drawable/ic_people"
+                android:drawablePadding="24dp"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="16sp"
+                android:padding="12dp" />
+
             <TextView
                 android:id="@+id/addCollaborator"
                 android:layout_width="match_parent"

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

@@ -713,6 +713,8 @@
     <string name="repoTransferOwnerError">New owner is required</string>
     <string name="repoTransferError">There is a problem with the owner name. Make sure that the new owner exists</string>
 
+    <string name="assignTeamTitle">Assign Team</string>
+
     <string name="exploreFilterDialogTitle">Filter Repositories</string>
     <string name="exploreFilterIncludeTopic">Search ONLY in Topic</string>
     <string name="exploreFilterIncludeDesc">Search in Description</string>