Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
genofire
donkey
Commits
52e86dcc
Commit
52e86dcc
authored
Aug 09, 2019
by
Anon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Layout main activity
parent
35f781f0
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
109 additions
and
27 deletions
+109
-27
app/src/main/res/drawable/card10_logo_text.xml
app/src/main/res/drawable/card10_logo_text.xml
+8
-0
app/src/main/res/layout/activity_main_connected.xml
app/src/main/res/layout/activity_main_connected.xml
+27
-7
app/src/main/res/layout/activity_main_no_permissions.xml
app/src/main/res/layout/activity_main_no_permissions.xml
+28
-7
app/src/main/res/layout/activity_main_not_connected.xml
app/src/main/res/layout/activity_main_not_connected.xml
+33
-12
app/src/main/res/values/dimensions.xml
app/src/main/res/values/dimensions.xml
+6
-0
app/src/main/res/values/strings.xml
app/src/main/res/values/strings.xml
+7
-1
No files found.
app/src/main/res/drawable/card10_logo_text.xml
0 → 100644
View file @
52e86dcc
<vector
android:height=
"66dp"
android:viewportHeight=
"220"
android:viewportWidth=
"660"
android:width=
"200dp"
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<path
android:fillColor=
"#00000000"
android:pathData=
"m431.2,210.5h-19.4c-19.5,0 -35.4,-15.9 -35.4,-35.4L376.4,45.4c0,-19.5 15.9,-35.4 35.4,-35.4h122.9l0.1,46.3h-19.8c-11,0 -19.9,9 -19.9,19.9v68.1c0,11 9,19.9 19.9,19.9h68.1c11,0 19.9,-9 19.9,-19.9L603,76.2c0,-11 -9,-19.9 -19.9,-19.9h-19.8l-0.2,-46.3h50.8c19.5,0 35.4,15.9 35.4,35.4L649.3,175.1c0,19.5 -15.9,35.4 -35.4,35.4h-154L459.6,56.1 417.9,110.4"
android:strokeColor=
"#000000"
android:strokeLineCap=
"round"
android:strokeLineJoin=
"round"
android:strokeWidth=
"15"
/>
<path
android:fillColor=
"#FF000000"
android:pathData=
"m18.2,133.5c0,7.3 2.4,13 7.1,17.2 4.8,4.2 10.4,6.3 16.8,6.3 1.3,0 3.2,-0.2 5.7,-0.6 2.5,-0.4 5,-0.9 7.4,-1.6 2.9,-0.6 5.9,-1.5 9,-2.4l4.6,14c-3.4,1.1 -6.6,2.1 -9.7,2.9 -2.7,0.8 -5.7,1.5 -8.7,1.9 -3.1,0.5 -5.8,0.7 -8.2,0.7 -5.3,0 -10.4,-1 -15.1,-2.9 -4.8,-1.9 -8.9,-4.6 -12.5,-8 -3.6,-3.4 -6.3,-7.4 -8.4,-12.1 -2,-4.7 -3,-9.8 -3,-15.5L3.2,84.2c0,-5.5 1,-10.6 3,-15.3 2,-4.7 4.8,-8.7 8.2,-12.1 3.5,-3.4 7.6,-6 12.4,-7.9 4.8,-1.9 9.8,-2.8 15.1,-2.8 2.6,0 5.3,0.4 8.2,1.1 2.9,0.7 5.7,1.5 8.5,2.3 2.9,1 6,2.1 9.2,3.4l-3.9,13.3c-2.6,-1 -5.3,-1.8 -8,-2.4 -2.3,-0.6 -4.7,-1.2 -7.3,-1.8 -2.6,-0.6 -4.8,-0.8 -6.8,-0.8 -6.5,0 -12,2.1 -16.7,6.3 -4.7,4.2 -7,9.8 -7,16.7v49.3zM158.2,156.3 L163.5,161.1 152.6,172 146.1,165.5c-5,2.4 -10.3,4.2 -15.7,5.3 -5.5,1.1 -9.7,1.7 -12.6,1.7 -4.7,0 -9,-0.9 -13.1,-2.8 -4,-1.9 -7.5,-4.4 -10.4,-7.6 -2.9,-3.2 -5.2,-7 -6.9,-11.3 -1.7,-4.3 -2.5,-8.8 -2.5,-13.7v-13.3c0,-4.7 0.8,-9.1 2.5,-13.3 1.7,-4.2 4,-7.9 6.9,-11 2.9,-3.1 6.4,-5.7 10.4,-7.5 4,-1.9 8.4,-2.8 13.1,-2.8 1,0 2.5,0 4.5,0.1 2,0.1 4.2,0.3 6.7,0.7 2.4,0.4 4.9,1 7.4,1.7 2.5,0.7 4.8,1.7 6.9,2.8v-5.1c0,-3.4 -0.6,-6.8 -1.8,-10.2 -1.2,-3.4 -2.9,-6.4 -5,-9 -2.1,-2.6 -4.6,-4.7 -7.4,-6.3 -2.8,-1.6 -5.8,-2.4 -8.8,-2.4 -1.1,0 -3.4,0.4 -6.7,1.2 -3.3,0.8 -6.8,1.6 -10.5,2.4 -4.2,1.1 -8.9,2.3 -14,3.6l-4.1,-14.5c5.3,-1.5 10.3,-2.7 15,-3.9 4,-1 8,-1.9 11.9,-2.7 3.9,-0.8 6.7,-1.2 8.5,-1.2 5.2,0 10.1,1.2 14.7,3.6 4.6,2.4 8.6,5.7 12,9.7 3.4,4 6.1,8.6 8.1,13.7 2,5.1 3,10.4 3,15.9zM142.9,111.3c0,-0.2 -0.7,-0.6 -2.1,-1.3 -1.4,-0.7 -3.2,-1.5 -5.4,-2.3 -2.3,-0.8 -4.9,-1.5 -8,-2.2 -3.1,-0.6 -6.3,-1 -9.7,-1 -5,0 -9.2,1.9 -12.7,5.6 -3.5,3.7 -5.2,8.1 -5.2,13.1v15c0,5.2 1.7,9.6 5.2,13.2 3.5,3.6 7.6,5.4 12.5,5.4 1.8,0 4.1,-0.4 7,-1.2 2.9,-0.8 5.7,-1.7 8.5,-2.7 3.1,-1.1 6.4,-2.5 9.9,-4.1zM242.9,70.1c-2.9,-1.8 -5.3,-3.2 -7.1,-4.2 -1.9,-1 -3.5,-1.8 -5,-2.3 -1.5,-0.5 -2.8,-0.8 -4.1,-0.8 -1.3,-0.1 -2.7,-0.1 -4.1,-0.1 -2.3,0 -5.2,0.6 -9,1.8 -3.7,1.2 -7.5,3.5 -11.4,6.9L202.2,170L187.2,170L187.2,64.8c-1,-1 -2.2,-2.1 -3.6,-3.4 -1.5,-1.3 -2.6,-2.4 -3.4,-3.4l10.7,-10.9 8.2,8c4.7,-3.7 9.1,-6.1 13.2,-7 4.1,-1 7.7,-1.5 10.8,-1.5 3.2,0 6.9,0.7 10.9,2.2 4,1.5 9.8,4.3 17.4,8.5zM322.4,2h15L337.4,156.5l6.1,5.8 -10.9,10.7 -7.3,-7.3c-4.8,2.4 -10,4.1 -15.4,5.1 -5.4,1 -9.7,1.5 -13,1.5 -4.7,0 -9,-0.9 -13,-2.7 -4,-1.8 -7.4,-4.2 -10.4,-7.4 -3,-3.1 -5.3,-6.9 -7,-11.1 -1.7,-4.3 -2.5,-8.8 -2.5,-13.7L264,81.7c0,-4.8 0.8,-9.4 2.5,-13.6 1.7,-4.2 4,-7.9 7,-11 3,-3.1 6.5,-5.7 10.4,-7.5 4,-1.9 8.3,-2.8 13,-2.8 2.4,0 5.9,0.3 10.3,0.8 4.4,0.6 9.5,2.2 15.1,5L322.3,2ZM322.1,69.8c-4.8,-2.9 -9.6,-4.9 -14.4,-6.1 -4.8,-1.1 -8.4,-1.7 -10.8,-1.7 -5,0 -9.2,1.9 -12.7,5.6 -3.5,3.7 -5.2,8.2 -5.2,13.3v57.4c0,5.2 1.7,9.6 5.2,13.2 3.5,3.6 7.6,5.4 12.5,5.4 1.5,0 3.4,-0.2 5.9,-0.6 2.5,-0.4 5.1,-0.9 7.8,-1.6 2.7,-0.6 5.1,-1.4 7.3,-2.3 2.2,-0.9 3.7,-1.9 4.5,-3L322.2,69.8Z"
/>
</vector>
app/src/main/res/layout/activity_main_connected.xml
View file @
52e86dcc
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:orientation=
"vertical"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
android:layout_height=
"match_parent"
android:padding=
"@dimen/activity_padding"
>
<androidx.appcompat.widget.AppCompatImageView
android:id=
"@+id/image_logo"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:src=
"@drawable/card10_logo_text"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
android:layout_width=
"wrap_content"
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:id=
"@+id/label_status"
/>
android:id=
"@+id/label_status"
android:layout_marginTop=
"@dimen/logo_margin_bottom"
android:gravity=
"center"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/image_logo"
/>
<Button
android:layout_width=
"wrap_content"
<Button
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/main_label_margin"
android:id=
"@+id/button_send"
android:id=
"@+id/button_send"
android:text=
"@string/main_button_send"
/>
android:text=
"@string/main_button_send"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/label_status"
/>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/activity_main_no_permissions.xml
View file @
52e86dcc
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:orientation=
"vertical"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:padding=
"@dimen/activity_padding"
>
<androidx.appcompat.widget.AppCompatImageView
android:id=
"@+id/image_logo"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:src=
"@drawable/card10_logo_text"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
<TextView
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/main_label_no_permissions"
/>
android:layout_marginTop=
"@dimen/logo_margin_bottom"
android:gravity=
"center"
android:text=
"@string/main_label_no_permissions"
android:id=
"@+id/label_no_permissions"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/image_logo"
/>
<Button
<Button
android:id=
"@+id/button_request_permissions"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:id=
"@+id/button_request_permissions"
android:layout_marginTop=
"@dimen/main_label_margin"
android:text=
"@string/main_button_grant_permissions"
/>
android:text=
"@string/main_button_grant_permissions"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/label_no_permissions"
/>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/activity_main_not_connected.xml
View file @
52e86dcc
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:orientation=
"vertical"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<TextView
android:layout_width=
"wrap_content"
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_height=
"wrap_content"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:text=
"@string/main_label_not_connected"
/>
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:padding=
"@dimen/activity_padding"
>
<Button
android:layout_width=
"wrap_content"
<androidx.appcompat.widget.AppCompatImageView
android:layout_height=
"wrap_content"
android:id=
"@+id/image_logo"
android:text=
"@string/main_button_connect"
android:layout_width=
"wrap_content"
android:id=
"@+id/button_connect"
/>
android:layout_height=
"wrap_content"
android:src=
"@drawable/card10_logo_text"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
</LinearLayout>
<TextView
\ No newline at end of file
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"@string/main_label_not_connected"
android:layout_marginTop=
"@dimen/logo_margin_bottom"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/image_logo"
/>
<Button
android:id=
"@+id/button_connect"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/main_button_connect"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/values/dimensions.xml
0 → 100644
View file @
52e86dcc
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen
name=
"activity_padding"
>
24dp
</dimen>
<dimen
name=
"logo_margin_bottom"
>
24dp
</dimen>
<dimen
name=
"main_label_margin"
>
24dp
</dimen>
</resources>
\ No newline at end of file
app/src/main/res/values/strings.xml
View file @
52e86dcc
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
<string
name=
"app_name"
>
card10
</string>
<string
name=
"app_name"
>
card10
</string>
<string
name=
"scan_activity_title"
>
Scan Devices
</string>
<string
name=
"scan_activity_title"
>
Scan Devices
</string>
<string
name=
"send_activity_title"
>
Send File
</string>
<string
name=
"main_activity_title"
>
@string/app_name
</string>
<string
name=
"main_activity_title"
>
@string/app_name
</string>
<string
name=
"main_label_no_permissions"
>
card10 needs location and storage permissions in order to scan for Bluetooth devices and send files.
</string>
<string
name=
"main_label_no_permissions"
>
card10 needs location and storage permissions in order to scan for Bluetooth devices and send files.
</string>
...
@@ -11,4 +10,11 @@
...
@@ -11,4 +10,11 @@
<string
name=
"main_button_grant_permissions"
>
Grant Permissions
</string>
<string
name=
"main_button_grant_permissions"
>
Grant Permissions
</string>
<string
name=
"main_button_connect"
>
Connect
</string>
<string
name=
"main_button_connect"
>
Connect
</string>
<string
name=
"main_button_send"
>
Send File
</string>
<string
name=
"main_button_send"
>
Send File
</string>
<string
name=
"send_activity_title"
>
Send File
</string>
<string
name=
"send_button_pick_file"
>
Select
</string>
<string
name=
"send_button_start_transfer"
>
Start
</string>
<string
name=
"send_button_stop_transfer"
>
Cancel
</string>
<string
name=
"send_label_no_file_selected"
>
No file selected
</string>
<string
name=
"send_label_selected_file"
>
Selected file:
</string>
</resources>
</resources>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment