diff options
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/activity_main.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_dashboard.xml | 160 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_fake_location.xml | 6 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_internet_activity_policy.xml | 46 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_permission_apps.xml | 56 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_permissions.xml | 30 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_quick_protection.xml | 91 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_tracker_apps.xml | 46 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_trackers.xml | 75 | ||||
| -rw-r--r-- | app/src/main/res/layout/item_app_toggle.xml (renamed from app/src/main/res/layout/item_permission_apps.xml) | 24 | ||||
| -rw-r--r-- | app/src/main/res/layout/item_list_tracker.xml | 29 | ||||
| -rw-r--r-- | app/src/main/res/layout/item_permission.xml | 30 | ||||
| -rw-r--r-- | app/src/main/res/layout/topbar.xml | 6 |
13 files changed, 391 insertions, 210 deletions
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 7013496..2627a32 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/container" - android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_width="match_parent" />
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml index dc79878..effd992 100644 --- a/app/src/main/res/layout/fragment_dashboard.xml +++ b/app/src/main/res/layout/fragment_dashboard.xml @@ -2,46 +2,46 @@ <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_width="match_parent" > - <include layout="@layout/topbar"/> + <include layout="@layout/topbar" /> <ProgressBar android:id="@+id/loadingSpinner" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" android:indeterminate="true" + android:layout_gravity="center" + android:layout_height="wrap_content" + android:layout_width="wrap_content" /> <androidx.core.widget.NestedScrollView android:id="@+id/scrollContainer" - android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_width="match_parent" android:visibility="gone" app:layout_behavior="@string/appbar_scrolling_view_behavior" > <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" android:background="@color/white" android:gravity="center_horizontal" + android:layout_height="match_parent" + android:layout_width="match_parent" android:orientation="vertical" tools:context=".main.MainActivity" > <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" android:gravity="center" + android:layout_gravity="center_horizontal" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:paddingBottom="16dp" android:paddingLeft="32dp" - android:paddingTop="16dp" android:paddingRight="32dp" - android:paddingBottom="16dp" + android:paddingTop="16dp" android:text="@string/privacy_dashboard_info" android:textColor="@color/black" android:textSize="14sp" @@ -49,91 +49,91 @@ <ImageView android:id="@+id/togglePrivacyCentral" - android:layout_width="96dp" android:layout_height="96dp" - android:layout_marginTop="16dp" android:layout_marginBottom="16dp" + android:layout_marginTop="16dp" + android:layout_width="96dp" android:src="@drawable/ic_privacy_toggle" /> <TextView - android:id="@+id/tap_to_enable_quick_protection" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" android:drawableEnd="@drawable/ic_chevron_right_24dp" android:fontFamily="sans-serif-medium" android:gravity="center" + android:id="@+id/tap_to_enable_quick_protection" + android:layout_gravity="center_horizontal" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:paddingBottom="16dp" android:paddingLeft="32dp" - android:paddingTop="16dp" android:paddingRight="32dp" - android:paddingBottom="16dp" + android:paddingTop="16dp" android:text="@string/tap_to_enable_quick_protection" android:textColor="@color/black" android:textSize="14sp" /> <ImageView - android:layout_width="match_parent" android:layout_height="160dp" + android:layout_width="match_parent" android:src="@drawable/dummy_leakage_analytics" /> <TextView + android:gravity="center" android:id="@+id/personal_leakag_info" - android:layout_width="match_parent" - android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:gravity="center" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:paddingBottom="16dp" android:paddingLeft="32dp" android:paddingRight="32dp" - android:paddingBottom="16dp" android:text="@string/personal_leakage_info" android:textColor="@color/black" android:textSize="12sp" /> <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" android:background="#f9f9f9" + android:layout_height="match_parent" + android:layout_width="match_parent" android:orientation="vertical" > <RelativeLayout android:id="@+id/am_i_tracked" - android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_width="match_parent" + android:paddingBottom="16dp" android:paddingLeft="32dp" - android:paddingTop="16dp" android:paddingRight="32dp" - android:paddingBottom="16dp" + android:paddingTop="16dp" > <ImageView android:id="@+id/am_i_tracked_icon" - android:layout_width="36dp" - android:layout_height="36dp" android:layout_alignParentStart="true" android:layout_centerVertical="true" + android:layout_height="36dp" + android:layout_width="36dp" android:src="@drawable/ic_tracked" /> <LinearLayout - android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toStartOf="@+id/am_i_tracked_chevron" android:layout_toEndOf="@+id/am_i_tracked_icon" + android:layout_toStartOf="@+id/am_i_tracked_chevron" + android:layout_width="match_parent" android:orientation="vertical" - android:paddingStart="16dp" android:paddingEnd="32dp" + android:paddingStart="16dp" > <TextView + android:fontFamily="sans-serif-medium" android:id="@+id/am_i_tracked_title" - android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="sans-serif-medium" + android:layout_width="match_parent" android:text="@string/am_i_tracked_title" android:textColor="@color/black" android:textSize="16sp" @@ -141,8 +141,8 @@ <TextView android:id="@+id/am_i_tracked_subtitle" - android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_width="match_parent" android:text="@string/am_i_tracked_subtitle" android:textColor="@color/black" android:textSize="14sp" @@ -151,48 +151,48 @@ <ImageView android:id="@+id/am_i_tracked_chevron" - android:layout_width="24dp" - android:layout_height="24dp" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_height="24dp" + android:layout_width="24dp" android:src="@drawable/ic_chevron_right_24dp" /> </RelativeLayout> <RelativeLayout android:id="@+id/apps_permissions" - android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_width="match_parent" + android:paddingBottom="16dp" android:paddingLeft="32dp" - android:paddingTop="16dp" android:paddingRight="32dp" - android:paddingBottom="16dp" + android:paddingTop="16dp" > <ImageView android:id="@+id/apps_permissions_icon" - android:layout_width="36dp" - android:layout_height="36dp" android:layout_alignParentStart="true" android:layout_centerVertical="true" + android:layout_height="36dp" + android:layout_width="36dp" android:src="@drawable/ic_apps_permissions" /> <LinearLayout - android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toStartOf="@+id/apps_permissions_chevron" android:layout_toEndOf="@+id/apps_permissions_icon" + android:layout_toStartOf="@+id/apps_permissions_chevron" + android:layout_width="match_parent" android:orientation="vertical" - android:paddingStart="16dp" android:paddingEnd="32dp" + android:paddingStart="16dp" > <TextView + android:fontFamily="sans-serif-medium" android:id="@+id/apps_permissions_title" - android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="sans-serif-medium" + android:layout_width="match_parent" android:text="@string/apps_permissions_title" android:textColor="@color/black" android:textSize="16sp" @@ -200,8 +200,8 @@ <TextView android:id="@+id/apps_permissions_subtitle" - android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_width="match_parent" android:text="@string/apps_permissions_subtitle" android:textColor="@color/black" android:textSize="14sp" @@ -210,48 +210,48 @@ <ImageView android:id="@+id/apps_permissions_chevron" - android:layout_width="24dp" - android:layout_height="24dp" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_height="24dp" + android:layout_width="24dp" android:src="@drawable/ic_chevron_right_24dp" /> </RelativeLayout> <RelativeLayout android:id="@+id/my_location" - android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_width="match_parent" + android:paddingBottom="16dp" android:paddingLeft="32dp" - android:paddingTop="16dp" android:paddingRight="32dp" - android:paddingBottom="16dp" + android:paddingTop="16dp" > <ImageView android:id="@+id/my_location_icon" - android:layout_width="36dp" - android:layout_height="36dp" android:layout_alignParentStart="true" android:layout_centerVertical="true" + android:layout_height="36dp" + android:layout_width="36dp" android:src="@drawable/ic_my_location" /> <LinearLayout - android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toStartOf="@+id/my_location_chevron" android:layout_toEndOf="@+id/my_location_icon" + android:layout_toStartOf="@+id/my_location_chevron" + android:layout_width="match_parent" android:orientation="vertical" - android:paddingStart="16dp" android:paddingEnd="32dp" + android:paddingStart="16dp" > <TextView + android:fontFamily="sans-serif-medium" android:id="@+id/my_location_title" - android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="sans-serif-medium" + android:layout_width="match_parent" android:text="@string/my_location_title" android:textColor="@color/black" android:textSize="16sp" @@ -259,8 +259,8 @@ <TextView android:id="@+id/my_location_subtitle" - android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_width="match_parent" android:text="@string/my_location_subtitle" android:textColor="@color/black" android:textSize="14sp" @@ -269,48 +269,48 @@ <ImageView android:id="@+id/my_location_chevron" - android:layout_width="24dp" - android:layout_height="24dp" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_height="24dp" + android:layout_width="24dp" android:src="@drawable/ic_chevron_right_24dp" /> </RelativeLayout> <RelativeLayout android:id="@+id/internet_activity_privacy" - android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_width="match_parent" + android:paddingBottom="16dp" android:paddingLeft="32dp" - android:paddingTop="16dp" android:paddingRight="32dp" - android:paddingBottom="16dp" + android:paddingTop="16dp" > <ImageView android:id="@+id/internet_activity_privacy_icon" - android:layout_width="36dp" - android:layout_height="36dp" android:layout_alignParentStart="true" android:layout_centerVertical="true" + android:layout_height="36dp" + android:layout_width="36dp" android:src="@drawable/ic_internet_activity" /> <LinearLayout - android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toStartOf="@+id/internet_activity_privacy_chevron" android:layout_toEndOf="@+id/internet_activity_privacy_icon" + android:layout_toStartOf="@+id/internet_activity_privacy_chevron" + android:layout_width="match_parent" android:orientation="vertical" - android:paddingStart="16dp" android:paddingEnd="32dp" + android:paddingStart="16dp" > <TextView + android:fontFamily="sans-serif-medium" android:id="@+id/internet_activity_privacy_title" - android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="sans-serif-medium" + android:layout_width="match_parent" android:text="@string/internet_activity_privacy_title" android:textColor="@color/black" android:textSize="16sp" @@ -318,8 +318,8 @@ <TextView android:id="@+id/internet_activity_privacy_subtitle" - android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_width="match_parent" android:text="@string/internet_activity_privacy_subtitle" android:textColor="@color/black" android:textSize="14sp" @@ -328,10 +328,10 @@ <ImageView android:id="@+id/internet_activity_privacy_chevron" - android:layout_width="24dp" - android:layout_height="24dp" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_height="24dp" + android:layout_width="24dp" android:src="@drawable/ic_chevron_right_24dp" /> </RelativeLayout> diff --git a/app/src/main/res/layout/fragment_fake_location.xml b/app/src/main/res/layout/fragment_fake_location.xml index 40324a1..d60513b 100644 --- a/app/src/main/res/layout/fragment_fake_location.xml +++ b/app/src/main/res/layout/fragment_fake_location.xml @@ -8,7 +8,7 @@ android:layout_width="match_parent" > - <include layout="@layout/topbar"/> + <include layout="@layout/topbar" /> <androidx.core.widget.NestedScrollView android:layout_height="match_parent" @@ -18,9 +18,9 @@ <LinearLayout android:layout_height="match_parent" + android:layout_marginBottom="32dp" android:layout_width="match_parent" android:orientation="vertical" - android:layout_marginBottom="32dp" tools:context=".main.MainActivity" > @@ -29,9 +29,9 @@ android:layout_gravity="center_horizontal" android:layout_height="wrap_content" android:layout_width="match_parent" - android:paddingTop="16dp" android:paddingLeft="32dp" android:paddingRight="32dp" + android:paddingTop="16dp" android:text="@string/fake_location_info" android:textColor="@color/black" android:textSize="14sp" diff --git a/app/src/main/res/layout/fragment_internet_activity_policy.xml b/app/src/main/res/layout/fragment_internet_activity_policy.xml index 7a5d8b5..c3021df 100644 --- a/app/src/main/res/layout/fragment_internet_activity_policy.xml +++ b/app/src/main/res/layout/fragment_internet_activity_policy.xml @@ -2,23 +2,23 @@ <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" android:background="@color/white" + android:layout_height="match_parent" + android:layout_width="match_parent" > - <include layout="@layout/topbar"/> + <include layout="@layout/topbar" /> <androidx.core.widget.NestedScrollView - android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginBottom="32dp" + android:layout_width="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" > <LinearLayout - android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_width="match_parent" android:orientation="vertical" android:paddingLeft="32dp" android:paddingRight="32dp" @@ -27,9 +27,9 @@ <TextView android:id="@+id/internet_activity_privacy_info" - android:layout_width="match_parent" - android:layout_height="wrap_content" android:layout_gravity="center_horizontal" + android:layout_height="wrap_content" + android:layout_width="match_parent" android:paddingTop="16dp" android:text="@string/internet_activity_privacy_info" android:textColor="@color/black" @@ -37,23 +37,23 @@ /> <TextView - android:id="@+id/learn_more_internet_activity_privacy_info" - android:layout_width="wrap_content" - android:layout_height="48dp" android:fontFamily="sans-serif-medium" android:gravity="center_vertical" + android:id="@+id/learn_more_internet_activity_privacy_info" + android:layout_height="48dp" + android:layout_width="wrap_content" android:text="@string/learn_more" android:textColor="#007fff" android:textSize="14sp" /> <TextView + android:fontFamily="sans-serif-medium" android:id="@+id/my_internet_activity_header" - android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="sans-serif-medium" - android:paddingTop="16dp" + android:layout_width="wrap_content" android:paddingBottom="8dp" + android:paddingTop="16dp" android:text="@string/internet_activity_privacy_title" android:textColor="@color/black" android:textSize="14sp" @@ -61,37 +61,41 @@ <RadioGroup android:id="@+id/internet_activity_privacy_choices" - android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_width="match_parent" android:orientation="vertical" > <foundation.e.privacycentralapp.common.RightRadioButton android:id="@+id/radio_use_real_ip" - android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_width="match_parent" android:text="@string/use_real_ip" android:textSize="16sp" /> + <TextView - android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_width="wrap_content" android:text="@string/i_can_be_tracked" - android:textSize="14sp"/> + android:textSize="14sp" + /> <foundation.e.privacycentralapp.common.RightRadioButton android:id="@+id/radio_use_hidden_ip" - android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:layout_width="match_parent" android:text="@string/hidden_ip" android:textSize="16sp" - android:layout_marginTop="8dp" /> + <TextView - android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_width="wrap_content" android:text="@string/i_am_anonymous" - android:textSize="14sp"/> + android:textSize="14sp" + /> </RadioGroup> </LinearLayout> </androidx.core.widget.NestedScrollView> diff --git a/app/src/main/res/layout/fragment_permission_apps.xml b/app/src/main/res/layout/fragment_permission_apps.xml index 65f4169..db61e93 100644 --- a/app/src/main/res/layout/fragment_permission_apps.xml +++ b/app/src/main/res/layout/fragment_permission_apps.xml @@ -2,37 +2,45 @@ <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" android:background="@color/white" + android:layout_height="match_parent" + android:layout_width="match_parent" > - <include layout="@layout/topbar"/> + <include layout="@layout/topbar" /> - <LinearLayout - android:layout_width="match_parent" + <androidx.core.widget.NestedScrollView android:layout_height="match_parent" - android:orientation="vertical" - tools:context=".main.MainActivity" + android:layout_width="match_parent" + app:layout_behavior="@string/appbar_scrolling_view_behavior" > - <TextView - android:id="@+id/permission_control" + <LinearLayout + android:layout_height="match_parent" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingLeft="32dp" - android:paddingRight="32dp" - android:textColor="@color/black" - android:textSize="14sp" - /> + android:orientation="vertical" + tools:context=".main.MainActivity" + > - <androidx.recyclerview.widget.RecyclerView - android:layout_width="match_parent" - android:layout_height="match_parent" - tools:listitem="@layout/item_permission_apps" - android:id="@+id/recylcer_view_permission_apps"/> - </LinearLayout> + <TextView + android:id="@+id/permission_control" + android:layout_gravity="center_horizontal" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:paddingBottom="16dp" + android:paddingLeft="32dp" + android:paddingRight="32dp" + android:paddingTop="16dp" + android:textColor="@color/black" + android:textSize="14sp" + /> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/recylcer_view_permission_apps" + android:layout_height="match_parent" + android:layout_width="match_parent" + tools:listitem="@layout/item_app_toggle" + /> + </LinearLayout> + </androidx.core.widget.NestedScrollView> </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_permissions.xml b/app/src/main/res/layout/fragment_permissions.xml index a452570..7ca4b43 100644 --- a/app/src/main/res/layout/fragment_permissions.xml +++ b/app/src/main/res/layout/fragment_permissions.xml @@ -2,16 +2,22 @@ <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" android:background="@color/white" + android:layout_height="match_parent" + android:layout_width="match_parent" > - <include layout="@layout/topbar"/> + <include layout="@layout/topbar" /> + + <androidx.core.widget.NestedScrollView + android:layout_height="match_parent" + android:layout_width="match_parent" + app:layout_behavior="@string/appbar_scrolling_view_behavior" + > <LinearLayout - android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_width="match_parent" android:orientation="vertical" android:paddingLeft="32dp" android:paddingRight="32dp" @@ -20,9 +26,9 @@ <TextView android:id="@+id/permission_control" - android:layout_width="match_parent" - android:layout_height="wrap_content" android:layout_gravity="center_horizontal" + android:layout_height="wrap_content" + android:layout_width="match_parent" android:paddingTop="16dp" android:text="@string/permission_control_info" android:textColor="@color/black" @@ -30,20 +36,22 @@ /> <TextView - android:id="@+id/learn_more_permissions" - android:layout_width="wrap_content" - android:layout_height="48dp" android:fontFamily="sans-serif-medium" android:gravity="center_vertical" + android:id="@+id/learn_more_permissions" + android:layout_height="48dp" + android:layout_width="wrap_content" android:text="@string/learn_more" android:textColor="#007fff" android:textSize="14sp" /> <androidx.recyclerview.widget.RecyclerView - android:layout_width="match_parent" + android:id="@+id/recylcer_view_permissions" android:layout_height="match_parent" + android:layout_width="match_parent" tools:listitem="@layout/item_permission" - android:id="@+id/recylcer_view_permissions"/> + /> </LinearLayout> + </androidx.core.widget.NestedScrollView> </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_quick_protection.xml b/app/src/main/res/layout/fragment_quick_protection.xml index d57a101..569f9b1 100644 --- a/app/src/main/res/layout/fragment_quick_protection.xml +++ b/app/src/main/res/layout/fragment_quick_protection.xml @@ -1,59 +1,70 @@ <?xml version="1.0" encoding="utf-8"?> <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" android:background="@color/white" + android:layout_height="match_parent" + android:layout_width="match_parent" > - <include layout="@layout/topbar"/> + <include layout="@layout/topbar" /> - <LinearLayout - android:layout_width="match_parent" + <androidx.core.widget.NestedScrollView android:layout_height="match_parent" - android:orientation="vertical" - android:layout_marginBottom="56dp" - tools:context=".main.MainActivity" + android:layout_width="match_parent" + app:layout_behavior="@string/appbar_scrolling_view_behavior" > - <TextView - android:id="@+id/quick_protection_info" + <LinearLayout + android:layout_height="match_parent" + android:layout_marginBottom="56dp" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:paddingLeft="32dp" - android:paddingRight="32dp" - android:paddingTop="16dp" - android:text="@string/quick_protection_info" - android:textColor="@color/black" - android:textSize="14sp" - /> + android:orientation="vertical" + tools:context=".main.MainActivity" + > + + <TextView + android:id="@+id/quick_protection_info" + android:layout_gravity="center_horizontal" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:paddingLeft="32dp" + android:paddingRight="32dp" + android:paddingTop="16dp" + android:text="@string/quick_protection_info" + android:textColor="@color/black" + android:textSize="14sp" + /> + + <TextView + android:fontFamily="sans-serif-medium" + android:id="@+id/quick_protection_settings_list" + android:layout_gravity="center_horizontal" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:paddingBottom="16dp" + android:paddingLeft="32dp" + android:paddingRight="32dp" + android:paddingTop="16dp" + android:text="@string/quick_protection_settings_list" + android:textColor="@color/black" + android:textSize="14sp" + /> + </LinearLayout> + + </androidx.core.widget.NestedScrollView> - <TextView - android:id="@+id/quick_protection_settings_list" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingLeft="32dp" - android:paddingRight="32dp" - android:fontFamily="sans-serif-medium" - android:text="@string/quick_protection_settings_list" - android:textColor="@color/black" - android:textSize="14sp" - /> - </LinearLayout> <TextView - android:layout_width="wrap_content" + android:fontFamily="sans-serif-medium" + android:gravity="center_vertical|end" + android:id="@+id/learn_more" + android:layout_gravity="bottom|end" android:layout_height="56dp" - android:paddingRight="32dp" + android:layout_width="wrap_content" android:paddingLeft="32dp" - android:gravity="center_vertical|right" - android:id="@+id/learn_more" + android:paddingRight="32dp" android:text="@string/learn_more" android:textColor="#007fff" android:textSize="14sp" - android:fontFamily="sans-serif-medium" - android:layout_gravity="bottom|right"/> + /> </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_tracker_apps.xml b/app/src/main/res/layout/fragment_tracker_apps.xml new file mode 100644 index 0000000..3341d95 --- /dev/null +++ b/app/src/main/res/layout/fragment_tracker_apps.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:background="@color/white" + android:layout_height="match_parent" + android:layout_width="match_parent" + > + + <include layout="@layout/topbar" /> + + <androidx.core.widget.NestedScrollView + android:layout_height="match_parent" + android:layout_width="match_parent" + app:layout_behavior="@string/appbar_scrolling_view_behavior" + > + + <LinearLayout + android:layout_height="match_parent" + android:layout_width="match_parent" + android:orientation="vertical" + tools:context=".main.MainActivity" + > + + <TextView + android:layout_gravity="center_horizontal" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:paddingBottom="16dp" + android:paddingLeft="32dp" + android:paddingRight="32dp" + android:paddingTop="16dp" + android:text="@string/enable_disable_tracker_info" + android:textColor="@color/black" + android:textSize="14sp" + /> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/recylcer_view_tracker_apps" + android:layout_height="match_parent" + android:layout_width="match_parent" + tools:listitem="@layout/item_app_toggle" + /> + </LinearLayout> + </androidx.core.widget.NestedScrollView> +</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_trackers.xml b/app/src/main/res/layout/fragment_trackers.xml new file mode 100644 index 0000000..591b2b6 --- /dev/null +++ b/app/src/main/res/layout/fragment_trackers.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:background="@color/white" + android:layout_height="match_parent" + android:layout_width="match_parent" + > + + <include layout="@layout/topbar" /> + + <androidx.core.widget.NestedScrollView + android:layout_height="match_parent" + android:layout_marginBottom="32dp" + android:layout_width="match_parent" + app:layout_behavior="@string/appbar_scrolling_view_behavior" + > + + <LinearLayout + android:layout_height="match_parent" + android:layout_width="match_parent" + android:orientation="vertical" + android:paddingLeft="32dp" + android:paddingRight="32dp" + tools:context=".main.MainActivity" + > + + <TextView + android:id="@+id/trackers_info" + android:layout_gravity="center_horizontal" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:paddingTop="16dp" + android:text="@string/manage_trackers_info" + android:textColor="@color/black" + android:textSize="14sp" + /> + + <TextView + android:fontFamily="sans-serif-medium" + android:gravity="center_vertical" + android:id="@+id/learn_more_trackers_info" + android:layout_height="48dp" + android:layout_width="wrap_content" + android:text="@string/learn_more" + android:textColor="#007fff" + android:textSize="14sp" + /> + + <ImageView + android:layout_height="300dp" + android:layout_width="wrap_content" + android:scaleType="centerInside" + android:src="@drawable/dummy_trackers_usage" + /> + + <TextView + android:layout_gravity="center_horizontal" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:paddingTop="16dp" + android:text="@string/following_trackers_in_use" + android:textColor="@color/black" + android:textSize="16sp" + /> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/recylcer_view_trackers" + android:layout_height="match_parent" + android:layout_width="match_parent" + tools:listitem="@layout/item_list_tracker" + /> + </LinearLayout> + </androidx.core.widget.NestedScrollView> +</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_permission_apps.xml b/app/src/main/res/layout/item_app_toggle.xml index aec8fec..d0f565f 100644 --- a/app/src/main/res/layout/item_permission_apps.xml +++ b/app/src/main/res/layout/item_app_toggle.xml @@ -2,43 +2,43 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/item_permission_apps" - android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingTop="16dp" + android:layout_width="match_parent" android:paddingBottom="16dp" android:paddingLeft="32dp" android:paddingRight="32dp" + android:paddingTop="16dp" > <ImageView android:id="@+id/app_icon" - android:layout_width="36dp" - android:layout_height="36dp" android:layout_alignParentStart="true" android:layout_centerVertical="true" + android:layout_height="36dp" + android:layout_width="36dp" android:src="@drawable/ic_facebook" /> <TextView + android:fontFamily="sans-serif-medium" android:id="@+id/app_title" - android:layout_width="match_parent" - android:layout_height="wrap_content" android:layout_centerVertical="true" - android:layout_toStartOf="@+id/togglePermission" + android:layout_height="wrap_content" android:layout_toEndOf="@+id/app_icon" - android:fontFamily="sans-serif-medium" - android:paddingStart="32dp" + android:layout_toStartOf="@+id/toggle" + android:layout_width="match_parent" android:paddingEnd="32dp" + android:paddingStart="32dp" android:textColor="@color/black" android:textSize="16sp" tools:text="Body sensor" /> <Switch - android:id="@+id/togglePermission" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:id="@+id/toggle" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_height="wrap_content" + android:layout_width="wrap_content" /> </RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_list_tracker.xml b/app/src/main/res/layout/item_list_tracker.xml new file mode 100644 index 0000000..1b5ecc2 --- /dev/null +++ b/app/src/main/res/layout/item_list_tracker.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!-- + ~ Copyright (C) 2021 E FOUNDATION + ~ + ~ This program is free software: you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License as published by + ~ the Free Software Foundation, either version 3 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. + --> + +<TextView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:fontFamily="sans-serif-medium" + android:id="@+id/tracker_title" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:textColor="@color/accent" + android:textSize="16sp" + tools:text="Google Crashlytics" + />
\ No newline at end of file diff --git a/app/src/main/res/layout/item_permission.xml b/app/src/main/res/layout/item_permission.xml index 8f54f64..66d4213 100644 --- a/app/src/main/res/layout/item_permission.xml +++ b/app/src/main/res/layout/item_permission.xml @@ -17,57 +17,57 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/item_permission" - android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingTop="16dp" + android:layout_width="match_parent" android:paddingBottom="16dp" + android:paddingTop="16dp" > <ImageView android:id="@+id/permission_icon" - android:layout_width="24dp" - android:layout_height="24dp" android:layout_alignParentStart="true" android:layout_centerVertical="true" + android:layout_height="24dp" + android:layout_width="24dp" android:src="@drawable/ic_body_monitor" /> <LinearLayout - android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toStartOf="@+id/chevron" android:layout_toEndOf="@+id/permission_icon" + android:layout_toStartOf="@+id/chevron" + android:layout_width="match_parent" android:orientation="vertical" - android:paddingStart="32dp" android:paddingEnd="32dp" + android:paddingStart="32dp" > <TextView + android:fontFamily="sans-serif-medium" android:id="@+id/permission_title" - android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="sans-serif-medium" - tools:text="Body sensor" + android:layout_width="match_parent" android:textColor="@color/black" android:textSize="16sp" + tools:text="Body sensor" /> <TextView android:id="@+id/permission_count" - android:layout_width="match_parent" android:layout_height="wrap_content" - tools:text="3 of 8 apps allowed" + android:layout_width="match_parent" android:textSize="14sp" + tools:text="3 of 8 apps allowed" /> </LinearLayout> <ImageView android:id="@+id/chevron" - android:layout_width="24dp" - android:layout_height="24dp" - android:padding="4dp" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_height="24dp" + android:layout_width="24dp" + android:padding="4dp" android:src="@drawable/ic_chevron_right_24dp" /> </RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/topbar.xml b/app/src/main/res/layout/topbar.xml index 9142d79..a493b3b 100644 --- a/app/src/main/res/layout/topbar.xml +++ b/app/src/main/res/layout/topbar.xml @@ -18,20 +18,20 @@ --> <com.google.android.material.appbar.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_height="wrap_content" android:layout_width="match_parent" - xmlns:app="http://schemas.android.com/apk/res-auto" app:elevation="0dp" > <com.google.android.material.appbar.MaterialToolbar android:background="@color/white" - android:id="@+id/toolbar" - app:titleCentered="true" android:elevation="0dp" + android:id="@+id/toolbar" android:layout_height="?android:attr/actionBarSize" android:layout_width="match_parent" + app:titleCentered="true" tools:layout_height="56dp" /> </com.google.android.material.appbar.AppBarLayout> |