RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] review fixes

Browse source
This commit is contained in:
Arsentiy Milchakov 2018-02-14 15:30:43 +03:00 • committed by Aleksandr Zatsepin
parent 095bd82fda
commit 7464eac30e
2 changed files with 178 additions and 197 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

280
android/res/layout/fragment_updater.xml
View file

@ -5,148 +5,148 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_height="match_parent"
android:layout_width="match_parent">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/update_widget"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="vertical"
android:gravity="center">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_base"
android:layout_gravity="center_horizontal"
android:tag="@string/tag_height_limited"
android:src="@drawable/wn_autoupdate"/>
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/margin_base"
android:layout_marginRight="@dimen/margin_base"
android:layout_marginBottom="@dimen/margin_base"
android:textAppearance="@style/MwmTextAppearance.Title"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:fontFamily="@string/robotoMedium"
tools:text="@string/whats_new_auto_update_title"
tools:targetApi="jelly_bean"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/margin_base"
android:layout_marginRight="@dimen/margin_base"
android:layout_marginBottom="@dimen/margin_base"
android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:text="@string/whats_new_auto_update_message"/>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/margin_base"
android:layout_marginRight="@dimen/margin_base"
android:layout_marginBottom="@dimen/margin_half"
android:layout_gravity="center_horizontal">
<TextView
android:id="@+id/update_btn"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/margin_base"
android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
android:textColor="?accentButtonTextColor"
android:background="?accentButtonBackground"
android:gravity="center"
android:visibility="gone"
tools:text="@string/whats_new_auto_update_button_size"
tools:visibility="visible"/>
<com.mapswithme.maps.widget.WheelProgressView
android:id="@+id/progress"
android:layout_width="@dimen/autoupdate_progress_size"
android:layout_height="@dimen/autoupdate_progress_size"
android:layout_gravity="center"
app:wheelProgressColor="?colorAccent"
app:wheelSecondaryColor="?dividerHorizontal"
app:wheelThickness="@dimen/margin_eighth"
android:visibility="gone"
tools:visibility="visible"/>
</FrameLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/margin_base"
android:layout_marginRight="@dimen/margin_base"
android:layout_marginBottom="@dimen/margin_base">
<TextView
android:id="@+id/later_btn"
android:layout_width="match_parent"
android:layout_height="@dimen/height_block_base"
android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
android:textColor="?buttonDialogTextColor"
android:layout_gravity="center_horizontal"
android:gravity="center"
android:background="?clickableBackground"
tools:text="@string/whats_new_auto_update_button_later"
tools:visibility="gone"/>
<LinearLayout
android:id="@+id/info"
android:layout_width="match_parent"
android:layout_height="@dimen/height_block_base"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible">
<TextView
android:id="@+id/relative_status"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center"
android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
android:text="@string/downloader_percent"/>
<TextView
android:id="@+id/common_status"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center"
android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
android:text="@string/downloader_process"/>
</LinearLayout>
</FrameLayout>
</LinearLayout>
<RelativeLayout
android:id="@+id/frame_btn"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="@dimen/margin_double_plus"
android:layout_marginTop="@dimen/margin_base_plus"
android:paddingTop="@dimen/margin_quarter_plus"
android:paddingBottom="@dimen/margin_quarter_plus"
android:paddingRight="@dimen/margin_half"
android:paddingLeft="@dimen/margin_half"
android:background="?accentButtonBackground"
android:visibility="gone"
tools:visibility="visible">
<TextView
android:id="@+id/hide_btn"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingLeft="@dimen/margin_half"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/update_widget"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="vertical"
android:gravity="center">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_base"
android:layout_gravity="center_horizontal"
android:tag="@string/tag_height_limited"
android:src="@drawable/wn_autoupdate"/>
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/margin_base"
android:layout_marginRight="@dimen/margin_base"
android:layout_marginBottom="@dimen/margin_base"
android:textAppearance="@style/MwmTextAppearance.Title"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:fontFamily="@string/robotoMedium"
tools:text="@string/whats_new_auto_update_title"
tools:targetApi="jelly_bean"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/margin_base"
android:layout_marginRight="@dimen/margin_base"
android:layout_marginBottom="@dimen/margin_base"
android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:text="@string/whats_new_auto_update_message"/>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/margin_base"
android:layout_marginRight="@dimen/margin_base"
android:layout_marginBottom="@dimen/margin_half"
android:layout_gravity="center_horizontal">
<TextView
android:id="@+id/update_btn"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/margin_base"
android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
android:textColor="?accentButtonTextColor"
android:background="?accentButtonBackground"
android:gravity="center"
android:visibility="gone"
tools:text="@string/whats_new_auto_update_button_size"
tools:visibility="visible"/>
<com.mapswithme.maps.widget.WheelProgressView
android:id="@+id/progress"
android:layout_width="@dimen/autoupdate_progress_size"
android:layout_height="@dimen/autoupdate_progress_size"
android:layout_gravity="center"
app:wheelProgressColor="?colorAccent"
app:wheelSecondaryColor="?dividerHorizontal"
app:wheelThickness="@dimen/margin_eighth"
android:visibility="gone"
tools:visibility="visible"/>
</FrameLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/margin_base"
android:layout_marginRight="@dimen/margin_base"
android:layout_marginBottom="@dimen/margin_base">
<TextView
android:id="@+id/later_btn"
android:layout_width="match_parent"
android:layout_height="@dimen/height_block_base"
android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
android:textColor="?buttonDialogTextColor"
android:layout_gravity="center_horizontal"
android:gravity="center"
android:background="?clickableBackground"
tools:text="@string/whats_new_auto_update_button_later"
tools:visibility="gone"/>
<LinearLayout
android:id="@+id/info"
android:layout_width="match_parent"
android:layout_height="@dimen/height_block_base"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible">
<TextView
android:id="@+id/relative_status"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center"
android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
android:text="@string/downloader_percent"/>
<TextView
android:id="@+id/common_status"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center"
android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
android:text="@string/downloader_process"/>
</LinearLayout>
</FrameLayout>
</LinearLayout>
<RelativeLayout
android:id="@+id/frame_btn"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="@dimen/margin_double_plus"
android:layout_marginTop="@dimen/margin_base_plus"
android:paddingTop="@dimen/margin_quarter_plus"
android:paddingBottom="@dimen/margin_quarter_plus"
android:paddingRight="@dimen/margin_half"
android:textAppearance="@style/MwmTextAppearance.Button"
android:textColor="?accentButtonTextColor"
android:fontFamily="@string/robotoMedium"
android:text="@string/downloader_hide_screen"
android:gravity="center_vertical"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:background="?clickableBackground"
tools:targetApi="jelly_bean"/>
</RelativeLayout>
</LinearLayout>
android:paddingLeft="@dimen/margin_half"
android:background="?accentButtonBackground"
android:visibility="gone"
tools:visibility="visible">
<TextView
android:id="@+id/hide_btn"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingLeft="@dimen/margin_half"
android:paddingRight="@dimen/margin_half"
android:textAppearance="@style/MwmTextAppearance.Button"
android:textColor="?accentButtonTextColor"
android:fontFamily="@string/robotoMedium"
android:text="@string/downloader_hide_screen"
android:gravity="center_vertical"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:background="?clickableBackground"
tools:targetApi="jelly_bean"/>
</RelativeLayout>
</LinearLayout>
</com.mapswithme.maps.widget.HeightLimitedFrameLayout>

95
android/src/com/mapswithme/maps/downloader/UpdaterDialogFragment.java
View file

@ -5,6 +5,7 @@ import android.content.DialogInterface;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.StringRes;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
@ -87,46 +88,27 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
}
@NonNull
private final View.OnClickListener mLaterClickListener = new View.OnClickListener()
private final View.OnClickListener mLaterClickListener = (View v) ->
{
@Override
public void onClick(View v)
{
Statistics.INSTANCE.trackDownloaderDialogEvent(DOWNLOADER_DIALOG_LATER, 0);
Statistics.INSTANCE.trackDownloaderDialogEvent(DOWNLOADER_DIALOG_LATER, 0);
finish();
}
finish();
};
@NonNull
private final View.OnClickListener mCancelClickListener = new View.OnClickListener()
private final View.OnClickListener mCancelClickListener = (View v) ->
{
@Override
public void onClick(View v)
{
Statistics.INSTANCE.trackDownloaderDialogEvent(DOWNLOADER_DIALOG_CANCEL, mTotalSizeMb);
Statistics.INSTANCE.trackDownloaderDialogEvent(DOWNLOADER_DIALOG_CANCEL, mTotalSizeMb);
MapManager.nativeCancel(CountryItem.getRootId());
finish();
}
MapManager.nativeCancel(CountryItem.getRootId());
finish();
};
@NonNull
private final View.OnClickListener mHideClickListener = new View.OnClickListener()
{
@Override
public void onClick(View v)
{
finish();
}
};
private final View.OnClickListener mHideClickListener = (View v) -> finish();
@NonNull
private final View.OnClickListener mUpdateClickListener = new View.OnClickListener()
{
@Override
public void onClick(View v)
{
private final View.OnClickListener mUpdateClickListener = (View v) ->
MapManager.warnOn3gUpdate(getActivity(), CountryItem.getRootId(), new Runnable()
{
@Override
@ -134,8 +116,7 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
{
mTitle.setText(getString(R.string.whats_new_auto_update_updating_maps));
mCommonStatus.setText("");
mProgressBar.setProgress(0);
mRelativeStatus.setText(GetRelativeStatusFormatted(0, 0, mTotalSizeMb));
setProgress(0, 0, mTotalSizeMb);
MapManager.nativeUpdate(CountryItem.getRootId());
UiUtils.show(mProgressBar, mInfo, mFrameBtn, mHideBtn);
UiUtils.hide(mUpdateBtn, mLaterBtn);
@ -144,8 +125,6 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
mTotalSizeMb);
}
});
}
};
public static boolean showOn(@NonNull FragmentActivity activity,
@Nullable BaseNewsFragment.NewsDialogListener doneListener)
@ -158,14 +137,13 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
if (info == null)
return false;
@Framework.DoAfterUpdate
final int result;
@Framework.DoAfterUpdate final int result;
final long size = info.totalSize / Constants.MB;
Fragment f = fm.findFragmentByTag(UpdaterDialogFragment.class.getName());
if (f != null)
{
((UpdaterDialogFragment)f).mDoneListener = doneListener;
((UpdaterDialogFragment) f).mDoneListener = doneListener;
return true;
}
else
@ -187,7 +165,7 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
fragment.setArguments(args);
fragment.mDoneListener = doneListener;
FragmentTransaction transaction = fm.beginTransaction()
.setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out);
.setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out);
fragment.show(transaction, UpdaterDialogFragment.class.getName());
return true;
@ -230,7 +208,7 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
res.setContentView(content);
mTitle = content.findViewById(R.id.title);
mUpdateBtn = content.findViewById(R.id.update_btn);
mUpdateBtn = content.findViewById(R.id.update_btn);
mProgressBar = content.findViewById(R.id.progress);
mLaterBtn = content.findViewById(R.id.later_btn);
mInfo = content.findViewById(R.id.info);
@ -343,9 +321,7 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
if (mAutoUpdate)
{
int progress = MapManager.nativeGetOverallProgress(mOutdatedMaps);
mProgressBar.setProgress(progress);
mRelativeStatus.setText(GetRelativeStatusFormatted(progress, mTotalSizeMb * progress / 100,
mTotalSizeMb));
setProgress(progress, mTotalSizeMb * progress / 100, mTotalSizeMb);
}
}
@ -355,12 +331,23 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
}
@NonNull
String GetRelativeStatusFormatted(int progress, long localSize, long remoteSize)
String getRelativeStatusFormatted(int progress, long localSize, long remoteSize)
{
return getString(R.string.downloader_percent, progress + "%",
localSize + getString(R.string.mb), remoteSize + getString(R.string.mb));
}
void setProgress(int progress, long localSize, long remoteSize)
{
mProgressBar.setProgress(progress);
mRelativeStatus.setText(getRelativeStatusFormatted(progress, localSize, remoteSize));
}
void setCommonStatus(@NonNull String mwmId, @StringRes int mwmStatusResId)
{
String status = getString(mwmStatusResId, MapManager.nativeGetName(mwmId));
mCommonStatus.setText(status);
}
private static class DetachableStorageCallback implements MapManager.StorageCallback
{
@Nullable
@ -383,7 +370,8 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
public void onStatusChanged(List<MapManager.StorageCallbackData> data)
{
String mwmId = null;
String mwmStatus = null;
@StringRes
int mwmStatusResId = 0;
for (MapManager.StorageCallbackData item : data)
{
if (!item.isLeafNode)
@ -400,26 +388,23 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
mLeftoverMaps.remove(item.countryId);
break;
case CountryItem.STATUS_PROGRESS:
if (mFragment == null)
break;
mwmId = item.countryId;
mwmStatus = mFragment.getString(R.string.downloader_process);
mwmStatusResId = R.string.downloader_process;
break;
case CountryItem.STATUS_APPLYING:
if (mFragment == null)
break;
mwmId = item.countryId;
mwmStatus = mFragment.getString(R.string.downloader_applying);
mwmStatusResId = R.string.downloader_applying;
break;
default:
LOGGER.d(TAG, "Ignored status: " + item.newStatus +
".For country: " + item.countryId);
break;
}
}
if (mwmId != null && mwmStatus != null && mFragment != null)
if (mwmId != null && mwmStatusResId != 0 && mFragment != null)
{
mFragment.mCommonStatus.setText(String.format(Locale.getDefault(), mwmStatus,
MapManager.nativeGetName(mwmId)));
mFragment.setCommonStatus(mwmId, mwmStatusResId);
}
if (mFragment != null && mFragment.isAdded() && mFragment.isAllUpdated())
@ -478,12 +463,8 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
return;
int progress = MapManager.nativeGetOverallProgress(mOutdatedMaps);
mFragment.mProgressBar.setProgress(progress);
String relativeStatusFormatted =
mFragment.GetRelativeStatusFormatted(progress, localSizeBytes / Constants.MB,
remoteSizeBytes / Constants.MB);
mFragment.mRelativeStatus.setText(relativeStatusFormatted);
mFragment.setProgress(progress, localSizeBytes / Constants.MB,
remoteSizeBytes / Constants.MB);
}
void attach(@NonNull UpdaterDialogFragment fragment)