feat: New screen for creating project

aikrq · Dec 2, 2024 · d058a33 · d058a33
1 parent 2d9563d
commit d058a33
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 15 deletions.
diff --git a/app/src/main/java/mod/remaker/activity/projectwizard/BasicWizardStep.java b/app/src/main/java/mod/remaker/activity/projectwizard/BasicWizardStep.java
@@ -7,12 +7,15 @@
 
 import a.a.a.xB;
 
+import mod.hey.studios.util.Helper;
 import mod.remaker.activity.projectwizard.model.WizardStep;
 
 import pro.sketchware.R;
 import pro.sketchware.databinding.WizardStepBasicBinding;
 
 public class BasicWizardStep extends WizardStep {
+    private WizardStepBasicBinding binding;
+
     @Override
     public String getTitle(Context context) {
         return xB.b().a(context, R.string.project_wizard_basic_title);
@@ -25,10 +28,14 @@ public String getSubtitle(Context context) {
 
     @Override
     public View getContentView(LayoutInflater inflater, ViewGroup container) {
-        WizardStepBasicBinding binding = WizardStepBasicBinding.inflate(inflater, container, true);
-        binding.btnNext.setOnClickListener(v -> {
-            presentStep(new AdditionalWizardStep());
-        });
+        binding = WizardStepBasicBinding.inflate(inflater, container, true);
+
+        binding.btnNext.setOnClickListener(v -> presentStep(new AdditionalWizardStep()));
+
+        binding.tilAppName.setHint(Helper.getResString(R.string.myprojects_settings_hint_enter_application_name));
+        binding.tilPackageName.setHint(Helper.getResString(R.string.myprojects_settings_hint_enter_package_name));
+        binding.tilProjectName.setHint(Helper.getResString(R.string.myprojects_settings_hint_enter_project_name));
+
         return binding.getRoot();
     }
 }
diff --git a/app/src/main/java/mod/remaker/activity/projectwizard/ProjectWizardActivity.java b/app/src/main/java/mod/remaker/activity/projectwizard/ProjectWizardActivity.java
@@ -34,6 +34,8 @@ public void onCreate(Bundle savedInstanceState) {
 
     @Override
     public void onBackPressed() {
-        mWizardLayout.onBackPressed();
+        if (!mWizardLayout.onBackPressed()) {
+            super.onBackPressed();
+        }
     }
 }
diff --git a/app/src/main/java/mod/remaker/activity/projectwizard/model/IWizardLayout.java b/app/src/main/java/mod/remaker/activity/projectwizard/model/IWizardLayout.java
@@ -14,7 +14,7 @@ public interface IWizardLayout {
     void closeLastStep();
     void setSteps(List<WizardStep> steps);
     List<WizardStep> getSteps();
-    void onBackPressed();
+    boolean onBackPressed();
 
     static IWizardLayout newLayout(Context context) {
         return new WizardLayout(context);

diff --git a/app/src/main/java/mod/remaker/activity/projectwizard/model/WizardLayout.java b/app/src/main/java/mod/remaker/activity/projectwizard/model/WizardLayout.java
@@ -20,7 +20,6 @@ public class WizardLayout extends FrameLayout implements IWizardLayout {
     private WizardStep oldStep;
 
     private ProjectWizardActivity activity;
-
     private List<WizardStep> steps;
 
     public WizardLayout(Context context) {
@@ -152,9 +151,8 @@ public void setSteps(List<WizardStep> steps) {
         this.steps = steps;
 
         if (containerViewBack != null) {
-            if (containerViewBack.getParent() != null) {
-                ((ViewGroup) containerViewBack.getParent()).removeView(containerViewBack);
-            }
+            ViewGroup parent = (ViewGroup) containerViewBack.getParent();
+            if (parent != null) parent.removeView(containerViewBack);
         }
 
         containerViewBack = new FrameLayout(activity);
@@ -176,13 +174,17 @@ public List<WizardStep> getSteps() {
     }
 
     @Override
-    public void onBackPressed() {
+    public boolean onBackPressed() {
         WizardStep lastStep = getLastStep();
+
         if (lastStep != null && lastStep.onBackPressed()) {
             if (!steps.isEmpty()) {
                 closeLastStep();
+                return true;
             }
         }
+
+        return false;
     }
 
     @Override

diff --git a/app/src/main/java/mod/remaker/activity/projectwizard/model/WizardStep.java b/app/src/main/java/mod/remaker/activity/projectwizard/model/WizardStep.java
@@ -34,6 +34,7 @@ public final View onCreateView(Context context) {
 
     private void configureStep(WizardStepBinding binding) {
         Context ctx = binding.getRoot().getContext();
+        binding.toolbar.setNavigationOnClickListener(v -> parentLayout.onBackPressed());
         binding.toolbar.setTitle(getTitle(ctx));
         binding.message.setText(getSubtitle(ctx));
     }

diff --git a/app/src/main/res/layout/wizard_step.xml b/app/src/main/res/layout/wizard_step.xml
@@ -2,13 +2,17 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:transitionGroup="true">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fitsSystemWindows="true">
+        android:fitsSystemWindows="true"
+        app:elevation="0dp"
+        app:liftOnScroll="false"
+        app:liftOnScrollColor="@android:color/transparent">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsing_toolbar"
@@ -43,13 +47,13 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="24dp"
             android:layout_marginStart="24dp"
-            android:layout_marginTop="12dp"
             android:textAppearance="?attr/textAppearanceBodyMedium" />
 
         <FrameLayout
             android:id="@+id/container"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
             android:paddingBottom="16dp"
             android:paddingTop="16dp" />
 

diff --git a/app/src/main/res/values/project_wizard_strings.xml b/app/src/main/res/values/project_wizard_strings.xml
@@ -1,4 +1,4 @@
 <resources>
     <string name="project_wizard_basic_title">New project</string>
-    <string name="project_wizard_basic_subtitle">Enter project name and package name to continue</string>
+    <string name="project_wizard_basic_subtitle">Enter project name and package name to continue.</string>
 </resources>