Skip to content

armgit / haven

Public Imported from GitHub
0

Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors

UI changes with weights and use sp instead of dp

Prashant Gahlotfa1558a8cb4e
diff --git a/src/main/res/layout/activity_microphone_configure.xml b/src/main/res/layout/activity_microphone_configure.xml
index 2c042a8..ff4929f 100644
--- a/src/main/res/layout/activity_microphone_configure.xml
+++ b/src/main/res/layout/activity_microphone_configure.xml
@@ -1,97 +1,91 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:background="@color/colorPrimary">
+ android:background="@color/colorPrimary"
+ android:orientation="vertical">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
- android:theme="@style/AppTheme.AppBarOverlay"/>
- app:popupTheme="@style/AppTheme.PopupOverlay" />
-<LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:gravity="center_vertical"
- >
-
+ android:theme="@style/AppTheme.AppBarOverlay"
+ app:popupTheme="@style/AppTheme.PopupOverlay" />
- <TextView
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center"
- android:text="@string/tune_the_sound_detection"
- android:textColor="@color/colorAccent"
- android:textSize="28dp"
- android:textStyle="bold"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical"
+ android:orientation="vertical"
+ android:weightSum="10">
- android:layout_marginLeft="10dp"
- android:layout_marginRight="10dp"
- />
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center"
- android:text="@string/set_your_phone_on_the_table_and_make_noises_in_the_room_to_find_the_right_level_to_detect"
- android:textColor="@color/colorAccent"
- android:textSize="14dp"
- android:textStyle="bold"
- android:layout_marginLeft="40dp"
- android:layout_marginRight="40dp"
-
-
- />
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:text="@string/tune_the_sound_detection"
+ android:textColor="@color/colorAccent"
+ android:textSize="20sp"
+ android:textStyle="bold" />
- <org.havenapp.main.ui.SimpleWaveformExtended
- android:id="@+id/simplewaveform"
- android:layout_width="match_parent"
- android:layout_height="240dp"
- android:layout_margin="10dp"
- />
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:text="@string/set_your_phone_on_the_table_and_make_noises_in_the_room_to_find_the_right_level_to_detect"
+ android:textColor="@color/colorAccent"
+ android:textSize="14sp"
+ android:textStyle="bold" />
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center"
- android:text="@string/configure_trigger_level"
- android:textColor="@color/colorAccent"
+ <org.havenapp.main.ui.SimpleWaveformExtended
+ android:id="@+id/simplewaveform"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_margin="10dp"
+ android:layout_weight="5" />
- />
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:text="@string/configure_trigger_level"
+ android:textColor="@color/colorAccent" />
<me.angrybyte.numberpicker.view.ActualNumberPicker
android:id="@+id/number_trigger_level"
android:layout_width="match_parent"
- android:layout_height="48dp"
- android:layout_centerHorizontal="true"
+ android:layout_height="0dp"
+ android:layout_gravity="center_horizontal"
android:layout_marginTop="3dp"
+ android:layout_weight="1"
android:background="#FFFFFFFF"
app:bar_color="@android:color/darker_gray"
app:bar_width="1dp"
app:draw_over_controls="true"
app:max_value="100"
app:min_value="0"
- app:show_text="true"
app:show_bars="true"
app:show_controls="false"
app:show_fast_controls="false"
+ app:show_text="true"
app:text_color="@android:color/darker_gray"
app:text_size="16sp" />
- <TextView
- android:id="@+id/text_display_level"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center"
- android:textSize="24dp"
- android:text="@string/current_noise_base"
- android:textColor="@color/colorAccent"
- android:textStyle="bold"
- android:layout_margin="15dp"
- />
+ <TextView
+ android:id="@+id/text_display_level"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_margin="15dp"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:text="@string/current_noise_base"
+ android:textColor="@color/colorAccent"
+ android:textSize="20sp"
+ android:textStyle="bold" />
+ </LinearLayout>
</LinearLayout>
- </LinearLayout>
\ No newline at end of file