Skip to content
This repository has been archived by the owner on Mar 10, 2022. It is now read-only.

Commit

Permalink
Fix range, textview translations
Browse files Browse the repository at this point in the history
  • Loading branch information
@divacky
divacky committed Jan 31, 2020
1 parent 3617a23 commit f9a5ec1
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 33 deletions.
4 changes: 2 additions & 2 deletions app/src/main/java/com/mqbcoding/stats/DashboardFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1224,10 +1224,10 @@ private void SetLayoutElements(TextView mValueElement, String mMeasurements, Str
if (mLongCons==null || mLongCons==0){
mGetMeasurement = Float.valueOf(0);
} else {
mGetMeasurement = mLongCons * mGetMeasurement;
mGetMeasurement = (mGetMeasurement/mLongCons) * 100 ;
}
} else {
mGetMeasurement = mShortCons * mGetMeasurement;
mGetMeasurement = (mGetMeasurement/mShortCons)*100;
}
}
if (mFormat == "FORMAT_SHORTTIME") {
Expand Down
58 changes: 29 additions & 29 deletions app/src/main/res/layout/layout_dashboard_consumption.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
android:ellipsize="marquee"
android:gravity="center"
android:singleLine="true"
android:text="Aktuální data"
android:text="@string/dash4_titleRight"
android:textAppearance="@style/CarBody2"
android:textColor="@android:color/white"
android:textSize="20sp"
Expand All @@ -58,7 +58,7 @@
android:layout_marginStart="20dp"
android:layout_marginTop="30dp"
android:gravity="start|center_vertical"
android:text="Palivo v nádrži:"
android:text="@string/dash4_elementRight1"
android:textAppearance="@style/CarBody2"
android:textColor="@android:color/white"
android:textSize="14sp"
Expand All @@ -71,7 +71,7 @@
android:layout_height="30dp"
android:layout_marginEnd="20dp"
android:gravity="center_vertical|right"
android:text="37.5 l"
android:text="0,0 l"
android:textAppearance="@style/CarBody2"
android:textColor="@android:color/white"
android:textSize="20sp"
Expand All @@ -83,7 +83,7 @@
android:layout_width="175dp"
android:layout_height="30dp"
android:gravity="start|center_vertical"
android:text="Dojezdová vzdálenost:"
android:text="@string/dash4_elementRight2"
android:textAppearance="@style/CarBody2"
android:textColor="@android:color/white"
android:textSize="14sp"
Expand All @@ -96,7 +96,7 @@
android:layout_width="175dp"
android:layout_height="30dp"
android:gravity="center_vertical|right"
android:text="356 km"
android:text="0 km"
android:textAppearance="@style/CarBody2"
android:textColor="@android:color/white"
android:textSize="20sp"
Expand All @@ -109,7 +109,7 @@
android:layout_width="175dp"
android:layout_height="30dp"
android:gravity="start|center_vertical"
android:text=""
android:text="@string/dash4_elementRight3"
android:textAppearance="@style/CarBody2"
android:textColor="@android:color/white"
android:textSize="14sp"
Expand All @@ -134,7 +134,7 @@
android:layout_width="175dp"
android:layout_height="30dp"
android:gravity="start|center_vertical"
android:text=""
android:text="@string/dash4_elementRight4"
android:textAppearance="@style/CarBody2"
android:textColor="@android:color/white"
android:textSize="14sp"
Expand All @@ -159,7 +159,7 @@
android:layout_width="175dp"
android:layout_height="30dp"
android:gravity="start|center_vertical"
android:text="Aktuální spotřeba:"
android:text="@string/dash4_elementRight5"
android:textAppearance="@style/CarBody2"
android:textColor="@android:color/white"
android:textSize="14sp"
Expand All @@ -185,7 +185,7 @@
android:layout_height="0dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:text="14,8 l/100km"
android:text="0,0 l/100km"
android:textAppearance="@style/CarBody2"
android:textColor="@android:color/white"
android:textSize="36sp"
Expand Down Expand Up @@ -226,7 +226,7 @@
android:ellipsize="marquee"
android:gravity="center"
android:singleLine="true"
android:text="Dlouhodobá spotřeba"
android:text="@string/dash4_titleCenter"
android:textAppearance="@style/CarBody2"
android:textColor="@android:color/white"
android:textSize="20sp"
Expand All @@ -241,7 +241,7 @@
android:layout_marginStart="20dp"
android:layout_marginTop="30dp"
android:gravity="start|center_vertical"
android:text="Ujetá vzálenost:"
android:text="@string/dash4_elementCenter1"
android:textAppearance="@style/CarBody2"
android:textColor="@android:color/white"
android:textSize="14sp"
Expand All @@ -254,7 +254,7 @@
android:layout_height="30dp"
android:layout_marginEnd="20dp"
android:gravity="center_vertical|right"
android:text="9569 km"
android:text="0 km"
android:textAppearance="@style/CarBody2"
android:textColor="@android:color/white"
android:textSize="20sp"
Expand All @@ -266,7 +266,7 @@
android:layout_width="175dp"
android:layout_height="30dp"
android:gravity="start|center_vertical"
android:text="Průměrná rychlost:"
android:text="@string/dash4_elementCenter2"
android:textAppearance="@style/CarBody2"
android:textColor="@android:color/white"
android:textSize="14sp"
Expand All @@ -279,7 +279,7 @@
android:layout_width="175dp"
android:layout_height="30dp"
android:gravity="center_vertical|right"
android:text="67.4 kmh"
android:text="0,0 kmh"
android:textAppearance="@style/CarBody2"
android:textColor="@android:color/white"
android:textSize="20sp"
Expand All @@ -292,7 +292,7 @@
android:layout_width="175dp"
android:layout_height="30dp"
android:gravity="start|center_vertical"
android:text="Doba:"
android:text="@string/dash4_elementCenter3"
android:textAppearance="@style/CarBody2"
android:textColor="@android:color/white"
android:textSize="14sp"
Expand All @@ -305,7 +305,7 @@
android:layout_width="175dp"
android:layout_height="30dp"
android:gravity="center_vertical|right"
android:text="14:54:22 min"
android:text="00:00"
android:textAppearance="@style/CarBody2"
android:textColor="@android:color/white"
android:textSize="20sp"
Expand All @@ -317,7 +317,7 @@
android:layout_width="175dp"
android:layout_height="30dp"
android:gravity="start|center_vertical"
android:text=""
android:text="@string/dash4_elementCenter4"
android:textAppearance="@style/CarBody2"
android:textColor="@android:color/white"
android:textSize="14sp"
Expand All @@ -342,7 +342,7 @@
android:layout_width="175dp"
android:layout_height="30dp"
android:gravity="start|center_vertical"
android:text="Průměrná spotřeba:"
android:text="@string/dash4_elementCenter5"
android:textAppearance="@style/CarBody2"
android:textColor="@android:color/white"
android:textSize="14sp"
Expand All @@ -368,7 +368,7 @@
android:layout_height="0dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:text="6,9 l/100km"
android:text="0,0 l/100km"
android:textAppearance="@style/CarBody2"
android:textColor="@android:color/white"
android:textSize="36sp"
Expand Down Expand Up @@ -410,7 +410,7 @@
android:ellipsize="marquee"
android:gravity="center"
android:singleLine="true"
android:text="Spotřeba od startu"
android:text="@string/dash4_titleLeft"
android:textAppearance="@style/CarBody2"
android:textColor="@android:color/white"
android:textSize="20sp"
Expand All @@ -426,7 +426,7 @@
android:layout_marginStart="20dp"
android:layout_marginTop="30dp"
android:gravity="start|center_horizontal"
android:text="Ujetá vzálenost:"
android:text="@string/dash4_elementLeft1"
android:textAppearance="@style/CarBody2"
android:textColor="@android:color/white"
android:textSize="14sp"
Expand All @@ -440,7 +440,7 @@
android:layout_height="30dp"
android:layout_marginEnd="20dp"
android:gravity="center_vertical|right"
android:text="174 km"
android:text="0 km"
android:textAppearance="@style/CarBody2"
android:textColor="@android:color/white"
android:textSize="20sp"
Expand All @@ -452,7 +452,7 @@
android:layout_width="175dp"
android:layout_height="30dp"
android:gravity="start|center_horizontal"
android:text="Průměrná rychlost:"
android:text="@string/dash4_elementLeft2"
android:textAppearance="@style/CarBody2"
android:textColor="@android:color/white"
android:textSize="14sp"
Expand All @@ -465,7 +465,7 @@
android:layout_width="175dp"
android:layout_height="30dp"
android:gravity="center_vertical|right"
android:text="10.4 kmh"
android:text="0.0 kmh"
android:textAppearance="@style/CarBody2"
android:textColor="@android:color/white"
android:textSize="20sp"
Expand All @@ -478,7 +478,7 @@
android:layout_width="175dp"
android:layout_height="30dp"
android:gravity="start|center_horizontal"
android:text="Doba:"
android:text="@string/dash4_elementLeft3"
android:textAppearance="@style/CarBody2"
android:textColor="@android:color/white"
android:textSize="14sp"
Expand All @@ -491,7 +491,7 @@
android:layout_width="175dp"
android:layout_height="30dp"
android:gravity="center_vertical|right"
android:text="0:07:41 min"
android:text="00:00"
android:textAppearance="@style/CarBody2"
android:textColor="@android:color/white"
android:textSize="20sp"
Expand All @@ -503,7 +503,7 @@
android:layout_width="175dp"
android:layout_height="30dp"
android:gravity="start|center_horizontal"
android:text=""
android:text="@string/dash4_elementLeft4"
android:textAppearance="@style/CarBody2"
android:textColor="@android:color/white"
android:textSize="14sp"
Expand All @@ -528,7 +528,7 @@
android:layout_width="175dp"
android:layout_height="30dp"
android:gravity="start|center_horizontal"
android:text="Průměrná spotřeba:"
android:text="@string/dash4_elementLeft5"
android:textAppearance="@style/CarBody2"
android:textColor="@android:color/white"
android:textSize="14sp"
Expand All @@ -554,7 +554,7 @@
android:layout_height="0dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:text="6,4 l/100km"
android:text="0,0 l/100km"
android:textAppearance="@style/CarBody2"
android:textColor="@android:color/white"
android:textSize="36sp"
Expand Down
14 changes: 14 additions & 0 deletions app/src/main/res/values-cs/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,4 +211,18 @@
<string name="pref_enable_3nd_dash">Povolit dashboard o spotřebě</string>
<string name="pref_enable_4nd_dash">Povolit dashboard o spotřebě</string>
<string name="pref_enable_5nd_dash">Povolit dashboard servis</string>
<string name="dash4_elementLeft1">Ujetá vzdálenost:</string>
<string name="dash4_elementRight1">Palivo v nádrži:</string>
<string name="dash4_elementRight2">Dojezdová vzdálenost:</string>
<string name="dash4_elementRight5">Aktuální spotřeba:</string>
<string name="dash4_elementLeft5">Průměrná spotřeba:</string>
<string name="dash4_elementLeft3">Doba jízdy:</string>
<string name="dash4_elementCenter3">Doba jízdy:</string>
<string name="dash4_elementLeft2">Průměrná rychlost:</string>
<string name="dash4_elementCenter2">Průměrná rychlost:</string>
<string name="dash4_elementCenter1">Ujetá vzdálenost:</string>
<string name="dash4_elementCenter5">Průměrná spotřeba:</string>
<string name="dash4_titleCenter">Dlouhodobá spotřeba</string>
<string name="dash4_titleLeft">Spotřeba od startu</string>
<string name="dash4_titleRight">Aktuální data</string>
</resources>
20 changes: 18 additions & 2 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,22 @@
<string name="pref_enable_4nd_dash">Enable dashboard conspumtion</string>
<string name="pref_enable_5nd_dash">Enable dashboard service</string>
<string name="pref_enable_3nd_dash">Enable 3 dashboard</string>


<string name="dash4_titleRight">Actual data</string>
<string name="dash4_elementRight1">Fuel in tank:</string>
<string name="dash4_elementRight2">Driving distance:</string>
<string name="dash4_elementRight3"></string>
<string name="dash4_elementRight4"></string>
<string name="dash4_elementRight5">Current consumption:</string>
<string name="dash4_titleLeft">Consumption since start</string>
<string name="dash4_elementLeft1">Distance:</string>
<string name="dash4_elementLeft2">Avg speed:</string>
<string name="dash4_elementLeft3">Traveling time:</string>
<string name="dash4_elementLeft4"></string>
<string name="dash4_elementLeft5">Avg consumption:</string>
<string name="dash4_titleCenter">Long-Term consumption</string>
<string name="dash4_elementCenter1">Distance:</string>
<string name="dash4_elementCenter2">Avg speed:</string>
<string name="dash4_elementCenter3">Traveling time:</string>
<string name="dash4_elementCenter4"></string>
<string name="dash4_elementCenter5">Avg consumption:</string>
</resources>

0 comments on commit f9a5ec1

Please sign in to comment.