Merge pull request #74 from nvllz/master

Layout theme fixes
newhinton · Mar 30, 2023 · 35f5e32 · 35f5e32
2 parents b3fba29 + 26cc9bd
commit 35f5e32
Show file tree

Hide file tree

Showing 30 changed files with 246 additions and 279 deletions.
diff --git a/app/src/main/res/layout-sw720dp/dialog_remote_dest.xml b/app/src/main/res/layout-sw720dp/dialog_remote_dest.xml
@@ -5,7 +5,8 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:theme="@style/SecondaryCardStyle">
 
     <include
         android:id="@+id/empty_folder_view"
@@ -53,15 +54,15 @@
                 android:layout_width="match_parent"
                 android:layout_height="76dp"
                 android:background="?selectableItemBackground">
+
                 <ImageView
                     android:id="@+id/previous_dir_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="76dp"
+                    android:contentDescription="@string/file_icon"
                     android:paddingLeft="16dp"
                     android:paddingRight="16dp"
-                    android:src="@drawable/ic_arrow_back"
-                    android:contentDescription="@string/file_icon"
-                    app:tint="@color/iconTint" />
+                    android:src="@drawable/ic_arrow_back" />
 
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -71,16 +72,16 @@
                     android:layout_marginStart="16dp"
                     android:layout_marginEnd="16dp"
                     android:layout_centerVertical="true">
+
                     <TextView
                         android:id="@+id/previous_dir_label"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:fontFamily="sans-serif"
-                        android:textSize="16sp"
-                        android:textColor="@color/textColorPrimary"
                         android:ellipsize="middle"
+                        android:fontFamily="sans-serif"
                         android:singleLine="true"
-                        tools:text="Previous"/>
+                        android:textSize="16sp"
+                        tools:text="Previous" />
                 </LinearLayout>
 
                 <View

diff --git a/app/src/main/res/layout-sw720dp/remote_config_form.xml b/app/src/main/res/layout-sw720dp/remote_config_form.xml
@@ -49,12 +49,12 @@
                     android:paddingBottom="@dimen/config_form_template"
                     android:visibility="gone"
                     tools:visibility="visible">
+
                     <EditText
                         android:id="@+id/remote_name"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/remote_name_hint"
-                        android:textColor="@color/textColorPrimary"
                         android:inputType="textAutoCorrect"
                         tools:text="Remote name" />
                 </com.google.android.material.textfield.TextInputLayout>

diff --git a/app/src/main/res/layout/about_libraries_item.xml b/app/src/main/res/layout/about_libraries_item.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="16dp"
     android:layout_marginStart="8dp"
+    android:layout_marginTop="16dp"
     android:layout_marginEnd="8dp"
-    card_view:cardBackgroundColor="@color/cardColor"
+    android:theme="@style/PrimaryCardStyle"
     card_view:cardCornerRadius="@dimen/cardCornerRadius"
     card_view:contentPadding="@dimen/cardPadding">
 
@@ -21,23 +20,23 @@
             android:id="@+id/library_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingTop="12dp"
-            android:paddingBottom="12dp"
             android:background="?selectableItemBackground"
             android:clickable="true"
             android:focusable="true"
-            tools:text="Amazing Library"/>
+            android:paddingTop="12dp"
+            android:paddingBottom="12dp"
+            tools:text="Amazing Library" />
 
         <TextView
             android:id="@+id/library_licence"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingTop="12dp"
-            android:paddingBottom="12dp"
             android:background="?selectableItemBackground"
             android:clickable="true"
             android:focusable="true"
-            tools:text="Licence"/>
+            android:paddingTop="12dp"
+            android:paddingBottom="12dp"
+            tools:text="Licence" />
 
     </LinearLayout>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
@@ -19,16 +19,17 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
             android:layout_marginBottom="4dp"
-            app:cardBackgroundColor="?attr/colorPrimary"
-            app:cardCornerRadius="36dp"
+            app:cardCornerRadius="@dimen/cardCornerRadius"
+            style="@style/MainViewToolbar"
             app:cardElevation="2dp"
             app:strokeWidth="0dp">
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"/>
+                android:theme="@style/MainViewToolbar"
+                android:orientation="horizontal" />
 
         </com.google.android.material.card.MaterialCardView>
     </com.google.android.material.appbar.AppBarLayout>

diff --git a/app/src/main/res/layout/activity_about_libs.xml b/app/src/main/res/layout/activity_about_libs.xml
@@ -19,15 +19,16 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
             android:layout_marginBottom="4dp"
-            app:cardBackgroundColor="?attr/colorPrimary"
-            app:cardCornerRadius="36dp"
+            app:cardCornerRadius="@dimen/cardCornerRadius"
+            style="@style/MainViewToolbar"
             app:cardElevation="2dp"
             app:strokeWidth="0dp">
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:theme="@style/MainViewToolbar"
                 android:orientation="horizontal" />
 
         </com.google.android.material.card.MaterialCardView>

diff --git a/app/src/main/res/layout/auth_screen.xml b/app/src/main/res/layout/auth_screen.xml
@@ -21,15 +21,14 @@
             app:layout_constraintBottom_toTopOf="@id/progressText"/>
 
     <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/waiting_for_code"
-            android:textColor="@color/textColorPrimary"
-            android:id="@+id/progressText"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/setupProgress"
-            app:layout_constraintBottom_toBottomOf="parent"/>
+        android:id="@+id/progressText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/waiting_for_code"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/setupProgress" />
 
     <Button
             android:id="@+id/cancel_auth"

diff --git a/app/src/main/res/layout/config_form_union.xml b/app/src/main/res/layout/config_form_union.xml
@@ -49,7 +49,6 @@
                         android:layout_height="wrap_content"
                         android:hint="@string/remote_name_hint"
                         android:inputType="textAutoCorrect"
-                        android:textColor="@color/textColorPrimary"
                         tools:text="Remote name" />
                 </com.google.android.material.textfield.TextInputLayout>
 

diff --git a/app/src/main/res/layout/config_list_item_template.xml b/app/src/main/res/layout/config_list_item_template.xml
@@ -7,7 +7,8 @@
         android:layout_height="wrap_content"
         android:id="@+id/provider"
         android:paddingTop="16dp"
-        android:paddingBottom="8dp">
+        android:paddingBottom="8dp"
+        android:theme="@style/SecondaryCardStyle">
 
     <RadioButton
             android:id="@+id/provider_rb"
@@ -51,15 +52,14 @@
     </LinearLayout>
 
     <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            app:srcCompat="@drawable/ic_cloud"
-            android:id="@+id/providerIcon"
-            android:contentDescription="@null"
-            android:layout_marginEnd="16dp"
-            app:tint="@color/iconTint"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
+        android:id="@+id/providerIcon"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_marginEnd="16dp"
+        android:contentDescription="@null"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ic_cloud" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>