TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-17 21:47:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement placeholder input bar layout

Browse Source
This commit is contained in:
Niels Andriesse 2021-06-15 09:42:18 +10:00
parent 7c659c9a68
commit f8ea8cbd03
6 changed files with 74 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt Normal file
View File

@ -0,0 +1,28 @@
package org.thoughtcrime.securesms.conversation.v2.input_bar
import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import android.widget.LinearLayout
import network.loki.messenger.R
class InputBar : LinearLayout {
// region Lifecycle
constructor(context: Context) : super(context) {
setUpViewHierarchy()
}
constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
setUpViewHierarchy()
}
constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
setUpViewHierarchy()
}
private fun setUpViewHierarchy() {
LayoutInflater.from(context).inflate(R.layout.view_input_bar, this)
}
// endregion
}

7
app/src/main/res/layout/activity_conversation_v2.xml
View File

@ -10,12 +10,11 @@
android:id="@+id/conversationRecyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="40dp" />
android:layout_marginBottom="@dimen/input_bar_height" />
<View
<org.thoughtcrime.securesms.conversation.v2.input_bar.InputBar
android:layout_width="match_parent"
android:layout_height="40dp"
android:background="@color/red"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true" />
</RelativeLayout>

38
app/src/main/res/layout/view_input_bar.xml Normal file
View File

@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="@dimen/input_bar_height"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/separator" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<View
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_alignParentStart="true"
android:background="@color/red" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp" />
<View
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_alignParentEnd="true"
android:background="@color/blue" />
</RelativeLayout>
</LinearLayout>

5
app/src/main/res/values-notnight-v21/colors.xml
View File

@ -20,10 +20,11 @@
<color name="pn_option_background">#FCFCFC</color>
<color name="open_group_chip_color">#0D000000</color>
<color name="message_selected">#FFFFFF</color>
<color name="input_bar_background">#FCFCFC</color>
<color name="default_background_start">#ffffff</color>
<color name="default_background_end">#fcfcfd</color>
<color name="action_bar_background">#fcfcfd</color>
<color name="default_background_end">#fcfcfc</color>
<color name="action_bar_background">#fcfcfc</color>
<color name="app_icon_background">#333132</color>
<color name="progress_bar_background">#0A000000</color>

1
app/src/main/res/values/colors.xml
View File

@ -27,6 +27,7 @@
<color name="paths_building">#FFCE3A</color>
<color name="open_group_chip_color">#0DFFFFFF</color>
<color name="message_selected">#000000</color>
<color name="input_bar_background">#171717</color>
<array name="profile_picture_placeholder_colors">
<item>#5ff8b0</item>

5
app/src/main/res/values/dimens.xml
View File

@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Session -->
<!-- Font Sizes -->
<dimen name="very_small_font_size">12sp</dimen>
<dimen name="small_font_size">15sp</dimen>
@ -38,6 +36,7 @@
<dimen name="path_row_height">56dp</dimen>
<dimen name="path_row_dot_size">8dp</dimen>
<dimen name="path_row_expanded_dot_size">16dp</dimen>
<dimen name="input_bar_height">64dp</dimen>
<!-- Distances -->
<dimen name="small_spacing">8dp</dimen>
@ -48,8 +47,6 @@
<dimen name="new_conversation_button_bottom_offset">56dp</dimen>
<dimen name="onboarding_button_bottom_offset">40dp</dimen>
<!-- Session -->
<dimen name="emoji_drawer_size">32sp</dimen>
<dimen name="min_keyboard_size">50dp</dimen>
<dimen name="default_custom_keyboard_size">220dp</dimen>