Merge branch 'main' into main

aikrq · Dec 29, 2024 · c96d950 · c96d950
2 parents cc05d45 + 3af3fce
commit c96d950
Show file tree

Hide file tree

Showing 9 changed files with 148 additions and 110 deletions.
diff --git a/app/src/main/java/mod/hey/studios/project/ProjectSettingsDialog.java b/app/src/main/java/mod/hey/studios/project/ProjectSettingsDialog.java
@@ -37,18 +37,22 @@ public void show() {
                 behavior.setSkipCollapsed(true);
             }
         });
-        
+
         binding.etMinimumSdkVersion.setText(settings.getValue(ProjectSettings.SETTING_MINIMUM_SDK_VERSION, String.valueOf(VAR_DEFAULT_MIN_SDK_VERSION)));
         binding.etTargetSdkVersion.setText(settings.getValue(ProjectSettings.SETTING_TARGET_SDK_VERSION, String.valueOf(VAR_DEFAULT_TARGET_SDK_VERSION)));
         binding.etApplicationClassName.setText(settings.getValue(ProjectSettings.SETTING_APPLICATION_CLASS, ".SketchApplication"));
 
-        binding.enableViewbinding.setChecked(
+        binding.cbEnableViewbinding.setChecked(
                 settings.getValue(ProjectSettings.SETTING_ENABLE_VIEWBINDING, "false").equals("true"));
         binding.cbRemoveOldMethods.setChecked(
                 settings.getValue(ProjectSettings.SETTING_DISABLE_OLD_METHODS, "false").equals("true"));
         binding.cbUseNewMaterialComponentsAppTheme.setChecked(
                 settings.getValue(ProjectSettings.SETTING_ENABLE_BRIDGELESS_THEMES, "false").equals("true"));
 
+        binding.enableViewbinding.setOnClickListener(v -> binding.cbEnableViewbinding.performClick());
+        binding.removeOldMethods.setOnClickListener(v -> binding.cbRemoveOldMethods.performClick());
+        binding.useNewMaterialComponentsAppTheme.setOnClickListener(v -> binding.cbUseNewMaterialComponentsAppTheme.performClick());
+
         binding.enableViewbinding.setTag(ProjectSettings.SETTING_ENABLE_VIEWBINDING);
         binding.etMinimumSdkVersion.setTag(ProjectSettings.SETTING_MINIMUM_SDK_VERSION);
         binding.etTargetSdkVersion.setTag(ProjectSettings.SETTING_TARGET_SDK_VERSION);
@@ -62,7 +66,7 @@ public void show() {
                 binding.etMinimumSdkVersion,
                 binding.etTargetSdkVersion,
                 binding.etApplicationClassName,
-                binding.enableViewbinding,
+                binding.cbEnableViewbinding,
                 binding.cbRemoveOldMethods,
                 binding.cbUseNewMaterialComponentsAppTheme
         };

diff --git a/app/src/main/res/layout/activity_logcatreader.xml b/app/src/main/res/layout/activity_logcatreader.xml
@@ -70,14 +70,15 @@
         android:background="?attr/colorSurface"
         android:gravity="center"
         android:orientation="vertical"
-        android:paddingHorizontal="16dp"
+        android:paddingHorizontal="24dp"
         android:paddingBottom="100dp"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         tools:visibility="gone">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:gravity="center"
             android:text="Logcat hasn't captured anything yet"
             android:textColor="?attr/colorOnSurface"
             android:textSize="20sp" />
@@ -86,6 +87,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
+            android:gravity="center"
             android:text="Keep this screen open then run your app"
             android:textColor="?attr/colorOnSurfaceVariant"
             android:textSize="14sp" />

diff --git a/app/src/main/res/layout/bottom_sheet_project_options.xml b/app/src/main/res/layout/bottom_sheet_project_options.xml
@@ -16,7 +16,7 @@
         android:layout_marginStart="16dp"
         android:layout_marginBottom="10dp"
         android:text="Project Settings"
-        android:textAppearance="?attr/textAppearanceHeadlineSmallEmphasized" />
+        android:textAppearance="?attr/textAppearanceTitleLarge" />
 
     <LinearLayout
         android:id="@+id/project_settings"

diff --git a/app/src/main/res/layout/compile_log.xml b/app/src/main/res/layout/compile_log.xml
@@ -60,34 +60,31 @@
         android:id="@+id/noContentLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?android:colorBackground"
+        android:background="?attr/colorSurface"
         android:gravity="center"
         android:orientation="vertical"
-        android:paddingHorizontal="16dp"
+        android:paddingHorizontal="24dp"
         android:paddingBottom="100dp"
         android:visibility="gone"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="150dp"
-            android:src="@drawable/img_nocontent" />
-
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="30dp"
             android:gravity="center"
             android:text="Awesome, no bugs to fix!"
+            android:textColor="?attr/colorOnSurfaceVariant"
             android:textSize="20sp" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
+            android:layout_marginTop="4dp"
             android:gravity="center"
             android:text="Let's continue working on the project"
+            android:textColor="?attr/colorOnSurfaceVariant"
             android:textSize="14sp" />
+
     </LinearLayout>
 
     <LinearLayout