[Widget] Prettified widget. Fixed background colour from being grey t…

…o white. Made progress bar thinner. Made a shorter "No trams" message.
thecosmicfrog · May 13, 2019 · f0c54f7 · f0c54f7
1 parent 0e5f464
commit f0c54f7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/mobile/src/main/java/org/thecosmicfrog/luasataglance/service/WidgetListenerService.java b/mobile/src/main/java/org/thecosmicfrog/luasataglance/service/WidgetListenerService.java
@@ -490,7 +490,7 @@ private void updateStopForecast(Context context, RemoteViews views, StopForecast
                 if (stopForecast.getInboundTrams().size() == 0) {
                     views.setTextViewText(
                             TEXTVIEW_INBOUND_STOP1_NAME,
-                            context.getString(R.string.no_trams_forecast)
+                            context.getString(R.string.no_trams_forecast_short)
                     );
                 } else {
                     String inboundTram;
@@ -542,7 +542,7 @@ private void updateStopForecast(Context context, RemoteViews views, StopForecast
                 if (stopForecast.getOutboundTrams().size() == 0) {
                     views.setTextViewText(
                             TEXTVIEW_OUTBOUND_STOP1_NAME,
-                            context.getString(R.string.no_trams_forecast)
+                            context.getString(R.string.no_trams_forecast_short)
                     );
                 } else {
                     String outboundTram;

diff --git a/mobile/src/main/res/layout/stop_forecast_widget.xml b/mobile/src/main/res/layout/stop_forecast_widget.xml
@@ -41,6 +41,7 @@
             android:gravity="center_vertical|start"
             android:layout_weight="0.075"
             android:layout_marginLeft="3dp"
+            android:layout_marginBottom="3dp"
             android:text="@string/widget_left_arrow"
             android:textColor="@android:color/white" />
 
@@ -57,23 +58,27 @@
             android:id="@+id/textview_stop_name_right_arrow"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
+            android:gravity="center_vertical|end"
             android:layout_marginRight="3dp"
+            android:layout_marginBottom="3dp"
             android:layout_weight="0.075"
-            android:gravity="center_vertical|end"
             android:text="@string/widget_right_arrow"
             android:textColor="@android:color/white" />
     </LinearLayout>
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="10dp"
+        android:layout_height="6dp"
-        android:background="#eeeeee">
+        android:elevation="@dimen/cardview_default_elevation">
 
         <ProgressBar
             style="?android:attr/progressBarStyleHorizontal"
             android:id="@+id/progressbar"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent"
+            android:background="@android:color/white"
+            android:progressTint="@android:color/white"
+            android:progressBackgroundTint="@android:color/white" />
     </RelativeLayout>
 
     <LinearLayout
@@ -170,7 +175,7 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="6dp"
-            android:background="#eeeeee" />
+            android:background="@android:color/white" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -249,6 +254,6 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="6dp"
-            android:background="#eeeeee" />
+            android:background="@android:color/white" />
     </LinearLayout>
 </LinearLayout>
diff --git a/mobile/src/main/res/values-ga/strings.xml b/mobile/src/main/res/values-ga/strings.xml
@@ -70,6 +70,7 @@
     <string name="min">nóim</string>
     <string name="mins">nóim</string>
     <string name="no_trams_forecast"><b>Tram ar bith geallta</b></string>
+    <string name="no_trams_forecast_short"><b>Tram ar bith geallta</b></string>
     <string name="bottomnav_map_short">Léarscáil</string>
     <string name="bottomnav_favourites_short">Ceanáin</string>
     <string name="tap_to_load_times"><b>Cliceáil chun amanna a fháil</b></string>

diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
@@ -73,6 +73,7 @@
     <string name="min">min</string>
     <string name="mins">mins</string>
     <string name="no_trams_forecast"><b>No trams forecast</b></string>
+    <string name="no_trams_forecast_short"><b>No trams</b></string>
     <string name="bottomnav_map_short">Map</string>
     <string name="bottomnav_favourites_short">Fav\'s</string>
     <string name="tap_to_load_times"><b>Tap to load times</b></string>