Skip to content
This repository has been archived by the owner on Sep 6, 2019. It is now read-only.

Commit

Permalink
Merge pull request #566 from tonymanou/ui_v2
Browse files Browse the repository at this point in the history 
UI update
  • Loading branch information
@M66B
M66B committed Aug 24, 2013
2 parents 6c0f8ce + cd6efca commit 4e7777b
Show file tree
Hide file tree
Showing 45 changed files with 348 additions and 216 deletions.
24 changes: 0 additions & 24 deletions res/drawable/application_filter_border.xml
View file

This file was deleted.

13 changes: 13 additions & 0 deletions res/drawable/card_dark.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >

<gradient
android:angle="90"
android:startColor="@color/color_filter_background"
android:endColor="@color/color_filter_background2"
android:type="linear"
android:useLevel="false" />

<corners android:radius="4dp" />

</shape>
Binary file added res/drawable/card_light.9.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable/check_holo_dark.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable/check_holo_light.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable/divider_dark.9.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable/divider_light.9.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
259 changes: 165 additions & 94 deletions res/layout/mainlist.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,62 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:background="?attr/drawable_background"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
tools:context=".ActivityMain" >

<!-- Filters -->
<!-- Frame -->

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:layout_marginRight="@dimen/activity_vertical_margin"
android:background="@drawable/application_filter_border"
android:orientation="vertical" >
android:background="?attr/drawable_card"
android:orientation="vertical"
android:paddingBottom="6dp"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingTop="1dp" >

<!-- Restriction category -->

<LinearLayout
android:id="@+id/llCategory"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/drawable_divider"
android:orientation="horizontal" >

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/title_category"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textIsSelectable="false" />

<Spinner
android:id="@+id/spRestriction"
android:layout_width="0dp"
android:layout_height="37dp"
android:layout_weight="1" />

<ImageView
android:id="@+id/imgInfo"
android:layout_width="32dip"
android:layout_height="32dip"
android:layout_gravity="center_vertical"
android:contentDescription="@string/help_application"
android:src="?attr/icon_info" />
</LinearLayout>

<!-- Filters -->

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
Expand All @@ -33,36 +70,26 @@
android:contentDescription="@string/title_category"
android:src="?attr/icon_expander_maximized" />

<LinearLayout
android:id="@+id/llCategory"
android:layout_width="match_parent"
<EditText
android:id="@+id/etFilter"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="3dp"
android:layout_marginRight="3dp"
android:layout_toRightOf="@id/imgToggleFilters"
android:orientation="horizontal" >

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/title_category"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textIsSelectable="false" />

<Spinner
android:id="@+id/spRestriction"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1" />
android:ems="10"
android:hint="@string/help_application"
android:inputType="textNoSuggestions"
android:textAppearance="?android:attr/textAppearanceSmall" />

<ImageView
android:id="@+id/imgInfo"
android:layout_width="32dip"
android:layout_height="32dip"
android:layout_gravity="center_vertical"
android:contentDescription="@string/help_application"
android:src="?attr/icon_info" />
</LinearLayout>
<ImageView
android:id="@+id/imgClear"
android:layout_width="24dip"
android:layout_height="24dip"
android:layout_alignRight="@id/etFilter"
android:layout_centerVertical="true"
android:contentDescription="@string/help_application"
android:src="?attr/icon_clear_grayed" />

<TextView
android:id="@+id/tvFilterDetail"
Expand All @@ -80,83 +107,127 @@
android:id="@+id/llFilters"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
android:layout_marginLeft="4dp" >

<ImageView
android:id="@+id/imgUsed"
android:layout_width="24dip"
android:layout_height="24dip"
android:layout_gravity="center_vertical"
android:layout_marginLeft="6dip"
android:contentDescription="@string/help_used"
android:src="?attr/icon_used_grayed" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical" >

<ImageView
android:id="@+id/imgInternet"
android:layout_width="24dip"
android:layout_height="24dip"
android:layout_gravity="center_vertical"
android:contentDescription="@string/help_internet"
android:src="?attr/icon_internet_grayed" />
<ImageView
android:id="@+id/ImageView04"
android:layout_width="24dp"
android:layout_height="24dp"
android:contentDescription="@string/help_used"
android:src="?attr/icon_used" />

<RelativeLayout
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1" >

<EditText
android:id="@+id/etFilter"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="6dip"
android:hint="@string/help_application"
android:inputType="textNoSuggestions"
android:textAppearance="?android:attr/textAppearanceSmall" />
<ImageView
android:id="@+id/ImageView02"
android:layout_width="24dp"
android:layout_height="24dp"
android:contentDescription="@string/help_internet"
android:src="?attr/icon_internet" />

<ImageView
android:id="@+id/imgClear"
android:layout_width="24dip"
android:layout_height="24dip"
android:layout_alignRight="@id/etFilter"
android:layout_centerVertical="true"
android:layout_gravity="center_vertical"
android:id="@+id/ImageView01"
android:layout_width="24dp"
android:layout_height="24dp"
android:contentDescription="@string/help_granted"
android:src="?attr/icon_granted" />

<ImageView
android:id="@+id/imageView1"
android:layout_width="24dp"
android:layout_height="24dp"
android:contentDescription="@string/help_application"
android:src="?attr/icon_clear_grayed" />
</RelativeLayout>
android:src="?attr/icon_system" />

<CheckBox
android:id="@+id/cbFilter"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_gravity="center_vertical" />
</LinearLayout>
<ImageView
android:id="@+id/ImageView03"
android:layout_width="24dp"
android:layout_height="24dp"
android:contentDescription="@string/title_restrict"
android:src="?attr/icon_checked" />
</LinearLayout>

<CheckBox
android:id="@+id/cbFPermission"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:text="@string/settings_fpermission"
android:textAppearance="?android:attr/textAppearanceSmall" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical" >

<CheckBox
android:id="@+id/cbFSystem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:text="@string/settings_fsystem"
android:textAppearance="?android:attr/textAppearanceSmall" />
<CheckBox
android:id="@+id/cbFUsed"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_marginLeft="4dp"
android:text="@string/filter_used"
android:textAppearance="?android:attr/textAppearanceSmall" />

<CheckBox
android:id="@+id/cbFInternet"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_marginLeft="4dp"
android:text="@string/filter_internet"
android:textAppearance="?android:attr/textAppearanceSmall" />

<CheckBox
android:id="@+id/cbFPermission"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_marginLeft="4dp"
android:text="@string/settings_fpermission"
android:textAppearance="?android:attr/textAppearanceSmall" />

<CheckBox
android:id="@+id/cbFSystem"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_marginLeft="4dp"
android:text="@string/settings_fsystem"
android:textAppearance="?android:attr/textAppearanceSmall" />

<CheckBox
android:id="@+id/cbFilter"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_marginLeft="4dp"
android:text="@string/filter_restricted"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

<!-- Title -->

<TextView
android:layout_width="wrap_content"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/title_restrict"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textIsSelectable="false" />
android:layout_marginRight="@dimen/activity_vertical_margin" >

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="@string/title_restrict"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textIsSelectable="false" />

<TextView
android:id="@+id/tvStats"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textAppearance="?android:attr/textAppearanceSmall" />

<ProgressBar
android:id="@+id/pbFilter"
style="?android:attr/progressBarStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:visibility="gone" />
</RelativeLayout>

<!-- Thin divider -->

Expand Down
3 changes: 2 additions & 1 deletion res/layout/restrictionlist.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?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:layout_height="match_parent"
android:background="?attr/drawable_background"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
Expand Down
3 changes: 3 additions & 0 deletions res/values-ar/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@
<string name="settings_subscriber">IMSI</string>
<string name="settings_fpermission">تصفية بواسطة الأُذونات</string>
<string name="settings_fsystem">فلترة برامج النظام</string>
<string name="filter_used">Filter on data usage</string>
<string name="filter_internet">Filter on internet access</string>
<string name="filter_restricted">Filter on restricted</string>
<string name="help_application">التطبيق</string>
<string name="help_internet">لديه صلاحية الوصول للإنترنت</string>
<string name="help_granted">لديه صلاحية أندرويد</string>
Expand Down
3 changes: 3 additions & 0 deletions res/values-bg/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@
<string name="settings_subscriber">Абонатно ID</string>
<string name="settings_fpermission">Филтриране по разрешения</string>
<string name="settings_fsystem">Филтриране на системни приложения</string>
<string name="filter_used">Filter on data usage</string>
<string name="filter_internet">Filter on internet access</string>
<string name="filter_restricted">Filter on restricted</string>
<string name="help_application">Приложение</string>
<string name="help_internet">има разрешение за интернет</string>
<string name="help_granted">има разрешение в Android</string>
Expand Down
3 changes: 3 additions & 0 deletions res/values-ca/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@
<string name="settings_subscriber">ID de subscriptor</string>
<string name="settings_fpermission">Filta per permís</string>
<string name="settings_fsystem">Filtra aplicacions de sistema</string>
<string name="filter_used">Filter on data usage</string>
<string name="filter_internet">Filter on internet access</string>
<string name="filter_restricted">Filter on restricted</string>
<string name="help_application">Aplicació</string>
<string name="help_internet">té permís d\'Internet</string>
<string name="help_granted">té permisos d\'Android</string>
Expand Down
Loading

0 comments on commit 4e7777b

Please sign in to comment.