Skip to content

Commit e1f2dc1

Browse files
m1gacb1kenobi
andauthored
fix(android): remove some deprecated classes (#14039)
Co-authored-by: Chris Barber <[email protected]>
1 parent eb87849 commit e1f2dc1

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUIBottomNavigationTabGroup.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import com.google.android.material.bottomnavigation.BottomNavigationItemView;
2626
import com.google.android.material.bottomnavigation.BottomNavigationMenuView;
2727
import com.google.android.material.bottomnavigation.BottomNavigationView;
28-
import com.google.android.material.bottomnavigation.LabelVisibilityMode;
28+
import com.google.android.material.navigation.NavigationBarView;
2929
import com.google.android.material.shape.CornerFamily;
3030
import com.google.android.material.shape.MaterialShapeDrawable;
3131
import com.google.android.material.shape.ShapeAppearanceModel;
@@ -238,14 +238,14 @@ public void addTabItemInController(TiViewProxy tabProxy)
238238
final int shiftMode = proxy.getProperties().optInt(TiC.PROPERTY_SHIFT_MODE, 1);
239239
switch (shiftMode) {
240240
case 0:
241-
this.mBottomNavigationView.setLabelVisibilityMode(LabelVisibilityMode.LABEL_VISIBILITY_LABELED);
241+
this.mBottomNavigationView.setLabelVisibilityMode(NavigationBarView.LABEL_VISIBILITY_LABELED);
242242
break;
243243
case 1:
244-
this.mBottomNavigationView.setLabelVisibilityMode(LabelVisibilityMode.LABEL_VISIBILITY_AUTO);
244+
this.mBottomNavigationView.setLabelVisibilityMode(NavigationBarView.LABEL_VISIBILITY_AUTO);
245245
break;
246246
case 2:
247247
// NOTE: Undocumented for now, will create new property that has parity with iOS.
248-
this.mBottomNavigationView.setLabelVisibilityMode(LabelVisibilityMode.LABEL_VISIBILITY_UNLABELED);
248+
this.mBottomNavigationView.setLabelVisibilityMode(NavigationBarView.LABEL_VISIBILITY_UNLABELED);
249249
break;
250250
}
251251
}

android/runtime/common/src/java/org/appcelerator/kroll/common/TiConfig.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
*/
77
package org.appcelerator.kroll.common;
88

9-
import android.util.Config;
10-
119
/**
1210
* A replacement class for org.appcelerator.titanium.config.TitaniumConfig so that I can change
1311
* settings via tiapp.xml
@@ -24,9 +22,9 @@ public class TiConfig
2422
* &lt;property name="ti.android.debug" type="bool"&gt;true&lt;/property&gt;
2523
* </pre>
2624
*/
27-
public static boolean LOGD = Config.DEBUG;
28-
public static boolean LOGV = Config.DEBUG;
29-
public static boolean DEBUG = Config.DEBUG;
30-
public static boolean RELEASE = !Config.DEBUG;
31-
public static boolean PROFILE = Config.PROFILE;
25+
public static boolean LOGD = false;
26+
public static boolean LOGV = false;
27+
public static boolean DEBUG = false;
28+
public static boolean RELEASE = true;
29+
public static boolean PROFILE = false;
3230
}

0 commit comments

Comments
 (0)