Skip to content

Commit

Permalink
Layout tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
d4rken committed Oct 4, 2017
1 parent 9889849 commit ff2b952
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 14 deletions.
30 changes: 22 additions & 8 deletions app/src/main/res/layout/viewholder_managed_device.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,38 +73,45 @@
android:layout_marginStart="16dp"
android:orientation="vertical">

<LinearLayout
<RelativeLayout
android:id="@+id/music_container"
android:layout_width="match_parent"
android:layout_height="32dp"
android:gravity="center_vertical"
android:orientation="horizontal">

<ImageView
android:id="@+id/music_icon"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:contentDescription="Music volume"
android:src="@drawable/ic_music_note_white_24dp"
tools:ignore="HardcodedText"/>

<SeekBar
android:id="@+id/music_seekbar"
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_centerVertical="true"
android:layout_toEndOf="@+id/music_icon"
android:layout_toStartOf="@+id/music_counter"
android:progress="0"/>

<TextView
android:id="@+id/music_counter"
style="@style/TextAppearance.AppCompat.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:gravity="center"
tools:text="15"/>
</LinearLayout>
</RelativeLayout>


<LinearLayout
<RelativeLayout
android:id="@+id/call_container"
android:layout_width="match_parent"
android:layout_height="32dp"
Expand All @@ -113,27 +120,34 @@
android:orientation="horizontal">

<ImageView
android:id="@+id/call_icon"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:contentDescription="Call volume"
android:src="@drawable/ic_headset_mic_white_24dp"
tools:ignore="HardcodedText"/>

<SeekBar
android:id="@+id/call_seekbar"
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_centerVertical="true"
android:layout_toEndOf="@+id/call_icon"
android:layout_toStartOf="@+id/call_counter"
android:progress="0"/>

<TextView
android:id="@+id/call_counter"
style="@style/TextAppearance.AppCompat.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:gravity="center"
tools:text="15"/>
</LinearLayout>
</RelativeLayout>
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
6 changes: 0 additions & 6 deletions app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,4 @@
<string name="label_website">Website</string>
<string name="label_gplay">Google Play</string>
<string name="label_email">Email</string>

<string name="label_app_enabled">App aktivieren</string>
<string name="desc_app_enabled">Betrifft die Fähigkeit der App auf Lautstärken- und Bluetooth-Ereignisse zu reagieren.</string>

<string name="label_bug_reports">Fehlerberichte</string>
<string name="desc_bug_reports">Automatische Fehler- und Absturzberichte.</string>
</resources>

0 comments on commit ff2b952

Please sign in to comment.