Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion res/layout/radar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
android:paddingRight="5dp" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_centerVertical="true"
android:layout_centerHorizontal="true" android:textColor="#FFFFFFFF"
android:text="Loading ..." android:textSize="15dp" android:background="#44000000"
android:textSize="15dp" android:background="#44000000"
android:visibility="gone" />

<RelativeLayout android:layout_width="wrap_content" android:layout_centerHorizontal="true"
Expand Down
2 changes: 2 additions & 0 deletions res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@
<string name="km256">256 KM</string>
<string name="km512">512 KM</string>
<string name="map">Map</string>
<string name="loading">Loading ...</string>
<string name="cannot_connect">Not Connected</string>

</resources>
16 changes: 15 additions & 1 deletion src/au/com/jtribe/weatherradar/AussieWeatherRadar.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

import android.app.Activity;
import android.app.Dialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.Bitmap;
Expand Down Expand Up @@ -277,10 +278,18 @@ private void showProgressViews() {
}

private void setProgessVisibility(int visibility) {
this.progressText.setText(R.string.loading);
this.progressText.setVisibility(visibility);
this.progressBar.setVisibility(visibility);
}

private void showNoConnectivity() {
progressText.setText(R.string.cannot_connect);
progressText.setVisibility(View.VISIBLE);
progressBar.setVisibility(View.GONE);
CacheDialogPreference.deleteCache(DialogInterface.BUTTON_POSITIVE);
}

private void refreshCurrentConditions(final String productCode) {
showProgressViews();
this.animationVG.removeAllViews();
Expand Down Expand Up @@ -324,7 +333,11 @@ public void handleMessage(Message msg) {
animationVG.removeAllViews();
timeVG.removeAllViews();

ArrayList<String> animationLink = msg.getData().getStringArrayList("aniLink");
ArrayList<String> animationLink = msg.getData()
.getStringArrayList("aniLink");
if (animationLink.isEmpty()) {
showNoConnectivity();
} else {

View lastView = null;
for (int i = 0; i < animationLink.size(); i++) {
Expand All @@ -343,6 +356,7 @@ public void handleMessage(Message msg) {
animationVG.startFlipping();

hideProgressViews();
}
}
};
aniRunnable = new AnimationRunnable(productCode, toastHandler);
Expand Down