Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,16 @@ android {

buildFeatures {
buildConfig = true
viewBinding = true
}

defaultConfig {
applicationId "com.ayuget.redface"
minSdkVersion 16
targetSdkVersion 35
multiDexEnabled true
versionCode 5101
versionName "5.1.0"
versionCode 5200
versionName "5.2.0"
vectorDrawables.useSupportLibrary = true
}
compileOptions {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -61,14 +51,17 @@ public class AccountActivity extends BaseActivity {
@Inject
HTTPClientProvider httpClientProvider;

private SubscriptionHandler<User, Boolean> loginSubscriptionHandler = new SubscriptionHandler<>();
private final SubscriptionHandler<User, Boolean> 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");
Expand All @@ -77,41 +70,40 @@ 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).
// In this case, we want "fresh" cookies, because we might be in the process of logging in
// again.
httpClientProvider.clearUserCookies(user);

subscribe(loginSubscriptionHandler.load(user, authenticator.login(user), new EndlessObserver<Boolean>() {
subscribe(loginSubscriptionHandler.load(user, authenticator.login(user), new EndlessObserver<>() {
@Override
public void onNext(Boolean loginWorked) {

Expand Down Expand Up @@ -146,9 +138,5 @@ public void onError(Throwable throwable) {
}));
}

private void cleanUserCookies(User user) {

}


}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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) {
Expand Down Expand Up @@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
18 changes: 10 additions & 8 deletions app/src/main/res/layout/activity_exif_details.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2015 Ayuget
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -16,15 +15,18 @@
-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<include layout="@layout/toolbar_actionbar" />
android:layout_height="match_parent"
android:orientation="vertical">

<include
android:id="@+id/toolbar"
layout="@layout/toolbar_actionbar" />

<LinearLayout
android:id="@+id/image_attributes"
android:orientation="vertical"
android:layout_marginTop="@dimen/activity_vertical_margin"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
android:layout_marginTop="@dimen/activity_vertical_margin"
android:orientation="vertical" />
</LinearLayout>
14 changes: 7 additions & 7 deletions app/src/main/res/layout/activity_settings.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2015 Ayuget
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -15,15 +14,16 @@
~ limitations under the License.
-->

<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/appBackgroundColor">
android:background="?attr/appBackgroundColor"
android:orientation="vertical">

<include layout="@layout/toolbar_actionbar" />
<include
android:id="@+id/toolbar"
layout="@layout/toolbar_actionbar" />

<FrameLayout
android:id="@+id/container"
Expand Down
Loading