Skip to content

Commit

Permalink
#109 Fixed sonarqube leftovers
Browse files Browse the repository at this point in the history
  • Loading branch information
@thomcz
thomcz committed Feb 2, 2017
1 parent c2b8d3e commit 268e5a3
Show file tree
Hide file tree
Showing 10 changed files with 263 additions and 273 deletions.
172 changes: 86 additions & 86 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,93 +1,93 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="hrv.band.app">
package="hrv.band.app">

<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="com.microsoft.band.service.access.BIND_BAND_SERVICE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="com.microsoft.band.service.access.BIND_BAND_SERVICE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.INTERNET" />

<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity
android:name=".view.SplashActivity"
android:label="@string/app_name"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity
android:name=".view.SplashActivity"
android:label="@string/app_name"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".view.IntroActivity"
android:label="Intro" />
<activity
android:name=".view.MainActivity"
android:label="@string/app_name"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".view.HRVMeasurementActivity"
android:label="@string/title_activity_save_values"
android:parentActivityName=".view.MainActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="hrv.band.app.view.MainActivity" />
</activity>
<activity
android:name=".view.ValueDescriptionActivity"
android:label="@string/title_activity_value_description"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".view.StatisticActivity"
android:label="@string/title_activity_statistic"
android:parentActivityName=".view.MainActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="hrv.band.app.view.MainActivity" />
</activity>
<activity
android:name=".view.HRVValueActivity"
android:label="@string/title_activity_hrv_value"
android:parentActivityName=".view.StatisticActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="hrv.band.app.view.StatisticActivity" />
</activity>
<activity
android:name=".view.ImprintActivity"
android:label="@string/common_imprint"
android:parentActivityName=".view.MainActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="hrv.band.app.view.MainActivity" />
</activity>
<activity
android:name=".view.SettingsActivity"
android:label="@string/main_drawer_settings"
android:parentActivityName=".view.MainActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="hrv.band.app.view.MainActivity" />
</activity>
</application>
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".view.IntroActivity"
android:label="Intro" />
<activity
android:name=".view.MainActivity"
android:label="@string/app_name"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".view.HRVMeasurementActivity"
android:label="@string/title_activity_save_values"
android:parentActivityName=".view.MainActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="hrv.band.app.view.MainActivity" />
</activity>
<activity
android:name=".view.ValueDescriptionActivity"
android:label="@string/title_activity_value_description"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".view.StatisticActivity"
android:label="@string/title_activity_statistic"
android:parentActivityName=".view.MainActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="hrv.band.app.view.MainActivity" />
</activity>
<activity
android:name=".view.HRVValueActivity"
android:label="@string/title_activity_hrv_value"
android:parentActivityName=".view.StatisticActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="hrv.band.app.view.StatisticActivity" />
</activity>
<activity
android:name=".view.ImprintActivity"
android:label="@string/common_imprint"
android:parentActivityName=".view.MainActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="hrv.band.app.view.MainActivity" />
</activity>
<activity
android:name=".view.SettingsActivity"
android:label="@string/main_drawer_settings"
android:parentActivityName=".view.MainActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="hrv.band.app.view.MainActivity" />
</activity>
</application>

</manifest>
166 changes: 79 additions & 87 deletions app/src/main/res/layout/abstract_hrv_fragment_rr.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,102 +12,94 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="3"/>

<!--<ListView
android:id="@+id/rr_value_list"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="2"/>-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_weight="1">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
>
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textColor="@color/colorAccent"
android:layout_weight="1"
android:textSize="18sp"
android:text="@string/measure_fragment_min"/>
<TextView
android:id="@+id/rr_min"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"/>
<TextView
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="18sp"
android:text="@string/measure_fragment_time_unit"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textColor="@color/colorAccent"
android:layout_weight="1"
android:textSize="18sp"
android:text="@string/measure_fragment_min"/>
<TextView
android:id="@+id/rr_min"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"
android:text="@string/measure_fragment_time_unit"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/colorAccent"
android:layout_weight="1"
android:textSize="18sp"
android:text="@string/measure_fragment_max"/>
<TextView
android:id="@+id/rr_max"
android:layout_width="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textColor="@color/colorAccent"
android:layout_weight="1"
android:textSize="18sp"
android:text="@string/measure_fragment_max"/>
<TextView
android:id="@+id/rr_max"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"
android:text="@string/measure_fragment_time_unit"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="18sp"/>
<TextView
android:layout_width="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textColor="@color/colorAccent"
android:layout_weight="1"
android:textSize="18sp"
android:text="@string/measure_fragment_avg"/>
<TextView
android:id="@+id/rr_average"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"
android:text="@string/measure_fragment_time_unit"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="18sp"
android:text="@string/measure_fragment_time_unit"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textColor="@color/colorAccent"
android:layout_weight="1"
android:textSize="18sp"
android:text="@string/measure_fragment_avg"/>
<TextView
android:id="@+id/rr_average"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"
android:text="@string/measure_fragment_time_unit"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textColor="@color/colorAccent"
android:layout_weight="1"
android:textSize="18sp"
android:text="@string/measure_fragment_count"/>
<TextView
android:id="@+id/rr_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"/>
</LinearLayout>
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textColor="@color/colorAccent"
android:layout_weight="1"
android:textSize="18sp"
android:text="@string/measure_fragment_count"/>
<TextView
android:id="@+id/rr_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"/>
</LinearLayout>
</LinearLayout>

</LinearLayout>
Loading

0 comments on commit 268e5a3

Please sign in to comment.