TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-07 09:12:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Niels Andriesse
2020-01-16 11:37:52 +11:00
parent 9378818b73
commit 7519400579
16 changed files with 63 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/conversation_activity.xml
View File

@@ -15,7 +15,8 @@
app:contentInsetLeft="24dp"
app:contentInsetRight="20dp"
android:background="@color/action_bar_background"
android:theme="@style/Session.DarkActionBar">
android:theme="@style/Session.DarkActionBar"
app:popupTheme="@style/Session.DarkActionBar">
<LinearLayout
android:layout_width="match_parent"

15
res/layout/conversation_item_update.xml
View File

@@ -10,8 +10,8 @@
android:gravity="center"
android:orientation="vertical"
android:paddingBottom="6dp"
android:paddingStart="28dp"
android:paddingEnd="28dp"
android:paddingStart="48dp"
android:paddingEnd="48dp"
android:paddingTop="8dp">
<LinearLayout
@@ -34,8 +34,8 @@
style="@style/Signal.Text.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAllCaps="true"
android:textColor="?conversation_item_update_text_color"
android:textSize="@dimen/small_font_size"
android:textColor="@color/text"
tools:text="1 hour" />
</LinearLayout>
@@ -56,7 +56,8 @@
android:autoLink="all"
android:gravity="center"
android:linksClickable="true"
android:textColor="?attr/conversation_item_update_text_color"
android:textSize="@dimen/small_font_size"
android:textColor="@color/text"
tools:text="Gwen Stacy set the disappearing message timer to 1 hour" />
<TextView
@@ -70,8 +71,8 @@
android:gravity="center"
android:linksClickable="false"
android:minWidth="15sp"
android:textAllCaps="true"
android:textColor="?conversation_item_update_text_color"
android:textSize="@dimen/small_font_size"
android:textColor="@color/text"
tools:text="30 min ago" />
</LinearLayout>

14
res/layout/conversation_search_nav.xml
View File

@@ -54,20 +54,16 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.pnikosis.materialishprogress.ProgressWheel
<com.github.ybq.android.spinkit.SpinKitView
style="@style/SpinKitView.DoubleBounce"
android:id="@+id/conversation_search_progress_wheel"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_gravity="center"
android:layout_marginTop="0dp"
android:layout_marginBottom="0dp"
android:indeterminate="true"
android:padding="8dp"
android:background="?conversation_background"
android:background="@color/compose_view_background"
android:visibility="gone"
app:SpinKit_Color="@color/text"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:matProg_barColor="@color/core_grey_25"
app:matProg_progressIndeterminate="true" />
app:layout_constraintTop_toTopOf="parent" />
</org.thoughtcrime.securesms.components.ConversationSearchBottomBar>

2
res/layout/expiration_timer_menu.xml
View File

@@ -13,6 +13,7 @@
android:layout_height="20dp"
android:layout_gravity="center"
android:src="@drawable/ic_timer"
android:background="@color/transparent"
android:scaleType="fitCenter"/>
<TextView
@@ -23,6 +24,7 @@
android:gravity="center_horizontal|bottom"
android:paddingBottom="3dp"
android:paddingTop="1dp"
android:background="@color/transparent"
android:textColor="@android:color/white"
android:textSize="10sp" />
</FrameLayout>