Skip to content

Commit

Permalink
Fetching information and handling it through bluetooth connection and…
Browse files Browse the repository at this point in the history
… upgrades to UI
  • Loading branch information
juanjoserendon13 committed Apr 30, 2018
1 parent 1b5f659 commit f5ffa04
Show file tree
Hide file tree
Showing 9 changed files with 143 additions and 0 deletions.
35 changes: 35 additions & 0 deletions .idea/assetWizardSettings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions app/src/main/java/com/proter/juanjose/protermico/PopUp.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package com.proter.juanjose.protermico;

public class PopUp {
}
Binary file added app/src/main/res/drawable/card_back_rest.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions app/src/main/res/drawable/ic_bt_close_popup.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="30dp"
android:height="30dp"
android:viewportWidth="30"
android:viewportHeight="30">
<path
android:pathData="M15,15m-15,0a15,15 0,1 1,30 0a15,15 0,1 1,-30 0"
android:fillColor="#BDBDBD"/>
<path
android:pathData="M5.5952,7.7166l2.1213,-2.1213l16.6876,16.6876l-2.1213,2.1213z"
android:fillColor="#FFFFFF"/>
<path
android:pathData="M5.5952,22.2831l16.6876,-16.6876l2.1213,2.1213l-16.6876,16.6876z"
android:fillColor="#FFFFFF"/>
</vector>
21 changes: 21 additions & 0 deletions app/src/main/res/drawable/ic_clock.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="51dp"
android:height="59dp"
android:viewportWidth="51"
android:viewportHeight="59">
<path
android:pathData="M25.5,58.6c-13.8,0 -25,-11.2 -25,-25c0,-13.8 11.2,-25 25,-25s25,11.2 25,25C50.5,47.4 39.3,58.6 25.5,58.6zM25.5,14.4C14.9,14.4 6.2,23 6.2,33.6c0,10.6 8.6,19.3 19.3,19.3s19.3,-8.6 19.3,-19.3C44.8,23 36.1,14.4 25.5,14.4z"
android:fillColor="#FFFFFF"/>
<path
android:pathData="M22.3,5.3h6.4v5.5h-6.4z"
android:fillColor="#FFFFFF"/>
<path
android:pathData="M18,0.4h15v5h-15z"
android:fillColor="#FFFFFF"/>
<path
android:pathData="M40.3878,17.5308l5.7457,-4.821l3.5354,4.2136l-5.7457,4.821z"
android:fillColor="#FFFFFF"/>
<path
android:pathData="M25.5,18v15.6h15.6C41.1,25 34.1,18 25.5,18z"
android:fillColor="#FFFFFF"/>
</vector>
12 changes: 12 additions & 0 deletions app/src/main/res/drawable/ic_leafs.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="59dp"
android:height="57dp"
android:viewportWidth="59"
android:viewportHeight="57">
<path
android:pathData="M31.4,36.6c1.5,-3.3 3.3,-6.5 5.4,-9.5c-3.9,8.5 -7.2,17 -8.7,26.4c21.9,-5 34,-29.6 24.4,-50c-22.4,4.3 -35.2,29 -25.8,49.7C27.4,47.5 29,41.9 31.4,36.6"
android:fillColor="#66BA6B"/>
<path
android:pathData="M21.6,43c-8.9,-13.2 2.7,6 4.3,10.5C9.2,51 1.9,41.3 3.7,24.5c17,2.2 24.6,11.7 23,28.7C25.5,49.5 23.8,46.2 21.6,43"
android:fillColor="#66BA6B"/>
</vector>
21 changes: 21 additions & 0 deletions app/src/main/res/drawable/ic_negative.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="87dp"
android:height="46dp"
android:viewportWidth="87"
android:viewportHeight="46">
<group>
<clip-path android:pathData="M29.6,1.5h27.8v42.4h-27.8z M 0,0"/>
<path
android:pathData="M19.7,22.1c2.9,-1.9,6.7,-2.4,10.1,-1.4c1.1,0.4,2.2,0.9,3.4,1.2C40,23.7,47,17.6,54,19 c2.7,0.6,5.2,2.2,8,2.3c0.6,0,1.1,0,1.7,0.1c1.7,0.5,2.3,2.5,2.5,4.2c0.5,2.8,0.8,5.6,0.9,8.4c0.1,2.1,0.1,4.2,-0.5,6.2 c-0.7,2.5,-2.4,4.6,-4,6.6c-1.3,1.6,-2.6,3.1,-3.8,4.7c-0.4,0.5,-0.8,0.9,-1.3,1.2C57,52.9,56.5,52.9,56,53 c-6.6,0.3,-13.2,-0.7,-19.7,-1.8c-2.6,-0.4,-5.3,-0.8,-7.9,-1.3c-1.1,-0.2,-2.3,-0.4,-3.3,-1c-1.7,-1,-2.6,-2.8,-3.1,-4.7 c-2.1,-7.4,0.4,-15.3,-0.4,-23"
android:fillColor="#FF5722"/>
</group>
<path
android:pathData="M58.9,45.4H28.1V0h30.8V45.4zM31.1,42.4h24.8V3H31.1V42.4z"
android:fillColor="#5D4037"/>
<path
android:pathData="M5.5,20.2h17.6v5h-17.6z"
android:fillColor="#5D4037"/>
<path
android:pathData="M0.4,22.7l10.2,5.9l0,-11.8z"
android:fillColor="#5D4037"/>
</vector>
30 changes: 30 additions & 0 deletions app/src/main/res/drawable/ic_positive.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="87dp"
android:height="46dp"
android:viewportWidth="87"
android:viewportHeight="46">
<group>
<clip-path android:pathData="M29.6,-50.7h27.8v42.4h-27.8z M 0,0"/>
<path
android:pathData="M19.7,-30.1c2.9,-1.9,6.7,-2.4,10.1,-1.4c1.1,0.4,2.2,0.9,3.4,1.2C40,-28.5,47,-34.6,54,-33.2 c2.7,0.6,5.2,2.2,8,2.3c0.6,0,1.1,0,1.7,0.1c1.7,0.5,2.3,2.5,2.5,4.2c0.5,2.8,0.8,5.6,0.9,8.4c0.1,2.1,0.1,4.2,-0.5,6.2 c-0.7,2.5,-2.4,4.6,-4,6.6c-1.3,1.6,-2.6,3.1,-3.8,4.7c-0.4,0.5,-0.8,0.9,-1.3,1.2C57,0.7,56.5,0.8,56,0.8C49.5,1.1,42.9,0,36.4,-1 c-2.6,-0.4,-5.3,-0.8,-7.9,-1.3c-1.1,-0.2,-2.3,-0.4,-3.3,-1c-1.7,-1,-2.6,-2.8,-3.1,-4.7c-2.1,-7.4,0.4,-15.3,-0.4,-23"
android:fillColor="#FF5722"/>
</group>
<group>
<clip-path android:pathData="M29.6,1.5h27.8v42.4h-27.8z M 0,0"/>
<path
android:pathData="M19.7,1.4c2.9,-3.2,6.7,-4.1,10.1,-2.3c1.1,0.6,2.2,1.5,3.4,2C40,4.1,47.1,-6.1,54.1,-3.7 c2.7,0.9,5.2,3.7,8,3.9c0.6,0,1.1,0,1.7,0.2c1.7,0.8,2.3,4.1,2.5,6.9c0.5,4.7,0.8,9.4,0.9,14.1c0.1,3.5,0.1,7,-0.5,10.4 c-0.7,4.1,-2.4,7.6,-4,11c-1.3,2.6,-2.6,5.2,-3.8,7.8c-0.4,0.8,-0.8,1.6,-1.3,2c-0.4,0.3,-0.9,0.4,-1.4,0.4c-6.6,0.5,-13.2,-1.2,-19.7,-2.9 c-2.6,-0.7,-5.3,-1.4,-7.9,-2.1c-1.1,-0.3,-2.3,-0.6,-3.3,-1.6c-1.7,-1.6,-2.6,-4.7,-3.1,-7.8C20,26.1,22.6,12.9,21.7,0.1"
android:fillColor="#66BA6B"/>
</group>
<path
android:pathData="M58.9,45.4H28.1V0h30.8V45.4zM31.1,42.4h24.8V3H31.1V42.4z"
android:fillColor="#5D4037"/>
<path
android:pathData="M63.9,22.7L81.5,22.7"
android:fillColor="#66BA6B"/>
<path
android:pathData="M63.9,20.2h17.6v5h-17.6z"
android:fillColor="#5D4037"/>
<path
android:pathData="M86.6,22.7l-10.2,5.9l0,-11.8z"
android:fillColor="#5D4037"/>
</vector>
5 changes: 5 additions & 0 deletions app/src/main/res/layout/activity_popup.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_height="match_parent">

</RelativeLayout>

0 comments on commit f5ffa04

Please sign in to comment.