Design fixes

This commit is contained in:
GaidamakUA 2015-12-30 12:28:13 +02:00
parent f91cfe28f1
commit 1d73416707
32 changed files with 60 additions and 56 deletions

View file

@ -10,12 +10,13 @@
tools:context="net.osmand.plus.osmedit.EditPoiDialogFragment">
<android.support.design.widget.TabLayout
android:theme="?attr/appbar_layout_theme"
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/pstsTabBackground"
android:theme="?attr/appbar_layout_theme"
app:layout_scrollFlags="scroll"
android:background="?attr/pstsTabBackground"/>
app:tabIndicatorColor="?attr/pstsIndicatorColor"/>
<android.support.v4.view.ViewPager
android:id="@+id/viewpager"

View file

@ -7,7 +7,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="125dp"
android:layout_height="wrap_content"
android:background="@color/color_dialog_buttons_light"
android:orientation="vertical"
android:paddingLeft="24dp"
@ -18,7 +18,7 @@
android:id="@+id/regionNameTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="27dp"
android:layout_marginBottom="8dp"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/color_white"
tools:text="Flevoland"/>
@ -45,6 +45,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:gravity="center"
android:textColor="@color/color_white"
android:textSize="12sp"
@ -110,7 +111,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:text="@string/update_every"
android:text="@string/update"
android:textColor="?android:attr/textColorPrimary"
android:textSize="16sp"/>
@ -120,6 +121,7 @@
style="@style/OsmandLightTheme.Spinner"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="right"
android:entries="@array/update_frequencies_array"
android:paddingLeft="0dp"/>
</LinearLayout>
@ -167,15 +169,6 @@
android:textSize="16sp"
tools:text="Updates: 65NB"/>
<Button
android:id="@+id/removeUpdatesButton"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|center_vertical"
android:gravity="center_vertical|right"
android:textColor="?attr/color_dialog_buttons"
android:text="@string/shared_string_clear"/>
</LinearLayout>

View file

@ -103,8 +103,8 @@
android:layout_height="wrap_content"
android:background="?attr/bg_color"
app:layout_scrollFlags="scroll"
app:tabIndicatorColor="?attr/pstsIndicatorColor"
app:tabSelectedTextColor="?attr/pstsIndicatorColor"
app:tabIndicatorColor="@color/osmand_orange"
app:tabSelectedTextColor="@color/osmand_orange"
app:tabTextColor="@android:color/darker_gray"/>
</android.support.design.widget.AppBarLayout>

View file

@ -9,4 +9,5 @@
android:groupIndicator="@null"
android:headerDividersEnabled="false"
android:orientation="vertical"
android:drawSelectorOnTop="true"
tools:context=".liveupdates.LiveUpdatesFragment"/>

View file

@ -2064,7 +2064,7 @@
<string name="route_distance">Адлегласьць:</string>
<string name="route_duration">Час:</string>
<string name="rendering_attr_horseRoutes_name">Конныя маршруты</string>
<string name="update_every">Абнавіць кожны</string>
<string name="update">Абнавіць кожны</string>
<string name="only_download_over_wifi">Сьцягваць толькі праз WiFi</string>
<string name="live_update">Бягучае абнаўленьне</string>
<string name="update_now">Абнавіць зараз</string>

View file

@ -2007,7 +2007,7 @@
<string name="number_of_rows_in_dash">Брой редове %1$s</string>
<string name="dashboard_or_drawer_description">Можете да управлявате приложението чрез гъвкаво табло или чрез статично меню. Вашият избор може да бъде променен по-късно.</string>
<string name="rendering_attr_horseRoutes_name">Пътеки за конна езда</string>
<string name="update_every">Обновяване на всеки</string>
<string name="update">Обновяване на всеки</string>
<string name="only_download_over_wifi">Сваляне само през WiFi</string>
<string name="live_update">Актуализиране на момента</string>
<string name="update_now">Актуализирай сега</string>

View file

@ -1876,7 +1876,7 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
<string name="av_audio_bitrate">Taxa de bits de l\'àudio</string>
<string name="av_audio_bitrate_descr">Seleccioneu la taxa de bits de l\'àudio</string>
<string name="looking_up_address">Consulta per adreça</string>
<string name="update_every">Actualitza tots</string>
<string name="update">Actualitza tots</string>
<string name="only_download_over_wifi">Baixades només amb WIFI</string>
<string name="live_update">Actualitza al moment</string>
<string name="update_now">Actualitza ara</string>

View file

@ -1880,7 +1880,7 @@
<string name="no_location_permission">Aplikace nemá povolen přístup k poloze.</string>
<string name="no_camera_permission">Aplikace nemá povolen přístup k fotoaparátu.</string>
<string name="no_microphone_permission">Aplikace nemá povolen přístup k mikrofonu.</string>
<string name="update_every">Aktualizovat každých</string>
<string name="update">Aktualizovat každých</string>
<string name="live_update">Okamžité aktualizace</string>
<string name="update_now">Aktualizovat nyní</string>
<string name="missing_write_external_storage_permission">Aplikace nemá povolen přístup k SD kartě</string>

View file

@ -2183,7 +2183,7 @@
<string name="no_address_found">Kan ikke bestemme adresse</string>
<string name="looking_up_address">Søger efter adressen</string>
<string name="rendering_attr_horseRoutes_name">Rideruter</string>
<string name="update_every">Opdateringsinterval</string>
<string name="update">Opdateringsinterval</string>
<string name="only_download_over_wifi">Hent kun med WiFi</string>
<string name="live_update">Realtidsopdatering</string>
<string name="update_now">Opdater nu</string>

View file

@ -2045,7 +2045,7 @@
<string name="av_audio_bitrate">Audio-Bitrate</string>
<string name="av_audio_bitrate_descr">Wähle Audio-Bitrate</string>
<string name="rendering_attr_horseRoutes_name">Pferdewege</string>
<string name="update_every">Aktualisierungsintervall</string>
<string name="update">Aktualisierungsintervall</string>
<string name="only_download_over_wifi">Nur über WLAN herunterladen</string>
<string name="live_update">Live-Aktualisierung</string>
<string name="update_now">Jetzt aktualisieren</string>

View file

@ -2003,7 +2003,7 @@
<string name="no_address_found">Dirección indeterminada</string>
<string name="looking_up_address">Buscando dirección</string>
<string name="rendering_attr_horseRoutes_name">Rutas a caballo</string>
<string name="update_every">Actualizar cada</string>
<string name="update">Actualizar cada</string>
<string name="only_download_over_wifi">Descargar sólo por WiFi</string>
<string name="live_update">Actualización en vivo</string>
<string name="update_now">Actualizar ahora</string>

View file

@ -2002,7 +2002,7 @@
<string name="no_address_found">Dirección indeterminada</string>
<string name="looking_up_address">Buscando dirección</string>
<string name="rendering_attr_horseRoutes_name">Rutas a caballo</string>
<string name="update_every">Actualizar cada</string>
<string name="update">Actualizar cada</string>
<string name="only_download_over_wifi">Descargar sólo por WiFi</string>
<string name="live_update">Actualización en vivo</string>
<string name="update_now">Actualizar ahora</string>

View file

@ -2069,7 +2069,7 @@
<string name="av_audio_bitrate_descr">Sélectionnez le bitrate audio</string>
<string name="no_address_found">Impossible de déterminer l\'adresse</string>
<string name="looking_up_address">Recherche de l\'adresse</string>
<string name="update_every">Mettre à jour tout les</string>
<string name="update">Mettre à jour tout les</string>
<string name="only_download_over_wifi">Télécharger uniquement en WIFI</string>
<string name="live_update">Mise à jour en temps réel</string>
<string name="rendering_attr_horseRoutes_name">Randonnée à cheval</string>

View file

@ -2065,7 +2065,7 @@
<string name="no_microphone_permission">Az alkalmazásnak nincs jogosultsága elérni a mikrofont.</string>
<string name="route_distance">Távolság:</string>
<string name="route_duration">Idő:</string>
<string name="update_every">Frissítési gyakoriság</string>
<string name="update">Frissítési gyakoriság</string>
<string name="missing_write_external_storage_permission">Az alkalmazásnak nincs jogosultsága elérni az SD kártyát.</string>
<string name="last_update">Utolsó frissítés: %s</string>
</resources>

View file

@ -2096,7 +2096,7 @@
<string name="no_address_found">Nessun indirizzo trovato</string>
<string name="looking_up_address">Ricerca dell\'indirizzo in corso</string>
<string name="routing_attr_avoid_borders_name">Non superare i confini</string>
<string name="update_every">Aggiorna ogni</string>
<string name="update">Aggiorna ogni</string>
<string name="only_download_over_wifi">Scarica solo da rete WiFi</string>
<string name="live_update">Aggiornamenti in tempo reale</string>
<string name="lang_fy">Frisone occidentale</string>

View file

@ -2035,7 +2035,7 @@
<string name="routing_attr_avoid_stairs_description">Vengti laiptų</string>
<string name="poi_dialog_reopen">Atidaryti iš naujo</string>
<string name="poi_context_menu_modify_osm_change">Redaguoti LV</string>
<string name="update_every">Atnaujinti kas</string>
<string name="update">Atnaujinti kas</string>
<string name="only_download_over_wifi">Atsisiųsti tik naudojant Wi-Fi</string>
<string name="update_now">Atnaujinti tuoj pat</string>
<string name="missing_write_external_storage_permission">Programėlė neturi teisių įrašyti į atminties kortelę</string>

View file

@ -2122,7 +2122,7 @@
<string name="av_audio_bitrate_descr">Kies audio bitrate</string>
<string name="looking_up_address">Adres wordt gezocht</string>
<string name="rendering_attr_horseRoutes_name">Ruiterroutes</string>
<string name="update_every">Controle op Update</string>
<string name="update">Controle op Update</string>
<string name="only_download_over_wifi">Alleen downloaden via WiFi</string>
<string name="live_update">Live Update</string>
<string name="update_now">Nu Controleren</string>

View file

@ -2084,7 +2084,7 @@
<string name="only_download_over_wifi">Pobieraj tylko przez WiFi</string>
<string name="live_update">Uaktualniaj na bieżąco</string>
<string name="update_now">Aktualizuj teraz</string>
<string name="update_every">Aktualizacja co</string>
<string name="update">Aktualizacja co</string>
<string name="route_distance">Odległość:</string>
<string name="route_duration">Czas:</string>
<string name="looking_up_address">Wyszukiwanie adresu</string>

View file

@ -1951,7 +1951,7 @@
<string name="no_address_found">Sem endereço determinado</string>
<string name="looking_up_address">Endereço procurado</string>
<string name="rendering_attr_horseRoutes_name">Rotas a cavalo</string>
<string name="update_every">Atualizar tudo</string>
<string name="update">Atualizar tudo</string>
<string name="only_download_over_wifi">Somente baixar via Wi-Fi</string>
<string name="live_update">Atualização ao vivo</string>
<string name="update_now">Atualizar agora</string>

View file

@ -1921,7 +1921,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="Night">Noite</string>
<string name="dashboard_or_drawer_description">Há uma nova opção para controlar principalmente o aplicativo através do painel flexível (Dashboard) ou um menu estático. A sua escolha pode sempre ser alterada nas configurações do painel.</string>
<string name="dashboard_or_drawer_title">Dashboard ou menu de controle</string>
<string name="update_every">Actualizar em cada</string>
<string name="update">Actualizar em cada</string>
<string name="only_download_over_wifi">Apenas download com WiFi</string>
<string name="live_update">Actualização sincronizada</string>
<string name="update_now">Actualizar agora</string>

View file

@ -1866,7 +1866,7 @@
<string name="routing_attr_avoid_stairs_name">Избегать лестниц</string>
<string name="routing_attr_avoid_stairs_description">Избегать лестниц</string>
<string name="routing_attr_avoid_borders_name">Избегать пересечение бордюра</string>
<string name="update_every">Обновлять каждые</string>
<string name="update">Обновлять каждые</string>
<string name="only_download_over_wifi">Загружать только через WiFi</string>
<string name="update_now">Обновить сейчас</string>
<string name="missing_write_external_storage_permission">Приложению не разрешена запись на карту памяти</string>

View file

@ -2042,7 +2042,7 @@
<string name="route_distance">Distàntzia:</string>
<string name="route_duration">Tempus:</string>
<string name="rendering_attr_horseRoutes_name">Àndalas a caddu</string>
<string name="update_every">Agiorna cada</string>
<string name="update">Agiorna cada</string>
<string name="only_download_over_wifi">Iscàrriga petzi pro mèdiu de una retza WiFi</string>
<string name="live_update">Agiornamentos in tempus reale</string>
<string name="update_now">Agiorna como</string>

View file

@ -1954,7 +1954,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
<string name="route_distance">Vzdialenosť:</string>
<string name="route_duration">Čas:</string>
<string name="update_now">Aktualizovať teraz</string>
<string name="update_every">Aktualizovať každých</string>
<string name="update">Aktualizovať každých</string>
<string name="only_download_over_wifi">Sťahovať iba cez WiFi</string>
<string name="live_update">Okamžité aktualizácie</string>
<string name="missing_write_external_storage_permission">Aplikácia nemá oprávnenia použiť SD kartu</string>

View file

@ -2046,7 +2046,7 @@
<string name="looking_up_address">Iskanje naslova</string>
<string name="route_distance">Razdalja:</string>
<string name="route_duration">Čas:</string>
<string name="update_every">Posodobi vsakih</string>
<string name="update">Posodobi vsakih</string>
<string name="only_download_over_wifi">Prejmi le preko WiFi</string>
<string name="live_update">Posodobitev v živo</string>
<string name="update_now">Posodobi takoj</string>

View file

@ -2030,7 +2030,7 @@
<string name="no_address_found">Ingen adress angiven</string>
<string name="looking_up_address">Slår upp adressen</string>
<string name="rendering_attr_horseRoutes_name">Hästleder</string>
<string name="update_every">Uppdatera varje</string>
<string name="update">Uppdatera varje</string>
<string name="only_download_over_wifi">Hämta endast via WiFi</string>
<string name="live_update">Direktuppdatering</string>
<string name="update_now">Uppdatera nu</string>

View file

@ -1989,7 +1989,7 @@
<string name="osmo_auth_error_short">Yetkilendirme başarısız oldu</string>
<string name="osmo_auth_error">OsMo yetkilendirme hata oluştu: %1$s.\nAşağı bir geçici olarak hizmet olabilir veya kayıt süresi.\nYeni kayıt devam etmek istiyor musunuz?</string>
<string name="osmo_group_information_desc">" -Tüm oluşturulan grupları genel! Anonim olmak istiyorsan, izci kimlikleri üzerinden doğrudan aygıtlarını bağlayın.\n-Özel gruplar için 8 kişi sınırlıdır\nHareketsizlik ya da 2 hafta için sadece 1 kişi faaliyet-grup-ecek var olmak silmek.\n-Sadece davet, ama kontrol grubuna yönetici konsolu için gitmek gerekir gibi grup giriş, sınırlayabilirsiniz.\n-Bir grup oluşturun, ancak diğer koşulları ile lütfen http://osmo.mobi başvurun gerekiyorsa"</string>
<string name="update_every">Bütün Güncellemler</string>
<string name="update">Bütün Güncellemler</string>
<string name="only_download_over_wifi">Sadece WiFi üzerinden İndir</string>
<string name="live_update">Canlı güncelleştirme</string>
<string name="route_distance">Mesafe:</string>

View file

@ -2215,7 +2215,7 @@ OsmAnd має відкриті сирці і активно розвиваєть
<string name="show_free_version_banner">Показати банер безкоштовної версії</string>
<string name="use_dashboard_btn">Використовувати домашню сторінку</string>
<string name="use_drawer_btn">Використовувати меню</string>
<string name="update_every">Оновлювати кожні</string>
<string name="update">Оновлювати кожні</string>
<string name="share_osm_edits_subject">OSM правки, поширені через OsmAnd</string>
<string name="rendering_attr_hideProposed_name">Приховати заплановані об\'єкти</string>
<string name="save_poi_without_poi_type_message">Ви дійсно хочете зберегти POI, не вказавши його тип?</string>

View file

@ -2029,7 +2029,7 @@
<string name="no_address_found">沒有確定地址</string>
<string name="looking_up_address">查尋地址</string>
<string name="rendering_attr_horseRoutes_name">馬道</string>
<string name="update_every">更新全部</string>
<string name="update">更新全部</string>
<string name="only_download_over_wifi">只在 WiFi 連線下載</string>
<string name="live_update">即時更新</string>
<string name="update_now">立即更新</string>

View file

@ -2133,7 +2133,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="use_drawer_btn">Use menu</string>
<string name="dashboard_or_drawer_title">Dashboard or menu control</string>
<string name="dashboard_or_drawer_description">There is a new choice to primarily control the app via the flexible dashboard or a static menu. Your choice can always be changed in the dashboard settings.</string>
<string name="update_every">Update every</string>
<string name="update">Update</string>
<string name="only_download_over_wifi">Only download over WiFi</string>
<string name="live_update">Live update</string>
<string name="update_now">Update now</string>

View file

@ -133,7 +133,6 @@
<item name="android:textColorPrimary">@color/color_white</item>
<item name="android:textColorSecondary">@color/inactive_item_orange</item>
<item name="android:textColorHint">@color/inactive_item_orange</item>
<item name="pstsIndicatorColor">@color/osmand_orange</item>
<item name="colorAccent">@color/color_white</item>
<!--<item name="actionMenuTextColor">@color/color_white</item>-->
</style>

View file

@ -80,6 +80,16 @@ public class LiveUpdatesFragment extends Fragment {
listView.addFooterView(bottomShadowView);
adapter = new LocalIndexesAdapter(this);
listView.setAdapter(adapter);
listView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() {
@Override
public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) {
final FragmentManager fragmentManager = getChildFragmentManager();
LiveUpdatesSettingsDialogFragment
.createInstance(adapter.getChild(groupPosition, childPosition))
.show(fragmentManager, "settings");
return true;
}
});
new LoadLocalIndexTask(adapter, this).execute();
return view;
}
@ -93,7 +103,9 @@ public class LiveUpdatesFragment extends Fragment {
}
public void notifyLiveUpdatesChanged() {
adapter.notifyLiveUpdatesChanged();
if (adapter != null) {
adapter.notifyLiveUpdatesChanged();
}
}
protected class LocalIndexesAdapter extends OsmandBaseExpandableListAdapter {
@ -318,8 +330,6 @@ public class LiveUpdatesFragment extends Fragment {
final OsmandSettings.CommonPreference<Boolean> shouldUpdatePreference =
preferenceLiveUpdatesOn(item, fragment.getSettings());
IncrementalChangesManager changesManager = context.getResourceManager().getChangesManager();
final String fileNameWithoutExtension =
Algorithms.getFileNameWithoutExtension(new File(item.getFileName()));
nameTextView.setText(getNameToDisplay(item, fragment.getMyActivity()));
AbsListView.LayoutParams layoutParams = (AbsListView.LayoutParams) view.getLayoutParams();
@ -347,6 +357,8 @@ public class LiveUpdatesFragment extends Fragment {
}
view.setLayoutParams(layoutParams);
final String fileNameWithoutExtension =
Algorithms.getFileNameWithoutExtension(new File(item.getFileName()));
final long timestamp = changesManager.getTimestamp(fileNameWithoutExtension);
final long lastCheck = preferenceLastCheck(item, fragment.getSettings()).get();
String lastCheckString = formatDateTime(fragment.getActivity(),
@ -361,7 +373,6 @@ public class LiveUpdatesFragment extends Fragment {
}
};
options.setOnClickListener(clickListener);
view.setOnClickListener(clickListener);
if (isLastChild) {
divider.setVisibility(View.GONE);

View file

@ -14,7 +14,6 @@ import android.view.LayoutInflater;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.Spinner;
import android.widget.TextView;
@ -67,7 +66,7 @@ public class LiveUpdatesSettingsDialogFragment extends DialogFragment {
final Spinner updateTimesOfDaySpinner = (Spinner) view.findViewById(R.id.updateTimesOfDaySpinner);
final View updateTimesOfDayList = view.findViewById(R.id.updateTimesOfDayList);
final TextView sizeTextView = (TextView) view.findViewById(R.id.sizeTextView);
final Button removeUpdatesButton = (Button) view.findViewById(R.id.removeUpdatesButton);
// final Button removeUpdatesButton = (Button) view.findViewById(R.id.removeUpdatesButton);
regionNameTextView.setText(getNameToDisplay(localIndexInfo, getMyActivity()));
final String fileNameWithoutExtension =
@ -122,14 +121,14 @@ public class LiveUpdatesSettingsDialogFragment extends DialogFragment {
}
});
removeUpdatesButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
changesManager.deleteUpdates(fileNameWithoutExtension);
getLiveUpdatesFragment().notifyLiveUpdatesChanged();
updateSize(fileNameWithoutExtension, changesManager, sizeTextView);
}
});
// removeUpdatesButton.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View v) {
// changesManager.deleteUpdates(fileNameWithoutExtension);
// getLiveUpdatesFragment().notifyLiveUpdatesChanged();
// updateSize(fileNameWithoutExtension, changesManager, sizeTextView);
// }
// });
builder.setView(view)
.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {