浏览代码

Remove unused input styles

Peter Cai 2 年之前
父节点
当前提交
19837494bb

+ 4 - 12
app-common/src/main/res/layout/fragment_profile_download.xml

@@ -40,7 +40,6 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="15dp"
         android:hint="@string/profile_download_server"
-        style="@style/Widget.OpenEUICC.Input"
         app:layout_constraintTop_toBottomOf="@id/toolbar"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
@@ -48,8 +47,7 @@
 
         <com.google.android.material.textfield.TextInputEditText
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:theme="@style/Theme.OpenEUICC.Input.Cursor"/>
+            android:layout_height="match_parent" />
 
     </com.google.android.material.textfield.TextInputLayout>
 
@@ -59,7 +57,6 @@
         android:layout_height="wrap_content"
         android:layout_marginVertical="15dp"
         android:hint="@string/profile_download_code"
-        style="@style/Widget.OpenEUICC.Input"
         app:layout_constraintTop_toBottomOf="@id/profile_download_server"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
@@ -69,8 +66,7 @@
         <com.google.android.material.textfield.TextInputEditText
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:inputType="textPassword"
-            android:theme="@style/Theme.OpenEUICC.Input.Cursor"/>
+            android:inputType="textPassword" />
 
     </com.google.android.material.textfield.TextInputLayout>
 
@@ -80,7 +76,6 @@
         android:layout_height="wrap_content"
         android:layout_marginVertical="15dp"
         android:hint="@string/profile_download_confirmation_code"
-        style="@style/Widget.OpenEUICC.Input"
         app:layout_constraintTop_toBottomOf="@id/profile_download_code"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
@@ -90,8 +85,7 @@
         <com.google.android.material.textfield.TextInputEditText
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:inputType="textPassword"
-            android:theme="@style/Theme.OpenEUICC.Input.Cursor"/>
+            android:inputType="textPassword" />
 
     </com.google.android.material.textfield.TextInputLayout>
 
@@ -102,7 +96,6 @@
         android:layout_marginTop="15dp"
         android:layout_marginBottom="6dp"
         android:hint="@string/profile_download_imei"
-        style="@style/Widget.OpenEUICC.Input"
         app:layout_constraintTop_toBottomOf="@id/profile_download_confirmation_code"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
@@ -113,8 +106,7 @@
         <com.google.android.material.textfield.TextInputEditText
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:inputType="textPassword"
-            android:theme="@style/Theme.OpenEUICC.Input.Cursor"/>
+            android:inputType="textPassword" />
 
     </com.google.android.material.textfield.TextInputLayout>
 

+ 1 - 3
app-common/src/main/res/layout/fragment_profile_rename.xml

@@ -40,7 +40,6 @@
         android:layout_height="wrap_content"
         android:layout_marginVertical="15dp"
         android:hint="@string/profile_rename_new_name"
-        style="@style/Widget.OpenEUICC.Input"
         app:layout_constraintTop_toBottomOf="@id/toolbar"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
@@ -49,8 +48,7 @@
 
         <com.google.android.material.textfield.TextInputEditText
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:theme="@style/Theme.OpenEUICC.Input.Cursor"/>
+            android:layout_height="match_parent" />
 
     </com.google.android.material.textfield.TextInputLayout>
 

+ 1 - 12
app-common/src/main/res/values/themes.xml

@@ -5,23 +5,12 @@
         <item name="alertDialogTheme">@style/AlertDialogTheme</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:windowLightNavigationBar">?attr/isLightTheme</item>
-        <item name="dialogCornerRadius">28dp</item>
         <item name="toolbarStyle">@style/Widget.Material3.Toolbar</item>
         <item name="android:statusBarColor">?attr/colorSurface</item>
         <item name="android:colorBackground">?attr/colorSurface</item>
     </style>
 
-    <style name="Theme.OpenEUICC.Input.Cursor" parent="ThemeOverlay.Material3.TextInputEditText.OutlinedBox">
-        <item name="colorControlActivated">?attr/colorSecondary</item>
-    </style>
-
-    <style name="Widget.OpenEUICC.Input" parent="Widget.Material3.TextInputLayout.OutlinedBox">
-        <item name="boxBackgroundColor">@android:color/transparent</item>
-        <item name="boxStrokeColor">?attr/colorSecondary</item>
-        <item name="hintTextColor">?attr/colorSecondary</item>
-    </style>
-
-    <style name="AlertDialogTheme" parent="ThemeOverlay.Material3.Dialog.Alert">
+    <style name="AlertDialogTheme" parent="Theme.Material3.DayNight.Dialog.Alert">
         <item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
         <item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyle</item>
         <item name="dialogCornerRadius">28dp</item>