Skip to content
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

Jump to bottom

Alpha development #539

Merged
merged 23 commits into from
Jul 31, 2019
Merged

Alpha development #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
78d3fe5
Update version
Jun 17, 2019
6dcf552
Update translations
Jun 21, 2019
56a8ad1
Fix the sorting feature for dashboard screen (woops)
Jun 21, 2019
f802547
Showing filters via backdrop
Jun 21, 2019
be2f92c
Finish the new filter setup for Dashboard, Scenes and Switches
Jun 24, 2019
9599c97
removed the toolbar visible animation
Jun 24, 2019
3d53862
Fix the dark theme for the new filters
galadril Jun 25, 2019
a392a74
Fixed the dark theme on several points
galadril Jun 25, 2019
323b862
Implement backdrop filter on logs screen
Jun 28, 2019
b9c0f8c
Update libs
Jun 28, 2019
bc6bcf2
Update libs
Jun 28, 2019
124ae5f
Implemented a 'use demo system' feature
Jul 1, 2019
2d6531f
Disabled the version check for now as it's really slow on Domoticz
Jul 1, 2019
290098e
Small fix on the new sorting feature
Jul 1, 2019
781b36f
Woops removed a bit too mutch code
Jul 1, 2019
b0a1ef2
Working on a auto refresh custom timer feature
galadril Jul 16, 2019
05a4d5d
Small rework to fix the new timer settings
Jul 18, 2019
ab17101
new version
Jul 18, 2019
9c83038
Fixed issues with cameras
Jul 18, 2019
477bd7b
Fix auto refresh on Plans #538
galadril Jul 30, 2019
a141085
Use icons for all blinds #525
galadril Jul 30, 2019
19ab4e0
Small code cleanup
galadril Jul 30, 2019
6bd6b7a
New version
galadril Jul 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
22 changes: 11 additions & 11 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,20 +170,20 @@ dependencies {
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.annotation:annotation:1.1.0'

implementation "com.google.firebase:firebase-core:16.0.9"
implementation "com.google.firebase:firebase-core:17.0.0"
implementation "com.google.firebase:firebase-crash:16.2.1"
implementation "com.google.firebase:firebase-perf:17.0.2"
implementation "com.google.firebase:firebase-messaging:18.0.0"
implementation "com.google.firebase:firebase-ads:17.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.crashlytics.sdk.android:crashlytics:2.10.1"

implementation "com.google.android.gms:play-services-analytics:16.0.8"
implementation "com.google.android.gms:play-services-wearable:16.0.1"
implementation "com.google.android.gms:play-services-maps:16.1.0"
implementation "com.google.android.gms:play-services-gcm:16.1.0"
implementation "com.google.android.gms:play-services-location:16.0.0"
implementation "com.google.android.gms:play-services-places:16.1.0"
implementation "com.google.android.gms:play-services-ads:17.2.1"
implementation "com.google.android.gms:play-services-analytics:17.0.0"
implementation "com.google.android.gms:play-services-wearable:17.0.0"
implementation "com.google.android.gms:play-services-maps:17.0.0"
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.ads.consent:consent-library:1.0.7'
implementation "com.github.nisrulz:recyclerviewhelper:27.1.1"

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