Skip to content

Alpha development #547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Aug 21, 2019
Merged

Alpha development #547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
89ce91d
Working on adding a new temp small widget
Jul 31, 2019
d8f6d85
Added a small widget for temperature sensors #464
Aug 1, 2019
6af37ff
Set allowBackup to false as its giving issues
Aug 1, 2019
482fd5e
Code cleanup
Aug 1, 2019
01e9c02
Improve the geofence location picker dialog and settings screen
Aug 1, 2019
09da7c2
Small fix on importing/exporting settings that invalidate widgets
Aug 1, 2019
511533e
Improve the error handling of widget config screens
Aug 1, 2019
399d317
Fixes for the security widget
Aug 1, 2019
d78773e
Hotfix issue with http calls and cleartext #540
galadril Aug 1, 2019
71bed84
update version
Aug 2, 2019
ac2922f
Fixed some crash reports
Aug 5, 2019
f1ced94
New version
Aug 5, 2019
5d49124
Dont hide the actionbar for tablets
Aug 21, 2019
ebf49ee
Dont show the clock when looking at a specific plan
Aug 21, 2019
c6ca0c5
#544 Dont animate the temp-circles on auto-refresh
Aug 21, 2019
6dd5909
Update the gradle files / libraries
Aug 21, 2019
94dc915
New build
Aug 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,5 @@ libs/MemorizingTrustManager/build/


# Android Studio build files
ajcore.*
ajcore.*
*.hprof
21 changes: 12 additions & 9 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,20 +161,20 @@ dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')

implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.appcompat:appcompat:1.1.0-beta01'
implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
implementation 'androidx.legacy:legacy-support-v13:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha06'
implementation 'androidx.recyclerview:recyclerview:1.1.0-beta03'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.biometric:biometric:1.0.0-alpha04'
implementation 'com.google.android.material:material:1.1.0-alpha07'
implementation 'com.google.android.material:material:1.1.0-alpha09'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.annotation:annotation:1.1.0'

implementation "com.google.firebase:firebase-core:17.0.0"
implementation "com.google.firebase:firebase-core:17.1.0"
implementation "com.google.firebase:firebase-crash:16.2.1"
implementation "com.google.firebase:firebase-perf:18.0.1"
implementation "com.google.firebase:firebase-messaging:19.0.1"
implementation "com.google.firebase:firebase-ads:18.0.0"
implementation "com.google.firebase:firebase-perf:19.0.0"
implementation "com.google.firebase:firebase-messaging:20.0.0"
implementation "com.google.firebase:firebase-ads:18.1.1"
implementation "com.crashlytics.sdk.android:crashlytics:2.10.1"

implementation "com.google.android.gms:play-services-analytics:17.0.0"
Expand All @@ -183,7 +183,7 @@ dependencies {
implementation "com.google.android.gms:play-services-gcm:17.0.0"
implementation "com.google.android.gms:play-services-location:17.0.0"
implementation "com.google.android.gms:play-services-places:17.0.0"
implementation "com.google.android.gms:play-services-ads:18.0.0"
implementation "com.google.android.gms:play-services-ads:18.1.1"
implementation 'com.google.android.ads.consent:consent-library:1.0.7'
implementation "com.github.nisrulz:recyclerviewhelper:27.1.1"

Expand Down Expand Up @@ -219,7 +219,10 @@ dependencies {

implementation 'com.github.matthiasrobbers:shortbread:1.0.2'
annotationProcessor 'com.github.matthiasrobbers:shortbread-compiler:1.0.2'
implementation 'com.schibstedspain.android:leku:3.3.0'
implementation ('com.schibstedspain.android:leku:6.3.0') {
exclude group: 'com.google.android.gms'
exclude group: 'androidx.appcompat'
}
implementation 'com.github.k0shk0sh:PermissionHelper:1.1.0'
implementation 'com.github.zagum:SpeechRecognitionView:1.0.2'
implementation "com.github.skydoves:colorpickerview:2.0.1"
Expand Down
94 changes: 60 additions & 34 deletions app/src/debug/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,48 +89,47 @@
<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.USE_BIOMETRIC" />
<uses-permission android:name="android.permission.USE_BIOMETRIC"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="com.android.vending.CHECK_LICENSE"/>

<uses-permission
android:name="android.permission.RECEIVE_SMS"
tools:node="remove" />
<uses-permission
android:name="android.permission.READ_SMS"
tools:node="remove" />
<uses-permission
android:name="android.permission.SEND_SMS"
tools:node="remove" />
<uses-permission
android:name="android.permission.WRITE_SMS"
tools:node="remove" />
<uses-permission
android:name="android.permission.RECEIVE_WAP_PUSH"
tools:node="remove" />
<uses-permission
android:name="android.permission.RECEIVE_MMS"
tools:node="remove" />
<uses-permission
android:name="android.permission.READ_CALL_LOG"
tools:node="remove" />
<uses-permission
android:name="android.permission.WRITE_CALL_LOG"
tools:node="remove" />
<uses-permission
android:name="android.permission.PROCESS_OUTGOING_CALLS"
tools:node="remove" />
<uses-permission
android:name="android.permission.RECEIVE_SMS"
tools:node="remove"/>
<uses-permission
android:name="android.permission.READ_SMS"
tools:node="remove"/>
<uses-permission
android:name="android.permission.SEND_SMS"
tools:node="remove"/>
<uses-permission
android:name="android.permission.WRITE_SMS"
tools:node="remove"/>
<uses-permission
android:name="android.permission.RECEIVE_WAP_PUSH"
tools:node="remove"/>
<uses-permission
android:name="android.permission.RECEIVE_MMS"
tools:node="remove"/>
<uses-permission
android:name="android.permission.READ_CALL_LOG"
tools:node="remove"/>
<uses-permission
android:name="android.permission.WRITE_CALL_LOG"
tools:node="remove"/>
<uses-permission
android:name="android.permission.PROCESS_OUTGOING_CALLS"
tools:node="remove"/>

<application
android:name=".app.AppController"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name_domoticz"
android:theme="@style/AppThemeMain"
android:usesCleartextTraffic="true"
android:theme="@style/AppThemeMain"
tools:replace="android:icon, android:label, android:theme, android:name">

<activity android:name=".Service.NFCServiceActivity">
<activity android:name=".Service$NFCServiceActivity">
<intent-filter>
<action android:name="android.intent.action.VIEW"/>

Expand All @@ -155,8 +154,8 @@
android:enabled="true"
android:exported="true">
<intent-filter>
<action android:name="android.bluetooth.device.action.ACL_CONNECTED" />
<action android:name="android.bluetooth.device.action.ACL_DISCONNECTED" />
<action android:name="android.bluetooth.device.action.ACL_CONNECTED"/>
<action android:name="android.bluetooth.device.action.ACL_DISCONNECTED"/>
</intent-filter>
</receiver>

Expand Down Expand Up @@ -289,6 +288,33 @@

<service android:name=".Widgets.SecurityWidgetProvider$UpdateSecurityWidgetService"/>

<receiver android:name=".Widgets.WidgetProviderSmallTemp">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
</intent-filter>
<meta-data
android:name="android.appwidget.provider"
android:resource="@xml/smalltempwidgetprovider"/>
</receiver>

<activity
android:name=".Widgets.SmallTempWidgetConfigurationActivity"
android:configChanges="orientation|screenSize"
android:label="Domoticz Widget Config">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEARCH"/>
</intent-filter>

<meta-data
android:name="android.app.searchable"
android:resource="@xml/searchable"/>
</activity>

<service android:name=".Widgets.WidgetProviderSmallTemp$UpdateWidgetService"/>

<receiver android:name=".Service.BootUpReceiver">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED"/>
Expand Down
54 changes: 40 additions & 14 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,47 +87,46 @@
<uses-permission android:name="android.permission.NFC"/>
<uses-permission android:name="android.permission.CAMERA"/>
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
<uses-permission android:name="android.permission.USE_BIOMETRIC" />
<uses-permission android:name="android.permission.USE_BIOMETRIC"/>
<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"/>

<uses-permission
android:name="android.permission.RECEIVE_SMS"
tools:node="remove" />
tools:node="remove"/>
<uses-permission
android:name="android.permission.READ_SMS"
tools:node="remove" />
tools:node="remove"/>
<uses-permission
android:name="android.permission.SEND_SMS"
tools:node="remove" />
tools:node="remove"/>
<uses-permission
android:name="android.permission.WRITE_SMS"
tools:node="remove" />
tools:node="remove"/>
<uses-permission
android:name="android.permission.RECEIVE_WAP_PUSH"
tools:node="remove" />
tools:node="remove"/>
<uses-permission
android:name="android.permission.RECEIVE_MMS"
tools:node="remove" />
tools:node="remove"/>
<uses-permission
android:name="android.permission.READ_CALL_LOG"
tools:node="remove" />
tools:node="remove"/>
<uses-permission
android:name="android.permission.WRITE_CALL_LOG"
tools:node="remove" />
tools:node="remove"/>
<uses-permission
android:name="android.permission.PROCESS_OUTGOING_CALLS"
tools:node="remove" />
tools:node="remove"/>

<application
android:name=".app.AppController"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name_domoticz"
android:theme="@style/AppThemeMain"
android:usesCleartextTraffic="true"
android:theme="@style/AppThemeMain"
tools:replace="android:icon, android:label, android:theme, android:name">

<activity android:name=".Service.NFCServiceActivity">
Expand All @@ -153,8 +152,8 @@
android:enabled="true"
android:exported="true">
<intent-filter>
<action android:name="android.bluetooth.device.action.ACL_CONNECTED" />
<action android:name="android.bluetooth.device.action.ACL_DISCONNECTED" />
<action android:name="android.bluetooth.device.action.ACL_CONNECTED"/>
<action android:name="android.bluetooth.device.action.ACL_DISCONNECTED"/>
</intent-filter>
</receiver>

Expand Down Expand Up @@ -287,6 +286,33 @@
android:resource="@xml/securitywidgetprovider"/>
</service>

<receiver android:name=".Widgets.WidgetProviderSmallTemp">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
</intent-filter>
<meta-data
android:name="android.appwidget.provider"
android:resource="@xml/smalltempwidgetprovider"/>
</receiver>

<activity
android:name=".Widgets.SmallTempWidgetConfigurationActivity"
android:configChanges="orientation|screenSize"
android:label="Domoticz Widget Config">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEARCH"/>
</intent-filter>

<meta-data
android:name="android.app.searchable"
android:resource="@xml/searchable"/>
</activity>

<service android:name=".Widgets.WidgetProviderSmallTemp$UpdateWidgetService"/>

<service android:name=".Widgets.SecurityWidgetProvider$UpdateSecurityWidgetService"/>

<receiver android:name=".Service.BootUpReceiver">
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/nl/hnogames/domoticz/Adapters/BluetoothAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
holder.switch_idx.setText(context.getString(R.string.connectedSwitch) + ": " + mBluetoothInfo.getSwitchIdx());
} else {
holder.switch_idx.setText(context.getString(R.string.connectedSwitch)
+ ": " + context.getString(R.string.not_available));
+ ": " + context.getString(R.string.not_available));
}

if (!UsefulBits.isEmpty(mBluetoothInfo.getValue()))
Expand Down
20 changes: 10 additions & 10 deletions app/src/main/java/nl/hnogames/domoticz/Adapters/CamerasAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ private void SaveSorting() {
@Override
public DataObjectHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View view = LayoutInflater.from(parent.getContext())
.inflate(R.layout.camera_row, parent, false);
.inflate(R.layout.camera_row, parent, false);

if (mSharedPrefs.darkThemeEnabled()) {
if ((view.findViewById(R.id.card_global_wrapper)) != null)
Expand Down Expand Up @@ -138,16 +138,16 @@ public void onBindViewHolder(@NonNull DataObjectHolder holder, int position) {

if (holder.camera.getDrawable() == null) {
picasso.load(imageUrl)
.placeholder(R.drawable.placeholder)
//.error(mSharedPrefs.darkThemeEnabled() ? R.drawable.baseline_error_outline_white_24 : R.drawable.baseline_error_outline_black_24)
.into(holder.camera);
.placeholder(R.drawable.placeholder)
//.error(mSharedPrefs.darkThemeEnabled() ? R.drawable.baseline_error_outline_white_24 : R.drawable.baseline_error_outline_black_24)
.into(holder.camera);
} else
picasso.load(imageUrl)
.memoryPolicy(MemoryPolicy.NO_CACHE)
.noFade()
.noPlaceholder()
//.error(mSharedPrefs.darkThemeEnabled() ? R.drawable.baseline_error_outline_white_24 : R.drawable.baseline_error_outline_black_24)
.into(holder.camera);
.memoryPolicy(MemoryPolicy.NO_CACHE)
.noFade()
.noPlaceholder()
//.error(mSharedPrefs.darkThemeEnabled() ? R.drawable.baseline_error_outline_white_24 : R.drawable.baseline_error_outline_black_24)
.into(holder.camera);
} catch (Exception ex) {
Log.i("CameraAdapter", ex.getMessage());
}
Expand Down Expand Up @@ -190,7 +190,7 @@ public interface onClickListener {
}

public static class DataObjectHolder extends RecyclerView.ViewHolder
implements View.OnClickListener, RVHViewHolder {
implements View.OnClickListener, RVHViewHolder {
TextView name;
ImageView camera;

Expand Down
Loading