From ebf09f4ed44434a53ad4087e45ecbc0fec00f441 Mon Sep 17 00:00:00 2001 From: Nicolas Bonnec Date: Sat, 24 Oct 2026 11:37:32 +0200 Subject: [PATCH 1/4] Start with SettingsActivity. --- app/build.gradle | 1 + .../redface/ui/activity/SettingsActivity.java | 17 ++++++++--------- app/src/main/res/layout/activity_settings.xml | 14 +++++++------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c105dadb..02c05e51 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,6 +27,7 @@ android { buildFeatures { buildConfig = true + viewBinding = true } defaultConfig { diff --git a/app/src/main/java/com/ayuget/redface/ui/activity/SettingsActivity.java b/app/src/main/java/com/ayuget/redface/ui/activity/SettingsActivity.java index 38071dcb..6f267b2f 100644 --- a/app/src/main/java/com/ayuget/redface/ui/activity/SettingsActivity.java +++ b/app/src/main/java/com/ayuget/redface/ui/activity/SettingsActivity.java @@ -18,37 +18,36 @@ import android.os.Bundle; import android.view.MenuItem; +import android.view.View; -import androidx.appcompat.widget.Toolbar; import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsCompat; import com.ayuget.redface.R; +import com.ayuget.redface.databinding.ActivitySettingsBinding; import com.ayuget.redface.ui.event.NestedPreferenceSelectedEvent; import com.ayuget.redface.ui.event.ThemeChangedEvent; import com.ayuget.redface.ui.fragment.HomePreferenceFragment; import com.ayuget.redface.ui.fragment.NestedPreferenceFragmentBuilder; import com.squareup.otto.Subscribe; -import butterknife.BindView; public class SettingsActivity extends BaseActivity { private static final String NESTED_FRAGMENT_TAG = "nested_fragment"; - @BindView(R.id.toolbar_actionbar) - Toolbar toolbar; - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_settings); + ActivitySettingsBinding binding = ActivitySettingsBinding.inflate(getLayoutInflater()); + View view = binding.getRoot(); + setContentView(view); - toolbar.setTitle(getResources().getString(R.string.settings_title)); + binding.toolbar.toolbarActionbar.setTitle(getResources().getString(R.string.settings_title)); - setSupportActionBar(toolbar); + setSupportActionBar(binding.toolbar.toolbarActionbar); getSupportActionBar().setDisplayHomeAsUpEnabled(true); - ViewCompat.setOnApplyWindowInsetsListener(toolbar, (v, insets) -> { + ViewCompat.setOnApplyWindowInsetsListener(binding.toolbar.toolbarActionbar, (v, insets) -> { int statusBarHeight = insets.getInsets(WindowInsetsCompat.Type.statusBars()).top; v.setPadding(0, statusBarHeight, 0, 0); return insets; diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index a28be2b8..c74b7e25 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -1,5 +1,4 @@ - - - + android:background="?attr/appBackgroundColor" + android:orientation="vertical"> - + Date: Sat, 24 Oct 2026 13:31:04 +0200 Subject: [PATCH 2/4] Remove Butterknife and clean up. --- .../redface/ui/activity/AccountActivity.java | 46 +++++++------------ 1 file changed, 17 insertions(+), 29 deletions(-) diff --git a/app/src/main/java/com/ayuget/redface/ui/activity/AccountActivity.java b/app/src/main/java/com/ayuget/redface/ui/activity/AccountActivity.java index 9bbbd41e..84d60af9 100644 --- a/app/src/main/java/com/ayuget/redface/ui/activity/AccountActivity.java +++ b/app/src/main/java/com/ayuget/redface/ui/activity/AccountActivity.java @@ -19,8 +19,6 @@ import android.content.Intent; import android.os.Bundle; import android.view.View; -import android.widget.EditText; -import android.widget.TextView; import com.ayuget.redface.R; import com.ayuget.redface.account.RedfaceAccountManager; @@ -29,25 +27,17 @@ import com.ayuget.redface.data.api.model.User; import com.ayuget.redface.data.rx.EndlessObserver; import com.ayuget.redface.data.rx.SubscriptionHandler; +import com.ayuget.redface.databinding.ActivityAccountBinding; import com.ayuget.redface.network.HTTPClientProvider; import com.ayuget.redface.ui.UIConstants; import com.ayuget.redface.ui.misc.SnackbarHelper; import javax.inject.Inject; -import butterknife.BindView; -import butterknife.OnClick; import timber.log.Timber; public class AccountActivity extends BaseActivity { - @BindView(R.id.username) - EditText usernameTextView; - - @BindView(R.id.password) - EditText passwordTextView; - - @BindView(R.id.relogin_instructions) - TextView reloginInstructions; + private ActivityAccountBinding binding; @Inject HFRAuthenticator authenticator; @@ -61,14 +51,17 @@ public class AccountActivity extends BaseActivity { @Inject HTTPClientProvider httpClientProvider; - private SubscriptionHandler loginSubscriptionHandler = new SubscriptionHandler<>(); + private final SubscriptionHandler loginSubscriptionHandler = new SubscriptionHandler<>(); private boolean isReloginMode; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_account); + binding = ActivityAccountBinding.inflate(getLayoutInflater()); + View view = binding.getRoot(); + setContentView(view); + binding.signInButton.setOnClickListener(v -> onLoginAttempt()); if (getIntent() != null) { Timber.d("Got some intent data"); @@ -77,33 +70,32 @@ protected void onCreate(Bundle savedInstanceState) { if (isReloginMode) { Timber.d("Relogin mode"); - reloginInstructions.setVisibility(View.VISIBLE); + binding.reloginInstructions.setVisibility(View.VISIBLE); } if (savedInstanceState != null) { savedInstanceState.clear(); } } - @OnClick(R.id.sign_in_button) protected void onLoginAttempt() { - final String username = usernameTextView.getText().toString().trim(); + final String username = binding.username.getText().toString().trim(); - if (username.equals("")) { - usernameTextView.setError(getString(R.string.login_username_empty)); + if (username.isEmpty()) { + binding.username.setError(getString(R.string.login_username_empty)); return; } else { - usernameTextView.setError(null); + binding.username.setError(null); } - final String password = passwordTextView.getText().toString().trim(); - if (password.equals("")) { - passwordTextView.setError(getString(R.string.login_password_empty)); + final String pwd = binding.password.getText().toString().trim(); + if (pwd.isEmpty()) { + binding.password.setError(getString(R.string.login_password_empty)); return; } Timber.d("Login attempt for user '%s'", username); - final User user = new User(username, password); + final User user = new User(username, pwd); // Clearing cookies is necessary because cookies are cached in persistent storage // and not overwritter at every request (for obvious performance reasons). @@ -111,7 +103,7 @@ protected void onLoginAttempt() { // again. httpClientProvider.clearUserCookies(user); - subscribe(loginSubscriptionHandler.load(user, authenticator.login(user), new EndlessObserver() { + subscribe(loginSubscriptionHandler.load(user, authenticator.login(user), new EndlessObserver<>() { @Override public void onNext(Boolean loginWorked) { @@ -146,9 +138,5 @@ public void onError(Throwable throwable) { })); } - private void cleanUserCookies(User user) { - - } - } From 43fb34a498c205c4718ee9aadd6a69e37f18c437 Mon Sep 17 00:00:00 2001 From: Nicolas Bonnec Date: Sat, 24 Oct 2026 13:31:17 +0200 Subject: [PATCH 3/4] Bump version. --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 02c05e51..1455c2c3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,8 +35,8 @@ android { minSdkVersion 16 targetSdkVersion 35 multiDexEnabled true - versionCode 5101 - versionName "5.1.0" + versionCode 5200 + versionName "5.2.0" vectorDrawables.useSupportLibrary = true } compileOptions { From 5d5b2b1516eb19a67b1fcce8c1123560d0feecff Mon Sep 17 00:00:00 2001 From: Nicolas Bonnec Date: Sat, 24 Oct 2026 13:36:48 +0200 Subject: [PATCH 4/4] Remove Butterknife and clean. --- .../ui/activity/ExifDetailsActivity.java | 20 +++++++++---------- .../main/res/layout/activity_exif_details.xml | 18 +++++++++-------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/com/ayuget/redface/ui/activity/ExifDetailsActivity.java b/app/src/main/java/com/ayuget/redface/ui/activity/ExifDetailsActivity.java index 0603a767..274927b7 100644 --- a/app/src/main/java/com/ayuget/redface/ui/activity/ExifDetailsActivity.java +++ b/app/src/main/java/com/ayuget/redface/ui/activity/ExifDetailsActivity.java @@ -21,6 +21,7 @@ import android.net.Uri; import android.os.Bundle; import android.text.TextUtils; +import android.view.View; import android.widget.LinearLayout; import androidx.annotation.DrawableRes; @@ -29,6 +30,7 @@ import androidx.exifinterface.media.ExifInterface; import com.ayuget.redface.R; +import com.ayuget.redface.databinding.ActivityExifDetailsBinding; import com.ayuget.redface.storage.StorageHelper; import com.ayuget.redface.ui.UIConstants; import com.ayuget.redface.ui.misc.ImageMenuHandler; @@ -49,20 +51,18 @@ public class ExifDetailsActivity extends BaseActivity { public static final String FIELD_SEPARATOR = " ยท "; - @BindView(R.id.toolbar_actionbar) - Toolbar toolbar; - - @BindView(R.id.image_attributes) - LinearLayout imageAttributes; + private ActivityExifDetailsBinding binding; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_exif_details); + binding = ActivityExifDetailsBinding.inflate(getLayoutInflater()); + View view = binding.getRoot(); + setContentView(view); - toolbar.setTitle(R.string.exif_data_title); - toolbar.setNavigationIcon(R.drawable.ic_close_white_24dp); - toolbar.setNavigationOnClickListener(v -> finish()); + binding.toolbar.toolbarActionbar.setTitle(R.string.exif_data_title); + binding.toolbar.toolbarActionbar.setNavigationIcon(R.drawable.ic_close_white_24dp); + binding.toolbar.toolbarActionbar.setNavigationOnClickListener(v -> finish()); Intent intent = getIntent(); if (intent == null) { @@ -116,7 +116,7 @@ protected void addDetailIfPresent(String mainText, String secondaryText, @Drawab .withIcon(icon) .build(); - imageAttributes.addView(detailView); + binding.imageAttributes.addView(detailView); } else { Timber.d("Missing information : mainText = %s, secondaryText = %s", mainText, secondaryText); } diff --git a/app/src/main/res/layout/activity_exif_details.xml b/app/src/main/res/layout/activity_exif_details.xml index ce019bab..9e771b9f 100644 --- a/app/src/main/res/layout/activity_exif_details.xml +++ b/app/src/main/res/layout/activity_exif_details.xml @@ -1,5 +1,4 @@ - - - + android:layout_height="match_parent" + android:orientation="vertical"> + + + android:layout_height="match_parent" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:orientation="vertical" />