fixed hint text
This commit is contained in:
@@ -1,6 +1,9 @@
|
|||||||
package ru.vtosters.lite.net;
|
package ru.vtosters.lite.net;
|
||||||
|
|
||||||
import android.util.Base64;
|
import android.util.Base64;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import org.json.JSONException;
|
||||||
|
|
||||||
import java.io.ByteArrayOutputStream;
|
import java.io.ByteArrayOutputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@@ -89,6 +92,7 @@ public final class NetCall {
|
|||||||
interrupt();
|
interrupt();
|
||||||
join();
|
join();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
Log.e("NetCall", "Failed to interrupt and join thread", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}.start();
|
}.start();
|
||||||
|
|||||||
@@ -168,7 +168,7 @@ public class PreferencesUtil {
|
|||||||
editText.setText(PreferenceManager.getDefaultSharedPreferences(getGlobalContext()).getString(key, ""));
|
editText.setText(PreferenceManager.getDefaultSharedPreferences(getGlobalContext()).getString(key, ""));
|
||||||
editText.setHint(title);
|
editText.setHint(title);
|
||||||
editText.setTextColor(getTextAttr());
|
editText.setTextColor(getTextAttr());
|
||||||
editText.setHintTextColor(getSTextColor(getGlobalContext()));
|
editText.setHintTextColor(getSTextAttr());
|
||||||
|
|
||||||
editText.setBackgroundTintList(ColorStateList.valueOf(getAccentColor()));
|
editText.setBackgroundTintList(ColorStateList.valueOf(getAccentColor()));
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,16 @@
|
|||||||
package ru.vtosters.lite.ui.fragments;
|
package ru.vtosters.lite.ui.fragments;
|
||||||
|
|
||||||
|
import static ru.vtosters.lite.music.Scrobbler.isLoggedIn;
|
||||||
import static ru.vtosters.lite.ui.PreferencesUtil.getSTextColor;
|
import static ru.vtosters.lite.ui.PreferencesUtil.getSTextColor;
|
||||||
import static ru.vtosters.lite.utils.AndroidUtils.dp2px;
|
import static ru.vtosters.lite.utils.AndroidUtils.dp2px;
|
||||||
import static ru.vtosters.lite.utils.AndroidUtils.edit;
|
import static ru.vtosters.lite.utils.AndroidUtils.edit;
|
||||||
import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier;
|
import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier;
|
||||||
import static ru.vtosters.lite.utils.AndroidUtils.getPreferences;
|
import static ru.vtosters.lite.utils.AndroidUtils.getPreferences;
|
||||||
|
import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
|
||||||
import static ru.vtosters.lite.utils.LifecycleUtils.restartApplicationWithTimer;
|
import static ru.vtosters.lite.utils.LifecycleUtils.restartApplicationWithTimer;
|
||||||
import static ru.vtosters.lite.utils.ThemesUtils.getAccentColor;
|
import static ru.vtosters.lite.utils.ThemesUtils.getAccentColor;
|
||||||
import static ru.vtosters.lite.utils.ThemesUtils.getAlertStyle;
|
import static ru.vtosters.lite.utils.ThemesUtils.getAlertStyle;
|
||||||
|
import static ru.vtosters.lite.utils.ThemesUtils.getSTextAttr;
|
||||||
import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr;
|
import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
@@ -51,14 +54,14 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
|
|||||||
alert.getButton(DialogInterface.BUTTON_POSITIVE).setTextColor(getAccentColor());
|
alert.getButton(DialogInterface.BUTTON_POSITIVE).setTextColor(getAccentColor());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void lastfmAuth(Context ctx) {
|
public void lastfmAuth(Context ctx) {
|
||||||
LinearLayout linearLayout = new LinearLayout(ctx);
|
LinearLayout linearLayout = new LinearLayout(ctx);
|
||||||
linearLayout.setOrientation(LinearLayout.VERTICAL);
|
linearLayout.setOrientation(LinearLayout.VERTICAL);
|
||||||
|
|
||||||
final EditText fn = new EditText(ctx);
|
final EditText fn = new EditText(ctx);
|
||||||
fn.setHint("Логин");
|
fn.setHint("Логин");
|
||||||
fn.setTextColor(getTextAttr());
|
fn.setTextColor(getTextAttr());
|
||||||
fn.setHintTextColor(getSTextColor(ctx));
|
fn.setHintTextColor(getSTextAttr());
|
||||||
fn.setBackgroundTintList(ColorStateList.valueOf(getAccentColor()));
|
fn.setBackgroundTintList(ColorStateList.valueOf(getAccentColor()));
|
||||||
linearLayout.addView(fn);
|
linearLayout.addView(fn);
|
||||||
fn.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
|
fn.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
|
||||||
@@ -69,7 +72,7 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
|
|||||||
final EditText ln = new EditText(ctx);
|
final EditText ln = new EditText(ctx);
|
||||||
ln.setHint("Пароль");
|
ln.setHint("Пароль");
|
||||||
ln.setTextColor(getTextAttr());
|
ln.setTextColor(getTextAttr());
|
||||||
ln.setHintTextColor(getSTextColor(ctx));
|
ln.setHintTextColor(getSTextAttr());
|
||||||
ln.setBackgroundTintList(ColorStateList.valueOf(getAccentColor()));
|
ln.setBackgroundTintList(ColorStateList.valueOf(getAccentColor()));
|
||||||
linearLayout.addView(ln);
|
linearLayout.addView(ln);
|
||||||
ln.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
|
ln.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
|
||||||
@@ -101,7 +104,11 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
|
|||||||
findPreference("download_video").setOnPreferenceClickListener(new MediaFragment.download());
|
findPreference("download_video").setOnPreferenceClickListener(new MediaFragment.download());
|
||||||
findPreference("dateformat").setOnPreferenceChangeListener(new MediaFragment.restart());
|
findPreference("dateformat").setOnPreferenceChangeListener(new MediaFragment.restart());
|
||||||
findPreference("lastfm_auth").setOnPreferenceClickListener(preference -> {
|
findPreference("lastfm_auth").setOnPreferenceClickListener(preference -> {
|
||||||
lastfmAuth(getContext());
|
if (isLoggedIn()) {
|
||||||
|
sendToast("Вы уже авторизованы");
|
||||||
|
} else {
|
||||||
|
lastfmAuth(getContext());
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
findPreference("lastfm_reset").setOnPreferenceClickListener(preference -> {
|
findPreference("lastfm_reset").setOnPreferenceClickListener(preference -> {
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import static ru.vtosters.lite.tgs.TGPref.setTGBotKey;
|
|||||||
import static ru.vtosters.lite.utils.AndroidUtils.dp2px;
|
import static ru.vtosters.lite.utils.AndroidUtils.dp2px;
|
||||||
import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier;
|
import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier;
|
||||||
import static ru.vtosters.lite.utils.ThemesUtils.getAccentColor;
|
import static ru.vtosters.lite.utils.ThemesUtils.getAccentColor;
|
||||||
|
import static ru.vtosters.lite.utils.ThemesUtils.getSTextAttr;
|
||||||
|
|
||||||
import android.app.AlertDialog;
|
import android.app.AlertDialog;
|
||||||
import android.app.ProgressDialog;
|
import android.app.ProgressDialog;
|
||||||
@@ -166,7 +167,7 @@ public class StickersFragment extends BaseToolbarFragment {
|
|||||||
LinearLayout linearLayout = new LinearLayout(getContext());
|
LinearLayout linearLayout = new LinearLayout(getContext());
|
||||||
|
|
||||||
final EditText editText = new EditText(getContext());
|
final EditText editText = new EditText(getContext());
|
||||||
editText.setHintTextColor(PreferencesUtil.getSTextColor(getContext()));
|
editText.setHintTextColor(getSTextAttr());
|
||||||
editText.setBackgroundTintList(ColorStateList.valueOf(getAccentColor()));
|
editText.setBackgroundTintList(ColorStateList.valueOf(getAccentColor()));
|
||||||
|
|
||||||
linearLayout.addView(editText);
|
linearLayout.addView(editText);
|
||||||
@@ -223,7 +224,7 @@ public class StickersFragment extends BaseToolbarFragment {
|
|||||||
LinearLayout linearLayout = new LinearLayout(getContext());
|
LinearLayout linearLayout = new LinearLayout(getContext());
|
||||||
|
|
||||||
final EditText editText = new EditText(getContext());
|
final EditText editText = new EditText(getContext());
|
||||||
editText.setHintTextColor(PreferencesUtil.getSTextColor(getContext()));
|
editText.setHintTextColor(getSTextAttr());
|
||||||
editText.setBackgroundTintList(ColorStateList.valueOf(getAccentColor()));
|
editText.setBackgroundTintList(ColorStateList.valueOf(getAccentColor()));
|
||||||
|
|
||||||
linearLayout.addView(editText);
|
linearLayout.addView(editText);
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import static ru.vtosters.lite.utils.AndroidUtils.getResources;
|
|||||||
import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
|
import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
|
||||||
import static ru.vtosters.lite.utils.ThemesUtils.getAccentColor;
|
import static ru.vtosters.lite.utils.ThemesUtils.getAccentColor;
|
||||||
import static ru.vtosters.lite.utils.ThemesUtils.getAlertStyle;
|
import static ru.vtosters.lite.utils.ThemesUtils.getAlertStyle;
|
||||||
|
import static ru.vtosters.lite.utils.ThemesUtils.getSTextAttr;
|
||||||
import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr;
|
import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
@@ -154,7 +155,7 @@ public class RenameTool {
|
|||||||
final EditText fn = new EditText(ctx);
|
final EditText fn = new EditText(ctx);
|
||||||
fn.setHint("Имя");
|
fn.setHint("Имя");
|
||||||
fn.setTextColor(getTextAttr());
|
fn.setTextColor(getTextAttr());
|
||||||
fn.setHintTextColor(getSTextColor(ctx));
|
fn.setHintTextColor(getSTextAttr());
|
||||||
fn.setBackgroundTintList(ColorStateList.valueOf(getAccentColor()));
|
fn.setBackgroundTintList(ColorStateList.valueOf(getAccentColor()));
|
||||||
linearLayout.addView(fn);
|
linearLayout.addView(fn);
|
||||||
fn.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
|
fn.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
|
||||||
@@ -165,7 +166,7 @@ public class RenameTool {
|
|||||||
final EditText ln = new EditText(ctx);
|
final EditText ln = new EditText(ctx);
|
||||||
ln.setHint("Фамилия");
|
ln.setHint("Фамилия");
|
||||||
ln.setTextColor(getTextAttr());
|
ln.setTextColor(getTextAttr());
|
||||||
ln.setHintTextColor(getSTextColor(ctx));
|
ln.setHintTextColor(getSTextAttr());
|
||||||
ln.setBackgroundTintList(ColorStateList.valueOf(getAccentColor()));
|
ln.setBackgroundTintList(ColorStateList.valueOf(getAccentColor()));
|
||||||
linearLayout.addView(ln);
|
linearLayout.addView(ln);
|
||||||
ln.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
|
ln.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
|
||||||
@@ -226,7 +227,7 @@ public class RenameTool {
|
|||||||
|
|
||||||
final EditText fn = new EditText(ctx);
|
final EditText fn = new EditText(ctx);
|
||||||
fn.setHint("Имя");
|
fn.setHint("Имя");
|
||||||
fn.setHintTextColor(getSTextColor(ctx));
|
fn.setHintTextColor(getSTextAttr());
|
||||||
fn.setTextColor(getTextAttr());
|
fn.setTextColor(getTextAttr());
|
||||||
fn.setBackgroundTintList(ColorStateList.valueOf(getAccentColor()));
|
fn.setBackgroundTintList(ColorStateList.valueOf(getAccentColor()));
|
||||||
linearLayout.addView(fn);
|
linearLayout.addView(fn);
|
||||||
|
|||||||
Reference in New Issue
Block a user