srctree

Robin Linden parent 2599329c cc2a247e
Fix lint warnings

* Useless layout.
* .editorconfig rule matches no files.

inline split

.editorconfig added: 78, removed: 89, total 0

@@ -12,5 +12,5 @@ insert_final_newline = true

indent_size = 4

max_line_length = 120

[*.yml]

[*.{yml,yaml}]

indent_size = 2

atox/src/main/kotlin/ui/chat/ChatAdapter.kt added: 78, removed: 89, total 0

@@ -3,6 +3,7 @@ package ltd.evilcorp.atox.ui.chat

import android.content.res.Resources

import android.text.format.Formatter

import android.util.Log

import android.view.Gravity

import android.view.LayoutInflater

import android.view.MotionEvent

import android.view.View

@@ -10,7 +11,6 @@ import android.view.ViewGroup

import android.widget.BaseAdapter

import android.widget.Button

import android.widget.ImageView

import android.widget.LinearLayout

import android.widget.ListView

import android.widget.ProgressBar

import android.widget.RelativeLayout

@@ -69,7 +69,7 @@ private class MessageViewHolder(row: View) {

}

private class FileTransferViewHolder(row: View) {

val container = row.findViewById(R.id.fileTransferContainer) as LinearLayout

val container = row.findViewById(R.id.fileTransfer) as RelativeLayout

val fileName = row.findViewById(R.id.fileName) as TextView

val fileSize = row.findViewById(R.id.fileSize) as TextView

val progress = row.findViewById(R.id.progress) as ProgressBar

@@ -239,14 +239,11 @@ class ChatAdapter(

}

val layout = vh.container.layoutParams as RelativeLayout.LayoutParams

val alignment = if (fileTransfer.outgoing) {

RelativeLayout.ALIGN_PARENT_END

vh.container.gravity = if (fileTransfer.outgoing) {

Gravity.END

} else {

RelativeLayout.ALIGN_PARENT_START

Gravity.START

}

layout.addRule(alignment)

vh.container.layoutParams = layout

view

}

atox/src/main/res/layout/chat_filetransfer.xml added: 78, removed: 89, total 0

@@ -3,92 +3,84 @@

xmlns:tools="http://schemas.android.com/tools"

android:id="@+id/fileTransfer"

android:layout_width="match_parent"

android:layout_height="wrap_content">

<LinearLayout android:id="@+id/fileTransferContainer"

android:layout_height="wrap_content"

android:layout_margin="8dp">

<LinearLayout android:id="@+id/container"

android:layout_width="wrap_content"

android:layout_height="wrap_content"

android:layout_margin="8dp"

android:orientation="vertical"

android:padding="0dp">

android:background="@drawable/border"

android:orientation="vertical">

<LinearLayout

android:layout_width="wrap_content"

android:layout_height="wrap_content"

android:background="@drawable/border"

android:orientation="vertical">

<LinearLayout

android:layout_width="wrap_content"

android:layout_height="wrap_content">

<TextView

android:id="@+id/fileName"

android:layout_width="wrap_content"

android:layout_height="wrap_content"

android:ellipsize="end"

android:maxLines="1"

android:paddingStart="0dp"

android:paddingEnd="8dp"

android:maxWidth="224dp"

tools:text="linux_distro.iso" />

<TextView

android:id="@+id/fileSize"

android:layout_width="wrap_content"

android:layout_height="wrap_content"

tools:text="42KiB" />

</LinearLayout>

<ProgressBar android:id="@+id/progress"

style="?android:attr/progressBarStyleHorizontal"

android:layout_width="match_parent"

android:layout_height="wrap_content"/>

<TextView android:id="@+id/state"

android:layout_height="wrap_content">

<TextView android:id="@+id/fileName"

android:layout_width="wrap_content"

android:layout_height="wrap_content"

android:visibility="gone"/>

<LinearLayout android:id="@+id/acceptLayout"

style="?buttonBarStyle"

android:ellipsize="end"

android:maxWidth="224dp"

android:maxLines="1"

android:paddingStart="0dp"

android:paddingEnd="8dp"

tools:text="linux_distro.iso"/>

<TextView android:id="@+id/fileSize"

android:layout_width="wrap_content"

android:layout_height="match_parent">

<Button android:id="@+id/accept"

style="?buttonBarPositiveButtonStyle"

android:layout_width="wrap_content"

android:layout_height="wrap_content"

android:minHeight="0dp"

android:text="@string/accept"/>

<Button android:id="@+id/reject"

style="?buttonBarPositiveButtonStyle"

android:layout_width="wrap_content"

android:layout_height="wrap_content"

android:minHeight="0dp"

android:text="@string/reject"/>

</LinearLayout>

<LinearLayout android:id="@+id/cancelLayout"

style="?buttonBarStyle"

android:layout_width="wrap_content"

android:layout_height="match_parent"

android:visibility="gone">

<Button android:id="@+id/cancel"

style="?buttonBarPositiveButtonStyle"

android:layout_width="wrap_content"

android:layout_height="wrap_content"

android:minHeight="0dp"

android:text="@string/cancel" />

</LinearLayout>

<LinearLayout android:id="@+id/completedLayout"

android:layout_width="wrap_content"

android:layout_height="match_parent"

android:orientation="vertical"

android:visibility="gone">

<ImageView android:id="@+id/imagePreview"

android:layout_width="match_parent"

android:layout_height="match_parent"

android:adjustViewBounds="true"

android:importantForAccessibility="no" />

</LinearLayout>

android:layout_height="wrap_content"

tools:text="42KiB"/>

</LinearLayout>

<TextView android:id="@+id/timestamp"

style="@style/TextAppearance.AppCompat.Caption"

<ProgressBar android:id="@+id/progress"

style="?android:attr/progressBarStyleHorizontal"

android:layout_width="match_parent"

android:layout_height="wrap_content"/>

<TextView android:id="@+id/state"

android:layout_width="wrap_content"

android:layout_height="wrap_content"

android:layout_gravity="start"

tools:text="2020-12-24" />

android:visibility="gone"/>

<LinearLayout android:id="@+id/acceptLayout"

style="?buttonBarStyle"

android:layout_width="wrap_content"

android:layout_height="match_parent">

<Button android:id="@+id/accept"

style="?buttonBarPositiveButtonStyle"

android:layout_width="wrap_content"

android:layout_height="wrap_content"

android:minHeight="0dp"

android:text="@string/accept"/>

<Button android:id="@+id/reject"

style="?buttonBarPositiveButtonStyle"

android:layout_width="wrap_content"

android:layout_height="wrap_content"

android:minHeight="0dp"

android:text="@string/reject"/>

</LinearLayout>

<LinearLayout android:id="@+id/cancelLayout"

style="?buttonBarStyle"

android:layout_width="wrap_content"

android:layout_height="match_parent"

android:visibility="gone">

<Button android:id="@+id/cancel"

style="?buttonBarPositiveButtonStyle"

android:layout_width="wrap_content"

android:layout_height="wrap_content"

android:minHeight="0dp"

android:text="@string/cancel"/>

</LinearLayout>

<LinearLayout android:id="@+id/completedLayout"

android:layout_width="wrap_content"

android:layout_height="match_parent"

android:orientation="vertical"

android:visibility="gone">

<ImageView android:id="@+id/imagePreview"

android:layout_width="match_parent"

android:layout_height="match_parent"

android:adjustViewBounds="true"

android:importantForAccessibility="no"/>

</LinearLayout>

<TextView android:id="@+id/timestamp"

style="@style/TextAppearance.AppCompat.Caption"

android:layout_width="wrap_content"

android:layout_height="wrap_content"

android:layout_below="@id/container"

android:layout_gravity="start"

tools:text="2020-12-24"/>

</RelativeLayout>