Browse Source

DatePickerDialog theme and style.
Button styling.
Small improvements to layouts and correction of spelling errors.
Sets edittext highlight colour to theme colour.

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

Daniel Bailey 6 years ago
parent
commit
9f7fa6b6b6

+ 1 - 2
src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.java

@@ -23,7 +23,6 @@
 package com.owncloud.android.ui.activity;
 
 import android.content.Intent;
-import android.graphics.PorterDuff;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextUtils;
@@ -97,7 +96,7 @@ public class PassCodeActivity extends AppCompatActivity implements Injectable {
         int elementColor = ThemeUtils.elementColor(this);
 
         mBCancel = findViewById(R.id.cancel);
-        mBCancel.getBackground().setColorFilter(elementColor, PorterDuff.Mode.SRC_ATOP);
+        mBCancel.setBackgroundColor(ThemeUtils.primaryColor(this));
 
         mPassCodeHdr = findViewById(R.id.header);
         mPassCodeHdrExplanation = findViewById(R.id.explanation);

+ 1 - 0
src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

@@ -399,6 +399,7 @@ public class ReceiveExternalFilesActivity extends FileActivity
 
             final EditText userInput = view.findViewById(R.id.user_input);
             setFilename(userInput, selectPos);
+            userInput.setHighlightColor(ThemeUtils.primaryColor(getContext()));
             userInput.requestFocus();
 
             final Spinner spinner = view.findViewById(R.id.file_type);

+ 1 - 0
src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java

@@ -99,6 +99,7 @@ public class CreateFolderDialogFragment
         inputText.setText("");
         inputText.requestFocus();
         inputText.getBackground().setColorFilter(accentColor, PorterDuff.Mode.SRC_ATOP);
+        inputText.setHighlightColor(ThemeUtils.primaryColor(getActivity()));
 
         // Build the dialog
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());

+ 1 - 0
src/main/java/com/owncloud/android/ui/dialog/NoteDialogFragment.java

@@ -109,6 +109,7 @@ public class NoteDialogFragment extends DialogFragment implements DialogInterfac
 
         // Setup layout
         noteEditText.setText(share.getNote());
+        noteEditText.setHighlightColor(ThemeUtils.primaryColor(getActivity()));
         noteEditText.requestFocus();
         ThemeUtils.colorTextInputLayout(noteEditTextInputLayout, accentColor);
 

+ 1 - 0
src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java

@@ -102,6 +102,7 @@ public class RenameFileDialogFragment
         // Setup layout
         String currentName = mTargetFile.getFileName();
         EditText inputText = v.findViewById(R.id.user_input);
+        inputText.setHighlightColor(ThemeUtils.primaryColor(getActivity()));
         inputText.setText(currentName);
         ThemeUtils.themeEditText(getContext(), inputText, false);
         int selectionStart = 0;

+ 2 - 2
src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java

@@ -179,10 +179,10 @@ public class ContactsBackupFragment extends FileFragment implements DatePickerDi
         int accentColor = ThemeUtils.primaryAccentColor(getContext());
         int fontColor = ThemeUtils.fontColor(getContext());
 
-        backupNow.getBackground().setColorFilter(accentColor, PorterDuff.Mode.SRC_ATOP);
+        backupNow.setBackgroundColor(ThemeUtils.primaryColor(getActivity()));
         backupNow.setTextColor(fontColor);
 
-        contactsDatePickerBtn.getBackground().setColorFilter(accentColor, PorterDuff.Mode.SRC_ATOP);
+        contactsDatePickerBtn.setBackgroundColor(ThemeUtils.primaryColor(getActivity()));
         contactsDatePickerBtn.setTextColor(fontColor);
 
         MaterialButton chooseDate = view.findViewById(R.id.contacts_datepicker);

+ 2 - 2
src/main/res/drawable/uploader_list_separator.xml

@@ -19,5 +19,5 @@
 -->
 <shape
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient android:startColor="@color/filelist_icon_backgorund" android:endColor="@color/filelist_icon_backgorund" android:angle="0"/>
-</shape>
+    <gradient android:startColor="@color/filelist_icon_background" android:endColor="@color/filelist_icon_background" android:angle="0" />
+</shape>

+ 1 - 2
src/main/res/layout/file_details_fragment.xml

@@ -24,8 +24,7 @@
     android:id="@+id/scrollView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fillViewport="true"
-    android:background="@color/background_color">
+    android:fillViewport="true">
 
     <LinearLayout
         android:layout_width="match_parent"

+ 3 - 7
src/main/res/layout/file_download_fragment.xml

@@ -22,9 +22,7 @@
 	android:orientation="vertical" 
 	android:layout_gravity="center"
 	android:gravity="center_vertical"
-	android:padding="@dimen/file_download_fragment_layout_padding"
-	android:background="@color/background_color_inverse"
-	>
+	android:padding="@dimen/file_download_fragment_layout_padding">
 	
 	<TextView 
 	    android:id="@+id/progressText" 
@@ -32,8 +30,7 @@
 		android:layout_height="wrap_content"
 		android:textColor="@color/dark_background_text_color"
 		android:text="@string/downloader_not_downloaded_yet"
-		android:layout_marginBottom="@dimen/alternate_fragment_margin"
-	/>
+		android:layout_marginBottom="@dimen/alternate_fragment_margin" />
 	
     <LinearLayout
         android:id="@+id/fdProgressBlock"
@@ -80,8 +77,7 @@
 		android:layout_gravity="center_horizontal"
 		android:layout_margin="@dimen/file_download_fragment_display_text_margin"
 		android:textColor="@color/dark_background_text_color"
-		android:text="@string/downloader_download_failed_ticker"
-	/>
+		android:text="@string/downloader_download_failed_ticker" />
 	
 </LinearLayout>
 

+ 1 - 1
src/main/res/layout/info_box.xml

@@ -23,7 +23,7 @@
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:layout_gravity="center_horizontal|bottom"
-              android:background="@color/filelist_icon_backgorund"
+              android:background="@color/filelist_icon_background"
               android:gravity="center"
               android:padding="@dimen/standard_half_padding"
               android:visibility="gone">

+ 1 - 2
src/main/res/layout/sorting_order_fragment.xml

@@ -24,8 +24,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minWidth="300dp"
-    android:orientation="vertical"
-    android:background="@color/background_color">
+    android:orientation="vertical">
 
     <TextView
         android:id="@+id/header"

+ 3 - 1
src/main/res/values-night/colors.xml

@@ -28,7 +28,7 @@
     <color name="textColor_inverse">#ffffff</color>
     <color name="disabled_text">#ff888888</color>
     <color name="list_divider_background">#eee</color>
-    <color name="filelist_icon_backgorund">#DDDDDD</color>
+    <color name="filelist_icon_background">#DDDDDD</color>
     <color name="dark_background_text_color">#EEEEEE</color>
     <color name="transparent">#00000000</color>
     <color name="secondaryTextColor">#a0a0a0</color>
@@ -77,5 +77,7 @@
 
     <!--<color name="background_material_light">#555555</color>-->
     <color name="drawer_menu_icon">#ffffff</color>
+    <color name="date_picker_header_text">#616161</color>
+    <color name="date_picker_header_bg">#111111</color>
 
 </resources>

+ 3 - 1
src/main/res/values/colors.xml

@@ -31,7 +31,7 @@
     <color name="fg_default">#000000</color>
     <color name="fg_contrast">#656565</color>
     <color name="fg_inverse">#FFFFFF</color>
-    <color name="filelist_icon_backgorund">#DDDDDD</color>
+    <color name="filelist_icon_background">#DDDDDD</color>
     <color name="dark_background_text_color">#EEEEEE</color>
     <color name="transparent">#00000000</color>
     <color name="secondaryTextColor">#a0a0a0</color>
@@ -82,6 +82,8 @@
 
     <!--<color name="background_material_light">#ef4</color>-->
     <color name="drawer_menu_icon">#757575</color>
+    <color name="date_picker_header_text">#ffffff</color>
+    <color name="date_picker_header_bg">#757575</color>
 
     <!-- Excluded from future app dark theme -->
     <color name="themed_fg">#FFFFFF</color>

+ 24 - 8
src/main/res/values/styles.xml

@@ -37,7 +37,8 @@
         <item name="android:textColor">@color/textColor</item>
         <item name="colorSecondary">@color/textColor</item>
         <item name="android:colorSecondary">@color/textColor</item>
-	</style>
+        <item name="android:datePickerDialogTheme">@style/FallbackDatePickerDialogTheme</item>
+    </style>
 
 	<style name="FallbackThemingTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
 		<item name="colorPrimary">#424242</item>
@@ -47,16 +48,29 @@
         <item name="android:textColor">@color/textColor</item>
         <item name="colorSecondary">@color/textColor</item>
         <item name="android:colorSecondary">@color/textColor</item>
-	</style>
+        <item name="android:datePickerDialogTheme">@style/FallbackDatePickerDialogTheme</item>
+    </style>
 
 	<style name="FallbackDatePickerDialogTheme" parent="Theme.MaterialComponents.DayNight.Dialog">
 		<item name="colorPrimary">#424242</item>
 		<item name="colorPrimaryDark">#212121</item>
-		<item name="colorAccent">#757575</item>
+        <item name="android:colorAccent">@color/date_picker_header_bg</item>
+        <item name="colorAccent">@color/date_picker_header_bg</item>
         <item name="android:textAllCaps">false</item>
-	</style>
+        <item name="android:windowBackground">@color/background_color</item>
+        <item name="android:textColor">@color/textColor</item>
+        <item name="android:datePickerStyle">@style/DatePickerStyle</item>
+        <!--&lt;!&ndash; TODO change these references &ndash;&gt;-->
+        <item name="colorControlHighlight">@color/date_picker_header_bg</item>
+        <item name="colorControlActivated">@color/textColor</item>
+    </style>
 
-	<style name="FallbackTheming.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
+    <style name="DatePickerStyle" parent="Theme.MaterialComponents.DayNight.Dialog">
+        <item name="android:headerBackground">@color/date_picker_header_bg</item>
+        <item name="android:datePickerMode">calendar</item>
+    </style>
+
+    <style name="FallbackTheming.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
 		<item name="colorPrimary">#424242</item>
 		<item name="colorPrimaryDark">#212121</item>
 		<item name="colorAccent">#757575</item>
@@ -65,7 +79,7 @@
 		<item name="buttonBarStyle">@style/Theme.ownCloud.Dialog.ButtonBar</item>
 	</style>
 
-	<!-- seperate action bar style for activities without an action bar -->
+	<!-- separate action bar style for activities without an action bar -->
 	<style name="Theme.ownCloud.Toolbar" parent="Theme.MaterialComponents.DayNight.NoActionBar">
 		<item name="windowNoTitle">true</item>
 		<item name="windowActionBar">false</item>
@@ -97,7 +111,8 @@
 		<item name="android:textColorPrimary">@color/primary</item>
 		<item name="searchViewStyle">@style/ownCloud.SearchView</item>
         <item name="android:textAllCaps">false</item>
-	</style>
+        <item name="android:colorBackground">@color/background_color</item>
+    </style>
 
 	<style name="ownCloud.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog">
 		<item name="colorAccent">@color/color_accent</item>
@@ -219,7 +234,8 @@
 		<item name="colorAccent">@color/color_accent</item>
 		<item name="buttonBarButtonStyle">@style/Theme.ownCloud.Dialog.ButtonBar.Button</item>
 		<item name="buttonBarStyle">@style/Theme.ownCloud.Dialog.ButtonBar</item>
-	</style>
+        <item name="android:windowBackground">@color/background_color</item>
+    </style>
 
 	<style name="Theme.ownCloud.Dialog.NoTitle" parent="@style/Theme.ownCloud.Dialog">
 		<item name="windowNoTitle">true</item>