Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • circles/circles-android
1 result
Show changes
Commits on Source (6)
Hide whitespace changes
Inline Side-by-side
Showing
with 27 additions and 17 deletions
app/src/main/java/org/futo/circles/feature/direct/timeline/menu/DmMenuBottomSheet.kt
View file @ fac218dd
...@@ -84,7 +84,6 @@ class DmMenuBottomSheet : TransparentBackgroundBottomSheetDialogFragment() { ...@@ -84,7 +84,6 @@ class DmMenuBottomSheet : TransparentBackgroundBottomSheetDialogFragment() {
} }
} }
tvReact.apply { tvReact.apply {
setIsVisible(viewModel.isMyPost().not())
setOnClickListener { setOnClickListener {
findNavController().navigateSafe( findNavController().navigateSafe(
DmMenuBottomSheetDirections.toEmojiBottomSheet( DmMenuBottomSheetDirections.toEmojiBottomSheet(
......
app/src/main/res/layout/list_item_my_image_dm.xml
View file @ fac218dd
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
android:id="@+id/ivBackground" android:id="@+id/ivBackground"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:background="@color/chip_selected_color" android:background="@color/my_dm_background"
app:layout_constraintBottom_toBottomOf="@id/dmFooter" app:layout_constraintBottom_toBottomOf="@id/dmFooter"
app:layout_constraintEnd_toEndOf="@id/ivMediaContent" app:layout_constraintEnd_toEndOf="@id/ivMediaContent"
app:layout_constraintStart_toStartOf="@id/ivMediaContent" app:layout_constraintStart_toStartOf="@id/ivMediaContent"
...@@ -33,12 +33,12 @@ ...@@ -33,12 +33,12 @@
<org.futo.circles.view.DmFooterView <org.futo.circles.view.DmFooterView
android:id="@+id/dmFooter" android:id="@+id/dmFooter"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="12dp"
android:paddingBottom="4dp" android:paddingBottom="4dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/ivBackground"
app:layout_constraintTop_toBottomOf="@id/ivMediaContent" /> app:layout_constraintTop_toBottomOf="@id/ivMediaContent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/list_item_my_text_dm.xml
View file @ fac218dd
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
android:id="@+id/ivBackground" android:id="@+id/ivBackground"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:background="@color/chip_selected_color" android:background="@color/my_dm_background"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:foreground="?selectableItemBackground" android:foreground="?selectableItemBackground"
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
android:id="@+id/dmFooter" android:id="@+id/dmFooter"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="12dp"
android:paddingBottom="4dp" android:paddingBottom="4dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
......
app/src/main/res/layout/list_item_my_video_dm.xml
View file @ fac218dd
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
android:id="@+id/ivBackground" android:id="@+id/ivBackground"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:background="@color/chip_selected_color" android:background="@color/my_dm_background"
app:layout_constraintBottom_toBottomOf="@id/dmFooter" app:layout_constraintBottom_toBottomOf="@id/dmFooter"
app:layout_constraintEnd_toEndOf="@id/videoPlaybackLayout" app:layout_constraintEnd_toEndOf="@id/videoPlaybackLayout"
app:layout_constraintStart_toStartOf="@id/videoPlaybackLayout" app:layout_constraintStart_toStartOf="@id/videoPlaybackLayout"
...@@ -30,12 +30,12 @@ ...@@ -30,12 +30,12 @@
<org.futo.circles.view.DmFooterView <org.futo.circles.view.DmFooterView
android:id="@+id/dmFooter" android:id="@+id/dmFooter"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="12dp"
android:paddingBottom="4dp" android:paddingBottom="4dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/ivBackground"
app:layout_constraintTop_toBottomOf="@id/videoPlaybackLayout" /> app:layout_constraintTop_toBottomOf="@id/videoPlaybackLayout" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/list_item_other_image_dm.xml
View file @ fac218dd
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
android:id="@+id/ivBackground" android:id="@+id/ivBackground"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:background="@color/post_card_background_color" android:background="@color/other_dm_background"
app:layout_constraintBottom_toBottomOf="@id/dmFooter" app:layout_constraintBottom_toBottomOf="@id/dmFooter"
app:layout_constraintEnd_toEndOf="@id/ivMediaContent" app:layout_constraintEnd_toEndOf="@id/ivMediaContent"
app:layout_constraintStart_toStartOf="@id/ivMediaContent" app:layout_constraintStart_toStartOf="@id/ivMediaContent"
...@@ -32,12 +32,12 @@ ...@@ -32,12 +32,12 @@
<org.futo.circles.view.DmFooterView <org.futo.circles.view.DmFooterView
android:id="@+id/dmFooter" android:id="@+id/dmFooter"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="12dp"
android:paddingBottom="4dp" android:paddingBottom="4dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ivMediaContent" /> app:layout_constraintTop_toBottomOf="@id/ivMediaContent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/list_item_other_text_dm.xml
View file @ fac218dd
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
android:id="@+id/ivBackground" android:id="@+id/ivBackground"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:background="@color/post_card_background_color" android:background="@color/other_dm_background"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:foreground="?selectableItemBackground" android:foreground="?selectableItemBackground"
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
android:id="@+id/dmFooter" android:id="@+id/dmFooter"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="12dp"
android:paddingBottom="4dp" android:paddingBottom="4dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
......
app/src/main/res/layout/list_item_other_video_dm.xml
View file @ fac218dd
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
android:id="@+id/ivBackground" android:id="@+id/ivBackground"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:background="@color/post_card_background_color" android:background="@color/other_dm_background"
app:layout_constraintBottom_toBottomOf="@id/dmFooter" app:layout_constraintBottom_toBottomOf="@id/dmFooter"
app:layout_constraintEnd_toEndOf="@id/videoPlaybackLayout" app:layout_constraintEnd_toEndOf="@id/videoPlaybackLayout"
app:layout_constraintStart_toStartOf="@id/videoPlaybackLayout" app:layout_constraintStart_toStartOf="@id/videoPlaybackLayout"
...@@ -29,12 +29,12 @@ ...@@ -29,12 +29,12 @@
<org.futo.circles.view.DmFooterView <org.futo.circles.view.DmFooterView
android:id="@+id/dmFooter" android:id="@+id/dmFooter"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="12dp"
android:paddingBottom="4dp" android:paddingBottom="4dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/videoPlaybackLayout" /> app:layout_constraintTop_toBottomOf="@id/videoPlaybackLayout" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/view_dm_footer.xml
View file @ fac218dd
...@@ -11,6 +11,12 @@ ...@@ -11,6 +11,12 @@
android:id="@+id/vEmojisList" android:id="@+id/vEmojisList"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fadingEdgeLength="8dp"
android:paddingStart="8dp"
android:paddingEnd="0dp"
android:requiresFadingEdge="horizontal"
android:scrollbars="none"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/tvTime" app:layout_constraintEnd_toStartOf="@id/tvTime"
app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_bias="0"
...@@ -23,15 +29,19 @@ ...@@ -23,15 +29,19 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="end" android:gravity="end"
android:lines="1" android:lines="1"
android:paddingStart="12dp"
android:paddingEnd="0dp"
android:textSize="12sp" android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/tvEditedLabel" app:layout_constraintEnd_toStartOf="@id/tvEditedLabel"
app:layout_goneMarginEnd="12dp"
tools:text="Jul 17, 6:00 PM" /> tools:text="Jul 17, 6:00 PM" />
<TextView <TextView
android:id="@+id/tvEditedLabel" android:id="@+id/tvEditedLabel"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="12dp"
android:lines="1" android:lines="1"
android:paddingStart="4dp" android:paddingStart="4dp"
android:paddingEnd="0dp" android:paddingEnd="0dp"
......
app/src/main/res/values/colors.xml
View file @ fac218dd
...@@ -5,5 +5,8 @@ ...@@ -5,5 +5,8 @@
<color name="highlight_color">#4D0E7AFE</color> <color name="highlight_color">#4D0E7AFE</color>
<color name="launcher_background_color">#00008b</color> <color name="launcher_background_color">#00008b</color>
<color name="background_dim">#52000000</color> <color name="background_dim">#52000000</color>
<color name="other_dm_background">#C0E6FF</color>
<color name="my_dm_background">#D5C4FF</color>
</resources> </resources>
\ No newline at end of file