diff --git a/app/build.gradle b/app/build.gradle index ee2b30c..be75cd8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,6 +27,9 @@ android { resValue "string", "app_name", "Gotify DEV" } } + buildFeatures { + viewBinding true + } compileOptions { sourceCompatibility = '1.8' targetCompatibility = '1.8' diff --git a/app/src/main/java/com/github/gotify/log/LogsActivity.java b/app/src/main/java/com/github/gotify/log/LogsActivity.java index e8ca495..5287f16 100644 --- a/app/src/main/java/com/github/gotify/log/LogsActivity.java +++ b/app/src/main/java/com/github/gotify/log/LogsActivity.java @@ -13,18 +13,21 @@ import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatActivity; import com.github.gotify.R; import com.github.gotify.Utils; +import com.github.gotify.databinding.ActivityLogsBinding; public class LogsActivity extends AppCompatActivity { + private ActivityLogsBinding binding; private Handler handler = new Handler(); @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_logs); + binding = ActivityLogsBinding.inflate(getLayoutInflater()); + setContentView(binding.getRoot()); Log.i("Entering " + getClass().getSimpleName()); updateLogs(); - setSupportActionBar(findViewById(R.id.toolbar)); + setSupportActionBar(binding.appBarDrawer.toolbar); ActionBar actionBar = getSupportActionBar(); if (actionBar != null) { actionBar.setDisplayHomeAsUpEnabled(true); @@ -54,7 +57,7 @@ public class LogsActivity extends AppCompatActivity { Log.clear(); } if (item.getItemId() == R.id.action_copy_logs) { - TextView content = findViewById(R.id.log_content); + TextView content = binding.logContent; ClipboardManager clipboardManager = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE); ClipData clipData = ClipData.newPlainText("GotifyLog", content.getText().toString()); @@ -73,7 +76,7 @@ public class LogsActivity extends AppCompatActivity { @Override protected void onPostExecute(String s) { - TextView content = findViewById(R.id.log_content); + TextView content = binding.logContent; if (content.getSelectionStart() == content.getSelectionEnd()) { content.setText(s); } diff --git a/app/src/main/java/com/github/gotify/login/AdvancedDialog.java b/app/src/main/java/com/github/gotify/login/AdvancedDialog.java index f52fd1e..d031f59 100644 --- a/app/src/main/java/com/github/gotify/login/AdvancedDialog.java +++ b/app/src/main/java/com/github/gotify/login/AdvancedDialog.java @@ -3,26 +3,23 @@ package com.github.gotify.login; import android.app.AlertDialog; import android.content.Context; import android.view.LayoutInflater; -import android.view.View; -import android.widget.Button; -import android.widget.CheckBox; import android.widget.CompoundButton; -import android.widget.TextView; import androidx.annotation.Nullable; -import butterknife.BindView; -import butterknife.ButterKnife; import com.github.gotify.R; +import com.github.gotify.databinding.AdvancedSettingsDialogBinding; class AdvancedDialog { private Context context; - private ViewHolder holder; + private LayoutInflater layoutInflater; + private AdvancedSettingsDialogBinding binding; private CompoundButton.OnCheckedChangeListener onCheckedChangeListener; private Runnable onClickSelectCaCertificate; private Runnable onClickRemoveCaCertificate; - AdvancedDialog(Context context) { + AdvancedDialog(Context context, LayoutInflater layoutInflater) { this.context = context; + this.layoutInflater = layoutInflater; } AdvancedDialog onDisableSSLChanged( @@ -42,12 +39,9 @@ class AdvancedDialog { } AdvancedDialog show(boolean disableSSL, @Nullable String selectedCertificate) { - - View dialogView = - LayoutInflater.from(context).inflate(R.layout.advanced_settings_dialog, null); - holder = new ViewHolder(dialogView); - holder.disableSSL.setChecked(disableSSL); - holder.disableSSL.setOnCheckedChangeListener(onCheckedChangeListener); + binding = AdvancedSettingsDialogBinding.inflate(layoutInflater); + binding.disableSSL.setChecked(disableSSL); + binding.disableSSL.setOnCheckedChangeListener(onCheckedChangeListener); if (selectedCertificate == null) { showSelectCACertificate(); @@ -56,7 +50,7 @@ class AdvancedDialog { } new AlertDialog.Builder(context) - .setView(dialogView) + .setView(binding.getRoot()) .setTitle(R.string.advanced_settings) .setPositiveButton(context.getString(R.string.done), (ignored, ignored2) -> {}) .show(); @@ -64,33 +58,18 @@ class AdvancedDialog { } private void showSelectCACertificate() { - holder.toggleCaCert.setText(R.string.select_ca_certificate); - holder.toggleCaCert.setOnClickListener((a) -> onClickSelectCaCertificate.run()); - holder.selectedCaCertificate.setText(R.string.no_certificate_selected); + binding.toggleCaCert.setText(R.string.select_ca_certificate); + binding.toggleCaCert.setOnClickListener((a) -> onClickSelectCaCertificate.run()); + binding.selecetedCaCert.setText(R.string.no_certificate_selected); } void showRemoveCACertificate(String certificate) { - holder.toggleCaCert.setText(R.string.remove_ca_certificate); - holder.toggleCaCert.setOnClickListener( + binding.toggleCaCert.setText(R.string.remove_ca_certificate); + binding.toggleCaCert.setOnClickListener( (a) -> { showSelectCACertificate(); onClickRemoveCaCertificate.run(); }); - holder.selectedCaCertificate.setText(certificate); - } - - class ViewHolder { - @BindView(R.id.disableSSL) - CheckBox disableSSL; - - @BindView(R.id.toggle_ca_cert) - Button toggleCaCert; - - @BindView(R.id.seleceted_ca_cert) - TextView selectedCaCertificate; - - ViewHolder(View view) { - ButterKnife.bind(this, view); - } + binding.selecetedCaCert.setText(certificate); } } diff --git a/app/src/main/java/com/github/gotify/login/LoginActivity.java b/app/src/main/java/com/github/gotify/login/LoginActivity.java index a57f273..292994e 100644 --- a/app/src/main/java/com/github/gotify/login/LoginActivity.java +++ b/app/src/main/java/com/github/gotify/login/LoginActivity.java @@ -6,19 +6,14 @@ import android.content.Intent; import android.net.Uri; import android.os.Build; import android.os.Bundle; +import android.text.Editable; +import android.text.TextWatcher; import android.view.View; -import android.widget.Button; import android.widget.EditText; -import android.widget.ImageView; -import android.widget.ProgressBar; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.view.ContextThemeWrapper; -import butterknife.BindView; -import butterknife.ButterKnife; -import butterknife.OnClick; -import butterknife.OnTextChanged; import com.github.gotify.R; import com.github.gotify.SSLSettings; import com.github.gotify.Settings; @@ -32,6 +27,7 @@ import com.github.gotify.client.api.ClientApi; import com.github.gotify.client.api.UserApi; import com.github.gotify.client.model.Client; import com.github.gotify.client.model.VersionInfo; +import com.github.gotify.databinding.ActivityLoginBinding; import com.github.gotify.init.InitializationActivity; import com.github.gotify.log.Log; import com.github.gotify.log.LogsActivity; @@ -48,30 +44,7 @@ public class LoginActivity extends AppCompatActivity { // return value from startActivityForResult when choosing a certificate private final int FILE_SELECT_CODE = 1; - @BindView(R.id.username) - EditText usernameField; - - @BindView(R.id.gotify_url) - EditText urlField; - - @BindView(R.id.password) - EditText passwordField; - - @BindView(R.id.advanced_settings) - ImageView toggleAdvanced; - - @BindView(R.id.checkurl) - Button checkUrlButton; - - @BindView(R.id.login) - Button loginButton; - - @BindView(R.id.checkurl_progress) - ProgressBar checkUrlProgress; - - @BindView(R.id.login_progress) - ProgressBar loginProgress; - + private ActivityLoginBinding binding; private Settings settings; private boolean disableSSLValidation; @@ -82,27 +55,46 @@ public class LoginActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); UncaughtExceptionHandler.registerCurrentThread(); - setContentView(R.layout.activity_login); + binding = ActivityLoginBinding.inflate(getLayoutInflater()); + setContentView(binding.getRoot()); Log.i("Entering " + getClass().getSimpleName()); - ButterKnife.bind(this); settings = new Settings(this); } - @OnTextChanged(R.id.gotify_url) - public void onUrlChange() { - invalidateUrl(); + @Override + protected void onPostCreate(@Nullable Bundle savedInstanceState) { + super.onPostCreate(savedInstanceState); + + binding.gotifyUrl.addTextChangedListener( + new TextWatcher() { + @Override + public void beforeTextChanged( + CharSequence charSequence, int i, int i1, int i2) {} + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + invalidateUrl(); + } + + @Override + public void afterTextChanged(Editable editable) {} + }); + + binding.checkurl.setOnClickListener(ignored -> doCheckUrl()); + binding.openLogs.setOnClickListener(ignored -> openLogs()); + binding.advancedSettings.setOnClickListener(ignored -> toggleShowAdvanced()); + binding.login.setOnClickListener(ignored -> doLogin()); } private void invalidateUrl() { - usernameField.setVisibility(View.GONE); - passwordField.setVisibility(View.GONE); - loginButton.setVisibility(View.GONE); - checkUrlButton.setText(getString(R.string.check_url)); + binding.username.setVisibility(View.GONE); + binding.password.setVisibility(View.GONE); + binding.login.setVisibility(View.GONE); + binding.checkurl.setText(getString(R.string.check_url)); } - @OnClick(R.id.checkurl) public void doCheckUrl() { - String url = urlField.getText().toString(); + String url = binding.gotifyUrl.getText().toString(); HttpUrl parsedUrl = HttpUrl.parse(url); if (parsedUrl == null) { Utils.showSnackBar(LoginActivity.this, "Invalid URL (include http:// or https://)"); @@ -113,8 +105,8 @@ public class LoginActivity extends AppCompatActivity { showHttpWarning(); } - checkUrlProgress.setVisibility(View.VISIBLE); - checkUrlButton.setVisibility(View.GONE); + binding.checkurlProgress.setVisibility(View.VISIBLE); + binding.checkurl.setVisibility(View.GONE); final String trimmedUrl = url.trim(); final String fixedUrl = @@ -127,8 +119,8 @@ public class LoginActivity extends AppCompatActivity { .getVersion() .enqueue(callInUI(this, onValidUrl(fixedUrl), onInvalidUrl(fixedUrl))); } catch (Exception e) { - checkUrlProgress.setVisibility(View.GONE); - checkUrlButton.setVisibility(View.VISIBLE); + binding.checkurlProgress.setVisibility(View.GONE); + binding.checkurl.setVisibility(View.VISIBLE); String errorMsg = getString(R.string.version_failed, fixedUrl + "/version", e.getMessage()); Utils.showSnackBar(LoginActivity.this, errorMsg); @@ -144,18 +136,16 @@ public class LoginActivity extends AppCompatActivity { .show(); } - @OnClick(R.id.open_logs) public void openLogs() { startActivity(new Intent(this, LogsActivity.class)); } - @OnClick(R.id.advanced_settings) void toggleShowAdvanced() { String selectedCertName = caCertContents != null ? getNameOfCertContent(caCertContents) : null; advancedDialog = - new AdvancedDialog(this) + new AdvancedDialog(this, getLayoutInflater()) .onDisableSSLChanged( (ignored, disable) -> { invalidateUrl(); @@ -231,31 +221,31 @@ public class LoginActivity extends AppCompatActivity { private Callback.SuccessCallback onValidUrl(String url) { return (version) -> { settings.url(url); - checkUrlProgress.setVisibility(View.GONE); - checkUrlButton.setVisibility(View.VISIBLE); - checkUrlButton.setText(getString(R.string.found_gotify_version, version.getVersion())); - usernameField.setVisibility(View.VISIBLE); - usernameField.requestFocus(); - passwordField.setVisibility(View.VISIBLE); - loginButton.setVisibility(View.VISIBLE); + binding.checkurlProgress.setVisibility(View.GONE); + binding.checkurl.setVisibility(View.VISIBLE); + binding.checkurl.setText( + getString(R.string.found_gotify_version, version.getVersion())); + binding.username.setVisibility(View.VISIBLE); + binding.username.requestFocus(); + binding.password.setVisibility(View.VISIBLE); + binding.login.setVisibility(View.VISIBLE); }; } private Callback.ErrorCallback onInvalidUrl(String url) { return (exception) -> { - checkUrlProgress.setVisibility(View.GONE); - checkUrlButton.setVisibility(View.VISIBLE); + binding.checkurlProgress.setVisibility(View.GONE); + binding.checkurl.setVisibility(View.VISIBLE); Utils.showSnackBar(LoginActivity.this, versionError(url, exception)); }; } - @OnClick(R.id.login) public void doLogin() { - String username = usernameField.getText().toString(); - String password = passwordField.getText().toString(); + String username = binding.username.getText().toString(); + String password = binding.password.getText().toString(); - loginButton.setVisibility(View.GONE); - loginProgress.setVisibility(View.VISIBLE); + binding.login.setVisibility(View.GONE); + binding.loginProgress.setVisibility(View.VISIBLE); ApiClient client = ClientFactory.basicAuth(settings.url(), tempSSLSettings(), username, password); @@ -265,8 +255,8 @@ public class LoginActivity extends AppCompatActivity { } private void onInvalidLogin(ApiException e) { - loginButton.setVisibility(View.VISIBLE); - loginProgress.setVisibility(View.GONE); + binding.login.setVisibility(View.VISIBLE); + binding.loginProgress.setVisibility(View.GONE); Utils.showSnackBar(this, getString(R.string.wronguserpw)); } @@ -304,13 +294,13 @@ public class LoginActivity extends AppCompatActivity { private void onFailedToCreateClient(ApiException e) { Utils.showSnackBar(this, getString(R.string.create_client_failed)); - loginProgress.setVisibility(View.GONE); - loginButton.setVisibility(View.VISIBLE); + binding.loginProgress.setVisibility(View.GONE); + binding.login.setVisibility(View.VISIBLE); } private void onCancelClientDialog(DialogInterface dialog, int which) { - loginProgress.setVisibility(View.GONE); - loginButton.setVisibility(View.VISIBLE); + binding.loginProgress.setVisibility(View.GONE); + binding.login.setVisibility(View.VISIBLE); } private String versionError(String url, ApiException exception) { diff --git a/app/src/main/java/com/github/gotify/messages/ListMessageAdapter.java b/app/src/main/java/com/github/gotify/messages/ListMessageAdapter.java index c19ac37..d0d27fd 100644 --- a/app/src/main/java/com/github/gotify/messages/ListMessageAdapter.java +++ b/app/src/main/java/com/github/gotify/messages/ListMessageAdapter.java @@ -7,7 +7,6 @@ import android.content.SharedPreferences; import android.text.format.DateUtils; import android.text.util.Linkify; import android.view.LayoutInflater; -import android.view.View; import android.view.ViewGroup; import android.widget.ImageButton; import android.widget.ImageView; @@ -16,13 +15,14 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.preference.PreferenceManager; import androidx.recyclerview.widget.RecyclerView; -import butterknife.BindView; -import butterknife.ButterKnife; +import androidx.viewbinding.ViewBinding; import com.github.gotify.MarkwonFactory; import com.github.gotify.R; import com.github.gotify.Settings; import com.github.gotify.Utils; import com.github.gotify.client.model.Message; +import com.github.gotify.databinding.MessageItemBinding; +import com.github.gotify.databinding.MessageItemCompactBinding; import com.github.gotify.messages.provider.MessageWithImage; import com.squareup.picasso.Picasso; import io.noties.markwon.Markwon; @@ -90,9 +90,17 @@ public class ListMessageAdapter extends RecyclerView.Adapter openDocumentation()); + } + public void onRefreshAll(View view) { refreshAll(); } @@ -204,7 +192,6 @@ public class MessagesActivity extends AppCompatActivity new LoadMore().execute(viewModel.getAppId()); } - @OnClick(R.id.learn_gotify) public void openDocumentation() { Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://gotify.net/docs/pushmsg")); @@ -216,7 +203,7 @@ public class MessagesActivity extends AppCompatActivity } protected void onUpdateApps(List applications) { - Menu menu = navigationView.getMenu(); + Menu menu = binding.navView.getMenu(); menu.removeGroup(R.id.apps); viewModel.getTargetReferences().clear(); updateMessagesAndStopLoading(viewModel.getMessages().get(viewModel.getAppId())); @@ -244,20 +231,20 @@ public class MessagesActivity extends AppCompatActivity } private void initDrawer() { - setSupportActionBar(toolbar); - navigationView.setItemIconTintList(null); + setSupportActionBar(binding.appBarDrawer.toolbar); + binding.navView.setItemIconTintList(null); ActionBarDrawerToggle toggle = new ActionBarDrawerToggle( this, - drawer, - toolbar, + binding.drawerLayout, + binding.appBarDrawer.toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close); - drawer.addDrawerListener(toggle); + binding.drawerLayout.addDrawerListener(toggle); toggle.syncState(); - navigationView.setNavigationItemSelectedListener(this); - View headerView = navigationView.getHeaderView(0); + binding.navView.setNavigationItemSelectedListener(this); + View headerView = binding.navView.getHeaderView(0); Settings settings = viewModel.getSettings(); @@ -278,8 +265,8 @@ public class MessagesActivity extends AppCompatActivity @Override public void onBackPressed() { - if (drawer.isDrawerOpen(GravityCompat.START)) { - drawer.closeDrawer(GravityCompat.START); + if (binding.drawerLayout.isDrawerOpen(GravityCompat.START)) { + binding.drawerLayout.closeDrawer(GravityCompat.START); } else { super.onBackPressed(); } @@ -294,11 +281,11 @@ public class MessagesActivity extends AppCompatActivity Application app = viewModel.getAppsHolder().get().get(id); updateAppOnDrawerClose = app != null ? app.getId() : MessageState.ALL_MESSAGES; startLoading(); - toolbar.setSubtitle(item.getTitle()); + binding.appBarDrawer.toolbar.setSubtitle(item.getTitle()); } else if (id == R.id.nav_all_messages) { updateAppOnDrawerClose = MessageState.ALL_MESSAGES; startLoading(); - toolbar.setSubtitle(""); + binding.appBarDrawer.toolbar.setSubtitle(""); } else if (id == R.id.logout) { new AlertDialog.Builder(new ContextThemeWrapper(this, R.style.AppTheme_Dialog)) .setTitle(R.string.logout) @@ -315,7 +302,7 @@ public class MessagesActivity extends AppCompatActivity startActivity(intent); } - drawer.closeDrawer(GravityCompat.START); + binding.drawerLayout.closeDrawer(GravityCompat.START); return true; } @@ -325,13 +312,13 @@ public class MessagesActivity extends AppCompatActivity } private void startLoading() { - swipeRefreshLayout.setRefreshing(true); - messagesView.setVisibility(View.GONE); + binding.swipeRefresh.setRefreshing(true); + binding.messagesView.setVisibility(View.GONE); } private void stopLoading() { - swipeRefreshLayout.setRefreshing(false); - messagesView.setVisibility(View.VISIBLE); + binding.swipeRefresh.setRefreshing(false); + binding.messagesView.setVisibility(View.VISIBLE); } @Override @@ -359,7 +346,7 @@ public class MessagesActivity extends AppCompatActivity } listMessageAdapter.notifyDataSetChanged(); - selectAppInMenu(navigationView.getMenu().findItem(selectedIndex)); + selectAppInMenu(binding.navView.getMenu().findItem(selectedIndex)); super.onResume(); } @@ -373,12 +360,12 @@ public class MessagesActivity extends AppCompatActivity if (appItem != null) { appItem.setChecked(true); if (appItem.getItemId() != R.id.nav_all_messages) - toolbar.setSubtitle(appItem.getTitle()); + binding.appBarDrawer.toolbar.setSubtitle(appItem.getTitle()); } } private void scheduleDeletion(int position, Message message, boolean listAnimation) { - ListMessageAdapter adapter = (ListMessageAdapter) messagesView.getAdapter(); + ListMessageAdapter adapter = (ListMessageAdapter) binding.messagesView.getAdapter(); MessageFacade messages = viewModel.getMessages(); messages.deleteLocal(message); @@ -394,7 +381,7 @@ public class MessagesActivity extends AppCompatActivity MessageFacade messages = viewModel.getMessages(); MessageDeletion deletion = messages.undoDeleteLocal(); if (deletion != null) { - ListMessageAdapter adapter = (ListMessageAdapter) messagesView.getAdapter(); + ListMessageAdapter adapter = (ListMessageAdapter) binding.messagesView.getAdapter(); long appId = viewModel.getAppId(); adapter.setItems(messages.get(appId)); int insertPosition = @@ -406,7 +393,7 @@ public class MessagesActivity extends AppCompatActivity } private void showDeletionSnackbar() { - View view = swipeRefreshLayout; + View view = binding.swipeRefresh; Snackbar snackbar = Snackbar.make(view, R.string.snackbar_deleted, Snackbar.LENGTH_LONG); snackbar.setAction(R.string.snackbar_undo, v -> undoDelete()); snackbar.addCallback(new SnackbarCallback()); @@ -741,12 +728,12 @@ public class MessagesActivity extends AppCompatActivity stopLoading(); if (messageWithImages.isEmpty()) { - flipper.setDisplayedChild(1); + binding.flipper.setDisplayedChild(1); } else { - flipper.setDisplayedChild(0); + binding.flipper.setDisplayedChild(0); } - ListMessageAdapter adapter = (ListMessageAdapter) messagesView.getAdapter(); + ListMessageAdapter adapter = (ListMessageAdapter) binding.messagesView.getAdapter(); adapter.setItems(messageWithImages); adapter.notifyDataSetChanged(); } diff --git a/app/src/main/java/com/github/gotify/sharing/ShareActivity.java b/app/src/main/java/com/github/gotify/sharing/ShareActivity.java index 14d9e7a..e49fbb2 100644 --- a/app/src/main/java/com/github/gotify/sharing/ShareActivity.java +++ b/app/src/main/java/com/github/gotify/sharing/ShareActivity.java @@ -6,16 +6,11 @@ import android.os.Bundle; import android.view.MenuItem; import android.view.View; import android.widget.ArrayAdapter; -import android.widget.Button; -import android.widget.EditText; -import android.widget.LinearLayout; import android.widget.Spinner; import android.widget.Toast; +import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatActivity; -import butterknife.BindView; -import butterknife.ButterKnife; -import butterknife.OnClick; import com.github.gotify.R; import com.github.gotify.Settings; import com.github.gotify.api.Api; @@ -25,6 +20,7 @@ import com.github.gotify.client.ApiClient; import com.github.gotify.client.api.MessageApi; import com.github.gotify.client.model.Application; import com.github.gotify.client.model.Message; +import com.github.gotify.databinding.ActivityShareBinding; import com.github.gotify.log.Log; import com.github.gotify.messages.provider.ApplicationHolder; import java.util.ArrayList; @@ -33,35 +29,18 @@ import java.util.List; import static com.github.gotify.Utils.first; public class ShareActivity extends AppCompatActivity { + private ActivityShareBinding binding; private Settings settings; private ApplicationHolder appsHolder; - @BindView(R.id.title) - EditText edtTxtTitle; - - @BindView(R.id.content) - EditText edtTxtContent; - - @BindView(R.id.edtTxtPriority) - EditText edtTxtPriority; - - @BindView(R.id.appSpinner) - Spinner appSpinner; - - @BindView(R.id.push_button) - Button pushMessageButton; - - @BindView(R.id.missingAppsContainer) - LinearLayout missingAppsInfo; - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_share); - ButterKnife.bind(this); + binding = ActivityShareBinding.inflate(getLayoutInflater()); + setContentView(binding.getRoot()); Log.i("Entering " + getClass().getSimpleName()); - setSupportActionBar(findViewById(R.id.toolbar)); + setSupportActionBar(binding.appBarDrawer.toolbar); ActionBar actionBar = getSupportActionBar(); if (actionBar != null) { actionBar.setDisplayHomeAsUpEnabled(true); @@ -74,7 +53,7 @@ public class ShareActivity extends AppCompatActivity { if (Intent.ACTION_SEND.equals(intent.getAction()) && "text/plain".equals(type)) { String sharedText = intent.getStringExtra(Intent.EXTRA_TEXT); if (sharedText != null) { - edtTxtContent.setText(sharedText); + binding.content.setText(sharedText); } } @@ -94,13 +73,20 @@ public class ShareActivity extends AppCompatActivity { populateSpinner(apps); boolean appsAvailable = !apps.isEmpty(); - pushMessageButton.setEnabled(appsAvailable); - missingAppsInfo.setVisibility(appsAvailable ? View.GONE : View.VISIBLE); + binding.pushButton.setEnabled(appsAvailable); + binding.missingAppsContainer.setVisibility( + appsAvailable ? View.GONE : View.VISIBLE); }); - appsHolder.onUpdateFailed(() -> pushMessageButton.setEnabled(false)); + appsHolder.onUpdateFailed(() -> binding.pushButton.setEnabled(false)); appsHolder.request(); } + @Override + protected void onPostCreate(@Nullable Bundle savedInstanceState) { + super.onPostCreate(savedInstanceState); + binding.pushButton.setOnClickListener(ignored -> pushMessage()); + } + @Override public boolean onOptionsItemSelected(MenuItem item) { if (item.getItemId() == android.R.id.home) { @@ -109,12 +95,11 @@ public class ShareActivity extends AppCompatActivity { return super.onOptionsItemSelected(item); } - @OnClick(R.id.push_button) - public void pushMessage(View view) { - String titleText = edtTxtTitle.getText().toString(); - String contentText = edtTxtContent.getText().toString(); - String priority = edtTxtPriority.getText().toString(); - int appIndex = appSpinner.getSelectedItemPosition(); + public void pushMessage() { + String titleText = binding.title.getText().toString(); + String contentText = binding.content.getText().toString(); + String priority = binding.edtTxtPriority.getText().toString(); + int appIndex = binding.appSpinner.getSelectedItemPosition(); if (contentText.isEmpty()) { Toast.makeText(this, "Content should not be empty.", Toast.LENGTH_LONG).show(); @@ -147,7 +132,7 @@ public class ShareActivity extends AppCompatActivity { ArrayAdapter adapter = new ArrayAdapter<>( this, android.R.layout.simple_spinner_dropdown_item, appNameList); - appSpinner.setAdapter(adapter); + binding.appSpinner.setAdapter(adapter); } private class PushMessage extends AsyncTask { diff --git a/app/src/main/res/layout/activity_logs.xml b/app/src/main/res/layout/activity_logs.xml index 095fa57..a7038ef 100644 --- a/app/src/main/res/layout/activity_logs.xml +++ b/app/src/main/res/layout/activity_logs.xml @@ -36,6 +36,7 @@ diff --git a/app/src/main/res/layout/activity_messages.xml b/app/src/main/res/layout/activity_messages.xml index fef8166..819d50d 100644 --- a/app/src/main/res/layout/activity_messages.xml +++ b/app/src/main/res/layout/activity_messages.xml @@ -80,6 +80,7 @@ diff --git a/app/src/main/res/layout/activity_share.xml b/app/src/main/res/layout/activity_share.xml index 47086a5..1ec1138 100644 --- a/app/src/main/res/layout/activity_share.xml +++ b/app/src/main/res/layout/activity_share.xml @@ -11,6 +11,7 @@ android:orientation="vertical">