Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tfg-qiwei
client-android-app
Commits
bc9eddbf
Commit
bc9eddbf
authored
Oct 14, 2016
by
Qiwei Ni
Browse files
Millores petites
parent
78a5dce6
Changes
12
Hide whitespace changes
Inline
Side-by-side
app/src/main/java/cat/qiwei/client/BeaconActivity.java
View file @
bc9eddbf
...
...
@@ -43,7 +43,7 @@ public class BeaconActivity extends AppCompatActivity {
beaconAddr
=
(
TextView
)
findViewById
(
R
.
id
.
addr_info
);
beaconName
.
setText
(
beacon
.
beaconInfo
.
name
);
beaconDistance
.
setText
(
String
.
valueOf
(
beacon
.
beaconDevice
.
distance
));
beaconDistance
.
setText
(
String
.
format
(
"%.01fm"
,
beacon
.
beaconDevice
.
distance
));
beaconAddr
.
setText
(
beacon
.
beaconInfo
.
addr
);
recyclerView
=
(
RecyclerView
)
findViewById
(
R
.
id
.
notification_list
);
...
...
app/src/main/java/cat/qiwei/client/adapters/BeaconAdapter.java
View file @
bc9eddbf
...
...
@@ -74,7 +74,7 @@ public class BeaconAdapter extends RecyclerView.Adapter<BeaconAdapter.ViewHolder
Log
.
e
(
"info"
,
beacon
.
beaconDevice
.
uuid
);
holder
.
textViewName
.
setText
(
beacon
.
beaconInfo
.
name
);
holder
.
textViewInfo
.
setText
(
beacon
.
beaconInfo
.
addr
);
holder
.
textViewDistance
.
setText
(
String
.
valueOf
(
beacon
.
beaconDevice
.
distance
));
holder
.
textViewDistance
.
setText
(
String
.
format
(
"%.01fm"
,
beacon
.
beaconDevice
.
distance
));
LinearLayoutManager
linearLayoutManager
=
new
LinearLayoutManager
(
activity
);
holder
.
list
.
setLayoutManager
(
linearLayoutManager
);
...
...
app/src/main/java/cat/qiwei/client/adapters/NotificationAdapter.java
View file @
bc9eddbf
...
...
@@ -30,7 +30,6 @@ public class NotificationAdapter extends RecyclerView.Adapter<NotificationAdapte
NetworkImageView
networkImageView
;
TextView
textViewName
;
TextView
textViewInfo
;
TextView
textViewDistance
;
public
ViewHolder
(
View
itemView
)
{
super
(
itemView
);
...
...
app/src/main/java/cat/qiwei/client/adapters/NotificationCardviewAdapter.java
View file @
bc9eddbf
...
...
@@ -74,7 +74,7 @@ public class NotificationCardviewAdapter extends RecyclerView.Adapter<Notificati
holder
.
networkImageView
.
setVisibility
(
View
.
GONE
);
}
holder
.
textViewDistance
.
setText
(
String
.
valueOf
(
notification
.
beacon
.
beaconDevice
.
distance
));
holder
.
textViewDistance
.
setText
(
String
.
format
(
"%.01fm"
,
notification
.
beacon
.
beaconDevice
.
distance
));
holder
.
textViewBeaconName
.
setText
(
notification
.
beacon
.
beaconInfo
.
name
);
holder
.
textViewBeaconAdr
.
setText
(
notification
.
beacon
.
beaconInfo
.
addr
);
}
...
...
app/src/main/res/ic_place_white_24dp.png
0 → 100644
View file @
bc9eddbf
371 Bytes
app/src/main/res/layout/notification_cardview.xml
View file @
bc9eddbf
...
...
@@ -61,28 +61,6 @@
android:maxLines=
"1"
android:paddingRight=
"20dp"
android:text=
"holaaaaaaa"
/>
<RelativeLayout
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_centerVertical=
"true"
>
<ImageView
android:id=
"@+id/image_place"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:src=
"@drawable/ic_place_black_18dp"
android:tint=
"@color/colorDivider"
android:paddingRight=
"3dp"
android:layout_alignBottom=
"@+id/beacon_distance"
/>
<TextView
android:id=
"@+id/beacon_distance"
android:layout_toRightOf=
"@+id/image_place"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:textSize=
"16sp"
android:text=
"3m"
/>
</RelativeLayout>
</RelativeLayout>
</RelativeLayout>
...
...
app/src/main/res/menu/activity_main_drawer.xml
View file @
bc9eddbf
...
...
@@ -8,7 +8,7 @@
android:title=
"Notificacions"
/>
<item
android:id=
"@+id/nav_beacon"
android:icon=
"@mipmap/ic_
favorit
e_white_24dp"
android:icon=
"@mipmap/ic_
plac
e_white_24dp"
android:title=
"Locals"
/>
</menu>
</item>
...
...
app/src/main/res/mipmap-mdpi/ic_place_white_24dp.png
0 → 100644
View file @
bc9eddbf
265 Bytes
app/src/main/res/mipmap-xhdpi/ic_place_white_24dp.png
0 → 100644
View file @
bc9eddbf
456 Bytes
app/src/main/res/mipmap-xxhdpi/ic_place_white_24dp.png
0 → 100644
View file @
bc9eddbf
675 Bytes
app/src/main/res/mipmap-xxxhdpi/ic_place_white_24dp.png
0 → 100644
View file @
bc9eddbf
869 Bytes
app/src/main/res/values/strings.xml
View file @
bc9eddbf
<resources>
<string
name=
"app_name"
>
Client
</string>
<string
name=
"app_name"
>
Notificacions
</string>
<string
name=
"navigation_drawer_open"
>
Open navigation drawer
</string>
<string
name=
"navigation_drawer_close"
>
Close navigation drawer
</string>
...
...
Write
Preview
Supports
Markdown
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