shows qr code with app, adds black design
- qr code is generated from text code - password is shown as well, when clicking on the 'view' icon - hides top view - removes floating button - display status is now in an own class
This commit is contained in:
@ -22,13 +22,4 @@
|
||||
|
||||
<include layout="@layout/content_main" />
|
||||
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||
android:id="@+id/fab"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="bottom|end"
|
||||
android:layout_marginEnd="@dimen/fab_margin"
|
||||
android:layout_marginBottom="16dp"
|
||||
app:srcCompat="@android:drawable/ic_dialog_email" />
|
||||
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
@ -7,22 +7,61 @@
|
||||
tools:context="com.maenle.bump.ui.FirstFragment">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/textview_first"
|
||||
android:id="@+id/textview_scan"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/current_sender"
|
||||
app:layout_constraintBottom_toTopOf="@id/button_first"
|
||||
android:layout_marginTop="40dp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_first"
|
||||
<TextView
|
||||
android:id="@+id/textview_encryption"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/scan_sender"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
android:text="@string/current_sender"
|
||||
android:gravity="center"
|
||||
android:breakStrategy="balanced"
|
||||
android:maxEms="16"
|
||||
android:visibility="gone"
|
||||
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/textview_first" />
|
||||
app:layout_constraintTop_toBottomOf="@id/textview_scan"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/idIVQrcode"
|
||||
android:layout_width="300dp"
|
||||
android:layout_height="300dp"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:contentDescription="@string/qr_code"
|
||||
android:layout_marginTop="20dp"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/textview_encryption"
|
||||
app:layout_constraintStart_toStartOf="parent"/>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:layout_marginTop="20dp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/idIVQrcode"
|
||||
app:layout_constraintStart_toStartOf="parent">
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_scan"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="20dp"
|
||||
android:text="@string/scan_sender" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_view"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/view_sender" />
|
||||
</LinearLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
@ -8,7 +8,7 @@
|
||||
<fragment
|
||||
android:id="@+id/FirstFragment"
|
||||
android:name="com.maenle.bump.ui.FirstFragment"
|
||||
android:label="@string/first_fragment_label"
|
||||
android:label="@string/main_fragment_label"
|
||||
tools:layout="@layout/fragment_first">
|
||||
|
||||
<action
|
||||
|
@ -2,7 +2,7 @@
|
||||
<string name="app_name">Bump</string>
|
||||
<string name="action_settings">Settings</string>
|
||||
<!-- Strings used for fragments for navigation -->
|
||||
<string name="first_fragment_label">First Fragment</string>
|
||||
<string name="main_fragment_label">Bump</string>
|
||||
<string name="second_fragment_label">Second Fragment</string>
|
||||
<string name="next">Next</string>
|
||||
<string name="previous">Previous</string>
|
||||
@ -11,7 +11,7 @@
|
||||
<string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>
|
||||
<string name="current_sender">No Sender Added</string>
|
||||
<string name="scan_sender">Scan</string>
|
||||
<string name="camera_fragment_label">Camera Fragment</string>
|
||||
<string name="camera_fragment_label">Scan new Fragment</string>
|
||||
<string name="preference_file_key">code_file_key</string>
|
||||
<string name="code_key">code_key</string>
|
||||
<string name="notification_title">Bump</string>
|
||||
@ -21,4 +21,7 @@
|
||||
<string name="notification">This is a notification</string>
|
||||
<string name="message_subscribed">Subscribed to Channel</string>
|
||||
<string name="message_subscribe_failed">Could not subscribe</string>
|
||||
<string name="view_sender">View</string>
|
||||
<string name="qr_code">none</string>
|
||||
<string name="hide_sender">Hide</string>
|
||||
</resources>
|
Reference in New Issue
Block a user