From 297d7226d6e189aaae9e5379e5bd9f9b5543ebf0 Mon Sep 17 00:00:00 2001
From: Isaac John Wesley <wonderviz@gmail.com>
Date: Sun, 7 Oct 2012 14:58:00 +0530
Subject: [PATCH] Translucent Theme for Actionbar

Conflicts:

	src/org/wikimedia/commons/CommonsApplication.java
---
 AndroidManifest.xml                          |  2 +-
 project.properties                           |  2 +-
 res/drawable/action_bar_translucent.xml      |  4 +++
 res/drawable/actionbar_top_shadow.xml        | 10 ++++++
 res/layout/activity_share.xml                | 35 +++++++++++++-----
 res/layout/login.xml                         | 38 ++++++++++++++++++++
 res/values/theme.xml                         | 12 +++++++
 src/org/wikimedia/commons/ShareActivity.java |  5 +++
 8 files changed, 98 insertions(+), 10 deletions(-)
 create mode 100644 res/drawable/action_bar_translucent.xml
 create mode 100644 res/drawable/actionbar_top_shadow.xml
 create mode 100644 res/layout/login.xml
 create mode 100644 res/values/theme.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ac5af4ef5..a26ad3f7a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -13,7 +13,7 @@
         android:name=".CommonsApplication"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/Theme.Commons" >
         <activity
             android:name=".LoginActivity"
             android:label="@string/title_activity_login"
diff --git a/project.properties b/project.properties
index 0840b4a05..8937e94b9 100644
--- a/project.properties
+++ b/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-15
+target=android-14
diff --git a/res/drawable/action_bar_translucent.xml b/res/drawable/action_bar_translucent.xml
new file mode 100644
index 000000000..1bd39b6dc
--- /dev/null
+++ b/res/drawable/action_bar_translucent.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+<gradient android:angle="90" android:startColor="#60ffffff" android:endColor="#40ffffff"/>
+</shape>
\ No newline at end of file
diff --git a/res/drawable/actionbar_top_shadow.xml b/res/drawable/actionbar_top_shadow.xml
new file mode 100644
index 000000000..70d1f48c5
--- /dev/null
+++ b/res/drawable/actionbar_top_shadow.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:startColor="#70000000"
+        android:endColor="#00000000"
+        android:angle="270"
+        >
+    </gradient>
+</shape>
\ No newline at end of file
diff --git a/res/layout/activity_share.xml b/res/layout/activity_share.xml
index 138a5beb0..bf0f90b66 100644
--- a/res/layout/activity_share.xml
+++ b/res/layout/activity_share.xml
@@ -1,16 +1,28 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content" >
-
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
+    
+  
+    
     <ImageView
         android:id="@+id/backgroundImage"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="fill_parent"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
         android:scaleType="centerCrop" />
 
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="12dp"
+            android:layout_marginTop="48dp"
+            android:background="@drawable/actionbar_top_shadow"
+            android:orientation="vertical" >
+        </LinearLayout>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -27,6 +39,7 @@
         android:background="@drawable/share_overlay_background_gradient" >
 
         <TextView
+            android:textColor="#818181"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/upload_overlay_title"
@@ -34,6 +47,7 @@
             android:textAppearance="?android:attr/textAppearanceLarge" />
 
         <TextView
+            android:textColor="#818181"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Title"
@@ -46,9 +60,11 @@
             android:layout_height="wrap_content"
             android:singleLine="true"
             android:scrollHorizontally="false"
+            android:textColor="#363636"
             />
         
         <TextView
+            android:textColor="#818181"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Description"
@@ -60,6 +76,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:inputType="textMultiLine"
+            android:textColor="#363636"
             />
         
         <Button
@@ -70,5 +87,7 @@
             />
         
     </LinearLayout>
+    
+    </RelativeLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/login.xml b/res/layout/login.xml
new file mode 100644
index 000000000..79562c642
--- /dev/null
+++ b/res/layout/login.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <ListView
+        android:id="@+id/listView1"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" >
+    </ListView>
+    
+    <RelativeLayout 
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ImageView
+            android:id="@+id/commonsLogo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="20dp"
+            android:src="@drawable/commons_logo_large" />
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="150dp"
+            android:layout_below="@+id/commonsLogo"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="20dp"
+            android:orientation="vertical" >
+            
+            
+        </LinearLayout>
+        
+    </RelativeLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/res/values/theme.xml b/res/values/theme.xml
new file mode 100644
index 000000000..6dfa14536
--- /dev/null
+++ b/res/values/theme.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.Commons" parent="android:style/Theme.Holo">
+    <item name="android:actionBarStyle">@style/ActionBar</item>
+	</style>
+
+	<style name="ActionBar" parent="android:style/Widget.Holo.ActionBar">
+	    <item name="android:background">@drawable/action_bar_translucent</item>
+	</style>
+
+</resources>
\ No newline at end of file
diff --git a/src/org/wikimedia/commons/ShareActivity.java b/src/org/wikimedia/commons/ShareActivity.java
index 3f8d25ddf..64ec4130b 100644
--- a/src/org/wikimedia/commons/ShareActivity.java
+++ b/src/org/wikimedia/commons/ShareActivity.java
@@ -95,7 +95,12 @@ public class ShareActivity extends Activity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        //Actionbar overlay on top of imageview (should be called before .setcontentview)
+        getWindow().requestFeature(Window.FEATURE_ACTION_BAR_OVERLAY);
+        getActionBar().setDisplayShowTitleEnabled(false);
+        
         setContentView(R.layout.activity_share);
+        
         app = (CommonsApplication)this.getApplicationContext();
         
         backgroundImageView = (ImageView)findViewById(R.id.backgroundImage);