Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
KDE Connect Android
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
30
Merge Requests
30
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Network
KDE Connect Android
Commits
882afbbc
Commit
882afbbc
authored
Apr 20, 2019
by
Nicolas Fella
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make ListAdapter.Item.inflateView nonNull
parent
8e603594
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
23 additions
and
2 deletions
+23
-2
src/org/kde/kdeconnect/UserInterface/List/CustomItem.java
src/org/kde/kdeconnect/UserInterface/List/CustomItem.java
+7
-0
src/org/kde/kdeconnect/UserInterface/List/EntryItem.java
src/org/kde/kdeconnect/UserInterface/List/EntryItem.java
+3
-0
src/org/kde/kdeconnect/UserInterface/List/ListAdapter.java
src/org/kde/kdeconnect/UserInterface/List/ListAdapter.java
+2
-2
src/org/kde/kdeconnect/UserInterface/List/PairingDeviceItem.java
.../kde/kdeconnect/UserInterface/List/PairingDeviceItem.java
+3
-0
src/org/kde/kdeconnect/UserInterface/List/PluginItem.java
src/org/kde/kdeconnect/UserInterface/List/PluginItem.java
+3
-0
src/org/kde/kdeconnect/UserInterface/List/SectionItem.java
src/org/kde/kdeconnect/UserInterface/List/SectionItem.java
+3
-0
src/org/kde/kdeconnect/UserInterface/List/SmallEntryItem.java
...org/kde/kdeconnect/UserInterface/List/SmallEntryItem.java
+2
-0
No files found.
src/org/kde/kdeconnect/UserInterface/List/CustomItem.java
View file @
882afbbc
...
...
@@ -23,14 +23,21 @@ package org.kde.kdeconnect.UserInterface.List;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
androidx.annotation.NonNull
;
public
class
CustomItem
implements
ListAdapter
.
Item
{
private
final
View
view
;
public
CustomItem
(
View
v
)
{
if
(
v
==
null
)
throw
new
IllegalArgumentException
(
"View must not be null"
);
this
.
view
=
v
;
}
@NonNull
@Override
public
View
inflateView
(
LayoutInflater
layoutInflater
)
{
return
view
;
...
...
src/org/kde/kdeconnect/UserInterface/List/EntryItem.java
View file @
882afbbc
...
...
@@ -24,6 +24,8 @@ import android.view.LayoutInflater;
import
android.view.View
;
import
android.widget.TextView
;
import
androidx.annotation.NonNull
;
import
org.kde.kdeconnect_tp.R
;
public
class
EntryItem
implements
ListAdapter
.
Item
{
...
...
@@ -41,6 +43,7 @@ public class EntryItem implements ListAdapter.Item {
this
.
subtitle
=
subtitle
;
}
@NonNull
@Override
public
View
inflateView
(
LayoutInflater
layoutInflater
)
{
View
v
=
layoutInflater
.
inflate
(
R
.
layout
.
list_item_entry
,
null
);
...
...
src/org/kde/kdeconnect/UserInterface/List/ListAdapter.java
View file @
882afbbc
...
...
@@ -33,6 +33,7 @@ import java.util.ArrayList;
public
class
ListAdapter
extends
ArrayAdapter
<
ListAdapter
.
Item
>
{
public
interface
Item
{
@NonNull
View
inflateView
(
LayoutInflater
layoutInflater
);
}
...
...
@@ -45,11 +46,10 @@ public class ListAdapter extends ArrayAdapter<ListAdapter.Item> {
layoutInflater
=
(
LayoutInflater
)
context
.
getSystemService
(
Context
.
LAYOUT_INFLATER_SERVICE
);
}
@NonNull
@Override
public
View
getView
(
int
position
,
View
convertView
,
@NonNull
ViewGroup
parent
)
{
final
Item
i
=
items
.
get
(
position
);
return
i
.
inflateView
(
layoutInflater
);
}
}
src/org/kde/kdeconnect/UserInterface/List/PairingDeviceItem.java
View file @
882afbbc
...
...
@@ -25,6 +25,8 @@ import android.view.View;
import
android.widget.ImageView
;
import
android.widget.TextView
;
import
androidx.annotation.NonNull
;
import
org.kde.kdeconnect.Device
;
import
org.kde.kdeconnect_tp.R
;
...
...
@@ -46,6 +48,7 @@ public class PairingDeviceItem implements ListAdapter.Item {
return
this
.
device
;
}
@NonNull
@Override
public
View
inflateView
(
LayoutInflater
layoutInflater
)
{
final
View
v
=
layoutInflater
.
inflate
(
R
.
layout
.
list_item_with_icon_entry
,
null
);
...
...
src/org/kde/kdeconnect/UserInterface/List/PluginItem.java
View file @
882afbbc
...
...
@@ -25,6 +25,8 @@ import android.view.View;
import
android.widget.ImageView
;
import
android.widget.TextView
;
import
androidx.annotation.NonNull
;
import
org.kde.kdeconnect.Plugins.Plugin
;
import
org.kde.kdeconnect_tp.R
;
...
...
@@ -39,6 +41,7 @@ public class PluginItem implements ListAdapter.Item {
}
@NonNull
@Override
public
View
inflateView
(
final
LayoutInflater
layoutInflater
)
{
View
v
=
layoutInflater
.
inflate
(
R
.
layout
.
list_item_with_icon_entry
,
null
);
...
...
src/org/kde/kdeconnect/UserInterface/List/SectionItem.java
View file @
882afbbc
...
...
@@ -24,6 +24,8 @@ import android.view.LayoutInflater;
import
android.view.View
;
import
android.widget.TextView
;
import
androidx.annotation.NonNull
;
import
org.kde.kdeconnect_tp.R
;
public
class
SectionItem
implements
ListAdapter
.
Item
{
...
...
@@ -36,6 +38,7 @@ public class SectionItem implements ListAdapter.Item {
this
.
isEmpty
=
true
;
}
@NonNull
@Override
public
View
inflateView
(
LayoutInflater
layoutInflater
)
{
...
...
src/org/kde/kdeconnect/UserInterface/List/SmallEntryItem.java
View file @
882afbbc
...
...
@@ -26,6 +26,7 @@ import android.widget.TextView;
import
org.kde.kdeconnect_tp.R
;
import
androidx.annotation.NonNull
;
import
androidx.core.content.ContextCompat
;
public
class
SmallEntryItem
implements
ListAdapter
.
Item
{
...
...
@@ -43,6 +44,7 @@ public class SmallEntryItem implements ListAdapter.Item {
this
.
clickListener
=
clickListener
;
}
@NonNull
@Override
public
View
inflateView
(
LayoutInflater
layoutInflater
)
{
View
v
=
layoutInflater
.
inflate
(
android
.
R
.
layout
.
simple_list_item_1
,
null
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment