Skip to content

Commit

Permalink
Merge pull request #487 from domoticz/beta-development
Browse files Browse the repository at this point in the history 
Beta development
  • Loading branch information
@galadril
galadril committed Oct 5, 2018
2 parents 0954945 + 8f04c60 commit 65bcf49
Show file tree
Hide file tree
Showing 51 changed files with 1,093 additions and 351 deletions.
42 changes: 21 additions & 21 deletions app/build.gradle
View file
Expand Up @@ -2,8 +2,8 @@ apply plugin: 'com.android.application'


android {
compileSdkVersion 27
buildToolsVersion '27.0.3'
compileSdkVersion 28
buildToolsVersion '28.0.2'

def versionPropsFile = file('version.properties')

Expand Down Expand Up @@ -37,7 +37,7 @@ android {
versionCode version_Code
versionName "${versionMajor}.${versionMinor}.${versionPatch} (${versionBuild})"
minSdkVersion 16
targetSdkVersion 27
targetSdkVersion 28
multiDexEnabled true
wearAppUnbundled true
}
Expand Down Expand Up @@ -153,33 +153,33 @@ allprojects {
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')

def supportVersion = '27.1.1'
def supportVersion = '28.0.0'
implementation "com.android.support:support-v4:$supportVersion"
implementation "com.android.support:appcompat-v7:$supportVersion"
implementation "com.android.support:support-v13:$supportVersion"
implementation "com.android.support:recyclerview-v7:$supportVersion"
implementation "com.android.support:cardview-v7:$supportVersion"
implementation "com.android.support:design:$supportVersion"

implementation "com.google.firebase:firebase-core:16.0.0"
implementation "com.google.firebase:firebase-crash:16.0.0"
implementation "com.google.firebase:firebase-perf:16.0.0"
implementation "com.google.firebase:firebase-messaging:17.0.0"
implementation "com.crashlytics.sdk.android:crashlytics:2.9.2"
implementation "com.google.firebase:firebase-core:16.0.4"
implementation "com.google.firebase:firebase-crash:16.2.1"
implementation "com.google.firebase:firebase-perf:16.1.2"
implementation "com.google.firebase:firebase-messaging:17.3.3"
implementation "com.crashlytics.sdk.android:crashlytics:2.9.5"

implementation 'com.google.android.ads.consent:consent-library:1.0.3'
implementation 'com.google.android.ads.consent:consent-library:1.0.6'

implementation "com.google.android.gms:play-services-analytics:16.0.0"
implementation "com.google.android.gms:play-services-wearable:15.0.1"
implementation "com.google.android.gms:play-services-maps:15.0.1"
implementation "com.google.android.gms:play-services-gcm:15.0.1"
implementation "com.google.android.gms:play-services-location:15.0.1"
implementation "com.google.android.gms:play-services-places:15.0.1"
implementation "com.google.android.gms:play-services-ads:15.0.1"
implementation "com.google.android.gms:play-services-analytics:16.0.4"
implementation "com.google.android.gms:play-services-wearable:16.0.1"
implementation "com.google.android.gms:play-services-maps:16.0.0"
implementation "com.google.android.gms:play-services-gcm:16.0.0"
implementation "com.google.android.gms:play-services-location:16.0.0"
implementation "com.google.android.gms:play-services-places:16.0.0"
implementation "com.google.android.gms:play-services-ads:16.0.0"

implementation 'com.android.support:multidex:1.0.3'
implementation 'com.google.code.gson:gson:2.8.0'
implementation 'com.android.volley:volley:1.0.0'
implementation 'com.google.code.gson:gson:2.8.4'
implementation 'com.android.volley:volley:1.1.0'
implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1@aar'
implementation 'com.larswerkman:lobsterpicker:1.0.1'

Expand All @@ -190,12 +190,12 @@ dependencies {
implementation 'com.github.hotchemi:android-rate:1.0.1'
implementation 'com.squareup.picasso:picasso:2.5.2'
implementation 'com.nhaarman.listviewanimations:lib-core:3.1.0@aar'
implementation 'me.dm7.barcodescanner:zxing:1.9'
implementation 'me.dm7.barcodescanner:zxing:1.9.8'
implementation 'com.github.jd-alexander:LikeButton:0.2.3'
implementation 'jp.wasabeef:recyclerview-animators:2.2.4'
implementation 'com.github.javiersantos:PiracyChecker:1.1'
implementation 'com.mikepenz:google-material-typeface:2.2.0.3.original@aar'
implementation('com.mikepenz:materialdrawer:5.8.2@aar') {
implementation("com.mikepenz:materialdrawer:6.0.9@aar") {
transitive = true
}

Expand Down
7 changes: 7 additions & 0 deletions app/src/debug/AndroidManifest.xml
View file
Expand Up @@ -53,6 +53,7 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
Expand All @@ -71,6 +72,7 @@
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name_domoticz"
android:usesCleartextTraffic="true"
android:theme="@style/AppThemeMain"
tools:replace="android:icon, android:label, android:theme, android:name" >

Expand Down Expand Up @@ -417,6 +419,11 @@
android:name="android.support.PARENT_ACTIVITY"
android:value=".GeoSettingsActivity" />
</activity>

<uses-library
android:name="org.apache.http.legacy"
android:required="false" />

</application>

</manifest>
9 changes: 8 additions & 1 deletion app/src/main/AndroidManifest.xml
View file
Expand Up @@ -63,12 +63,14 @@
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.USE_FINGERPRINT" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="com.android.vending.CHECK_LICENSE"/>

<application
android:name=".app.AppController"
android:allowBackup="true"
android:usesCleartextTraffic="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name_domoticz"
android:theme="@style/AppThemeMain"
Expand Down Expand Up @@ -417,6 +419,11 @@
android:name="android.support.PARENT_ACTIVITY"
android:value=".GeoSettingsActivity" />
</activity>

<uses-library
android:name="org.apache.http.legacy"
android:required="false" />

</application>

</manifest>
</manifest>
6 changes: 6 additions & 0 deletions app/src/main/java/nl/hnogames/domoticz/Adapters/DashboardAdapter.java
View file
Expand Up @@ -426,6 +426,12 @@ private void setDefaultRowData(DevicesInfo mDeviceInfo,
text = context.getString(R.string.direction) + " " + mDeviceInfo.getDirection() + " " + mDeviceInfo.getDirectionStr();
holder.switch_battery_level.setText(text);
}
if (!UsefulBits.isEmpty(mDeviceInfo.getRain())) {
text = context.getString(R.string.rain) + ": " + mDeviceInfo.getRain();
holder.switch_battery_level.setText(text);
}
if (!UsefulBits.isEmpty(mDeviceInfo.getRainRate()))
holder.switch_battery_level.append(", " + context.getString(R.string.rainrate) + ": " + mDeviceInfo.getRainRate());
if (!UsefulBits.isEmpty(mDeviceInfo.getForecastStr()))
holder.switch_battery_level.setText(mDeviceInfo.getForecastStr());
if (!UsefulBits.isEmpty(mDeviceInfo.getSpeed()))
Expand Down
126 changes: 51 additions & 75 deletions app/src/main/res/layout/fragment_add_server.xml
View file
Expand Up @@ -20,7 +20,6 @@
-->

<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
Expand Down Expand Up @@ -71,55 +70,42 @@
android:hint="@string/welcome_remote_server_address" />
</android.support.design.widget.TextInputLayout>

<LinearLayout
<TableLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:orientation="horizontal">

<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">

<TextView
android:id="@+id/remote_protocol_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/welcome_remote_server_protocol"
android:textColor="@color/default_text_color_light"
android:textSize="@dimen/text_size_large" />

<Spinner
android:id="@+id/remote_protocol_spinner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="3dp"
android:spinnerMode="dropdown" />
</LinearLayout>

<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_marginTop="15dp"
android:stretchColumns="1">
<TableRow
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/remote_port_input"
<Spinner
android:id="@+id/remote_protocol_spinner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:paddingTop="3dp"
android:spinnerMode="dropdown" />
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="numberSigned"
android:textColor="@color/default_text_color_light"
android:hint="@string/welcome_remote_server_port" />
</android.support.design.widget.TextInputLayout>

</LinearLayout>
android:layout_marginTop="15dp"
android:layout_weight="0"
android:layout_height="wrap_content">
<EditText
android:id="@+id/remote_port_input"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="numberSigned"
android:textColor="@color/default_text_color_light"
android:hint="@string/welcome_remote_server_port" />
</android.support.design.widget.TextInputLayout>
</TableRow>
</TableLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:orientation="horizontal">

<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down Expand Up @@ -293,48 +279,38 @@
android:hint="@string/welcome_local_server_address" />
</android.support.design.widget.TextInputLayout>


<LinearLayout
<TableLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:orientation="horizontal">
android:stretchColumns="1">

<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">

<TextView
android:id="@+id/local_protocol_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/welcome_local_server_protocol"
android:textColor="@color/default_text_color_light"
android:textSize="@dimen/text_size_large" />

<Spinner
android:id="@+id/local_protocol_spinner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="3dp"
android:spinnerMode="dropdown" />
</LinearLayout>

<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_marginTop="15dp"
<TableRow
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/local_port_input"

<Spinner
android:id="@+id/local_protocol_spinner"
android:layout_width="wrap_content"
android:layout_gravity="bottom"
android:layout_height="wrap_content"
android:paddingTop="3dp"
android:spinnerMode="dropdown" />
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="numberSigned"
android:textColor="@color/default_text_color_light"
android:hint="@string/welcome_local_server_port" />
</android.support.design.widget.TextInputLayout>
</LinearLayout>
android:layout_marginTop="15dp"
android:layout_weight="0"
android:layout_height="wrap_content">
<EditText
android:id="@+id/local_port_input"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="numberSigned"
android:textColor="@color/default_text_color_light"
android:hint="@string/welcome_local_server_port" />
</android.support.design.widget.TextInputLayout>
</TableRow>
</TableLayout>

<LinearLayout
android:layout_width="match_parent"
Expand Down

0 comments on commit 65bcf49

Please sign in to comment.