Skip to content

Commit de6914e

Browse files
committed
make maneuver classes with UiThread annotation
1 parent 2d200de commit de6914e

File tree

12 files changed

+35
-12
lines changed

12 files changed

+35
-12
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Mapbox welcomes participation and contributions from everyone.
1010
- Updated `MapboxJunctionApi` to ignore banner components with subtype `signboard`. `MapboxSignboardApi` should be used to handle such components. [#6459](https://github.com/mapbox/mapbox-navigation-android/pull/6459)
1111
- Marked `MapboxSpeedLimitView`, `MapboxStatusView`, `MapboxTripProgressView`, `MapboxSoundButton` methods with `@UiThread` annotation. [#6272](https://github.com/mapbox/mapbox-navigation-android/pull/6272)
1212
- Marked `InfoPanelBinder`, `NavigationView`, `NavigationViewApi` methods with `@UiThread` annotation. [#6269](https://github.com/mapbox/mapbox-navigation-android/pull/6269)
13+
- Marked `MapboxExitText`, `MapboxLaneGuidance`, `MapboxLaneGuidanceAdapter`, `MapboxManeuverView`, `MapboxPrimaryManeuver`, `MapboxSecondaryManeuver`, `MapboxStepDistance`, `MapboxSubManeuver`, `MapboxTurnIconManeuver`, `MapboxUpcomingManeuverAdapter` methods with `@UiThread` annotation. [#6270](https://github.com/mapbox/mapbox-navigation-android/pull/6270)
1314

1415
## Mapbox Navigation SDK 2.9.0-beta.1 - 06 October, 2022
1516
### Changelog

libnavui-maneuver/api/current.txt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,7 @@ package com.mapbox.navigation.ui.maneuver.model {
960960

961961
package com.mapbox.navigation.ui.maneuver.view {
962962

963-
public final class MapboxExitText extends androidx.appcompat.widget.AppCompatTextView {
963+
@UiThread public final class MapboxExitText extends androidx.appcompat.widget.AppCompatTextView {
964964
ctor public MapboxExitText(android.content.Context context);
965965
ctor public MapboxExitText(android.content.Context context, android.util.AttributeSet? attrs);
966966
ctor public MapboxExitText(android.content.Context context, android.util.AttributeSet? attrs, int defStyleAttr);
@@ -972,14 +972,14 @@ package com.mapbox.navigation.ui.maneuver.view {
972972
method public void updateTextAppearance(@StyleRes int style);
973973
}
974974

975-
public final class MapboxLaneGuidance extends androidx.appcompat.widget.AppCompatImageView {
975+
@UiThread public final class MapboxLaneGuidance extends androidx.appcompat.widget.AppCompatImageView {
976976
ctor public MapboxLaneGuidance(android.content.Context context, android.util.AttributeSet? attrs = null, int defStyleAttr = 0);
977977
ctor public MapboxLaneGuidance(android.content.Context context, android.util.AttributeSet? attrs = null);
978978
ctor public MapboxLaneGuidance(android.content.Context context);
979979
method public void renderLane(com.mapbox.navigation.ui.maneuver.model.LaneIcon laneIcon, androidx.appcompat.view.ContextThemeWrapper wrapper);
980980
}
981981

982-
public final class MapboxLaneGuidanceAdapter extends androidx.recyclerview.widget.RecyclerView.Adapter<com.mapbox.navigation.ui.maneuver.view.MapboxLaneGuidanceAdapter.MapboxLaneGuidanceViewHolder> {
982+
@UiThread public final class MapboxLaneGuidanceAdapter extends androidx.recyclerview.widget.RecyclerView.Adapter<com.mapbox.navigation.ui.maneuver.view.MapboxLaneGuidanceAdapter.MapboxLaneGuidanceViewHolder> {
983983
ctor public MapboxLaneGuidanceAdapter(android.content.Context context);
984984
method public void addLanes(java.util.List<com.mapbox.navigation.ui.maneuver.model.LaneIndicator> laneIndicatorList);
985985
method public int getItemCount();
@@ -991,10 +991,10 @@ package com.mapbox.navigation.ui.maneuver.view {
991991

992992
public final class MapboxLaneGuidanceAdapter.MapboxLaneGuidanceViewHolder extends androidx.recyclerview.widget.RecyclerView.ViewHolder {
993993
ctor public MapboxLaneGuidanceAdapter.MapboxLaneGuidanceViewHolder(error.NonExistentClass viewBinding);
994-
method public void bindLaneIndicator(com.mapbox.navigation.ui.maneuver.model.LaneIndicator laneIndicator);
994+
method @UiThread public void bindLaneIndicator(com.mapbox.navigation.ui.maneuver.model.LaneIndicator laneIndicator);
995995
}
996996

997-
public final class MapboxManeuverView extends androidx.constraintlayout.widget.ConstraintLayout {
997+
@UiThread public final class MapboxManeuverView extends androidx.constraintlayout.widget.ConstraintLayout {
998998
ctor public MapboxManeuverView(android.content.Context context);
999999
ctor public MapboxManeuverView(android.content.Context context, android.util.AttributeSet? attrs);
10001000
ctor public MapboxManeuverView(android.content.Context context, android.util.AttributeSet? attrs, int defStyleAttr, com.mapbox.navigation.ui.maneuver.model.ManeuverViewOptions options = ManeuverViewOptions.<init>().build());
@@ -1048,7 +1048,7 @@ package com.mapbox.navigation.ui.maneuver.view {
10481048
field public static final com.mapbox.navigation.ui.maneuver.view.MapboxManeuverViewState.EXPANDED INSTANCE;
10491049
}
10501050

1051-
public final class MapboxPrimaryManeuver extends androidx.appcompat.widget.AppCompatTextView {
1051+
@UiThread public final class MapboxPrimaryManeuver extends androidx.appcompat.widget.AppCompatTextView {
10521052
ctor public MapboxPrimaryManeuver(android.content.Context context);
10531053
ctor public MapboxPrimaryManeuver(android.content.Context context, android.util.AttributeSet? attrs);
10541054
ctor public MapboxPrimaryManeuver(android.content.Context context, android.util.AttributeSet? attrs, int defStyleAttr, com.mapbox.navigation.ui.maneuver.model.ManeuverPrimaryOptions options = ManeuverPrimaryOptions.<init>().build());
@@ -1058,7 +1058,7 @@ package com.mapbox.navigation.ui.maneuver.view {
10581058
method public void updateOptions(com.mapbox.navigation.ui.maneuver.model.ManeuverPrimaryOptions options);
10591059
}
10601060

1061-
public final class MapboxSecondaryManeuver extends androidx.appcompat.widget.AppCompatTextView {
1061+
@UiThread public final class MapboxSecondaryManeuver extends androidx.appcompat.widget.AppCompatTextView {
10621062
ctor public MapboxSecondaryManeuver(android.content.Context context);
10631063
ctor public MapboxSecondaryManeuver(android.content.Context context, android.util.AttributeSet? attrs);
10641064
ctor public MapboxSecondaryManeuver(android.content.Context context, android.util.AttributeSet? attrs, int defStyleAttr, com.mapbox.navigation.ui.maneuver.model.ManeuverSecondaryOptions options = ManeuverSecondaryOptions.<init>().build());
@@ -1068,15 +1068,15 @@ package com.mapbox.navigation.ui.maneuver.view {
10681068
method public void updateOptions(com.mapbox.navigation.ui.maneuver.model.ManeuverSecondaryOptions options);
10691069
}
10701070

1071-
public final class MapboxStepDistance extends androidx.appcompat.widget.AppCompatTextView {
1071+
@UiThread public final class MapboxStepDistance extends androidx.appcompat.widget.AppCompatTextView {
10721072
ctor public MapboxStepDistance(android.content.Context context);
10731073
ctor public MapboxStepDistance(android.content.Context context, android.util.AttributeSet? attrs);
10741074
ctor public MapboxStepDistance(android.content.Context context, android.util.AttributeSet? attrs, int defStyleAttr);
10751075
method public void renderDistanceRemaining(com.mapbox.navigation.ui.maneuver.model.StepDistance stepDistance);
10761076
method public void renderTotalStepDistance(com.mapbox.navigation.ui.maneuver.model.StepDistance stepDistance);
10771077
}
10781078

1079-
public final class MapboxSubManeuver extends androidx.appcompat.widget.AppCompatTextView {
1079+
@UiThread public final class MapboxSubManeuver extends androidx.appcompat.widget.AppCompatTextView {
10801080
ctor public MapboxSubManeuver(android.content.Context context);
10811081
ctor public MapboxSubManeuver(android.content.Context context, android.util.AttributeSet? attrs);
10821082
ctor public MapboxSubManeuver(android.content.Context context, android.util.AttributeSet? attrs, int defStyleAttr, com.mapbox.navigation.ui.maneuver.model.ManeuverSubOptions options = ManeuverSubOptions.<init>().build());
@@ -1086,7 +1086,7 @@ package com.mapbox.navigation.ui.maneuver.view {
10861086
method public void updateOptions(com.mapbox.navigation.ui.maneuver.model.ManeuverSubOptions options);
10871087
}
10881088

1089-
public final class MapboxTurnIconManeuver extends androidx.appcompat.widget.AppCompatImageView {
1089+
@UiThread public final class MapboxTurnIconManeuver extends androidx.appcompat.widget.AppCompatImageView {
10901090
ctor public MapboxTurnIconManeuver(android.content.Context context, android.util.AttributeSet? attrs = null, int defStyleAttr = 0);
10911091
ctor public MapboxTurnIconManeuver(android.content.Context context, android.util.AttributeSet? attrs = null);
10921092
ctor public MapboxTurnIconManeuver(android.content.Context context);
@@ -1096,7 +1096,7 @@ package com.mapbox.navigation.ui.maneuver.view {
10961096
method public void updateTurnIconStyle(androidx.appcompat.view.ContextThemeWrapper wrapper);
10971097
}
10981098

1099-
public final class MapboxUpcomingManeuverAdapter extends androidx.recyclerview.widget.RecyclerView.Adapter<com.mapbox.navigation.ui.maneuver.view.MapboxUpcomingManeuverAdapter.MapboxUpcomingManeuverViewHolder> {
1099+
@UiThread public final class MapboxUpcomingManeuverAdapter extends androidx.recyclerview.widget.RecyclerView.Adapter<com.mapbox.navigation.ui.maneuver.view.MapboxUpcomingManeuverAdapter.MapboxUpcomingManeuverViewHolder> {
11001100
ctor public MapboxUpcomingManeuverAdapter(android.content.Context context);
11011101
method public void addUpcomingManeuvers(java.util.List<com.mapbox.navigation.ui.maneuver.model.Maneuver> upcomingManeuvers);
11021102
method public int getItemCount();
@@ -1111,7 +1111,7 @@ package com.mapbox.navigation.ui.maneuver.view {
11111111
method @Deprecated public void updateUpcomingSecondaryManeuverTextAppearance(@StyleRes int style);
11121112
}
11131113

1114-
public final class MapboxUpcomingManeuverAdapter.MapboxUpcomingManeuverViewHolder extends androidx.recyclerview.widget.RecyclerView.ViewHolder {
1114+
@UiThread public final class MapboxUpcomingManeuverAdapter.MapboxUpcomingManeuverViewHolder extends androidx.recyclerview.widget.RecyclerView.ViewHolder {
11151115
ctor public MapboxUpcomingManeuverAdapter.MapboxUpcomingManeuverViewHolder(error.NonExistentClass viewBinding);
11161116
method public void bindUpcomingManeuver(com.mapbox.navigation.ui.maneuver.model.Maneuver maneuver);
11171117
method public error.NonExistentClass! getViewBinding();

libnavui-maneuver/src/main/java/com/mapbox/navigation/ui/maneuver/view/MapboxExitText.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import android.graphics.drawable.BitmapDrawable
88
import android.graphics.drawable.Drawable
99
import android.util.AttributeSet
1010
import androidx.annotation.StyleRes
11+
import androidx.annotation.UiThread
1112
import androidx.appcompat.widget.AppCompatTextView
1213
import androidx.core.content.ContextCompat
1314
import androidx.core.graphics.drawable.toBitmap
@@ -27,6 +28,7 @@ import com.mapbox.navigation.ui.utils.internal.ifNonNull
2728
* @property rightDrawable Drawable? denotes the style for exit sign that is on the right.
2829
* @property exitBackground Drawable? denotes the exit board style.
2930
*/
31+
@UiThread
3032
class MapboxExitText : AppCompatTextView {
3133

3234
/**

libnavui-maneuver/src/main/java/com/mapbox/navigation/ui/maneuver/view/MapboxLaneGuidance.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.mapbox.navigation.ui.maneuver.view
22

33
import android.content.Context
44
import android.util.AttributeSet
5+
import androidx.annotation.UiThread
56
import androidx.appcompat.view.ContextThemeWrapper
67
import androidx.appcompat.widget.AppCompatImageView
78
import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat
@@ -12,6 +13,7 @@ import com.mapbox.navigation.ui.maneuver.model.LaneIcon
1213
* It can be directly used in any other layout.
1314
* @constructor
1415
*/
16+
@UiThread
1517
class MapboxLaneGuidance @JvmOverloads constructor(
1618
context: Context,
1719
attrs: AttributeSet? = null,

libnavui-maneuver/src/main/java/com/mapbox/navigation/ui/maneuver/view/MapboxLaneGuidanceAdapter.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import android.content.Context
44
import android.view.LayoutInflater
55
import android.view.ViewGroup
66
import androidx.annotation.StyleRes
7+
import androidx.annotation.UiThread
78
import androidx.appcompat.view.ContextThemeWrapper
89
import androidx.recyclerview.widget.RecyclerView
910
import com.mapbox.navigation.ui.maneuver.R
@@ -19,6 +20,7 @@ import com.mapbox.navigation.ui.maneuver.view.MapboxLaneGuidanceAdapter.MapboxLa
1920
* @property laneIndicatorList MutableList<LaneIndicator>
2021
* @constructor
2122
*/
23+
@UiThread
2224
class MapboxLaneGuidanceAdapter(
2325
private val context: Context,
2426
) : RecyclerView.Adapter<MapboxLaneGuidanceViewHolder>() {
@@ -104,6 +106,7 @@ class MapboxLaneGuidanceAdapter(
104106
* Invoke the method to bind the lane to the view.
105107
* @param laneIndicator LaneIndicator
106108
*/
109+
@UiThread
107110
fun bindLaneIndicator(laneIndicator: LaneIndicator) {
108111
val laneIcon = laneApi.getTurnLane(laneIndicator)
109112
viewBinding.itemLaneGuidance.renderLane(

libnavui-maneuver/src/main/java/com/mapbox/navigation/ui/maneuver/view/MapboxManeuverView.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import android.content.res.TypedArray
55
import android.util.AttributeSet
66
import android.view.LayoutInflater
77
import androidx.annotation.StyleRes
8+
import androidx.annotation.UiThread
89
import androidx.annotation.VisibleForTesting
910
import androidx.appcompat.view.ContextThemeWrapper
1011
import androidx.constraintlayout.widget.ConstraintLayout
@@ -43,6 +44,7 @@ import kotlinx.coroutines.flow.asStateFlow
4344
*
4445
* @see MapboxManeuverApi
4546
*/
47+
@UiThread
4648
class MapboxManeuverView : ConstraintLayout {
4749

4850
private val _maneuverViewState = MutableStateFlow<MapboxManeuverViewState>(

libnavui-maneuver/src/main/java/com/mapbox/navigation/ui/maneuver/view/MapboxPrimaryManeuver.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.mapbox.navigation.ui.maneuver.view
22

33
import android.content.Context
44
import android.util.AttributeSet
5+
import androidx.annotation.UiThread
56
import androidx.annotation.VisibleForTesting
67
import androidx.appcompat.widget.AppCompatTextView
78
import com.mapbox.navigation.ui.maneuver.R
@@ -19,6 +20,7 @@ import com.mapbox.navigation.utils.internal.ifNonNull
1920
* @property attrs AttributeSet
2021
* @property defStyleAttr Int
2122
*/
23+
@UiThread
2224
class MapboxPrimaryManeuver : AppCompatTextView {
2325

2426
private var options = ManeuverPrimaryOptions.Builder().build()

libnavui-maneuver/src/main/java/com/mapbox/navigation/ui/maneuver/view/MapboxSecondaryManeuver.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.mapbox.navigation.ui.maneuver.view
22

33
import android.content.Context
44
import android.util.AttributeSet
5+
import androidx.annotation.UiThread
56
import androidx.annotation.VisibleForTesting
67
import androidx.appcompat.widget.AppCompatTextView
78
import com.mapbox.navigation.ui.maneuver.R
@@ -19,6 +20,7 @@ import com.mapbox.navigation.utils.internal.ifNonNull
1920
* @property attrs AttributeSet
2021
* @property defStyleAttr Int
2122
*/
23+
@UiThread
2224
class MapboxSecondaryManeuver : AppCompatTextView {
2325

2426
private var options = ManeuverSecondaryOptions.Builder().build()

libnavui-maneuver/src/main/java/com/mapbox/navigation/ui/maneuver/view/MapboxStepDistance.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.mapbox.navigation.ui.maneuver.view
22

33
import android.content.Context
44
import android.util.AttributeSet
5+
import androidx.annotation.UiThread
56
import androidx.appcompat.widget.AppCompatTextView
67
import com.mapbox.navigation.ui.maneuver.model.StepDistance
78

@@ -10,6 +11,7 @@ import com.mapbox.navigation.ui.maneuver.model.StepDistance
1011
* item in [MapboxUpcomingManeuverAdapter].
1112
* It can be directly used in any other layout.
1213
*/
14+
@UiThread
1315
class MapboxStepDistance : AppCompatTextView {
1416

1517
/**

libnavui-maneuver/src/main/java/com/mapbox/navigation/ui/maneuver/view/MapboxSubManeuver.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.mapbox.navigation.ui.maneuver.view
22

33
import android.content.Context
44
import android.util.AttributeSet
5+
import androidx.annotation.UiThread
56
import androidx.appcompat.widget.AppCompatTextView
67
import com.mapbox.navigation.ui.maneuver.R
78
import com.mapbox.navigation.ui.maneuver.model.ManeuverInstructionGenerator
@@ -18,6 +19,7 @@ import com.mapbox.navigation.utils.internal.ifNonNull
1819
* @property attrs AttributeSet
1920
* @property defStyleAttr Int
2021
*/
22+
@UiThread
2123
class MapboxSubManeuver : AppCompatTextView {
2224

2325
private var options = ManeuverSubOptions.Builder().build()

0 commit comments

Comments
 (0)