bitmessage/Abit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix lint issues

Browse Source
This commit is contained in:
Christian Basler
2018-02-20 16:40:03 +01:00
parent 21abdbd720
commit 9eefbad7d6
33 changed files with 191 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/layout/contact_row.xml
View File

@@ -37,11 +37,11 @@
android:layout_alignTop="@+id/avatar"
android:layout_toEndOf="@+id/avatar"
android:ellipsize="end"
android:lines="1"
android:paddingBottom="0dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="0dp"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textStyle="bold"
tools:text="Name" />
@@ -53,9 +53,9 @@
android:layout_alignBottom="@+id/avatar"
android:layout_toEndOf="@+id/avatar"
android:ellipsize="marquee"
android:lines="1"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall"
tools:text="BM-2cW0000000000000000000000000000000" />

23
app/src/main/res/layout/dialog_add_deterministic_identity.xml
View File

@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Christian Basler
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<android.support.constraint.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
@@ -34,13 +32,13 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:layout_constraintLeft_creator="1"
tools:layout_constraintTop_creator="1"/>
tools:layout_constraintTop_creator="1" />
<android.support.design.widget.TextInputLayout
android:id="@+id/label_wrapper"
android:layout_marginTop="24dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/description">
@@ -48,7 +46,7 @@
android:id="@+id/label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/label"/>
android:hint="@string/label" />
</android.support.design.widget.TextInputLayout>
@@ -64,7 +62,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/passphrase"
android:inputType="textMultiLine"/>
android:inputType="textMultiLine" />
</android.support.design.widget.TextInputLayout>
@@ -82,7 +80,8 @@
android:ems="10"
android:hint="@string/number_of_identities"
android:inputType="number"
android:text="1"/>
android:text="1"
tools:ignore="HardcodedText" />
</android.support.design.widget.TextInputLayout>
@@ -92,7 +91,7 @@
android:layout_height="wrap_content"
android:text="@string/shorter"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/number_of_identities_wrapper"/>
app:layout_constraintTop_toBottomOf="@id/number_of_identities_wrapper" />
<Button
android:id="@+id/ok"
@@ -103,7 +102,7 @@
android:text="@string/ok"
android:textColor="@color/colorAccent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/shorter"/>
app:layout_constraintTop_toBottomOf="@id/shorter" />
<Button
android:id="@+id/dismiss"
@@ -113,6 +112,6 @@
android:text="@string/cancel"
android:textColor="@color/colorAccent"
app:layout_constraintBottom_toBottomOf="@id/ok"
app:layout_constraintRight_toLeftOf="@id/ok"/>
app:layout_constraintRight_toLeftOf="@id/ok" />
</android.support.constraint.ConstraintLayout>

1
app/src/main/res/layout/message_row.xml
View File

@@ -26,6 +26,7 @@
android:layout_height="match_parent"
android:background="@drawable/bg_item_normal_state"
android:clickable="true"
android:focusable="true"
android:foreground="?attr/selectableItemBackground"
tools:ignore="UselessParent">

18
app/src/main/res/layout/select_identity_row.xml
View File

@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Christian Basler
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,9 +15,9 @@
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="64dp">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="64dp">
<CheckBox
android:id="@+id/checkbox"
@@ -31,21 +30,22 @@
android:paddingEnd="8dp"
android:paddingStart="16dp"
android:paddingTop="8dp"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"
tools:text="Name"/>
tools:text="Name" />
<TextView
android:id="@+id/address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentBottom="true"
android:layout_alignParentStart="true"
android:ellipsize="marquee"
android:lines="1"
android:paddingBottom="8dp"
android:paddingEnd="8dp"
android:paddingStart="48dp"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall"
tools:text="BM-2cW0000000000000000000000000000000"/>
tools:text="BM-2cW0000000000000000000000000000000" />
</RelativeLayout>

2
app/src/main/res/values/styles.xml
View File

@@ -5,7 +5,7 @@
<item name="android:activatedBackgroundIndicator">@drawable/bg_item_activated</item>
<item name="android:textColor">@color/colorPrimaryText</item>
<item name="android:textColorSecondary">@color/colorSecondaryText</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
</style>
<style name="CustomShowcaseTheme" parent="ShowcaseView">

2
app/src/main/res/xml/file_paths.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<paths xmlns:android="http://schemas.android.com/apk/res/android">
<paths>
<files-path name="exports" path="exports/"/>
</paths>

56
app/src/main/res/xml/preferences.xml
View File

@@ -1,64 +1,58 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<SwitchPreferenceCompat
<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<android.support.v7.preference.SwitchPreferenceCompat
android:defaultValue="true"
android:key="wifi_only"
android:summary="@string/wifi_only_summary"
android:title="@string/wifi_only"/>
<SwitchPreferenceCompat
android:title="@string/wifi_only" />
<android.support.v7.preference.SwitchPreferenceCompat
android:defaultValue="true"
android:key="request_acknowledgements"
android:summary="@string/request_acknowledgements_summary"
android:title="@string/request_acknowledgements"/>
<EditTextPreference
android:title="@string/request_acknowledgements" />
<android.support.v7.preference.EditTextPreference
android:inputType="textUri"
android:key="trusted_node"
android:summary="@string/trusted_node_summary"
android:title="@string/trusted_node"/>
<EditTextPreference
android:title="@string/trusted_node" />
<android.support.v7.preference.EditTextPreference
android:defaultValue="120"
android:inputType="number"
android:key="sync_timeout"
android:summary="@string/sync_timeout_summary"
android:title="@string/sync_timeout"/>
<SwitchPreferenceCompat
android:title="@string/sync_timeout" />
<android.support.v7.preference.SwitchPreferenceCompat
android:defaultValue="false"
android:dependency="trusted_node"
android:key="server_pow"
android:summary="@string/server_pow_summary"
android:title="@string/server_pow"
/>
<Preference
android:title="@string/server_pow" />
<android.support.v7.preference.Preference
android:key="about"
android:summary="@string/about_summary"
android:title="@string/about"
/>
<Preference
android:title="@string/about" />
<android.support.v7.preference.Preference
android:key="help_out"
android:summary="@string/help_out_summary"
android:title="@string/help_out">
<intent
android:action="android.intent.action.VIEW"
android:data="@string/help_out_link"/>
</Preference>
<Preference
android:data="@string/help_out_link" />
</android.support.v7.preference.Preference>
<android.support.v7.preference.Preference
android:key="cleanup"
android:title="@string/cleanup"
android:summary="@string/cleanup_summary"
/>
<Preference
android:title="@string/cleanup" />
<android.support.v7.preference.Preference
android:key="export"
android:title="@string/export_data"
android:summary="@string/export_data_summary"
/>
<Preference
android:title="@string/export_data" />
<android.support.v7.preference.Preference
android:key="import"
android:title="@string/import_data"
android:summary="@string/import_data_summary"
/>
<Preference
android:title="@string/import_data" />
<android.support.v7.preference.Preference
android:key="status"
android:summary="@string/status_summary"
android:title="@string/status"
/>
</PreferenceScreen>
android:title="@string/status" />
</android.support.v7.preference.PreferenceScreen>