aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorpacien2018-02-10 14:16:15 +0100
committerpacien2018-02-10 14:16:15 +0100
commit87ec3620d2259064831356c2f4000ae591756fd2 (patch)
tree9312da1d357fdd3790d5b80af221653696b23089 /app/src/main/res
parentd1c39ba87bb32308c2d3a7a749abffeb773541ef (diff)
downloadtincapp-87ec3620d2259064831356c2f4000ae591756fd2.tar.gz
Reformat code
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/drawable/ic_build_primary_24dp.xml14
-rw-r--r--app/src/main/res/drawable/ic_help_primary_24dp.xml14
-rw-r--r--app/src/main/res/drawable/ic_photo_camera_primary_24dp.xml8
-rw-r--r--app/src/main/res/drawable/ic_stop_primary_24dp.xml8
-rw-r--r--app/src/main/res/icon.svg56
-rw-r--r--app/src/main/res/layout/base.xml14
-rw-r--r--app/src/main/res/layout/dialog_decrypt_keys.xml14
-rw-r--r--app/src/main/res/layout/dialog_encrypt_decrypt_keys.xml14
-rw-r--r--app/src/main/res/layout/dialog_network_generate.xml14
-rw-r--r--app/src/main/res/layout/dialog_network_join.xml14
-rw-r--r--app/src/main/res/layout/dialog_node_details.xml12
-rw-r--r--app/src/main/res/menu/menu_base.xml6
-rw-r--r--app/src/main/res/menu/menu_start.xml6
-rw-r--r--app/src/main/res/menu/menu_status.xml6
-rw-r--r--app/src/main/res/values-v21/styles.xml1
15 files changed, 128 insertions, 73 deletions
diff --git a/app/src/main/res/drawable/ic_build_primary_24dp.xml b/app/src/main/res/drawable/ic_build_primary_24dp.xml
index b099a5c..fec2a3d 100644
--- a/app/src/main/res/drawable/ic_build_primary_24dp.xml
+++ b/app/src/main/res/drawable/ic_build_primary_24dp.xml
@@ -1,9 +1,9 @@
1<vector xmlns:android="http://schemas.android.com/apk/res/android" 1<vector xmlns:android="http://schemas.android.com/apk/res/android"
2 android:width="24dp" 2 android:width="24dp"
3 android:height="24dp" 3 android:height="24dp"
4 android:viewportWidth="24.0" 4 android:viewportWidth="24.0"
5 android:viewportHeight="24.0"> 5 android:viewportHeight="24.0">
6 <path 6 <path
7 android:fillColor="@color/textPrimary" 7 android:fillColor="@color/textPrimary"
8 android:pathData="M22.7,19l-9.1,-9.1c0.9,-2.3 0.4,-5 -1.5,-6.9 -2,-2 -5,-2.4 -7.4,-1.3L9,6 6,9 1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1c1.9,1.9 4.6,2.4 6.9,1.5l9.1,9.1c0.4,0.4 1,0.4 1.4,0l2.3,-2.3c0.5,-0.4 0.5,-1.1 0.1,-1.4z"/> 8 android:pathData="M22.7,19l-9.1,-9.1c0.9,-2.3 0.4,-5 -1.5,-6.9 -2,-2 -5,-2.4 -7.4,-1.3L9,6 6,9 1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1c1.9,1.9 4.6,2.4 6.9,1.5l9.1,9.1c0.4,0.4 1,0.4 1.4,0l2.3,-2.3c0.5,-0.4 0.5,-1.1 0.1,-1.4z"/>
9</vector> 9</vector>
diff --git a/app/src/main/res/drawable/ic_help_primary_24dp.xml b/app/src/main/res/drawable/ic_help_primary_24dp.xml
index b325098..946164f 100644
--- a/app/src/main/res/drawable/ic_help_primary_24dp.xml
+++ b/app/src/main/res/drawable/ic_help_primary_24dp.xml
@@ -1,9 +1,9 @@
1<vector xmlns:android="http://schemas.android.com/apk/res/android" 1<vector xmlns:android="http://schemas.android.com/apk/res/android"
2 android:width="24dp" 2 android:width="24dp"
3 android:height="24dp" 3 android:height="24dp"
4 android:viewportWidth="24.0" 4 android:viewportWidth="24.0"
5 android:viewportHeight="24.0"> 5 android:viewportHeight="24.0">
6 <path 6 <path
7 android:fillColor="@color/textPrimary" 7 android:fillColor="@color/textPrimary"
8 android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"/> 8 android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"/>
9</vector> 9</vector>
diff --git a/app/src/main/res/drawable/ic_photo_camera_primary_24dp.xml b/app/src/main/res/drawable/ic_photo_camera_primary_24dp.xml
index 28172b6..e62c1c3 100644
--- a/app/src/main/res/drawable/ic_photo_camera_primary_24dp.xml
+++ b/app/src/main/res/drawable/ic_photo_camera_primary_24dp.xml
@@ -1,8 +1,8 @@
1<vector xmlns:android="http://schemas.android.com/apk/res/android" 1<vector xmlns:android="http://schemas.android.com/apk/res/android"
2 android:width="24dp" 2 android:width="24dp"
3 android:height="24dp" 3 android:height="24dp"
4 android:viewportHeight="24.0" 4 android:viewportHeight="24.0"
5 android:viewportWidth="24.0"> 5 android:viewportWidth="24.0">
6 <path 6 <path
7 android:fillColor="@color/textPrimary" 7 android:fillColor="@color/textPrimary"
8 android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/> 8 android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>
diff --git a/app/src/main/res/drawable/ic_stop_primary_24dp.xml b/app/src/main/res/drawable/ic_stop_primary_24dp.xml
index 9d41e25..5cb11ed 100644
--- a/app/src/main/res/drawable/ic_stop_primary_24dp.xml
+++ b/app/src/main/res/drawable/ic_stop_primary_24dp.xml
@@ -1,8 +1,8 @@
1<vector xmlns:android="http://schemas.android.com/apk/res/android" 1<vector xmlns:android="http://schemas.android.com/apk/res/android"
2 android:width="24dp" 2 android:width="24dp"
3 android:height="24dp" 3 android:height="24dp"
4 android:viewportWidth="24.0" 4 android:viewportWidth="24.0"
5 android:viewportHeight="24.0"> 5 android:viewportHeight="24.0">
6 <path 6 <path
7 android:fillColor="@color/textPrimary" 7 android:fillColor="@color/textPrimary"
8 android:pathData="M6,6h12v12H6z"/> 8 android:pathData="M6,6h12v12H6z"/>
diff --git a/app/src/main/res/icon.svg b/app/src/main/res/icon.svg
index b0a2abc..559a013 100644
--- a/app/src/main/res/icon.svg
+++ b/app/src/main/res/icon.svg
@@ -1 +1,55 @@
1<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><defs><linearGradient x1="0" y1="0" x2="0" y2="0" gradientUnits="userSpaceOnUse" id="color-1"><stop offset="0" stop-color="#000000" stop-opacity="0.3"></stop><stop offset="1" stop-color="#000000" stop-opacity="0"></stop></linearGradient><filter id="dropshadow-base"><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .8 0"></feColorMatrix> <feOffset dx="0" dy="1"></feOffset> <feGaussianBlur stdDeviation="1"></feGaussianBlur> <feComposite in="SourceGraphic"></feComposite></filter><filter id="dropshadow-banner" x="-10%" y="-10%" width="120%" height="130%"><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"></feColorMatrix> <feOffset dx="0" dy="1"></feOffset> <feGaussianBlur stdDeviation="0.5"></feGaussianBlur> <feComposite in="SourceGraphic"></feComposite></filter></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="none" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M7,43c-1.10457,0 -2,-0.89543 -2,-2v-34c0,-1.10457 0.89543,-2 2,-2h34c1.10457,0 2,0.89543 2,2v34c0,1.10457 -0.89543,2 -2,2z" id="base 1 9" fill="#424242" stroke-width="1"></path><path d="M31.77839,8.44322l40.00014,40.00014l-6.22271,6.22271l-4.66703,-4.66703h-10.88975v6.22271h-3.11136l-33.77743,-33.77743v-9.33407h18.66814z" fill="url(#color-1)" stroke-width="1"></path><path d="M16.22161,16.22161h15.55678v4.66703l6.22271,-6.22271l-6.22271,-6.22271v4.66703h-18.66814v9.33407h3.11136zM31.77839,31.77839h-15.55678v-4.66703l-6.22271,6.22271l6.22271,6.22271v-4.66703h18.66814v-9.33407h-3.11136z" fill="none" stroke-width="0"></path><path d="M16.22161,22.44432h-3.11136v-9.33407h18.66814v-4.66703l6.22271,6.22271l-6.22271,6.22271v-4.66703h-15.55678zM31.77839,25.55568h3.11136v9.33407h-18.66814v4.66703l-6.22271,-6.22271l6.22271,-6.22271v4.66703h15.55678z" fill="#ffffff" stroke-width="0"></path><path d="M2,24c0,-12.15026 9.84974,-22 22,-22c12.15026,0 22,9.84974 22,22c0,12.15026 -9.84974,22 -22,22c-12.15026,0 -22,-9.84974 -22,-22z" id="base 1 5 1" fill="none" stroke-width="1"></path><path d="M2,24c0,-12.15026 9.84974,-22 22,-22c12.15026,0 22,9.84974 22,22c0,12.15026 -9.84974,22 -22,22c-12.15026,0 -22,-9.84974 -22,-22z" id="base 1 1 1" fill="none" stroke-width="1"></path><g fill="#000000" stroke-width="1" font-family="Roboto, sans-serif" font-weight="normal" font-size="14" text-anchor="start"></g><rect x="2" y="2" width="44" height="22" fill="none" stroke-width="1"></rect><path d="M2,24v-22h44v22z" fill="none" stroke-width="1"></path><path d="M2,24v-22h44v22z" fill="none" stroke-width="1"></path><path d="M2,24v-22h44v22z" fill="none" stroke-width="1"></path><path d="M2,24v-22h44v22z" fill="none" stroke-width="1"></path><g fill="#000000" stroke-width="1" font-family="Roboto, sans-serif" font-weight="normal" font-size="14" text-anchor="start"></g><rect x="2" y="2" width="44" height="22" fill="none" stroke-width="1"></rect><path d="M2,24v-22h44v22z" fill="none" stroke-width="1"></path><path d="M2,24v-22h44v22z" fill="none" stroke-width="1"></path><path d="M2,24v-22h44v22z" fill="none" stroke-width="1"></path><path d="M5,7c0,-1.10457 0.89543,-2 2,-2h34c1.10457,0 2,0.89543 2,2v17h-38z" id="base 1 6 1" fill-opacity="0.1" fill="#000000" stroke-width="1"></path><path d="M2,24v-22h44v22z" fill="none" stroke-width="1"></path></g></svg> \ No newline at end of file 1<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="48" height="48">
2 <defs>
3 <linearGradient x1="0" y1="0" x2="0" y2="0" gradientUnits="userSpaceOnUse" id="color-1">
4 <stop offset="0" stop-color="#000000" stop-opacity="0.3"></stop>
5 <stop offset="1" stop-color="#000000" stop-opacity="0"></stop>
6 </linearGradient>
7 <filter id="dropshadow-base">
8 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .8 0"></feColorMatrix>
9 <feOffset dx="0" dy="1"></feOffset>
10 <feGaussianBlur stdDeviation="1"></feGaussianBlur>
11 <feComposite in="SourceGraphic"></feComposite>
12 </filter>
13 <filter id="dropshadow-banner" x="-10%" y="-10%" width="120%" height="130%">
14 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"></feColorMatrix>
15 <feOffset dx="0" dy="1"></feOffset>
16 <feGaussianBlur stdDeviation="0.5"></feGaussianBlur>
17 <feComposite in="SourceGraphic"></feComposite>
18 </filter>
19 </defs>
20 <g fill="none" fill-rule="nonzero" stroke="none" stroke-width="none" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10"
21 stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none"
22 style="mix-blend-mode: normal">
23 <path d="M7,43c-1.10457,0 -2,-0.89543 -2,-2v-34c0,-1.10457 0.89543,-2 2,-2h34c1.10457,0 2,0.89543 2,2v34c0,1.10457 -0.89543,2 -2,2z"
24 id="base 1 9" fill="#424242" stroke-width="1"></path>
25 <path
26 d="M31.77839,8.44322l40.00014,40.00014l-6.22271,6.22271l-4.66703,-4.66703h-10.88975v6.22271h-3.11136l-33.77743,-33.77743v-9.33407h18.66814z"
27 fill="url(#color-1)" stroke-width="1"></path>
28 <path
29 d="M16.22161,16.22161h15.55678v4.66703l6.22271,-6.22271l-6.22271,-6.22271v4.66703h-18.66814v9.33407h3.11136zM31.77839,31.77839h-15.55678v-4.66703l-6.22271,6.22271l6.22271,6.22271v-4.66703h18.66814v-9.33407h-3.11136z"
30 fill="none" stroke-width="0"></path>
31 <path
32 d="M16.22161,22.44432h-3.11136v-9.33407h18.66814v-4.66703l6.22271,6.22271l-6.22271,6.22271v-4.66703h-15.55678zM31.77839,25.55568h3.11136v9.33407h-18.66814v4.66703l-6.22271,-6.22271l6.22271,-6.22271v4.66703h15.55678z"
33 fill="#ffffff" stroke-width="0"></path>
34 <path
35 d="M2,24c0,-12.15026 9.84974,-22 22,-22c12.15026,0 22,9.84974 22,22c0,12.15026 -9.84974,22 -22,22c-12.15026,0 -22,-9.84974 -22,-22z"
36 id="base 1 5 1" fill="none" stroke-width="1"></path>
37 <path
38 d="M2,24c0,-12.15026 9.84974,-22 22,-22c12.15026,0 22,9.84974 22,22c0,12.15026 -9.84974,22 -22,22c-12.15026,0 -22,-9.84974 -22,-22z"
39 id="base 1 1 1" fill="none" stroke-width="1"></path>
40 <g fill="#000000" stroke-width="1" font-family="Roboto, sans-serif" font-weight="normal" font-size="14" text-anchor="start"></g>
41 <rect x="2" y="2" width="44" height="22" fill="none" stroke-width="1"></rect>
42 <path d="M2,24v-22h44v22z" fill="none" stroke-width="1"></path>
43 <path d="M2,24v-22h44v22z" fill="none" stroke-width="1"></path>
44 <path d="M2,24v-22h44v22z" fill="none" stroke-width="1"></path>
45 <path d="M2,24v-22h44v22z" fill="none" stroke-width="1"></path>
46 <g fill="#000000" stroke-width="1" font-family="Roboto, sans-serif" font-weight="normal" font-size="14" text-anchor="start"></g>
47 <rect x="2" y="2" width="44" height="22" fill="none" stroke-width="1"></rect>
48 <path d="M2,24v-22h44v22z" fill="none" stroke-width="1"></path>
49 <path d="M2,24v-22h44v22z" fill="none" stroke-width="1"></path>
50 <path d="M2,24v-22h44v22z" fill="none" stroke-width="1"></path>
51 <path d="M5,7c0,-1.10457 0.89543,-2 2,-2h34c1.10457,0 2,0.89543 2,2v17h-38z" id="base 1 6 1" fill-opacity="0.1" fill="#000000"
52 stroke-width="1"></path>
53 <path d="M2,24v-22h44v22z" fill="none" stroke-width="1"></path>
54 </g>
55</svg> \ No newline at end of file
diff --git a/app/src/main/res/layout/base.xml b/app/src/main/res/layout/base.xml
index 997dd01..3ffcff8 100644
--- a/app/src/main/res/layout/base.xml
+++ b/app/src/main/res/layout/base.xml
@@ -1,11 +1,11 @@
1<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" 1<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
2 xmlns:app="http://schemas.android.com/apk/res-auto" 2 xmlns:app="http://schemas.android.com/apk/res-auto"
3 xmlns:tools="http://schemas.android.com/tools" 3 xmlns:tools="http://schemas.android.com/tools"
4 android:id="@+id/activity_base" 4 android:id="@+id/activity_base"
5 android:layout_width="match_parent" 5 android:layout_width="match_parent"
6 android:layout_height="match_parent" 6 android:layout_height="match_parent"
7 android:fitsSystemWindows="true" 7 android:fitsSystemWindows="true"
8 tools:context="org.pacien.tincapp.activities.BaseActivity"> 8 tools:context="org.pacien.tincapp.activities.BaseActivity">
9 9
10 <android.support.design.widget.AppBarLayout 10 <android.support.design.widget.AppBarLayout
11 android:id="@+id/appbar" 11 android:id="@+id/appbar"
diff --git a/app/src/main/res/layout/dialog_decrypt_keys.xml b/app/src/main/res/layout/dialog_decrypt_keys.xml
index b8a3586..dc46843 100644
--- a/app/src/main/res/layout/dialog_decrypt_keys.xml
+++ b/app/src/main/res/layout/dialog_decrypt_keys.xml
@@ -1,11 +1,11 @@
1<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 1<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2 android:layout_width="match_parent" 2 android:layout_width="match_parent"
3 android:layout_height="wrap_content" 3 android:layout_height="wrap_content"
4 android:orientation="vertical" 4 android:orientation="vertical"
5 android:paddingBottom="@dimen/dialog_vertical_margin" 5 android:paddingBottom="@dimen/dialog_vertical_margin"
6 android:paddingLeft="@dimen/dialog_horizontal_margin" 6 android:paddingLeft="@dimen/dialog_horizontal_margin"