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

RTL - Step 3

Browse source
This commit is contained in:
Nazar-Kutz 2020-06-11 10:32:26 +03:00
parent 20a91eafef
commit 0ec0609b4f
14 changed files with 44 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
OsmAnd/res/anim/slide_in_right.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<translate android:fromXDelta="100%p" android:toXDelta="0"
android:duration="@android:integer/config_mediumAnimTime"/>
<alpha android:fromAlpha="0.0" android:toAlpha="1.0"
android:duration="@android:integer/config_mediumAnimTime" />
</set>

7
OsmAnd/res/anim/slide_out_right.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<translate android:fromXDelta="0" android:toXDelta="100%p"
android:duration="@android:integer/config_mediumAnimTime"/>
<alpha android:fromAlpha="1.0" android:toAlpha="0.0"
android:duration="@android:integer/config_mediumAnimTime" />
</set>

3
OsmAnd/res/layout-land/track_details.xml
View file

@ -12,8 +12,7 @@
android:id="@+id/main_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@drawable/bg_left_menu_dark">
android:orientation="vertical">
<LinearLayout
android:id="@+id/top_bar_layout"

8
OsmAnd/res/layout/along_the_route_category_item.xml
View file

@ -30,17 +30,17 @@
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_gravity="center_vertical|start"
android:layout_marginLeft="@dimen/bottom_sheet_divider_margin_start"
android:layout_marginRight="@dimen/bottom_sheet_divider_margin_start"
android:layout_marginEnd="@dimen/bottom_sheet_divider_margin_start"
android:layout_marginStart="@dimen/bottom_sheet_divider_margin_start"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/TextAppearance.ListItemTitle"
android:textColor="?attr/active_color_basic"
osmand:typeface="@string/font_roboto_medium"
tools:text="Some Title"
android:layout_marginEnd="@dimen/bottom_sheet_divider_margin_start"
android:layout_marginStart="@dimen/bottom_sheet_divider_margin_start" />
tools:text="Some Title" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/compound_button"

2
OsmAnd/res/layout/gpx_route_card.xml
View file

@ -77,7 +77,7 @@
android:id="@+id/show_all_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_gravity="center_vertical|start"
android:paddingTop="@dimen/list_header_padding"
android:paddingBottom="@dimen/list_header_padding"
android:layout_marginStart="@dimen/route_info_list_text_padding"

1
OsmAnd/res/values/styles.xml
View file

@ -154,6 +154,7 @@
<item name="bg_map_context_menu">@drawable/bg_map_context_menu_light</item>
<item name="bottom_menu_view_bg">@drawable/bg_bottom_menu_light</item>
<item name="left_menu_view_bg">@drawable/bg_left_menu_light</item>
<item name="right_menu_view_bg">@drawable/bg_right_menu_light</item>
<item name="bg_point_editor_view">@drawable/bg_point_editor_view_light</item>
<item name="dashboard_divider">@color/divider_color_light</item>
<item name="divider_color">@color/divider_color</item>

7
OsmAnd/src/net/osmand/plus/mapcontextmenu/BaseMenuController.java
View file

@ -5,6 +5,7 @@ import android.graphics.drawable.Drawable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import net.osmand.AndroidUtils;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.activities.MapActivity;
@ -67,7 +68,8 @@ public abstract class BaseMenuController {
public int getSlideInAnimation() {
if (isLandscapeLayout()) {
return R.anim.slide_in_left;
return AndroidUtils.isLayoutRtl(getMapActivity())
? R.anim.slide_in_right : R.anim.slide_in_left;
} else {
return R.anim.slide_in_bottom;
}
@ -75,7 +77,8 @@ public abstract class BaseMenuController {
public int getSlideOutAnimation() {
if (isLandscapeLayout()) {
return R.anim.slide_out_left;
return AndroidUtils.isLayoutRtl(getMapActivity())
? R.anim.slide_out_right : R.anim.slide_out_left;
} else {
return R.anim.slide_out_bottom;
}

2
OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java
View file

@ -278,7 +278,7 @@ public class AmenityMenuBuilder extends MenuBuilder {
light ? R.color.ctx_menu_controller_button_text_color_light_n : R.color.ctx_menu_controller_button_text_color_dark_n);
Drawable pressed = app.getUIUtilities().getIcon(R.drawable.ic_action_read_text,
light ? R.color.ctx_menu_controller_button_text_color_light_p : R.color.ctx_menu_controller_button_text_color_dark_p);
button.setCompoundDrawablesWithIntrinsicBounds(Build.VERSION.SDK_INT >= 21
AndroidUtils.setCompoundDrawablesWithIntrinsicBounds(button, Build.VERSION.SDK_INT >= 21
? AndroidUtils.createPressedStateListDrawable(normal, pressed) : normal, null, null, null);
button.setCompoundDrawablePadding(dpToPx(8f));
llText.addView(button);

2
OsmAnd/src/net/osmand/plus/mapcontextmenu/other/TrackDetailsMenu.java
View file

@ -172,6 +172,8 @@ public class TrackDetailsMenu {
}
}
});
int navigationIconResId = AndroidUtils.getNavigationIconResId(mapActivity);
toolbarController.setBackBtnIconIds(navigationIconResId, navigationIconResId);
toolbarController.setOnCloseButtonClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {

5
OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenuFragment.java
View file

@ -511,8 +511,9 @@ public class MapRouteInfoMenuFragment extends ContextMenuFragment {
slideInAnim = R.anim.slide_in_bottom;
slideOutAnim = R.anim.slide_out_bottom;
} else {
slideInAnim = R.anim.slide_in_left;
slideOutAnim = R.anim.slide_out_left;
boolean isLayoutRtl = AndroidUtils.isLayoutRtl(mapActivity);
slideInAnim = isLayoutRtl ? R.anim.slide_in_right : R.anim.slide_in_left;
slideOutAnim = isLayoutRtl ? R.anim.slide_out_right : R.anim.slide_out_left;
}
}

3
OsmAnd/src/net/osmand/plus/routepreparationmenu/ShowAlongTheRouteBottomSheet.java
View file

@ -82,7 +82,8 @@ public class ShowAlongTheRouteBottomSheet extends MenuBottomSheetDialogFragment
int expandType = args.getInt(EXPAND_TYPE_KEY, -1);
final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
final View titleView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.bottom_sheet_item_toolbar_title, null);
final View titleView = View.inflate(new ContextThemeWrapper(getContext(), themeRes),
R.layout.bottom_sheet_item_toolbar_title, null);
TextView textView = (TextView) titleView.findViewById(R.id.title);
textView.setText(R.string.show_along_the_route);

2
OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/MapMarkersCard.java
View file

@ -114,7 +114,7 @@ public class MapMarkersCard extends BaseCard {
if (i > 0) {
View div = new View(ctx);
LinearLayout.LayoutParams p = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, AndroidUtils.dpToPx(ctx, 1f));
p.setMargins(listTextPadding, 0, 0, 0);
AndroidUtils.setMargins(p, listTextPadding, 0, 0, 0);
div.setLayoutParams(p);
AndroidUtils.setBackgroundColor(ctx, div, nightMode, R.color.divider_color_light, R.color.divider_color_dark);
div.setVisibility(View.VISIBLE);

7
OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/PedestrianRouteCard.java
View file

@ -1,12 +1,14 @@
package net.osmand.plus.routepreparationmenu.cards;
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.style.StyleSpan;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
@ -59,6 +61,11 @@ public class PedestrianRouteCard extends BaseCard {
} else {
AndroidUtils.setBackground(app, buttonDescr, nightMode, R.drawable.btn_border_trans_light, R.drawable.btn_border_trans_dark);
}
Drawable icPedestrian = app.getUIUtilities().getIcon(
R.drawable.ic_action_pedestrian_dark,
R.color.description_font_and_bottom_sheet_icons);
((ImageView) view.findViewById(R.id.image)).setImageDrawable(
AndroidUtils.getDrawableForDirection(app, icPedestrian));
view.findViewById(R.id.card_divider).setVisibility(View.VISIBLE);
view.findViewById(R.id.top_divider).setVisibility(View.GONE);
}

3
OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/TracksCard.java
View file

@ -11,6 +11,7 @@ import androidx.annotation.NonNull;
import androidx.appcompat.view.ContextThemeWrapper;
import androidx.core.content.ContextCompat;
import net.osmand.AndroidUtils;
import net.osmand.GPXUtilities.GPXFile;
import net.osmand.IndexConstants;
import net.osmand.plus.GPXDatabase.GpxDataItem;
@ -110,7 +111,7 @@ public class TracksCard extends BaseCard {
img.setVisibility(View.VISIBLE);
LinearLayout container = (LinearLayout) v.findViewById(R.id.container);
container.setMinimumHeight(minCardHeight);
container.setPadding(listContentPadding, 0, 0, 0);
AndroidUtils.setPadding(container, listContentPadding, 0, 0, 0);
v.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {