fixes for main page style

scalio · Jan 16, 2015 · 1ff2b1e · 1ff2b1e
1 parent 0fa47b4
commit 1ff2b1e
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -0,0 +1,4 @@
+---
+Credits
+
+Photo by (Patrik Goethe)[https://unsplash.com/patrikgoethe]
diff --git a/app/build.gradle b/app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.neenbedankt.android-apt'
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         applicationId "io.scal.openarchive"
@@ -32,8 +32,8 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:21.0.3'
-    compile 'com.android.support:support-v4:21.0.3'
+    compile 'com.android.support:appcompat-v7:21.0.+'
+    compile 'com.android.support:support-v4:21.0.+'
     compile 'com.squareup.okhttp:okhttp:2.1.0'
     compile 'com.squareup.okio:okio:1.1.0'
     compile 'com.github.satyan:sugar:1.3'

diff --git a/app/src/main/res/drawable/background.xml b/app/src/main/res/drawable/background.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item android:drawable="@color/white"/>
+    <item>
+        <bitmap
+            android:gravity="center|bottom|clip_vertical"
+            android:src="@drawable/library"
+            android:alpha="0.2"
+            />
+    </item>
+
+</layer-list>
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
@@ -2,7 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/library"
+    android:background="@drawable/background"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
@@ -20,6 +20,7 @@
 
     <TextView
         android:id="@+id/title"
+        android:textColor="@color/black"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/logo"
@@ -34,11 +35,11 @@
         android:id="@+id/btnImport"
         android:layout_width="300dp"
         android:layout_height="wrap_content"
-        android:layout_below="@id/title"
-        android:layout_centerInParent="true"
-        android:layout_marginTop="30dp"
+        android:layout_marginTop="27dp"
         android:text="@string/import_btn"
-        android:textSize="14sp" />
+        android:textSize="14sp"
+        android:layout_below="@+id/title"
+        android:layout_centerHorizontal="true" />
 
     <Button
         android:id="@+id/btnCapture"
@@ -53,17 +54,23 @@
         android:layout_alignLeft="@+id/btnImport"
         android:layout_alignStart="@+id/btnImport"/>
 
-    <Spinner
-        android:id="@+id/spCaptureOptions"
+    <FrameLayout
+        android:background="@android:drawable/btn_default"
         android:layout_width="100dp"
         android:layout_height="wrap_content"
         android:layout_below="@id/btnImport"
-        android:layout_toRightOf="@id/btnCapture"
-        android:entries="@array/ar_media_capture_options"
-        android:fontFamily="sans-serif-condensed"
-        android:textSize="14sp"
         android:layout_alignRight="@+id/btnImport"
         android:layout_alignEnd="@+id/btnImport"
-        android:layout_alignBottom="@+id/btnCapture"/>
+        android:layout_alignBottom="@+id/btnCapture">
+
+        <Spinner
+            android:id="@+id/spCaptureOptions"
+            android:entries="@array/ar_media_capture_options"
+            android:fontFamily="sans-serif-condensed"
+            android:textSize="14sp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        </FrameLayout>
 
 </RelativeLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -3,12 +3,15 @@
     <color name="red">#ff0000</color>
     <color name="green">#00ff00</color>
     <color name="blue">#0000ff</color>
+    <color name="white">#ffffff</color>
+    <color name="black">#000000</color>
     <color name="transparent_black">#33333333</color>
     <color name="storymaker_blue">#27aae1</color>
 
     <color name="extra_light_grey">#ffbebebe</color>
     <color name="light_grey">#9e9e9e</color>
     <color name="grey">#757575</color>
     <color name="dark_grey">#424242</color>
-    <color name="light_black">#212121</color>
+    <color name="light_black">#212121FF</color>
+    <color name="brand_accent">#A92E33</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -2,12 +2,28 @@
 
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="android:buttonStyle">@style/Button</item>
+        <item name="android:textViewStyle">@style/TextView</item>
+        <!--<item name="android:spinnerStyle">@style/Spinner</item>-->
     </style>
 
     <!-- Settings Theme to show action bar -->
     <style name="SettingsTheme" parent="AppTheme">
         <item name="android:windowNoTitle">false</item>
         <item name="android:windowActionBar">true</item>
+        <item name="android:textColor">@color/light_black</item>
+    </style>
+
+    <style name="Button" parent="android:Widget.Button">
+        <item name="android:alpha">1</item>
+    </style>
+
+    <style name="TextView" parent="android:Widget.TextView">
+        <item name="android:alpha">1</item>
+    </style>
+
+    <style name="Spinner" parent="android:Widget.Spinner">
+        <item name="android:background">@android:drawable/btn_default</item>
     </style>
 
 </resources>
diff --git a/art/library.jpg b/art/library.jpg