TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-25 18:29:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Niels Andriesse
2020-01-15 16:13:28 +11:00
parent bfb6435d72
commit 8aa214bd7d
29 changed files with 169 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
res/layout/contact_selection_list_item.xml
View File

@@ -12,20 +12,17 @@
android:paddingStart="16dp"
android:paddingEnd="8dp">
<org.thoughtcrime.securesms.components.AvatarImageView
android:id="@+id/contact_photo_image"
android:layout_width="40dp"
android:layout_height="40dp"
android:foreground="@drawable/contact_photo_background"
android:cropToPadding="true"
tools:src="@color/blue_600"
android:contentDescription="@string/SingleContactSelectionActivity_contact_photo" />
<org.thoughtcrime.securesms.loki.redesign.views.ProfilePictureView
android:id="@+id/profilePictureView"
android:layout_width="@dimen/medium_profile_picture_size"
android:layout_height="@dimen/medium_profile_picture_size" />
<LinearLayout android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginStart="16dp"
android:paddingEnd="16dp"
android:gravity="center_vertical"
android:orientation="vertical">
<org.thoughtcrime.securesms.components.emoji.EmojiTextView
@@ -35,14 +32,16 @@
android:checkMark="?android:attr/listChoiceIndicatorMultiple"
android:singleLine="true"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="16sp"
android:textSize="@dimen/medium_font_size"
android:textColor="@color/text"
android:textStyle="bold"
tools:text="Frieeeeeeedrich Nieeeeeeeeeetzsche" />
<LinearLayout android:id="@+id/number_container"
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:visibility="gone">
<TextView android:id="@+id/number"
android:layout_width="wrap_content"

2
res/layout/conversation_item_last_seen.xml
View File

@@ -6,7 +6,7 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingTop="24dp"
android:paddingBottom="20dp">
android:paddingBottom="18dp">
<View
android:layout_width="match_parent"

5
res/layout/conversation_item_received.xml
View File

@@ -18,7 +18,6 @@
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/conversation_individual_right_gutter"
android:paddingStart="@dimen/large_spacing"
android:clipToPadding="false"
android:clipChildren="false">
@@ -58,7 +57,7 @@
android:id="@+id/body_bubble"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/message_bubble_edge_margin"
android:layout_marginEnd="@dimen/massive_spacing"
android:layout_marginStart="@dimen/large_spacing"
android:paddingTop="@dimen/medium_spacing"
android:paddingBottom="@dimen/medium_spacing"
@@ -163,7 +162,7 @@
android:layout="@layout/conversation_item_received_document"
android:layout_width="210dp"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/medium_spacing"
android:layout_marginBottom="4dp"
android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />

4
res/layout/conversation_item_sent.xml
View File

@@ -36,7 +36,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginStart="@dimen/message_bubble_edge_margin"
android:layout_marginStart="@dimen/massive_spacing"
android:paddingTop="@dimen/medium_spacing"
android:paddingBottom="@dimen/medium_spacing"
android:layout_gravity="end"
@@ -99,7 +99,7 @@
android:layout_width="210dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
android:layout_marginBottom="@dimen/medium_spacing"
android:layout_marginBottom="4dp"
android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />
<org.thoughtcrime.securesms.components.emoji.EmojiTextView

5
res/layout/conversation_typing_view.xml
View File

@@ -4,9 +4,9 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="8dp"
android:paddingStart="@dimen/large_spacing"
android:paddingEnd="8dp"
android:paddingTop="2dp"
android:paddingBottom="@dimen/small_spacing"
android:gravity="center_vertical">
<org.thoughtcrime.securesms.components.AvatarImageView
@@ -21,7 +21,6 @@
android:id="@+id/typing_bubble"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:padding="12dp"
android:background="@drawable/message_bubble_background">

3
res/layout/document_view.xml
View File

@@ -82,7 +82,7 @@
<LinearLayout android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:layout_marginStart="6dp"
android:orientation="vertical"
android:focusable="false"
android:clickable="false">
@@ -91,6 +91,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Signal.Text.Body"
android:textSize="@dimen/medium_font_size"
android:singleLine="true"
android:maxLines="1"
android:clickable="false"

5
res/layout/media_overview_activity.xml
View File

@@ -3,6 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:background="@drawable/default_session_background"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto">
@@ -14,8 +15,7 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?android:attr/actionBarSize"
android:background="?attr/media_overview_toolbar_background"
android:titleTextColor="?attr/media_overview_toolbar_foreground"
style="@style/Session.DarkActionBar"
app:layout_scrollFlags="scroll|enterAlways"/>
<org.thoughtcrime.securesms.components.ControllableTabLayout
@@ -23,6 +23,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="top"
style="@style/Session.DarkTabLayout"
android:background="?attr/media_overview_toolbar_background"
app:tabBackground="?attr/media_overview_toolbar_background"
app:tabIndicatorColor="@color/textsecure_primary"

4
res/layout/media_overview_document_item_header.xml
View File

@@ -11,8 +11,6 @@
android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical"
android:textColor="?attr/media_overview_header_foreground"
android:textSize="14sp"
android:textStyle="bold"
android:textAllCaps="true"
android:textSize="@dimen/small_font_size"
tools:text="March 1, 2015" />
</FrameLayout>

2
res/layout/media_overview_documents_fragment.xml
View File

@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/media_overview_toolbar_background">
android:background="@drawable/default_session_background">
<android.support.v7.widget.RecyclerView
android:id="@+id/recycler_view"

2
res/layout/media_overview_gallery_fragment.xml
View File

@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/media_overview_toolbar_background">
android:background="@drawable/default_session_background">
<android.support.v7.widget.RecyclerView
android:id="@+id/media_grid"

4
res/layout/media_overview_gallery_item_header.xml
View File

@@ -11,8 +11,6 @@
android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical"
android:textColor="?attr/media_overview_header_foreground"
android:textSize="14sp"
android:textStyle="bold"
android:textAllCaps="true"
android:textSize="@dimen/small_font_size"
tools:text="March 1, 2015" />
</FrameLayout>

2
res/layout/media_preview_activity.xml
View File

@@ -6,7 +6,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray95">
android:background="@drawable/default_session_background">
<org.thoughtcrime.securesms.components.viewpager.HackyViewPager
android:id="@+id/media_pager"

4
res/layout/media_view_remove_button.xml
View File

@@ -4,5 +4,7 @@
android:layout_width="@dimen/media_bubble_remove_button_size"
android:layout_height="@dimen/media_bubble_remove_button_size"
android:layout_gravity="top|end"
android:src="@drawable/conversation_attachment_close_circle"
android:background="@drawable/circle_alpha"
android:src="@drawable/ic_close_white_18dp"
android:tint="#99FFFFFF"
android:visibility="gone"/>

1
res/layout/message_details_activity.xml
View File

@@ -2,6 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container"
android:background="@drawable/default_session_background"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">

15
res/layout/message_details_header.xml
View File

@@ -3,22 +3,23 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:background="@drawable/default_session_background"
android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout android:id="@+id/item_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="15dp"
android:paddingBottom="15dp"
android:elevation="2dp" />
android:paddingTop="@dimen/medium_spacing"
android:paddingBottom="@dimen/medium_spacing"
android:elevation="10dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingStart="10dp"
android:paddingEnd="10dp">
android:paddingStart="@dimen/medium_spacing"
android:paddingEnd="@dimen/medium_spacing">
<LinearLayout
android:layout_width="match_parent"
@@ -30,10 +31,10 @@
android:layout_weight="1"
android:visibility="gone"
android:textSize="16sp"
android:padding="5dp"
android:drawablePadding="12dp"
tools:visibility="visible"
android:text="@string/message_details_header__issues_need_your_attention"
android:drawableStart="@drawable/ic_info_outline_light"
android:drawableStart="@drawable/ic_error"
android:gravity="center_vertical" />
<Button

6
res/layout/search_toolbar.xml
View File

@@ -10,10 +10,6 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/search_toolbar_background"/>
<View android:layout_width="match_parent"
android:layout_height="4dp"
android:background="@drawable/search_toolbar_shadow"/>
android:background="@color/action_bar_background"/>
</merge>

15
res/layout/share_activity.xml
View File

@@ -5,7 +5,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@drawable/default_session_background">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
@@ -13,9 +14,9 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:minHeight="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:elevation="4dp"
android:theme="?attr/actionBarStyle">
android:background="@color/action_bar_background"
android:elevation="0dp"
android:theme="@style/Session.DarkActionBar">
<RelativeLayout
android:layout_width="match_parent"
@@ -23,9 +24,10 @@
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/ShareActivity_share_with"
android:text="Share"
android:textColor="@color/white"
android:textSize="20sp"
android:fontFamily="sans-serif-medium"
android:textSize="@dimen/very_large_font_size"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_toStartOf="@+id/search_action"/>
@@ -34,6 +36,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_search_white_24dp"
android:visibility="gone"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"/>

4
res/values/colors.xml
View File

@@ -33,8 +33,8 @@
<color name="loki_darkest_gray">#0a0a0a</color>
<!-- Loki -->
<color name="signal_primary">@color/loki_green</color>
<color name="signal_primary_dark">@color/loki_green</color>
<color name="signal_primary">@color/accent</color>
<color name="signal_primary_dark">@color/accent</color>
<color name="signal_primary_alpha33">#5578be20</color>
<color name="signal_primary_alpha_focus">#882090ea</color>

24
res/values/styles.xml
View File

@@ -11,11 +11,35 @@
<item name="android:elevation">0dp</item>
</style>
<style name="Session.DarkSubtitleActionBar" parent="@style/Widget.AppCompat.ActionBar">
<item name="background">@color/action_bar_background</item>
<item name="android:background">@color/action_bar_background</item>
<item name="titleTextStyle">@style/Session.DarkSubtitleActionBar.TitleTextStyle</item>
<item name="android:titleTextStyle">@style/Session.DarkSubtitleActionBar.TitleTextStyle</item>
<item name="subtitleTextStyle">@style/Session.DarkSubtitleActionBar.SubtitleTextStyle</item>
<item name="android:subtitleTextStyle">@style/Session.DarkSubtitleActionBar.SubtitleTextStyle</item>
<item name="elevation">0dp</item>
<item name="android:elevation">0dp</item>
</style>
<style name="Session.DarkActionBar.TitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
<item name="android:textColor">@color/text</item>
<item name="android:textSize">@dimen/very_large_font_size</item>
</style>
<style name="Session.DarkSubtitleActionBar.TitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
<item name="android:textColor">@color/text</item>
<item name="android:textSize">@dimen/large_font_size</item>
<item name="android:fontFamily">sans-serif-medium</item>
</style>
<style name="Session.DarkSubtitleActionBar.SubtitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
<item name="android:textColor">@color/text</item>
<item name="android:textSize">@dimen/small_font_size</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:textStyle">normal</item>
</style>
<style name="Session.AlertDialog" parent="ThemeOverlay.AppCompat.Dialog.Alert">
<item name="buttonBarNegativeButtonStyle">@style/Session.AlertDialog.NegativeButtonStyle</item>
<item name="buttonBarPositiveButtonStyle">@style/Session.AlertDialog.PositiveButtonStyle</item>

21
res/values/themes.xml
View File

@@ -24,6 +24,17 @@
<item name="preferenceTheme">@style/Session.SettingsTheme</item>
<item name="colorAccent">@color/accent</item>
</style>
<style name="Session.DarkTheme.SubtitleActionBar" parent="@style/Theme.AppCompat">
<item name="actionBarStyle">@style/Session.DarkSubtitleActionBar</item>
<item name="colorPrimary">@color/action_bar_background</item>
<item name="colorPrimaryDark">@color/action_bar_background</item>
<item name="android:navigationBarColor">@color/navigation_bar_background</item>
<item name="alertDialogTheme">@style/Session.AlertDialog</item>
<item name="android:windowBackground">@drawable/default_session_background</item>
<item name="preferenceTheme">@style/Session.SettingsTheme</item>
<item name="colorAccent">@color/accent</item>
</style>
<!-- Session -->
<style name="TextSecure.LightNoActionBar" parent="@style/TextSecure.LightTheme">
@@ -45,9 +56,9 @@
<item name="media_overview_toolbar_background">@color/white</item>
<item name="media_overview_toolbar_foreground">@color/gray70</item>
<item name="media_overview_header_foreground">@color/gray50</item>
<item name="media_overview_header_foreground">@color/text</item>
<item name="media_overview_document_primary">@color/core_grey_90</item>
<item name="media_overview_document_secondary">@color/core_grey_60</item>
<item name="media_overview_document_secondary">#99FFFFFF</item>
</style>
<style name="TextSecure.DarkNoActionBar" parent="@style/TextSecure.BaseDarkNoActionBar">
@@ -72,11 +83,11 @@
<item name="contact_selection_lay_user">#afeeeeee</item>
<item name="contact_selection_header_text">#66eeeeee</item>
<item name="media_overview_toolbar_background">@color/black</item>
<item name="media_overview_toolbar_background">@color/transparent</item>
<item name="media_overview_toolbar_foreground">@color/white</item>
<item name="media_overview_header_foreground">@color/gray10</item>
<item name="media_overview_header_foreground">@color/text</item>
<item name="media_overview_document_primary">@color/core_grey_05</item>
<item name="media_overview_document_secondary">@color/core_grey_25</item>
<item name="media_overview_document_secondary">#99FFFFFF</item>
</style>
<style name="TextSecure.HighlightTheme" parent="@style/TextSecure.LightTheme">