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

[android] Review fixes.

Browse source
This commit is contained in:
Dmitry Yunitsky 2016-03-14 16:13:47 +03:00 • committed by Sergey Yershov
parent 1b5170344a
commit cc901082c1
8 changed files with 35 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -995,7 +995,7 @@ Java_com_mapswithme_maps_Framework_nativeTurnChoosePositionMode(JNIEnv *, jclass
}
JNIEXPORT jboolean JNICALL
Java_com_mapswithme_maps_Framework_nativeIsScreenCenterDownloaded(JNIEnv *, jclass clazz)
Java_com_mapswithme_maps_Framework_nativeIsDownloadedMapAtScreenCenter(JNIEnv *, jclass clazz)
{
::Framework * fr = frm();
return storage::IsPointCoveredByDownloadedMaps(fr->GetViewportCenter(), fr->Storage(), fr->CountryInfoGetter());

1
android/jni/com/mapswithme/maps/editor/Editor.cpp
View file

@ -266,6 +266,7 @@ Java_com_mapswithme_maps_editor_Editor_nativeGetNewFeatureCategories(JNIEnv * en
auto jCategories = env->NewObjectArray(size, g_featureCategoryClazz, 0);
for (size_t i = 0; i < size; i++)
{
// TODO pass used categories section, too
jni::TScopedLocalRef jCategory(env, ToJavaFeatureCategory(env, printableTypes.m_allSorted[i]));
env->SetObjectArrayElement(jCategories, i, jCategory.get());
}

2
android/res/layout/item_feature_category.xml
View file

@ -10,7 +10,7 @@
<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:singleLine="true"

4
android/res/layout/menu_content_grid.xml
View file

@ -7,7 +7,8 @@
android:orientation="horizontal"
tools:background="#200000F0">
<!-- TODO add correct text -->
<!-- TODO add correct text
TODO check if button fits on narrow screens (eg nexus 7)-->
<TextView
android:id="@+id/add_place"
style="@style/MwmTheme.Menu.Content.GridItem.Text"
@ -66,6 +67,7 @@
android:text="@string/share_my_location"
tools:background="#200000FF"/>
<!-- TODO check if button fits on narrow screens (eg nexus 7)-->
<TextView
android:id="@+id/showcase"
style="@style/MwmTheme.Menu.Content.GridItem.Text"

2
android/src/com/mapswithme/maps/Framework.java
View file

@ -198,6 +198,6 @@ public class Framework
public static native void nativeTurnChoosePositionMode(boolean turnedOn);
public static native boolean nativeIsScreenCenterDownloaded();
public static native boolean nativeIsDownloadedMapAtScreenCenter();
}

52
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -88,26 +88,26 @@ import ru.mail.android.mytarget.nativeads.NativeAppwallAd;
import ru.mail.android.mytarget.nativeads.banners.NativeAppwallBanner;
public class MwmActivity extends BaseMwmFragmentActivity
implements LocationHelper.LocationListener,
MapObjectListener,
View.OnTouchListener,
BasePlacePageAnimationController.OnVisibilityChangedListener,
OnClickListener,
MapFragment.MapRenderingListener,
CustomNavigateUpListener,
ChooseBookmarkCategoryFragment.Listener,
RoutingController.Container
implements LocationHelper.LocationListener,
MapObjectListener,
View.OnTouchListener,
BasePlacePageAnimationController.OnVisibilityChangedListener,
OnClickListener,
MapFragment.MapRenderingListener,
CustomNavigateUpListener,
ChooseBookmarkCategoryFragment.Listener,
RoutingController.Container
{
public static final String EXTRA_TASK = "map_task";
private static final String EXTRA_CONSUMED = "mwm.extra.intent.processed";
private static final String EXTRA_UPDATE_COUNTRIES = ".extra.update.countries";
private static final String[] DOCKED_FRAGMENTS = {SearchFragment.class.getName(),
DownloaderFragment.class.getName(),
MigrationFragment.class.getName(),
RoutingPlanFragment.class.getName(),
EditorHostFragment.class.getName(),
AuthFragment.class.getName()};
private static final String[] DOCKED_FRAGMENTS = { SearchFragment.class.getName(),
DownloaderFragment.class.getName(),
MigrationFragment.class.getName(),
RoutingPlanFragment.class.getName(),
EditorHostFragment.class.getName(),
AuthFragment.class.getName() };
// Instance state
private static final String STATE_PP_OPENED = "PpOpened";
private static final String STATE_MAP_OBJECT = "MapObject";
@ -215,9 +215,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
: super.getFragmentContentResId());
}
public
@Nullable
Fragment getFragment(Class<? extends Fragment> clazz)
public Fragment getFragment(Class<? extends Fragment> clazz)
{
if (!mIsFragmentContainer)
throw new IllegalStateException("Must be called for tablets only!");
@ -382,10 +381,11 @@ public class MwmActivity extends BaseMwmFragmentActivity
public void onClick(View v)
{
showPositionChooser(false);
if (Framework.nativeIsScreenCenterDownloaded())
FeatureCategoryActivity.pickFeatureCategory(MwmActivity.this, Framework.nativeGetScreenRectCenter());
if (Framework.nativeIsDownloadedMapAtScreenCenter())
FeatureCategoryActivity.pick(MwmActivity.this, Framework.nativeGetScreenRectCenter());
else
// UiUtils.showAlertDialog(getActivity(), R.string.message_invalid_feature_position);
// TODO uncomment
// UiUtils.showAlertDialog(getActivity(), R.string.message_invalid_feature_position);
UiUtils.showAlertDialog(getActivity(), R.string.invalid_username_or_password);
}
});
@ -697,9 +697,9 @@ public class MwmActivity extends BaseMwmFragmentActivity
private void addTask(Intent intent)
{
if (intent != null &&
!intent.getBooleanExtra(EXTRA_CONSUMED, false) &&
intent.hasExtra(EXTRA_TASK) &&
((intent.getFlags() & Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) == 0))
!intent.getBooleanExtra(EXTRA_CONSUMED, false) &&
intent.hasExtra(EXTRA_TASK) &&
((intent.getFlags() & Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) == 0))
{
final MapTask mapTask = (MapTask) intent.getSerializableExtra(EXTRA_TASK);
mTasks.add(mapTask);
@ -1060,7 +1060,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
object.setSubtitle(request.getCallerName(MwmApplication.get()).toString());
}
else if (MapObject.isOfType(MapObject.MY_POSITION, object) &&
Framework.nativeIsRoutingActive())
Framework.nativeIsRoutingActive())
{
return;
}
@ -1080,7 +1080,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
if (switchFullScreenMode)
{
if ((mPanelAnimator != null && mPanelAnimator.isVisible()) ||
UiUtils.isVisible(mSearchController.getToolbar()))
UiUtils.isVisible(mSearchController.getToolbar()))
return;
setFullscreen(!mIsFullscreen);
@ -1195,7 +1195,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
public boolean onTouch(View view, MotionEvent event)
{
return mPlacePage.hideOnTouch() ||
mMapFragment.onTouch(view, event);
mMapFragment.onTouch(view, event);
}
@Override

2
android/src/com/mapswithme/maps/editor/FeatureCategoryActivity.java
View file

@ -16,7 +16,7 @@ public class FeatureCategoryActivity extends BaseToolbarActivity implements Feat
private double[] mLatLon;
public static void pickFeatureCategory(MwmActivity parent, @Size(2) double[] rect)
public static void pick(MwmActivity parent, @Size(2) double[] rect)
{
final Intent intent = new Intent(parent, FeatureCategoryActivity.class);
intent.putExtra(EXTRA_LAT_LON, rect);

2
android/src/com/mapswithme/maps/editor/FeatureCategoryAdapter.java
View file

@ -67,7 +67,7 @@ public class FeatureCategoryAdapter extends RecyclerView.Adapter<FeatureCategory
public void bind(int position)
{
name.setText(mCategories[position].name);
UiUtils.showIf(mSelectedCategory != null && mCategories[position].category == mSelectedCategory.category);
UiUtils.showIf(mSelectedCategory != null && mCategories[position].category == mSelectedCategory.category, selected);
}
}