devol
/
exodus-privacy-android-app
mirror of https://github.com/stom79/exodus-android-app
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'ui_change_report' of git://github.com/lenke182/exodus-android-app into lenke182-ui_change_report

This commit is contained in:
Schoumi 2019-10-01 15:54:01 +02:00
parent d2cb11cea1 df51f0ef80
commit 14223471a4
2 changed files with 48 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/res/drawable/square_purple.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/colorPrimary"/>
<corners android:radius="5dp"/>
<padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
</shape>

75
app/src/main/res/layout/report.xml
View File

@ -19,6 +19,7 @@
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<ImageView <ImageView
android:id="@+id/logo" android:id="@+id/logo"
android:padding="10dp"
android:layout_width="100dp" android:layout_width="100dp"
android:layout_height="100dp" android:layout_height="100dp"
/> />
@ -33,25 +34,27 @@
<TextView <TextView
android:id="@+id/name" android:id="@+id/name"
android:text="test" android:text="test"
android:layout_marginTop="10dp"
android:textAppearance="@style/TextAppearance.AppCompat.Large" android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<TextView <TextView
android:text="Creator"
android:id="@+id/creator" android:id="@+id/creator"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:text="Creator"
android:textAppearance="@style/TextAppearance.AppCompat.Small" />
<TextView <TextView
android:text="installed version" android:text="installed version"
android:id="@+id/installed_version" android:id="@+id/installed_version"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<TextView <TextView
android:text="Report version" android:text="Report version"
android:id="@+id/report_version" android:id="@+id/report_version"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<TextView <TextView
@ -59,17 +62,20 @@
android:autoLink="web" android:autoLink="web"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<TextView
android:id="@+id/analysed"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/analysed"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout
<TextView
android:id="@+id/analysed"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/base_info" android:layout_below="@id/base_info"
android:text="@string/analysed"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
/>
<LinearLayout
android:layout_below="@id/analysed"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -88,29 +94,30 @@
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/colorPrimary" android:background="@drawable/square_purple"
> android:paddingLeft="8dp"
android:paddingStart="8dp"
android:paddingTop="2dp"
android:paddingBottom="3dp">
<TextView <TextView
android:id="@+id/trackers_title" android:id="@+id/trackers_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAlignment="center"
android:text="@string/trackers_pct" android:text="@string/trackers_pct"
android:textAppearance="@style/TextAppearance.AppCompat.Large" android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white" /> android:textColor="@android:color/white" />
<TextView <TextView
android:id="@+id/trackers_nb" android:id="@+id/trackers_nb"
android:text="99"
android:background="@drawable/square_green"
android:layout_marginStart="5dp"
android:layout_marginLeft="5dp"
android:layout_marginBottom="2dp"
android:layout_marginTop="2dp"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textAlignment="center"
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
/> android:background="@drawable/square_green"
android:text="99"
android:textAlignment="center"
android:textSize="20sp"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp" />
</LinearLayout> </LinearLayout>
@ -131,7 +138,11 @@
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/colorPrimary" android:background="@drawable/square_purple"
android:paddingLeft="8dp"
android:paddingStart="8dp"
android:paddingTop="2dp"
android:paddingBottom="3dp"
> >
<TextView <TextView
android:id="@+id/permissions_title" android:id="@+id/permissions_title"
@ -144,16 +155,14 @@
<TextView <TextView
android:id="@+id/permissions_nb" android:id="@+id/permissions_nb"
android:text="99"
android:background="@drawable/square_green"
android:layout_marginStart="5dp"
android:layout_marginLeft="5dp"
android:layout_marginBottom="2dp"
android:layout_marginTop="2dp"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textAlignment="center"
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/square_green"
android:text="99"
android:textAlignment="center"
android:textSize="20sp"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
/> />
</LinearLayout> </LinearLayout>