Smayzy/I2D_projet_15_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Compare commits

base: Smayzy:e18d0ba99daa53b3c3bd249c2a09cfe335b23484
Branches Tags
Smayzy:master
Smayzy:demo
Smayzy:demo
Smayzy:0.3
Smayzy:0.2
Smayzy:0.1
..
compare: Smayzy:fb62dd37e23ba724f06a6ed01d100961036e474f
Branches Tags
Smayzy:demo
Smayzy:master
Smayzy:demo
Smayzy:0.3
Smayzy:0.2
Smayzy:0.1

No commits in common. "e18d0ba99daa53b3c3bd249c2a09cfe335b23484" and "fb62dd37e23ba724f06a6ed01d100961036e474f" have entirely different histories.
e18d0ba99d ... fb62dd37e2

3 changed files with 7 additions and 7 deletions
Show Stats Expand all files Collapse all files

2
app/src/main/java/ovh/smayzy/i2d_project_15_app/MainActivity.kt
View File

@ -191,7 +191,7 @@ class MainActivity : AppCompatActivity() {
xAxis.apply { xAxis.apply {
position = XAxis.XAxisPosition.BOTTOM position = XAxis.XAxisPosition.BOTTOM
valueFormatter = object : ValueFormatter() { valueFormatter = object : ValueFormatter() {
override fun getFormattedValue(value: Float): String { override fun getFormattedValue(value: Float): String? {
return "${value.toInt()}s" return "${value.toInt()}s"
} }
} }

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

@ -66,7 +66,7 @@
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:background="@color/colorBackground" android:background="@android:color/white"
app:layout_constraintTop_toBottomOf="@id/temp_circle" app:layout_constraintTop_toBottomOf="@id/temp_circle"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -80,7 +80,7 @@
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:background="@color/colorBackground" android:background="@android:color/white"
app:layout_constraintTop_toBottomOf="@id/temp_chart" app:layout_constraintTop_toBottomOf="@id/temp_chart"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

8
app/src/main/res/values/colors.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="colorPrimary_light">#3D2F71</color> <color name="colorPrimary_light">#00246B</color>
<color name="colorPrimary_dark">#141118</color> <color name="colorPrimary_dark">#CADCFC</color>
<color name="colorAccent">#343434</color> <color name="colorAccent">#97BAF8</color>
<color name="colorBackground">#141118</color> <color name="colorBackground">#97BAF8</color>
</resources> </resources>