aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--main/res/layout/cache_image_item.xml6
-rw-r--r--main/res/values-cs/strings.xml3
-rw-r--r--main/res/values-de/strings.xml3
-rw-r--r--main/res/values-es/strings.xml2
-rw-r--r--main/res/values-fr/strings.xml3
-rw-r--r--main/res/values-hu/strings.xml3
-rw-r--r--main/res/values-it/strings.xml3
-rw-r--r--main/res/values-ja/strings.xml3
-rw-r--r--main/res/values-nl/strings.xml3
-rw-r--r--main/res/values-pl/strings.xml3
-rw-r--r--main/res/values-pt/strings.xml3
-rw-r--r--main/res/values-sk/strings.xml3
-rw-r--r--main/res/values-sv/strings.xml3
-rw-r--r--main/res/values/strings.xml3
-rw-r--r--main/src/cgeo/geocaching/CacheDetailActivity.java3
-rw-r--r--main/src/cgeo/geocaching/ImagesActivity.java2
-rw-r--r--main/src/cgeo/geocaching/ui/ImagesList.java33
17 files changed, 14 insertions, 68 deletions
diff --git a/main/res/layout/cache_image_item.xml b/main/res/layout/cache_image_item.xml
index 7ed4782..3e025e1 100644
--- a/main/res/layout/cache_image_item.xml
+++ b/main/res/layout/cache_image_item.xml
@@ -27,4 +27,10 @@
android:textSize="14dip"
android:visibility="gone" />
+ <ProgressBar
+ android:id="@+id/progress_bar"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ style="@android:style/Widget.ProgressBar.Small"/>
+
</LinearLayout> \ No newline at end of file
diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml
index caf0a17..a93a535 100644
--- a/main/res/values-cs/strings.xml
+++ b/main/res/values-cs/strings.xml
@@ -514,7 +514,6 @@
<string name="cache_attributes">Atributy</string>
<string name="cache_inventory">Inventář</string>
<string name="cache_log_offline">Offline Log</string>
- <string name="cache_log_images_loading">Načítání obrázků z logů…</string>
<string name="cache_log_images_title">Obrázky z Logů</string>
<string name="cache_log_image_default_title">Fotografie</string>
<string name="cache_personal_note">Osobní poznámka</string>
@@ -617,9 +616,7 @@
<string name="cache_coordinates">Souřadnice</string>
<string name="cache_coordinates_original">Původní souřadnice</string>
<string name="cache_spoiler_images_title">Obrázky s nápovědou</string>
- <string name="cache_spoiler_images_loading">Načítání obrázků s nápovědou…</string>
<string name="cache_images_title">Obrázky</string>
- <string name="cache_images_loading">Načítání obrázků…</string>
<string name="cache_log_types">Typy zápisů</string>
<string name="cache_coordinates_no">Tato keš nemá souřadnice.</string>
<string name="cache_clear_history">Vymazat historii</string>
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index 87086ef..d011ce8 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -502,7 +502,6 @@
<string name="cache_attributes">Attribute</string>
<string name="cache_inventory">Inventar</string>
<string name="cache_log_offline">Offline-Log</string>
- <string name="cache_log_images_loading">Lade Logbild…</string>
<string name="cache_log_images_title">Logbild</string>
<string name="cache_log_image_default_title">Bild</string>
<string name="cache_personal_note">Persönliche Notiz</string>
@@ -603,8 +602,6 @@
<string name="cache_coordinates">Koordinaten</string>
<string name="cache_coordinates_original">Ursprüngliche Koordinaten</string>
<string name="cache_spoiler_images_title">Hinweisbilder</string>
- <string name="cache_spoiler_images_loading">Lade Hinweisbilder…</string>
- <string name="cache_images_loading">Lade Bilder…</string>
<string name="cache_log_types">Logs</string>
<string name="cache_coordinates_no">Dieser Cache hat keine Koordinaten.</string>
<string name="cache_clear_history">Verlauf leeren</string>
diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml
index 7215d72..0fe60b5 100644
--- a/main/res/values-es/strings.xml
+++ b/main/res/values-es/strings.xml
@@ -401,7 +401,6 @@
<string name="cache_attributes">Atributos</string>
<string name="cache_inventory">Inventario</string>
<string name="cache_log_offline">Registro desconectado</string>
- <string name="cache_log_images_loading">Cargando imagen de registro…</string>
<string name="cache_log_images_title">Imagen de resgistro</string>
<string name="cache_log_image_default_title">Foto</string>
<string name="cache_personal_note">Nota personal</string>
@@ -464,7 +463,6 @@
<string name="cache_location">Ubicación</string>
<string name="cache_coordinates">Coordenadas</string>
<string name="cache_spoiler_images_title">Imágenes reveladoras</string>
- <string name="cache_spoiler_images_loading">Cargando imágenes reveladoras…</string>
<string name="cache_log_types">Tipos de registro</string>
<string name="cache_coordinates_no">Este escondite no tiene coordenadas.</string>
<string name="cache_clear_history">Borrar historial</string>
diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml
index 9de84ac..1fe3e20 100644
--- a/main/res/values-fr/strings.xml
+++ b/main/res/values-fr/strings.xml
@@ -512,7 +512,6 @@
<string name="cache_attributes">Attributs</string>
<string name="cache_inventory">Inventaire</string>
<string name="cache_log_offline">Visite hors-ligne</string>
- <string name="cache_log_images_loading">Chargement de l\'image de la visite…</string>
<string name="cache_log_images_title">Image de la visite</string>
<string name="cache_log_image_default_title">Photo</string>
<string name="cache_personal_note">Note personnelle</string>
@@ -615,9 +614,7 @@
<string name="cache_coordinates">Coordonnées</string>
<string name="cache_coordinates_original">Coordonnées d\'origine</string>
<string name="cache_spoiler_images_title">Images indices</string>
- <string name="cache_spoiler_images_loading">Chargement des images indices…</string>
<string name="cache_images_title">Images</string>
- <string name="cache_images_loading">Chargement des images…</string>
<string name="cache_log_types">Types de visites</string>
<string name="cache_coordinates_no">Cette cache n\'a pas de coordonnées.</string>
<string name="cache_clear_history">Effacer l\'historique</string>
diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml
index ec5e06e..dd8dfb9 100644
--- a/main/res/values-hu/strings.xml
+++ b/main/res/values-hu/strings.xml
@@ -483,7 +483,6 @@
<string name="cache_attributes">Tulajdonságok</string>
<string name="cache_inventory">Tárgyak</string>
<string name="cache_log_offline">Offline bejegyzés</string>
- <string name="cache_log_images_loading">Bejegyzés kép betöltése…</string>
<string name="cache_log_images_title">Bejegyzés kép</string>
<string name="cache_log_image_default_title">Fotó</string>
<string name="cache_personal_note">Személyes megjegyzés</string>
@@ -577,9 +576,7 @@
<string name="cache_coordinates">Koordináták</string>
<string name="cache_coordinates_original">Eredeti koordináták</string>
<string name="cache_spoiler_images_title">Spoiler képek</string>
- <string name="cache_spoiler_images_loading">Spoiler képek betöltése…</string>
<string name="cache_images_title">Képek</string>
- <string name="cache_images_loading">Képek betéltése…</string>
<string name="cache_log_types">Bejegyzés típusok</string>
<string name="cache_coordinates_no">Ennek a ládának nincsenek koordinátái.</string>
<string name="cache_clear_history">Előzmények törlése</string>
diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml
index f7d29cb..0205a19 100644
--- a/main/res/values-it/strings.xml
+++ b/main/res/values-it/strings.xml
@@ -484,7 +484,6 @@
<string name="cache_attributes">Attributi</string>
<string name="cache_inventory">Oggetti</string>
<string name="cache_log_offline">Log Offline</string>
- <string name="cache_log_images_loading">Caricamento immagini log…</string>
<string name="cache_log_images_title">Immagini Log</string>
<string name="cache_log_image_default_title">Foto</string>
<string name="cache_personal_note">Note personali</string>
@@ -583,9 +582,7 @@
<string name="cache_coordinates">Coordinate</string>
<string name="cache_coordinates_original">Coordinate originali</string>
<string name="cache_spoiler_images_title">Immagini spoiler</string>
- <string name="cache_spoiler_images_loading">Caricamento immagini spoiler…</string>
<string name="cache_images_title">Immaginis</string>
- <string name="cache_images_loading">Caricamento immagini…</string>
<string name="cache_log_types">Tipi di Log</string>
<string name="cache_coordinates_no">Questo cache non ha coordinate.</string>
<string name="cache_clear_history">Cancella cronologia</string>
diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml
index 126a03c..926122f 100644
--- a/main/res/values-ja/strings.xml
+++ b/main/res/values-ja/strings.xml
@@ -494,7 +494,6 @@
<string name="cache_attributes">属性</string>
<string name="cache_inventory">目録</string>
<string name="cache_log_offline">オフラインログ</string>
- <string name="cache_log_images_loading">添付画像をロード中…</string>
<string name="cache_log_images_title">ログの添付画像</string>
<string name="cache_log_image_default_title">写真</string>
<string name="cache_personal_note">パーソナルノート</string>
@@ -595,9 +594,7 @@
<string name="cache_coordinates">座標</string>
<string name="cache_coordinates_original">オリジナル座標</string> <!-- 「初公開時の座標」の方がいいかも -->
<string name="cache_spoiler_images_title">スポイラー画像</string>
- <string name="cache_spoiler_images_loading">スポイラー画像をロード中…</string>
<string name="cache_images_title">画像</string>
- <string name="cache_images_loading">画像をロード中…</string>
<string name="cache_log_types">ログタイプ</string>
<string name="cache_coordinates_no">このキャッシュに座標値はありません。</string>
<string name="cache_clear_history">全履歴を削除</string>
diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml
index 729c382..322bb0b 100644
--- a/main/res/values-nl/strings.xml
+++ b/main/res/values-nl/strings.xml
@@ -497,7 +497,6 @@
<string name="cache_attributes">Attributen</string>
<string name="cache_inventory">Inventaris</string>
<string name="cache_log_offline">Offline log</string>
- <string name="cache_log_images_loading">Laden van logafbeeldingen…</string>
<string name="cache_log_images_title">Logafbeelding</string>
<string name="cache_log_image_default_title">Foto</string>
<string name="cache_personal_note">Persoonlijke aantekening</string>
@@ -600,9 +599,7 @@
<string name="cache_coordinates">Coördinaten</string>
<string name="cache_coordinates_original">Originele coordinaten</string>
<string name="cache_spoiler_images_title">Spoiler afbeeldingen</string>
- <string name="cache_spoiler_images_loading">Spoiler afbeeldingen laden…</string>
<string name="cache_images_title">Afbeeldingen</string>
- <string name="cache_images_loading">Afbeeldingen laden…</string>
<string name="cache_log_types">Log types</string>
<string name="cache_coordinates_no">Deze cache heeft geen coördinaten.</string>
<string name="cache_clear_history">Maak geschiedenis leeg</string>
diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml
index b5328c4..4ab069e 100644
--- a/main/res/values-pl/strings.xml
+++ b/main/res/values-pl/strings.xml
@@ -488,7 +488,6 @@
<string name="cache_attributes">Atrybuty</string>
<string name="cache_inventory">Inwentarz</string>
<string name="cache_log_offline">Wpis offline</string>
- <string name="cache_log_images_loading">Trwa ładowanie zdjęć z wpisu…</string>
<string name="cache_log_images_title">Zdjęcie z wpisu</string>
<string name="cache_log_image_default_title">Zdjęcie</string>
<string name="cache_personal_note">Notatka osobista</string>
@@ -586,9 +585,7 @@
<string name="cache_coordinates">Współrzędne</string>
<string name="cache_coordinates_original">Oryginalne współrzędne</string>
<string name="cache_spoiler_images_title">Zdjęcia spoiler</string>
- <string name="cache_spoiler_images_loading">Ładuję zdjęcia spoiler…</string>
<string name="cache_images_title">Zdjęcia</string>
- <string name="cache_images_loading">Ładuję zdjęcia…</string>
<string name="cache_log_types">Rodzaj wpisu</string>
<string name="cache_coordinates_no">Ta skrzynka nie ma współrzędnych GPS.</string>
<string name="cache_clear_history">Usuń historię</string>
diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml
index 5f67281..d6ee413 100644
--- a/main/res/values-pt/strings.xml
+++ b/main/res/values-pt/strings.xml
@@ -484,7 +484,6 @@
<string name="cache_attributes">Atributos</string>
<string name="cache_inventory">Inventário</string>
<string name="cache_log_offline">Registo Offline</string>
- <string name="cache_log_images_loading">A carregar imagem do registo…</string>
<string name="cache_log_images_title">Imagem do registo</string>
<string name="cache_log_image_default_title">Foto</string>
<string name="cache_personal_note">Nota pessoal</string>
@@ -580,9 +579,7 @@
<string name="cache_coordinates">Coordenadas</string>
<string name="cache_coordinates_original">Coordenadas originais</string>
<string name="cache_spoiler_images_title">Imagens spoiler</string>
- <string name="cache_spoiler_images_loading">A carregar imagens spoiler…</string>
<string name="cache_images_title">Imagens</string>
- <string name="cache_images_loading">A carregar as imagens…</string>
<string name="cache_log_types">Tipos de log</string>
<string name="cache_coordinates_no">Esta cache não tem coordenadas.</string>
<string name="cache_clear_history">Apagar histórico</string>
diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml
index cef88d4..e128fb0 100644
--- a/main/res/values-sk/strings.xml
+++ b/main/res/values-sk/strings.xml
@@ -484,7 +484,6 @@
<string name="cache_attributes">Atribúty</string>
<string name="cache_inventory">Obsah</string>
<string name="cache_log_offline">Offline log</string>
- <string name="cache_log_images_loading">Načítanie obrázku z logu…</string>
<string name="cache_log_images_title">Obrázok z logu</string>
<string name="cache_log_image_default_title">Fotografia</string>
<string name="cache_personal_note">Osobná poznámka</string>
@@ -579,9 +578,7 @@
<string name="cache_coordinates">Súradnice</string>
<string name="cache_coordinates_original">Pôvodné súradnice</string>
<string name="cache_spoiler_images_title">Spoilerové obrázky</string>
- <string name="cache_spoiler_images_loading">Načítanie spoilerových obrázkov…</string>
<string name="cache_images_title">Obrázky</string>
- <string name="cache_images_loading">Prebieha načítanie obrázkov…</string>
<string name="cache_log_types">Typy záznamov</string>
<string name="cache_coordinates_no">Táto skrýša nemá žiadne súradnice.</string>
<string name="cache_clear_history">Vymazať históriu</string>
diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml
index d3be9ff..b68de4c 100644
--- a/main/res/values-sv/strings.xml
+++ b/main/res/values-sv/strings.xml
@@ -512,7 +512,6 @@
<string name="cache_attributes">Attribut</string>
<string name="cache_inventory">Innehåll</string>
<string name="cache_log_offline">Offline logg</string>
- <string name="cache_log_images_loading">Laddar loggbilder…</string>
<string name="cache_log_images_title">Loggbild</string>
<string name="cache_log_image_default_title">Foto</string>
<string name="cache_personal_note">Personlig anteckning</string>
@@ -615,9 +614,7 @@
<string name="cache_coordinates">Koordinater</string>
<string name="cache_coordinates_original">Ursprungliga koordinater</string>
<string name="cache_spoiler_images_title">Spoiler bilder</string>
- <string name="cache_spoiler_images_loading">Laddar spoiler bilder…</string>
<string name="cache_images_title">Bilder</string>
- <string name="cache_images_loading">Laddar bilder…</string>
<string name="cache_log_types">Loggtyper</string>
<string name="cache_coordinates_no">Cachen saknar koordinater.</string>
<string name="cache_clear_history">Rensa historik</string>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 13926c5..c539915 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -512,7 +512,6 @@
<string name="cache_attributes">Attributes</string>
<string name="cache_inventory">Inventory</string>
<string name="cache_log_offline">Offline Log</string>
- <string name="cache_log_images_loading">Loading Log images…</string>
<string name="cache_log_images_title">Log images</string>
<string name="cache_log_image_default_title">Photo</string>
<string name="cache_personal_note">Personal note</string>
@@ -615,9 +614,7 @@
<string name="cache_coordinates">Coordinates</string>
<string name="cache_coordinates_original">Original Coordinates</string>
<string name="cache_spoiler_images_title">Spoiler images</string>
- <string name="cache_spoiler_images_loading">Loading spoiler images…</string>
<string name="cache_images_title">Images</string>
- <string name="cache_images_loading">Loading images…</string>
<string name="cache_log_types">Log types</string>
<string name="cache_coordinates_no">This cache has no coordinates.</string>
<string name="cache_clear_history">Clear history</string>
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index daeb14e..c4287ed 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -27,7 +27,6 @@ import cgeo.geocaching.ui.EditNoteDialog;
import cgeo.geocaching.ui.EditNoteDialog.EditNoteDialogListener;
import cgeo.geocaching.ui.Formatter;
import cgeo.geocaching.ui.ImagesList;
-import cgeo.geocaching.ui.ImagesList.ImageType;
import cgeo.geocaching.ui.LoggingUI;
import cgeo.geocaching.ui.WeakReferenceHandler;
import cgeo.geocaching.utils.BaseUtils;
@@ -905,7 +904,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
return;
}
imagesList = new ImagesList(this, cache.getGeocode());
- imagesList.loadImages(imageView, cache.getImages(), ImageType.AllImages, false);
+ imagesList.loadImages(imageView, cache.getImages(), false);
}
public static void startActivity(final Context context, final String geocode) {
diff --git a/main/src/cgeo/geocaching/ImagesActivity.java b/main/src/cgeo/geocaching/ImagesActivity.java
index de84af2..07ff734 100644
--- a/main/src/cgeo/geocaching/ImagesActivity.java
+++ b/main/src/cgeo/geocaching/ImagesActivity.java
@@ -63,7 +63,7 @@ public class ImagesActivity extends AbstractActivity {
@Override
public void onStart() {
super.onStart();
- imagesList.loadImages(findViewById(R.id.spoiler_list), imageNames, imgType, offline);
+ imagesList.loadImages(findViewById(R.id.spoiler_list), imageNames, offline);
}
@Override
diff --git a/main/src/cgeo/geocaching/ui/ImagesList.java b/main/src/cgeo/geocaching/ui/ImagesList.java
index 9464114..b2c819c 100644
--- a/main/src/cgeo/geocaching/ui/ImagesList.java
+++ b/main/src/cgeo/geocaching/ui/ImagesList.java
@@ -11,7 +11,6 @@ import cgeo.geocaching.utils.Log;
import org.apache.commons.lang3.StringUtils;
import android.app.Activity;
-import android.app.ProgressDialog;
import android.content.Intent;
import android.content.res.Resources;
import android.graphics.Bitmap;
@@ -46,16 +45,14 @@ public class ImagesList {
private Image currentImage;
public enum ImageType {
- LogImages(R.string.cache_log_images_title, R.string.cache_log_images_loading),
- SpoilerImages(R.string.cache_spoiler_images_title, R.string.cache_spoiler_images_loading),
- AllImages(R.string.cache_images_title, R.string.cache_images_loading);
+ LogImages(R.string.cache_log_images_title),
+ SpoilerImages(R.string.cache_spoiler_images_title),
+ AllImages(R.string.cache_images_title);
private final int titleResId;
- private final int loadingResId;
- ImageType(final int title, final int loading) {
+ ImageType(final int title) {
this.titleResId = title;
- this.loadingResId = loading;
}
public int getTitle() {
@@ -64,9 +61,6 @@ public class ImagesList {
}
private LayoutInflater inflater = null;
- private ProgressDialog progressDialog = null;
- private int count = 0;
- private int countDone = 0;
private final Activity activity;
// We could use a Set here, but we will insert no duplicates, so there is no need to check for uniqueness.
private final Collection<Bitmap> bitmaps = new LinkedList<Bitmap>();
@@ -83,18 +77,10 @@ public class ImagesList {
inflater = activity.getLayoutInflater();
}
- public void loadImages(final View parentView, final List<Image> images, ImageType imageType, final boolean offline) {
+ public void loadImages(final View parentView, final List<Image> images, final boolean offline) {
imagesView = (LinearLayout) parentView.findViewById(R.id.spoiler_list);
- count = images.size();
- progressDialog = new ProgressDialog(activity);
- progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
- progressDialog.setMessage(activity.getString(imageType.loadingResId));
- progressDialog.setCancelable(true);
- progressDialog.setMax(count);
- progressDialog.show();
-
for (final Image img : images) {
LinearLayout rowView = (LinearLayout) inflater.inflate(R.layout.cache_image_item, null);
@@ -154,19 +140,12 @@ public class ImagesList {
imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
imageView.setLayoutParams(new LayoutParams(bounds.width(), bounds.height()));
+ view.findViewById(R.id.progress_bar).setVisibility(View.GONE);
view.addView(imageView);
imageView.setId(image.hashCode());
images.put(imageView.getId(), img);
}
-
- synchronized (activity) {
- countDone++;
- progressDialog.setProgress(countDone);
- if (progressDialog.getProgress() >= count) {
- progressDialog.dismiss();
- }
- }
}
}
generated by cgit v1.1 at 2025-02-05 16:14:14 +0000