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

WIP

Browse Source
This commit is contained in:
Niels Andriesse
2020-01-14 16:05:31 +11:00
parent 7d21e98ced
commit 9776420135
35 changed files with 490 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/layout/activity_landing.xml
View File

@@ -16,7 +16,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/very_large_spacing"
android:layout_marginRight="@dimen/very_large_spacing"
android:textSize="@dimen/very_large_font_size"
android:textSize="@dimen/large_font_size"
android:textStyle="bold"
android:textColor="@color/text"
android:text="Your Session begins here..." />
@@ -25,7 +25,7 @@
android:id="@+id/fakeChatView"
android:layout_width="match_parent"
android:layout_height="@dimen/fake_chat_view_height"
android:layout_marginTop="@dimen/medium_spacing" />
android:layout_marginTop="@dimen/small_spacing" />
<View
android:layout_width="match_parent"
@@ -47,7 +47,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/medium_button_height"
android:layout_marginLeft="@dimen/massive_spacing"
android:layout_marginTop="@dimen/medium_spacing"
android:layout_marginTop="@dimen/small_spacing"
android:layout_marginRight="@dimen/massive_spacing"
android:text="Continue Your Session" />

1
res/layout/activity_restore.xml
View File

@@ -52,7 +52,6 @@
android:layout_width="match_parent"
android:layout_height="@dimen/medium_button_height"
android:layout_marginLeft="@dimen/massive_spacing"
android:layout_marginTop="@dimen/small_spacing"
android:layout_marginRight="@dimen/massive_spacing"
android:text="Continue" />

13
res/layout/activity_seed_v2.xml
View File

@@ -4,6 +4,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/default_session_background"
android:gravity="center_horizontal"
android:orientation="vertical">
<org.thoughtcrime.securesms.loki.redesign.views.SeedReminderView
@@ -21,7 +22,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/very_large_spacing"
android:layout_marginRight="@dimen/very_large_spacing"
android:textSize="@dimen/very_large_font_size"
android:textSize="@dimen/large_font_size"
android:textStyle="bold"
android:textColor="@color/text"
android:text="Meet your recovery phrase" />
@@ -30,7 +31,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/very_large_spacing"
android:layout_marginTop="@dimen/medium_spacing"
android:layout_marginTop="10dp"
android:layout_marginRight="@dimen/very_large_spacing"
android:textSize="@dimen/medium_font_size"
android:textColor="@color/text"
@@ -42,7 +43,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/very_large_spacing"
android:layout_marginTop="20dp"
android:layout_marginTop="@dimen/medium_spacing"
android:layout_marginRight="@dimen/very_large_spacing"
android:gravity="center"
android:textSize="@dimen/medium_font_size"
@@ -53,7 +54,7 @@
android:id="@+id/revealButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_spacing"
android:layout_marginTop="12dp"
android:textAlignment="center"
android:textSize="@dimen/medium_font_size"
android:textColor="@color/text"
@@ -68,10 +69,8 @@
<Button
style="@style/MediumProminentOutlineButton"
android:id="@+id/copyButton"
android:layout_width="match_parent"
android:layout_width="196dp"
android:layout_height="@dimen/medium_button_height"
android:layout_marginLeft="@dimen/massive_spacing"
android:layout_marginRight="@dimen/massive_spacing"
android:layout_marginBottom="@dimen/medium_spacing"
android:text="Copy" />

15
res/layout/conversation_fragment.xml
View File

@@ -45,15 +45,14 @@
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:layout_marginBottom="20dp"
android:padding="5dp"
android:layout_marginEnd="@dimen/medium_spacing"
android:layout_marginBottom="@dimen/medium_spacing"
android:layout_gravity="bottom|end"
android:background="@drawable/circle_tintable"
android:tint="@color/grey_600"
android:elevation="1dp"
android:alpha="0.9"
android:background="@drawable/scroll_to_bottom_button_background"
android:padding="@dimen/small_spacing"
android:tint="@color/text"
android:elevation="10dp"
android:contentDescription="@string/conversation_fragment__scroll_to_the_bottom_content_description"
android:src="@drawable/ic_scroll_down"/>
android:src="@drawable/ic_keyboard_arrow_down_white_24dp"/>
</FrameLayout>

2
res/layout/giphy_thumbnail.xml
View File

@@ -14,6 +14,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:indeterminate="true"
android:indeterminateTint="@color/accent"
android:indeterminateTintMode="src_in"
android:visibility="gone"
tools:visibility="visible"
android:layout_gravity="center"

5
res/layout/mediapicker_folder_fragment.xml
View File

@@ -4,18 +4,19 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="?android:windowBackground">
android:background="@drawable/default_session_background">
<android.support.v7.widget.Toolbar
android:id="@+id/mediapicker_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:minHeight="?attr/actionBarSize"
android:background="?attr/conversation_list_toolbar_background"
android:background="@color/action_bar_background"
android:theme="?attr/actionBarStyle" />
<android.support.v7.widget.RecyclerView
android:id="@+id/mediapicker_folder_list"
android:background="@drawable/default_session_background"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="2dp"

5
res/layout/mediapicker_item_fragment.xml
View File

@@ -4,18 +4,19 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="?android:windowBackground">
android:background="@drawable/default_session_background">
<android.support.v7.widget.Toolbar
android:id="@+id/mediapicker_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:minHeight="?attr/actionBarSize"
android:background="?attr/conversation_list_toolbar_background"
android:background="@color/action_bar_background"
android:theme="?attr/actionBarStyle" />
<android.support.v7.widget.RecyclerView
android:id="@+id/mediapicker_item_list"
android:background="@drawable/default_session_background"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="2dp"

2
res/layout/mediapicker_media_item.xml
View File

@@ -20,7 +20,7 @@
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?mediapicker_image_outline" />
android:background="@drawable/mediapicker_item_border_dark" />
<FrameLayout
android:id="@+id/mediapicker_play_overlay"

5
res/layout/mediasend_activity.xml
View File

@@ -4,7 +4,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">
<FrameLayout
android:id="@+id/mediasend_fragment_container"
@@ -37,7 +38,7 @@
android:paddingBottom="2dp"
android:gravity="center"
android:background="@drawable/media_count_number_background"
android:textColor="@color/signal_primary"
android:textColor="@color/accent"
android:textSize="18sp"
tools:text="3" />

7
res/layout/mediasend_fragment.xml
View File

@@ -41,6 +41,7 @@
android:paddingTop="6dp"
android:paddingBottom="6dp"
style="@style/Signal.Text.Body"
android:textSize="@dimen/medium_font_size"
android:maxLines="3"
android:maxLength="240"
android:hint="@string/MediaSendActivity_add_a_caption"
@@ -96,6 +97,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textSize="@dimen/small_font_size"
android:textCursorDrawable="@drawable/session_edit_text_cursor"
android:layout_weight="1"
android:nextFocusForward="@+id/send_button"
android:nextFocusRight="@+id/send_button"
@@ -118,10 +121,6 @@
android:id="@+id/mediasend_send_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingTop="6dp"
android:paddingEnd="6dp"
android:paddingBottom="6dp"
android:paddingStart="11dp"
android:scaleType="fitCenter"
android:contentDescription="@string/conversation_activity__send"
android:src="?conversation_transport_sms_indicator"

24
res/layout/progress_dialog.xml
View File

@@ -1,18 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/medium_spacing">
<com.pnikosis.materialishprogress.ProgressWheel
android:id="@+id/mediasend_progress_wheel"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:padding="8dp"
android:indeterminate="true"
app:matProg_progressIndeterminate="true"
app:matProg_barColor="@color/core_grey_25"/>
<com.github.ybq.android.spinkit.SpinKitView
style="@style/SpinKitView.Large.ThreeBounce"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
app:SpinKit_Color="@color/text" />
</FrameLayout>
</RelativeLayout>