@@ -84,6 +84,7 @@ public class Jx {
8484 private Hx eventManager ;
8585 private ArrayList <String > imports = new ArrayList <>();
8686 private String onCreateEventCode = "" ;
87+ private Material3LibraryManager materialLibraryManager ;
8788
8889 public Jx (jq jqVar , ProjectFileBean projectFileBean , eC eCVar ) {
8990 packageName = jqVar .packageName ;
@@ -97,6 +98,7 @@ public Jx(jq jqVar, ProjectFileBean projectFileBean, eC eCVar) {
9798 extraBlocks = getExtraBlockData ();
9899 isViewBindingEnabled = settings .getValue (ProjectSettings .SETTING_ENABLE_VIEWBINDING , BuildSettings .SETTING_GENERIC_VALUE_FALSE )
99100 .equals (BuildSettings .SETTING_GENERIC_VALUE_TRUE );
101+ materialLibraryManager = new Material3LibraryManager (projectDataManager .a );
100102 }
101103
102104 public String activityResult () {
@@ -751,7 +753,6 @@ private void handleAppCompat() {
751753
752754 if (buildConfig .g ) {
753755 if (projectFileBean .hasActivityOption (ProjectFileBean .OPTION_ACTIVITY_TOOLBAR ) && !projectFileBean .fileName .contains ("_fragment" )) {
754- Material3LibraryManager materialLibraryManager = new Material3LibraryManager (projectDataManager .a );
755756 addImport (
756757 (materialLibraryManager .isMaterial3Enabled ()) ? "com.google.android.material.appbar.MaterialToolbar" : "androidx.appcompat.widget.Toolbar"
757758 );
@@ -771,7 +772,9 @@ private void handleAppCompat() {
771772 "});"
772773 );
773774 } else {
774- fields .add ("private Toolbar _toolbar;" );
775+ fields .add ("private " +
776+ (materialLibraryManager .isMaterial3Enabled () ? "MaterialToolbar" : "Toolbar" ) +
777+ " _toolbar;" );
775778 fields .add ("private AppBarLayout _app_bar;" );
776779 fields .add ("private CoordinatorLayout _coordinator;" );
777780
0 commit comments