Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix review

Browse source
This commit is contained in:
Dima-1 2020-05-28 11:46:38 +03:00
parent c62bd692bd
commit ed5f751934
3 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/res/layout-land/fragment_coordinate_input_dialog.xml
View file

@ -57,15 +57,15 @@
android:ellipsize="end" android:ellipsize="end"
android:gravity="center_vertical" android:gravity="center_vertical"
android:maxLines="1" android:maxLines="1"
android:paddingLeft="16dp" android:paddingLeft="@dimen/content_padding"
android:paddingRight="16dp" android:paddingRight="@dimen/content_padding"
android:text="@string/shared_string_options" android:text="@string/shared_string_options"
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="@color/color_white" android:textColor="@color/color_white"
android:textSize="@dimen/default_list_text_size" android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_medium" osmand:typeface="@string/font_roboto_medium"
android:paddingStart="16dp" android:paddingStart="@dimen/content_padding"
android:paddingEnd="16dp" /> android:paddingEnd="@dimen/content_padding" />
</LinearLayout> </LinearLayout>

8
OsmAnd/src/net/osmand/plus/settings/fragments/DialogsAndNotificationsSettingsFragment.java
View file

@ -1,8 +1,5 @@
package net.osmand.plus.settings.fragments; package net.osmand.plus.settings.fragments;
import android.view.LayoutInflater;
import android.view.View;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.SwitchPreferenceCompat; import androidx.preference.SwitchPreferenceCompat;
@ -12,11 +9,6 @@ public class DialogsAndNotificationsSettingsFragment extends BaseSettingsFragmen
public static final String TAG = DialogsAndNotificationsSettingsFragment.class.getSimpleName(); public static final String TAG = DialogsAndNotificationsSettingsFragment.class.getSimpleName();
@Override
protected void createToolbar(LayoutInflater inflater, View view) {
super.createToolbar(inflater, view);
}
@Override @Override
protected void setupPreferences() { protected void setupPreferences() {
Preference mapDuringNavigationInfo = findPreference("dialogs_and_notifications_preferences_info"); Preference mapDuringNavigationInfo = findPreference("dialogs_and_notifications_preferences_info");

6
OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/TravelDownloadUpdateCard.java
View file

@ -9,8 +9,6 @@ import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.StringRes; import androidx.annotation.StringRes;
import androidx.appcompat.content.res.AppCompatResources;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
@ -68,7 +66,7 @@ public class TravelDownloadUpdateCard extends BaseTravelCard {
DownloadUpdateVH holder = (DownloadUpdateVH) viewHolder; DownloadUpdateVH holder = (DownloadUpdateVH) viewHolder;
this.ref = new WeakReference<TravelDownloadUpdateCard.DownloadUpdateVH>(holder); this.ref = new WeakReference<TravelDownloadUpdateCard.DownloadUpdateVH>(holder);
holder.title.setText(getTitle(loading)); holder.title.setText(getTitle(loading));
holder.icon.setImageResource(getIcon()); holder.icon.setImageResource(getIconRes());
holder.description.setText(getDescription()); holder.description.setText(getDescription());
if (indexItem == null) { if (indexItem == null) {
holder.fileDataContainer.setVisibility(View.GONE); holder.fileDataContainer.setVisibility(View.GONE);
@ -117,7 +115,7 @@ public class TravelDownloadUpdateCard extends BaseTravelCard {
return app.getString(download ? R.string.download_file : R.string.update_is_available); return app.getString(download ? R.string.download_file : R.string.update_is_available);
} }
private int getIcon() { private int getIconRes() {
return download ? R.drawable.travel_card_download_icon : R.drawable.travel_card_update_icon; return download ? R.drawable.travel_card_download_icon : R.drawable.travel_card_update_icon;
} }