Skip to content

Commit 70c724d

Browse files
caster-99caster-99
committed
Adelanto de estadísticas
1 parent 51829e4 commit 70c724d

File tree

6 files changed

+92
-40
lines changed

6 files changed

+92
-40
lines changed

‎.idea/jarRepositories.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ dependencies {
4545
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
4646
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
4747

48+
//Para los diagramas
49+
implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
50+
4851
//Nuestras dependencias
4952
implementation 'org.sqldroid:sqldroid:1.0.3'
5053
}

‎app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
<activity
1616
android:name=".activities.CarritoActivity"
1717
android:parentActivityName=".activities.CarritoActivity" />
18+
<activity
19+
android:name=".activities.FacturaActivity"
20+
android:parentActivityName=".activities.MainActivity" />
1821
<activity
1922
android:name=".activities.CrearProductoActivity"
2023
android:parentActivityName=".activities.MainActivity" />

‎app/src/main/java/com/teamihc/inventas/fragments/TasasFragment.java

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import android.app.Fragment;
44

5+
import android.graphics.Color;
56
import android.os.Bundle;
67
import android.view.LayoutInflater;
78
import android.view.View;
@@ -11,24 +12,47 @@
1112

1213
import androidx.annotation.Nullable;
1314

15+
import com.github.mikephil.charting.charts.BarChart;
16+
import com.github.mikephil.charting.data.BarData;
17+
import com.github.mikephil.charting.data.BarDataSet;
18+
import com.github.mikephil.charting.data.BarEntry;
1419
import com.teamihc.inventas.R;
1520
import com.teamihc.inventas.backend.entidades.Tasa;
1621

22+
import java.util.ArrayList;
23+
1724

1825
public class TasasFragment extends Fragment
1926
{
2027
private View view;
2128
private TextView tasaDia;
2229
private TextView tasaAnterior;
2330
private ImageView iconoSubida;
24-
31+
ArrayList<BarEntry> cambioTasa;
2532
//aqui se vacia la info de la tasa actual y de la estadistica del cambio de tasas
2633
@Nullable
2734
@Override
2835
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState)
2936
{
3037
view = inflater.inflate(R.layout.fragment_tasas, container, false);
3138
refrescarTasaDia();
39+
BarChart barChart = view.findViewById(R.id.tasaChart);
40+
llenarChart();
41+
BarDataSet barDataSet = new BarDataSet(cambioTasa, "Cambio de la tasa del dólar");
42+
barDataSet.setColor(Color.BLUE);
43+
barDataSet.setValueTextColor(Color.BLACK);
44+
barDataSet.setValueTextSize(16f);
45+
46+
BarData barData=new BarData(barDataSet);
47+
barChart.setFitBars(true);
48+
barData.setBarWidth(2f);
49+
50+
barChart.setData(barData);
51+
barChart.getDescription().setText("Tasa");
52+
barChart.animateY(2000);
53+
54+
55+
3256
return view;
3357
}
3458

@@ -38,7 +62,17 @@ public void onResume()
3862
super.onResume();
3963
refrescarTasaDia();
4064
}
41-
65+
66+
public void llenarChart(){
67+
cambioTasa = new ArrayList<>();
68+
cambioTasa.add(new BarEntry(20,192));
69+
cambioTasa.add(new BarEntry(30,532));
70+
cambioTasa.add(new BarEntry(60,130));
71+
cambioTasa.add(new BarEntry(70,323));
72+
cambioTasa.add(new BarEntry(88,224));
73+
cambioTasa.add(new BarEntry(90,192));
74+
}
75+
4276
/**
4377
* Muestra la tasa del día y la anterior en la vista.
4478
*/

‎app/src/main/res/layout/fragment_tasas.xml

Lines changed: 44 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -22,51 +22,54 @@
2222
app:layout_constraintBottom_toBottomOf="parent"
2323
app:layout_constraintEnd_toEndOf="parent"
2424
app:srcCompat="@drawable/ic_create_black_24dp" />
25-
<com.google.android.material.floatingactionbutton.FloatingActionButton
26-
android:id="@+id/btn_historico"
27-
android:layout_width="wrap_content"
28-
android:layout_height="wrap_content"
29-
android:layout_marginEnd="16dp"
30-
android:layout_marginBottom="16dp"
31-
android:clickable="true"
32-
android:contentDescription="@string/todo"
33-
android:focusable="true"
25+
26+
<com.github.mikephil.charting.charts.BarChart
27+
android:id="@+id/tasaChart"
28+
android:layout_width="match_parent"
29+
android:layout_height="match_parent"
30+
android:layout_marginBottom="260dp"
3431
android:onClick="openHistorico"
35-
app:backgroundTint="@color/colorSecondary"
36-
app:layout_constraintBottom_toBottomOf="parent"
37-
app:layout_constraintBottom_toTopOf="@+id/cambiar_tasa"
32+
app:layout_constraintBottom_toTopOf="@+id/linearLayout"
3833
app:layout_constraintEnd_toEndOf="parent"
39-
app:srcCompat="@drawable/ic_search_white_24dp" />
34+
app:layout_constraintStart_toStartOf="parent"
35+
app:layout_constraintTop_toTopOf="parent"
36+
app:layout_constraintVertical_bias="0.13999999" />
4037

4138
<LinearLayout
42-
android:padding="32dp"
39+
android:id="@+id/linearLayout"
40+
android:layout_width="386dp"
41+
android:layout_height="242dp"
42+
android:gravity="bottom|center"
4343
android:orientation="vertical"
44-
android:layout_width="match_parent"
45-
android:layout_height="match_parent"
44+
android:padding="32dp"
4645
app:layout_constraintBottom_toBottomOf="parent"
4746
app:layout_constraintEnd_toEndOf="parent"
47+
app:layout_constraintHorizontal_bias="0.41"
4848
app:layout_constraintStart_toStartOf="parent"
49-
app:layout_constraintTop_toTopOf="parent">
49+
app:layout_constraintTop_toTopOf="parent"
50+
app:layout_constraintVertical_bias="0.963">
5051

5152
<LinearLayout
52-
android:orientation="vertical"
53-
android:gravity="center"
5453
android:layout_width="match_parent"
55-
android:layout_height="wrap_content">
54+
android:layout_height="wrap_content"
55+
android:gravity="center"
56+
android:orientation="vertical">
5657

5758
<LinearLayout
58-
android:orientation="horizontal"
5959
android:layout_width="wrap_content"
60-
android:layout_height="wrap_content">
60+
android:layout_height="wrap_content"
61+
android:orientation="horizontal">
62+
6163
<TextView
6264
android:id="@+id/tasaDia"
63-
android:layout_gravity="center_vertical"
6465
android:layout_width="match_parent"
6566
android:layout_height="wrap_content"
67+
android:layout_gravity="center_vertical"
6668
android:fontFamily="@font/roboto"
67-
android:textSize="32sp"
69+
android:text="Bs.S 99.500.500,00"
6870
android:textColor="@color/black"
69-
android:text="Bs.S 99.500.500,00" />
71+
android:textSize="32sp" />
72+
7073
<ImageView
7174
android:id="@+id/iconoSubida"
7275
android:layout_width="48dp"
@@ -78,38 +81,41 @@
7881
android:layout_width="wrap_content"
7982
android:layout_height="wrap_content"
8083
android:fontFamily="@font/roboto"
81-
android:textSize="16sp"
84+
android:text="@string/tasa_del_dia"
8285
android:textColor="@android:color/darker_gray"
83-
android:text="@string/tasa_del_dia" />
86+
android:textSize="16sp" />
8487
</LinearLayout>
88+
8589
<LinearLayout
86-
android:orientation="vertical"
87-
android:gravity="center"
88-
android:layout_marginTop="32dp"
8990
android:layout_width="match_parent"
90-
android:layout_height="wrap_content">
91+
android:layout_height="wrap_content"
92+
android:layout_marginTop="32dp"
93+
android:gravity="center"
94+
android:orientation="vertical">
95+
9196
<LinearLayout
92-
android:orientation="horizontal"
9397
android:layout_width="wrap_content"
94-
android:layout_height="wrap_content">
98+
android:layout_height="wrap_content"
99+
android:orientation="horizontal">
100+
95101
<TextView
96102
android:id="@+id/tasaAnterior"
97-
android:layout_gravity="center_vertical"
98103
android:layout_width="match_parent"
99104
android:layout_height="wrap_content"
105+
android:layout_gravity="center_vertical"
100106
android:fontFamily="@font/roboto"
101-
android:textSize="32sp"
107+
android:text="Bs.S 99.500.500,00"
102108
android:textColor="@color/black"
103-
android:text="Bs.S 99.500.500,00" />
109+
android:textSize="32sp" />
104110
</LinearLayout>
105111

106112
<TextView
107113
android:layout_width="wrap_content"
108114
android:layout_height="wrap_content"
109115
android:fontFamily="@font/roboto"
110-
android:textSize="16sp"
116+
android:text="@string/tasa_anterior"
111117
android:textColor="@android:color/darker_gray"
112-
android:text="@string/tasa_anterior" />
118+
android:textSize="16sp" />
113119
</LinearLayout>
114120

115121
</LinearLayout>

‎build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ allprojects {
1616
repositories {
1717
google()
1818
jcenter()
19+
maven { url 'https://jitpack.io' }
1920
}
2021
}
2122

0 commit comments

Comments
 (0)