Просмотр исходного кода

Fixed contrast of text in notifications for Android 2.x and 3.x

David A. Velasco 11 лет назад
Родитель
Сommit
8a9f504138

+ 2 - 5
res/layout-v11/notification_with_progress_bar.xml

@@ -39,9 +39,7 @@
 			android:singleLine="true"
 			android:ellipsize="marquee"
             android:fadingEdge="horizontal"
-			android:textColor="?android:attr/textColorPrimary"
-        	android:textSize="18sp"
-        	android:textStyle="bold"
+            style="@style/Theme.ownCloud.NotificationText.Title"
         	/>
         <TextView android:id="@+id/text"
             android:layout_width="match_parent"
@@ -51,8 +49,7 @@
             android:singleLine="true"
             android:fadingEdge="horizontal"
             android:ellipsize="marquee"
-			android:textColor="?android:attr/textColorSecondary"
-        	android:textSize="16sp"
+            style="@style/Theme.ownCloud.NotificationText.Content"
             />
         <FrameLayout android:id="@+id/progressHolder"
             android:layout_width="match_parent"

+ 3 - 6
res/layout/notification_with_progress_bar.xml

@@ -31,8 +31,7 @@
         <ImageView android:id="@+id/icon"
             android:layout_width="25dp"
             android:layout_height="25dp"
-            android:scaleType="fitCenter"
-            android:background="@android:drawable/status_bar_item_app_background"
+            android:scaleType="centerInside"
             />
         <TextView android:id="@+id/title"
             android:layout_width="0dp"
@@ -42,9 +41,7 @@
             android:ellipsize="marquee"
             android:fadingEdge="horizontal"
             android:paddingLeft="4dp"
-			android:textSize="18sp"
-        	android:textStyle="bold"
-        	android:textColor="?android:attr/textColorPrimaryInverse"
+        	style="@style/Theme.ownCloud.NotificationText.Title"
             />
     </LinearLayout>
 	<TextView android:id="@+id/text"
@@ -53,7 +50,7 @@
 	    android:singleLine="true"
 	    android:ellipsize="marquee"
 	    android:fadingEdge="horizontal"
-        android:textColor="?android:attr/textColorPrimaryInverse"
+        style="@style/Theme.ownCloud.NotificationText.Content"
 	    />
     <FrameLayout android:id="@+id/progressHolder"
         android:layout_width="match_parent"

+ 13 - 0
res/values-v11/versioned_styles.xml

@@ -6,4 +6,17 @@
 		<item name="android:textColor">@color/button_text_color</item>
 	</style>
 
+	<!-- Notifications -->
+	<!-- Notifications -->
+	<style 	name="Theme.ownCloud.NotificationText.Title" 
+	    	parent="@android:style/TextAppearance.StatusBar.EventContent.Title" > 
+		<item name="android:textSize">18sp</item>
+        <item name="android:textStyle">bold</item>
+	</style>
+
+	<style 	name="Theme.ownCloud.NotificationText.Content" 
+	    	parent="@android:style/TextAppearance.StatusBar.EventContent"	>
+        <item name="android:textSize">16sp</item>
+	</style>
+	
 </resources>

+ 12 - 0
res/values-v9/versioned_styles.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+	
+	<!-- Notifications -->
+	<style name="Theme.ownCloud.NotificationText.Title" 
+	    parent="@android:style/TextAppearance.StatusBar.EventContent.Title" 
+	    />
+	<style name="Theme.ownCloud.NotificationText.Content" 
+	    parent="@android:style/TextAppearance.StatusBar.EventContent" 
+	    />
+	
+</resources>

+ 12 - 0
res/values/versioned_styles.xml

@@ -16,4 +16,16 @@
 	    <item name="android:indeterminateDrawable">@drawable/abs__progress_medium_holo</item>
 	</style>
 
+	<!-- Notifications -->
+	<style 	name="Theme.ownCloud.NotificationText.Title" 
+	    	parent="@android:style/TextAppearance">
+        <item name="android:textColor">#ff000000</item>
+		<item name="android:textSize">18sp</item>
+        <item name="android:textStyle">bold</item>
+	</style>
+	<style 	name="Theme.ownCloud.NotificationText.Content" 
+	    	parent="@android:style/TextAppearance">
+        <item name="android:textColor">#ff000000</item>
+		<item name="android:textSize">14sp</item>
+	</style>
 </resources>