v0.5

Railag · Dec 6, 2014 · 19eb9f2 · 19eb9f2
1 parent c08bf45
commit 19eb9f2
Show file tree

Hide file tree

Showing 30 changed files with 952 additions and 346 deletions.
diff --git a/.classpath b/.classpath
diff --git a/.project b/.project
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -9,6 +9,8 @@
         android:targetSdkVersion="19" />
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application
         android:name="com.bloqq.cache.App"
@@ -30,14 +32,31 @@
             android:name="com.bloqq.activities.HistoryActivity"
             android:label="@string/hist" >
         </activity>
+        <activity
+            android:name="com.bloqq.activities.FavoriteActivity"
+            android:label="@string/fav" >
+        </activity>
         <activity
             android:name="com.bloqq.activities.SettingsActivity"
             android:label="@string/settings" >
         </activity>
+        <activity
+            android:name="com.bloqq.activities.ReceiveActivity"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+            </intent-filter>
+        </activity>
 
         <provider
-            android:name="com.bloqq.sqlite.HistContentProvider"
-            android:authorities="com.bloqq.sqlite.HistContentProvider"
+            android:name="com.bloqq.sqlite.BloqqContentProvider"
+            android:authorities="com.bloqq.sqlite.BloqqContentProvider"
             android:exported="false" />
     </application>
 

diff --git a/README.md b/README.md
diff --git a/lint.xml b/lint.xml
diff --git a/project.properties b/project.properties
diff --git a/res/layout/activity_fav.xml b/res/layout/activity_fav.xml
@@ -0,0 +1,19 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/fav_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:background="@color/abc_search_url_text_pressed" >
+
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
diff --git a/res/layout/activity_hist.xml b/res/layout/activity_hist.xml
@@ -3,6 +3,7 @@
     android:id="@+id/hist_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/abc_search_url_text_pressed"
     android:focusable="true"
     android:focusableInTouchMode="true"
     android:paddingBottom="@dimen/activity_vertical_margin"

diff --git a/res/layout/fav_item.xml b/res/layout/fav_item.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
+
+    <ImageView
+        android:id="@+id/fav_item_star"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:src="@android:drawable/btn_star" />
+
+    <TextView
+        android:id="@+id/fav_item_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="@color/abc_search_url_text_holo"
+        android:textSize="16sp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/fav_item_url"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="16sp" />
+
+</LinearLayout>
diff --git a/res/layout/hist_item.xml b/res/layout/hist_item.xml
@@ -8,13 +8,26 @@
         android:id="@+id/hist_item_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textColor="@color/abc_search_url_text_normal"
         android:textSize="16sp"
         android:textStyle="bold" />
 
     <TextView
         android:id="@+id/hist_item_url"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textSize="16sp" />
+        android:textSize="8sp" />
+
+    <TextView
+        android:id="@+id/hist_item_date"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="@color/abc_search_url_text_normal"
+        android:textSize="12sp" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="5dp"
+        android:background="#1e5a92" />
 
 </LinearLayout>
diff --git a/res/layout/left_sliding_menu.xml b/res/layout/left_sliding_menu.xml
@@ -9,12 +9,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="100dp"
-        android:columnWidth="90dp"
         android:gravity="center"
-        android:horizontalSpacing="10dp"
-        android:numColumns="auto_fit"
+        android:numColumns="3"
         android:stretchMode="columnWidth"
-        android:verticalSpacing="10dp" >
+        android:verticalSpacing="50dp" >
     </GridView>
 
 </RelativeLayout>
diff --git a/res/menu/main.xml b/res/menu/main.xml
@@ -19,6 +19,16 @@
         ActionBar:showAsAction="ifRoom"
         android:orderInCategory="800"
         android:title="@string/hist"/>
+    <item
+        android:id="@+id/fav_button"
+        ActionBar:showAsAction="ifRoom"
+        android:orderInCategory="600"
+        android:title="@string/fav"/>
+    <item
+        android:id="@+id/fav_add_button"
+        ActionBar:showAsAction="ifRoom"
+        android:orderInCategory="550"
+        android:title="@string/fav_add"/>
     <item
         android:id="@+id/action_go"
         ActionBar:actionViewClass="com.bloqq.edits.AddressUrlEdit"

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -8,5 +8,22 @@
     <string name="hist">History</string>
     <string name="pref_homepage">Homepage URL</string>
     <string name="pref_homepage_summary">Put here your start page url</string>
+    <string name="fav">Favorites</string>
+    <string name="fav_add">Add favorite</string>
+    <string name="default_font_size">100</string>
+    <string name="font_size">Font size</string>
+    <string name="clear_hist">Clear history</string>
+    <string name="clear_fav">Clear favorites</string>
+
+    <string-array name="font_sizes">
+        <item>Large</item>
+        <item>Normal</item>
+        <item>Small</item>
+    </string-array>
+    <string-array name="font_sizes_int">
+        <item>130</item>
+        <item>100</item>
+        <item>70</item>
+    </string-array>
 
 </resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
@@ -6,4 +6,28 @@
         android:summary="@string/pref_homepage_summary"
         android:title="@string/pref_homepage" />
 
+    <SwitchPreference
+        android:defaultValue="true"
+        android:key="js_enabled"
+        android:summaryOff="Disabled"
+        android:summaryOn="Enabled"
+        android:title="Use JS" />
+
+    <ListPreference
+        android:defaultValue="@string/default_font_size"
+        android:entries="@array/font_sizes"
+        android:entryValues="@array/font_sizes_int"
+        android:icon="@android:drawable/btn_default_small"
+        android:key="font_size"
+        android:title="@string/font_size" />
+
+    <Preference
+        android:key="button_clear_hist"
+        android:summary="Press to clear"
+        android:title="@string/clear_hist" />
+    <Preference
+        android:key="button_clear_fav"
+        android:summary="Press to clear"
+        android:title="@string/clear_fav" />
+
 </PreferenceScreen>