10000 Add databinding to activities by AkshayCHD · Pull Request #71 · coding-blocks/DigitalOceanApp · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Add databinding to activities #71

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add databinding to activities #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02cbfe1
Ad 10000 d databinding to activities
AkshayCHD May 17, 2018
6f710d8
Merge branch 'master' into binding
AkshayCHD May 24, 2018
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: 3 additions & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
dataBinding {
enabled = true
}
}

ext {
Expand Down
78 changes: 33 additions & 45 deletions app/src/main/java/in/tosc/digitaloceanapp/activities/DetailDropletActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package in.tosc.digitaloceanapp.activities;

import android.databinding.DataBindingUtil;
import android.os.Bundle;
import android.os.Handler;
import android.support.annotation.NonNull;
Expand All @@ -21,13 +22,13 @@
import com.afollestad.materialdialogs.MaterialDialog;
import com.google.gson.Gson;

import in.tosc.digitaloceanapp.databinding.ActivityDetailDropletBinding;

import java.util.List;

import in.tosc.digitaloceanapp.R;
import in.tosc.digitaloceanapp.adapters.DropletsAdapter;



import in.tosc.digitaloceanapp.interfaces.OnDropletNameChange;
import in.tosc.doandroidlib.DigitalOcean;
import in.tosc.doandroidlib.api.DigitalOceanClient;
Expand All @@ -44,11 +45,8 @@

public class DetailDropletActivity extends AppCompatActivity implements CompoundButton.OnCheckedChangeListener {

private ActivityDetailDropletBinding binding;
private CoordinatorLayout coordinatorLayout;
private TextView name, memory, size, region, osName, ipAddress;
private Button resize, snapshot;
private EditText snapshotName;
private SwitchCompat switchIPv6, switchPrivateNet, switchBackup;
private Droplet droplet;
private DigitalOceanClient doaClient;
private int position;
Expand All @@ -59,7 +57,7 @@ public class DetailDropletActivity extends AppCompatActivity implements Compound
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_detail_droplet);
binding = DataBindingUtil.setContentView(this, R.layout.activity_detail_droplet);

gson = new Gson();
droplet = gson.fromJson(getIntent().getStringExtra("DROPLET"), Droplet.class);
Expand All @@ -68,30 +66,15 @@ public void onCreate(Bundle savedInstanceState) {

doaClient = DigitalOcean.getDOClient(getSharedPreferences("DO", MODE_PRIVATE).getString("authToken", null));

coordinatorLayout = (CoordinatorLayout) findViewById(R.id.coordinator_layout);

name = (TextView) findViewById(R.id.droplet_name);
ipAddress = (TextView) findViewById(R.id.ipAddress);
memory = (TextView) findViewById(R.id.droplet_memory);
size = (TextView) findViewById(R.id.droplet_size);
region = (TextView) findViewById(R.id.droplet_region);
osName = (TextView) findViewById(R.id.droplet_os);

resize = (Button) findViewById(R.id.resize_droplet);
snapshot = (Button) findViewById(R.id.take_droplet_snapshot);

snapshotName = (EditText) findViewById(R.id.edittext_snapshot_name);
coordinatorLayout = binding.coordinatorLayout;

switchIPv6 = (SwitchCompat) findViewById(R.id.switch_ipv6);
switchPrivateNet = (SwitchCompat) findViewById(R.id.switch_private_network);
switchBackup = (SwitchCompat) findViewById(R.id.switch_backup);
setData(droplet);
setIndividualFeatures(droplet);
setSwitches();

switchIPv6.setOnCheckedChangeListener(this);
switchPrivateNet.setOnCheckedChangeListener(this);
switchBackup.setOnCheckedChangeListener(this);
binding.switchIpv6.setOnCheckedChangeListener(this);
binding.switchPrivateNetwork.setOnCheckedChangeListener(this);
binding.switchBackup.setOnCheckedChangeListener(this);
}

@Override
Expand Down Expand Up @@ -230,20 +213,20 @@ public void onResponse(Call<Action> call, Response<Action> response) {
DropletActivity.refreshData();
} else {
Log.d("IPv6", response.code() + "");
setSwitchWithoutTriggering(switchIPv6,false);
setSwitchWithoutTriggering(binding.switchIpv6,false);
Snackbar.make(coordinatorLayout, getString(R.string.ipv6_couldnt_be_enabled), Snackbar.LENGTH_SHORT).show();

}
}

@Override
public void onFailure(Call<Action> call, Throwable t) {
setSwitchWithoutTriggering(switchIPv6,false);
setSwitchWithoutTriggering(binding.switchIpv6,false);
Snackbar.make(coordinatorLayout, getString(R.string.network_error), Snackbar.LENGTH_SHORT).show();
}
});
} else {
setSwitchWithoutTriggering(switchIPv6,true);
setSwitchWithoutTriggering(binding.switchIpv6,true);
Snackbar.make(coordinatorLayout, getString(R.string.ipv6_cannot_be_disabled), Snackbar.LENGTH_SHORT).show();
}
break;
Expand All @@ -258,19 +241,19 @@ public void onResponse(Call<Action> call, Response<Action> response) {
DropletActivity.refreshData();
} else {
Log.d("SPN", response.code() + "");
setSwitchWithoutTriggering(switchPrivateNet,false);
setSwitchWithoutTriggering(binding.switchPrivateNetwork,false);
Snackbar.make(coordinatorLayout, getString(R.string.private_network_couldnt_be_enabled), Snackbar.LENGTH_SHORT).show();
}
}

@Override
public void onFailure(Call<Action> call, Throwable t) {
setSwitchWithoutTriggering(switchPrivateNet,false);
setSwitchWithoutTriggering(binding.switchPrivateNetwork,false);
Snackbar.make(coordinatorLayout, getString(R.string.network_error), Snackbar.LENGTH_SHORT).show();
}
});
} else {
setSwitchWithoutTriggering(switchPrivateNet,true);
setSwitchWithoutTriggering(binding.switchPrivateNetwork,true);
Snackbar.make(coordinatorLayout, getString(R.string.private_network_cannot_be_disabled), Snackbar.LENGTH_SHORT).show();
}
break;
Expand All @@ -284,15 +267,15 @@ public void onResponse(Call<Action> call, Response<Action> response) {
Snackbar.make(coordinatorLayout, getString(R.string.backup_enabled), Snackbar.LENGTH_SHORT).show();
DropletActivity.refreshData();
} else {
setSwitchWithoutTriggering(switchBackup,false);
setSwitchWithoutTriggering(binding.switchBackup,false);
Snackbar.make(coordinatorLayout, getString(R.string.backup_couldnt_be_enabled), Snackbar.LENGTH_SHORT).show();
Log.d("SBE", response.code() + "");
}
}

@Override
public void onFailure(Call<Action> call, Throwable t) {
setSwitchWithoutTriggering(switchBackup,false);
setSwitchWithoutTriggering(binding.switchBackup,false);
Snackbar.make(coordinatorLayout, getString(R.string.network_error), Snackbar.LENGTH_SHORT).show();
}
});
Expand All @@ -305,15 +288,15 @@ public void onResponse(Call<Action> call, Response<Action> response) {
DropletActivity.refreshData();
} else {
Log.d("SBD", response.code() + "");
setSwitchWithoutTriggering(switchBackup,true);
setSwitchWithoutTriggering(binding.switchBackup,true);
Snackbar.make(coordinatorLayout, getString(R.string.backup_couldnt_be_disabled), Snackbar.LENGTH_SHORT).show();

}
}

@Override
public void onFailure(Call<Action> call, Throwable t) {
setSwitchWithoutTriggering(switchBackup,true);
setSwitchWithoutTriggering(binding.switchBackup,true);
Snackbar.make(coordinatorLayout, getString(R.string.network_error), Snackbar.LENGTH_SHORT).show();
}
});
Expand All @@ -326,22 +309,27 @@ public void onFailure(Call<Action> call, Throwable t) {
}

private void setData(Droplet droplet) {
name.setText(droplet.getName());
ipAddress.setText(droplet.getNetworks().getVersion4Networks().get(0).getIpAddress());
memory.setText(String.format(getResources().getString(R.string.droplet_memory), String.valueOf(droplet.getMemorySizeInMb())));
size.setText(String.format(getResources().getString(R.string.droplet_disk_size), String.valueOf(droplet.getDiskSize())));
region.setText(droplet.getRegion().getName());
osName.setText(droplet.getImage().getName());
binding.dropletName.setText(droplet.getName());
binding.ipAddress.setText(
droplet.getNetworks().getVersion4Networks().get(0).getIpAddress());
binding.dropletMemory.setText(
String.format(getResources().getString(R.string.droplet_memory),
String.valueOf(droplet.getMemorySizeInMb())));
binding.dropletSize.setText(
String.format(getResources().getString(R.string.droplet_disk_size),
String.valueOf(droplet.getDiskSize())));
binding.dropletRegion.setText(droplet.getRegion().getName());
binding.dropletOs.setText(droplet.getImage().getName());
}

private void setSwitches() {
boolean isIPv6Enabled = droplet.getEnableIpv6() == null ? false : droplet.getEnableIpv6();
boolean isPrivateNetworkEnabled = droplet.getEnablePrivateNetworking() == null ? false : droplet.getEnablePrivateNetworking();
boolean isBackupEnabled = droplet.getEnableBackup() == null ? false : droplet.getEnableBackup();

switchIPv6.setChecked(isIPv6Enabled);
switchPrivateNet.setChecked(isPrivateNetworkEnabled);
switchBackup.setChecked(isBackupEnabled);
binding.switchIpv6.setChecked(isIPv6Enabled);
binding.switchPrivateNetwork.setChecked(isPrivateNetworkEnabled);
binding.switchBackup.setChecked(isBackupEnabled);
}

private void setSwitchWithoutTriggering(SwitchCompat switchCompat,boolean newState)
Expand Down
29 changes: 15 additions & 14 deletions app/src/main/java/in/tosc/digitaloceanapp/activities/DropletCreateActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package in.tosc.digitaloceanapp.activities;

import android.databinding.DataBindingUtil;
import android.os.Bundle;
import android.support.v4.app.FragmentManager;
import android.support.v7.app.AppCompatActivity;
Expand All @@ -9,6 +10,7 @@
import android.widget.Toast;

import in.tosc.digitaloceanapp.R;
import in.tosc.digitaloceanapp.databinding.ActivityDropletCreateBinding;
import in.tosc.digitaloceanapp.fragments.AdditionalDetailsFragment;
import in.tosc.digitaloceanapp.fragments.DataCenterFragment;
import in.tosc.digitaloceanapp.fragments.SelectImageFragment;
Expand All @@ -23,11 +25,8 @@ public class DropletCreateActivity extends AppCompatActivity {

static Droplet droplet;
int count = 1;
Button btnNext;
Button btnPrev;
Button btnCreateDropet;
private static final String TAG = "DropletCreateActivity";

private ActivityDropletCreateBinding binding;

public static Droplet getDroplet() {
return droplet;
Expand All @@ -36,11 +35,9 @@ public static Droplet getDroplet() {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
binding = DataBindingUtil.setContentView(this, R.layout.activity_droplet_create);

droplet = new Droplet();
setContentView(R.layout.activity_droplet_create);
btnNext = (Button) findViewById(R.id.buttonNext);
btnPrev = (Button) findViewById(R.id.buttonPrev);
btnCreateDropet = (Button) findViewById(R.id.btnCreateDroplet);
}

private void removeFragment(int count) {
Expand All @@ -52,7 +49,7 @@ private void removeFragment(int count) {
break;
case 3:
fragmentManager.popBackStack("selectSizeFragment", FragmentManager.POP_BACK_STACK_INCLUSIVE);
btnNext.setVisibility(View.VISIBLE);
binding.buttonNext.setVisibility(View.VISIBLE);
break;
case 2:
fragmentManager.popBackStack("DataCenterFragment", FragmentManager.POP_BACK_STACK_INCLUSIVE);
Expand All @@ -74,22 +71,25 @@ private void addFragment(int count) {

case 2:
DataCenterFragment selectDataCenter = new DataCenterFragment();
fragmentTransaction.replace(R.id.fragmentHolder, selectDataCenter, "DATA_CENTER");
fragmentTransaction.replace(binding.fragmentHolder.getId(),
selectDataCenter, "DATA_CENTER");
fragmentTransaction.addToBackStack("DataCenterFragment");
fragmentTransaction.commit();
break;
case 3:
SelectSizeFragment selectSizeFragment = new SelectSizeFragment();
fragmentTransaction.replace(R.id.fragmentHolder, selectSizeFragment, "SELECT_SIZE");
fragmentTransaction.replace(binding.fragmentHolder.getId(), selectSizeFragment,
"SELECT_SIZE");
fragmentTransaction.addToBackStack("selectSizeFragment");
fragmentTransaction.commit();
break;
case 4:
AdditionalDetailsFragment additionalDetailsFragment = new AdditionalDetailsFragment();
fragmentTransaction.replace(R.id.fragmentHolder, additionalDetailsFragment, "ADDITIONAL_DETAILS");
fragmentTransaction.replace(binding.fragmentHolder.getId(),
additionalDetailsFragment, "ADDITIONAL_DETAILS");
fragmentTransaction.addToBackStack("additionalDetailsFragment");
fragmentTransaction.commit();
btnNext.setVisibility(View.GONE);
binding.buttonNext.setVisibility(View.GONE);
break;
// case 5:
// createDroplet(droplet);
Expand All @@ -112,7 +112,8 @@ protected void onResume() {
FragmentManager fragmentManager = getSupportFragmentManager();
android.support.v4.app.FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
SelectImageFragment selectImageFragment = new SelectImageFragment();
fragmentTransaction.replace(R.id.fragmentHolder, selectImageFragment, "CREATE_DROPLET");
fragmentTransaction.replace(binding.fragmentHolder.getId(),
selectImageFragment, "CREATE_DROPLET");
fragmentTransaction.addToBackStack("additionalDetailsFragment");
fragmentTransaction.commit();
}
Expand Down
16 changes: 7 additions & 9 deletions app/src/main/java/in/tosc/digitaloceanapp/activities/SplashActivity.java
View file
Open in desktop
10000
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import android.app.ProgressDialog;
import android.content.Intent;
import android.databinding.DataBindingUtil;
import android.net.Uri;
import android.os.Bundle;
import android.support.v7.app.AlertDialog;
Expand All @@ -12,6 +13,7 @@
import android.widget.EditText;

import in.tosc.digitaloceanapp.R;
import in.tosc.digitaloceanapp.databinding.ActivitySplashBinding;
import in.tosc.doandroidlib.DigitalOcean;
import in.tosc.doandroidlib.api.DigitalOceanClient;
import in.tosc.doandroidlib.objects.AccountInfo;
Expand All @@ -23,9 +25,6 @@ public class SplashActivity extends AppCompatActivity {

public static final String TAG = "Splash";


Button loginButton, signupButton;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Expand All @@ -36,7 +35,9 @@ protected void onCreate(Bundle savedInstanceState) {
progressFurther();
}

setContentView(R.layout.activity_splash);
ActivitySplashBinding binding
= DataBindingUtil.setContentView(this, R.layout.activity_splash);


getWindow().getDecorView().setSystemUiVisibility(
View.SYSTEM_UI_FLAG_LAYOUT_STABLE
Expand All @@ -46,11 +47,8 @@ protected void onCreate(Bundle savedInstanceState) {
| View.SYSTEM_UI_FLAG_FULLSCREEN
| View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);

loginButton = (Button) findViewById(R.id.btnLogin);
signupButton = (Button) findViewById(R.id.btnSignup);

final EditText tokenEditText = (EditText) findViewById(R.id.etToken);
loginButton.setOnClickListener(new View.OnClickListener() {
binding.btnLogin.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
String token = tokenEditText.getText().toString();
Expand All @@ -62,7 +60,7 @@ public void onClick(View v) {
}
});

signupButton.setOnClickListener(new View.OnClickListener() {
binding.btnSignup.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(Intent.ACTION_VIEW);
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/res/layout/activity_about.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
Expand Down Expand Up @@ -274,4 +275,5 @@
</android.support.v7.widget.CardView>
</LinearLayout>
</ScrollView>
</LinearLayout>
</LinearLayout>
</layout>
5 changes: 3 additions & 2 deletions app/src/main/res/layout/activity_detail_droplet.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<android.support.design.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/coordinator_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
Expand Down Expand Up @@ -214,4 +214,5 @@
</android.support.v7.widget.CardView>
</LinearLayout>
</ScrollView>
</android.support.design.widget.CoordinatorLayout>
</android.support.design.widget.CoordinatorLayout>
</layout>
Loading
0