Merge branch 'develop'
This commit is contained in:
Thomas
commit
dc636d1e1d
|
|
@ -6,8 +6,8 @@ android {
|
|||
defaultConfig {
|
||||
minSdkVersion 19
|
||||
targetSdkVersion 29
|
||||
versionCode 370
|
||||
versionName "2.35.6"
|
||||
versionCode 371
|
||||
versionName "2.35.7"
|
||||
multiDexEnabled true
|
||||
renderscriptTargetApi 28 as int
|
||||
renderscriptSupportModeEnabled true
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
Added:
|
||||
- Automatically add hashtag to messages when composing from a search
|
||||
|
||||
Fixed:
|
||||
- Some issues with content and URLs
|
||||
- Some crashes
|
||||
|
|
@ -32,6 +32,8 @@ import androidx.recyclerview.widget.LinearLayoutManager;
|
|||
import androidx.recyclerview.widget.RecyclerView;
|
||||
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
|
||||
|
||||
import com.google.android.material.floatingactionbutton.FloatingActionButton;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -42,6 +44,7 @@ import app.fedilab.android.asynctasks.RetrieveFeedsAsyncTask;
|
|||
import app.fedilab.android.client.APIResponse;
|
||||
import app.fedilab.android.client.Entities.Status;
|
||||
import app.fedilab.android.client.Entities.StatusDrawerParams;
|
||||
import app.fedilab.android.client.Entities.StoredStatus;
|
||||
import app.fedilab.android.drawers.StatusListAdapter;
|
||||
import app.fedilab.android.helper.Helper;
|
||||
import app.fedilab.android.interfaces.OnRetrieveFeedsInterface;
|
||||
|
|
@ -112,6 +115,21 @@ public class HashTagActivity extends BaseActivity implements OnRetrieveFeedsInte
|
|||
swipeRefreshLayout.setColorSchemeColors(
|
||||
c1, c2, c1
|
||||
);
|
||||
|
||||
FloatingActionButton toot = findViewById(R.id.toot);
|
||||
toot.setOnClickListener(v -> {
|
||||
Intent intentToot = new Intent(HashTagActivity.this, TootActivity.class);
|
||||
Bundle val = new Bundle();
|
||||
StoredStatus storedStatus = new StoredStatus();
|
||||
Status tagStatus = new Status();
|
||||
tagStatus.setVisibility("public");
|
||||
tagStatus.setContent(HashTagActivity.this, String.format("#%s ", tag));
|
||||
storedStatus.setStatus(tagStatus);
|
||||
val.putParcelable("storedStatus", storedStatus);
|
||||
intentToot.putExtras(val);
|
||||
startActivity(intentToot);
|
||||
});
|
||||
|
||||
toolbar.setBackgroundColor(ContextCompat.getColor(HashTagActivity.this, R.color.cyanea_primary));
|
||||
final RecyclerView lv_status = findViewById(R.id.lv_status);
|
||||
tootsPerPage = sharedpreferences.getInt(Helper.SET_TOOT_PER_PAGE, Helper.TOOTS_PER_PAGE);
|
||||
|
|
|
|||
|
|
@ -109,12 +109,7 @@ public class SearchResultActivity extends BaseActivity implements OnRetrieveSear
|
|||
actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
|
||||
ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
|
||||
TextView toolbar_title = actionBar.getCustomView().findViewById(R.id.toolbar_title);
|
||||
toolbar_close.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
finish();
|
||||
}
|
||||
});
|
||||
toolbar_close.setOnClickListener(v -> finish());
|
||||
if (!forTrends) {
|
||||
toolbar_title.setText(search);
|
||||
} else {
|
||||
|
|
@ -134,13 +129,11 @@ public class SearchResultActivity extends BaseActivity implements OnRetrieveSear
|
|||
|
||||
@Override
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
switch (item.getItemId()) {
|
||||
case android.R.id.home:
|
||||
finish();
|
||||
return true;
|
||||
default:
|
||||
return super.onOptionsItemSelected(item);
|
||||
if (item.getItemId() == android.R.id.home) {
|
||||
finish();
|
||||
return true;
|
||||
}
|
||||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -92,10 +92,14 @@ public class SlideMediaActivity extends BaseFragmentActivity implements OnDownlo
|
|||
Intent shareIntent = new Intent(Intent.ACTION_SEND);
|
||||
shareIntent.putExtra(Intent.EXTRA_STREAM, uri);
|
||||
ContentResolver cR = context.getContentResolver();
|
||||
shareIntent.setType(cR.getType(uri));
|
||||
try {
|
||||
startActivity(shareIntent);
|
||||
} catch (Exception ignored) {
|
||||
if( cR != null && uri != null) {
|
||||
shareIntent.setType(cR.getType(uri));
|
||||
try {
|
||||
startActivity(shareIntent);
|
||||
} catch (Exception ignored) {
|
||||
}
|
||||
}else {
|
||||
Toasty.error(context, context.getString(R.string.toast_error), Toasty.LENGTH_LONG).show();
|
||||
}
|
||||
} else {
|
||||
Toasty.success(context, context.getString(R.string.save_over), Toasty.LENGTH_LONG).show();
|
||||
|
|
|
|||
|
|
@ -3243,6 +3243,12 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
|
|||
toot_cw_content.setText("");
|
||||
toot_cw_content.setVisibility(View.GONE);
|
||||
}
|
||||
if( status.getVisibility() == null) {
|
||||
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
|
||||
String defaultVisibility = account.isLocked() ? "private" : "public";
|
||||
String settingsVisibility = sharedpreferences.getString(Helper.SET_TOOT_VISIBILITY + "@" + account.getAcct() + "@" + account.getInstance(), defaultVisibility);
|
||||
status.setVisibility(settingsVisibility);
|
||||
}
|
||||
|
||||
toot_content.setText(content);
|
||||
toot_space_left.setText(String.valueOf(countLength(social, toot_content, toot_cw_content)));
|
||||
|
|
|
|||
|
|
@ -66,6 +66,7 @@ import java.util.ArrayList;
|
|||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
|
|
@ -420,7 +421,7 @@ public class Status implements Parcelable {
|
|||
Matcher matcher;
|
||||
Pattern linkPattern = Pattern.compile("<a((?!href).)*href=\"([^\"]*)\"[^>]*(((?!</a).)*)</a>");
|
||||
matcher = linkPattern.matcher(spannableString);
|
||||
HashMap<String, String> targetedURL = new HashMap<>();
|
||||
LinkedHashMap<String, String> targetedURL = new LinkedHashMap<>();
|
||||
HashMap<String, Account> accountsMentionUnknown = new HashMap<>();
|
||||
String liveInstance = Helper.getLiveInstance(context);
|
||||
int i = 1;
|
||||
|
|
@ -553,9 +554,9 @@ public class Status implements Parcelable {
|
|||
}
|
||||
|
||||
if (accountsMentionUnknown.size() > 0) {
|
||||
Iterator it = accountsMentionUnknown.entrySet().iterator();
|
||||
Iterator<Map.Entry<String, Account>> it = accountsMentionUnknown.entrySet().iterator();
|
||||
while (it.hasNext()) {
|
||||
Map.Entry pair = (Map.Entry) it.next();
|
||||
Map.Entry<String, Account> pair = (Map.Entry<String, Account>) it.next();
|
||||
String key = (String) pair.getKey();
|
||||
Account account = (Account) pair.getValue();
|
||||
String targetedAccount = "@" + account.getAcct();
|
||||
|
|
@ -603,182 +604,182 @@ public class Status implements Parcelable {
|
|||
}
|
||||
}
|
||||
if (targetedURL.size() > 0) {
|
||||
Iterator it = targetedURL.entrySet().iterator();
|
||||
Iterator<Map.Entry<String, String>> it = targetedURL.entrySet().iterator();
|
||||
int endPosition = 0;
|
||||
while (it.hasNext()) {
|
||||
Map.Entry pair = (Map.Entry) it.next();
|
||||
Map.Entry<String, String> pair = (Map.Entry<String, String>) it.next();
|
||||
String key = ((String) pair.getKey()).split("\\|")[0];
|
||||
|
||||
String url = (String) pair.getValue();
|
||||
if (spannableStringT.toString().toLowerCase().contains(key.toLowerCase())) {
|
||||
//Accounts can be mentioned several times so we have to loop
|
||||
int startPosition = spannableStringT.toString().toLowerCase().indexOf(key.toLowerCase(), endPosition);
|
||||
if (startPosition < 0) {
|
||||
startPosition = 0;
|
||||
}
|
||||
endPosition = startPosition + key.length();
|
||||
if (key.contains("…") && !key.endsWith("…")) {
|
||||
key = key.split("…")[0] + "…";
|
||||
SpannableStringBuilder ssb = new SpannableStringBuilder();
|
||||
ssb.append(spannableStringT, 0, spannableStringT.length());
|
||||
if (ssb.length() >= endPosition) {
|
||||
ssb.replace(startPosition, endPosition, key);
|
||||
}
|
||||
spannableStringT = SpannableString.valueOf(ssb);
|
||||
if (startPosition > 0) {
|
||||
endPosition = startPosition + key.length();
|
||||
}
|
||||
if (endPosition <= spannableStringT.toString().length() && endPosition >= startPosition) {
|
||||
spannableStringT.setSpan(new LongClickableSpan() {
|
||||
@Override
|
||||
public void onClick(@NonNull View textView) {
|
||||
String finalUrl = url;
|
||||
Pattern link = Pattern.compile("https?://([\\da-z.-]+\\.[a-z.]{2,10})/(@[\\w._-]*[0-9]*)(/[0-9]+)?$");
|
||||
Matcher matcherLink = link.matcher(url);
|
||||
if (matcherLink.find() && !url.contains("medium.com")) {
|
||||
if (matcherLink.group(3) != null && Objects.requireNonNull(matcherLink.group(3)).length() > 0) { //It's a toot
|
||||
CrossActions.doCrossConversation(context, finalUrl);
|
||||
} else {//It's an account
|
||||
Account account = new Account();
|
||||
String acct = matcherLink.group(2);
|
||||
if (acct != null) {
|
||||
if (acct.startsWith("@"))
|
||||
acct = acct.substring(1);
|
||||
account.setAcct(acct);
|
||||
account.setInstance(matcherLink.group(1));
|
||||
CrossActions.doCrossProfile(context, account);
|
||||
if (key.contains("…") && !key.endsWith("…")) {
|
||||
key = key.split("…")[0] + "…";
|
||||
SpannableStringBuilder ssb = new SpannableStringBuilder();
|
||||
ssb.append(spannableStringT, 0, spannableStringT.length());
|
||||
if (ssb.length() >= endPosition) {
|
||||
ssb.replace(startPosition, endPosition, key);
|
||||
}
|
||||
spannableStringT = SpannableString.valueOf(ssb);
|
||||
endPosition = startPosition + key.length();
|
||||
}
|
||||
if (endPosition <= spannableStringT.toString().length() && endPosition >= startPosition) {
|
||||
spannableStringT.setSpan(new LongClickableSpan() {
|
||||
@Override
|
||||
public void onClick(@NonNull View textView) {
|
||||
String finalUrl = url;
|
||||
Pattern link = Pattern.compile("https?://([\\da-z.-]+\\.[a-z.]{2,10})/(@[\\w._-]*[0-9]*)(/[0-9]+)?$");
|
||||
Matcher matcherLink = link.matcher(url);
|
||||
if (matcherLink.find() && !url.contains("medium.com")) {
|
||||
if (matcherLink.group(3) != null && Objects.requireNonNull(matcherLink.group(3)).length() > 0) { //It's a toot
|
||||
CrossActions.doCrossConversation(context, finalUrl);
|
||||
} else {//It's an account
|
||||
Account account = new Account();
|
||||
String acct = matcherLink.group(2);
|
||||
if (acct != null) {
|
||||
if (acct.startsWith("@"))
|
||||
acct = acct.substring(1);
|
||||
account.setAcct(acct);
|
||||
account.setInstance(matcherLink.group(1));
|
||||
CrossActions.doCrossProfile(context, account);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
link = Pattern.compile("(https?://[\\da-z.-]+\\.[a-z.]{2,10})/videos/watch/(\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12})$");
|
||||
matcherLink = link.matcher(url);
|
||||
if (matcherLink.find()) { //Peertubee video
|
||||
Intent intent = new Intent(context, PeertubeActivity.class);
|
||||
Bundle b = new Bundle();
|
||||
String url = matcherLink.group(1) + "/videos/watch/" + matcherLink.group(2);
|
||||
b.putString("peertubeLinkToFetch", url);
|
||||
b.putString("peertube_instance", Objects.requireNonNull(matcherLink.group(1)).replace("https://", "").replace("http://", ""));
|
||||
b.putString("video_id", matcherLink.group(2));
|
||||
intent.putExtras(b);
|
||||
context.startActivity(intent);
|
||||
} else {
|
||||
if (!url.toLowerCase().startsWith("http://") && !url.toLowerCase().startsWith("https://"))
|
||||
finalUrl = "http://" + url;
|
||||
Helper.openBrowser(context, finalUrl);
|
||||
link = Pattern.compile("(https?://[\\da-z.-]+\\.[a-z.]{2,10})/videos/watch/(\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12})$");
|
||||
matcherLink = link.matcher(url);
|
||||
if (matcherLink.find()) { //Peertubee video
|
||||
Intent intent = new Intent(context, PeertubeActivity.class);
|
||||
Bundle b = new Bundle();
|
||||
String url = matcherLink.group(1) + "/videos/watch/" + matcherLink.group(2);
|
||||
b.putString("peertubeLinkToFetch", url);
|
||||
b.putString("peertube_instance", Objects.requireNonNull(matcherLink.group(1)).replace("https://", "").replace("http://", ""));
|
||||
b.putString("video_id", matcherLink.group(2));
|
||||
intent.putExtras(b);
|
||||
context.startActivity(intent);
|
||||
} else {
|
||||
if (!url.toLowerCase().startsWith("http://") && !url.toLowerCase().startsWith("https://"))
|
||||
finalUrl = "http://" + url;
|
||||
Helper.openBrowser(context, finalUrl);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onLongClick(@NonNull View textView) {
|
||||
PopupMenu popup = new PopupMenu(context, textView);
|
||||
popup.getMenuInflater()
|
||||
.inflate(R.menu.links_popup, popup.getMenu());
|
||||
int style;
|
||||
if (theme == Helper.THEME_DARK) {
|
||||
style = R.style.DialogDark;
|
||||
} else if (theme == Helper.THEME_BLACK) {
|
||||
style = R.style.DialogBlack;
|
||||
} else {
|
||||
style = R.style.Dialog;
|
||||
}
|
||||
popup.setOnMenuItemClickListener(item -> {
|
||||
switch (item.getItemId()) {
|
||||
case R.id.action_show_link:
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(context, style);
|
||||
builder.setMessage(url);
|
||||
builder.setTitle(context.getString(R.string.display_full_link));
|
||||
builder.setPositiveButton(R.string.close, (dialog, which) -> dialog.dismiss())
|
||||
.show();
|
||||
break;
|
||||
case R.id.action_share_link:
|
||||
Intent sendIntent = new Intent(Intent.ACTION_SEND);
|
||||
sendIntent.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.shared_via));
|
||||
sendIntent.putExtra(Intent.EXTRA_TEXT, url);
|
||||
sendIntent.setType("text/plain");
|
||||
context.startActivity(Intent.createChooser(sendIntent, context.getString(R.string.share_with)));
|
||||
break;
|
||||
|
||||
case R.id.action_open_other_app:
|
||||
Intent intent = new Intent(Intent.ACTION_VIEW);
|
||||
intent.setData(Uri.parse(url));
|
||||
try {
|
||||
context.startActivity(intent);
|
||||
} catch (Exception e) {
|
||||
Toasty.error(context, context.getString(R.string.toast_error), Toast.LENGTH_LONG).show();
|
||||
}
|
||||
break;
|
||||
case R.id.action_copy_link:
|
||||
ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
|
||||
ClipData clip = ClipData.newPlainText(Helper.CLIP_BOARD, url);
|
||||
if (clipboard != null) {
|
||||
clipboard.setPrimaryClip(clip);
|
||||
Toasty.info(context, context.getString(R.string.clipboard_url), Toast.LENGTH_LONG).show();
|
||||
}
|
||||
break;
|
||||
case R.id.action_unshorten:
|
||||
Thread thread = new Thread() {
|
||||
@Override
|
||||
public void run() {
|
||||
String response = new HttpsConnection(context, null).checkUrl(url);
|
||||
|
||||
Handler mainHandler = new Handler(context.getMainLooper());
|
||||
|
||||
Runnable myRunnable = () -> {
|
||||
AlertDialog.Builder builder1 = new AlertDialog.Builder(context, style);
|
||||
if (response != null) {
|
||||
builder1.setMessage(context.getString(R.string.redirect_detected, url, response));
|
||||
builder1.setNegativeButton(R.string.copy_link, (dialog, which) -> {
|
||||
ClipboardManager clipboard1 = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
|
||||
ClipData clip1 = ClipData.newPlainText(Helper.CLIP_BOARD, response);
|
||||
if (clipboard1 != null) {
|
||||
clipboard1.setPrimaryClip(clip1);
|
||||
Toasty.info(context, context.getString(R.string.clipboard_url), Toast.LENGTH_LONG).show();
|
||||
}
|
||||
dialog.dismiss();
|
||||
});
|
||||
builder1.setNeutralButton(R.string.share_link, (dialog, which) -> {
|
||||
Intent sendIntent1 = new Intent(Intent.ACTION_SEND);
|
||||
sendIntent1.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.shared_via));
|
||||
sendIntent1.putExtra(Intent.EXTRA_TEXT, url);
|
||||
sendIntent1.setType("text/plain");
|
||||
context.startActivity(Intent.createChooser(sendIntent1, context.getString(R.string.share_with)));
|
||||
dialog.dismiss();
|
||||
});
|
||||
} else {
|
||||
builder1.setMessage(R.string.no_redirect);
|
||||
}
|
||||
builder1.setTitle(context.getString(R.string.check_redirect));
|
||||
builder1.setPositiveButton(R.string.close, (dialog, which) -> dialog.dismiss())
|
||||
.show();
|
||||
|
||||
};
|
||||
mainHandler.post(myRunnable);
|
||||
@Override
|
||||
public void onLongClick(@NonNull View textView) {
|
||||
PopupMenu popup = new PopupMenu(context, textView);
|
||||
popup.getMenuInflater()
|
||||
.inflate(R.menu.links_popup, popup.getMenu());
|
||||
int style;
|
||||
if (theme == Helper.THEME_DARK) {
|
||||
style = R.style.DialogDark;
|
||||
} else if (theme == Helper.THEME_BLACK) {
|
||||
style = R.style.DialogBlack;
|
||||
} else {
|
||||
style = R.style.Dialog;
|
||||
}
|
||||
popup.setOnMenuItemClickListener(item -> {
|
||||
switch (item.getItemId()) {
|
||||
case R.id.action_show_link:
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(context, style);
|
||||
builder.setMessage(url);
|
||||
builder.setTitle(context.getString(R.string.display_full_link));
|
||||
builder.setPositiveButton(R.string.close, (dialog, which) -> dialog.dismiss())
|
||||
.show();
|
||||
break;
|
||||
case R.id.action_share_link:
|
||||
Intent sendIntent = new Intent(Intent.ACTION_SEND);
|
||||
sendIntent.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.shared_via));
|
||||
sendIntent.putExtra(Intent.EXTRA_TEXT, url);
|
||||
sendIntent.setType("text/plain");
|
||||
context.startActivity(Intent.createChooser(sendIntent, context.getString(R.string.share_with)));
|
||||
break;
|
||||
|
||||
case R.id.action_open_other_app:
|
||||
Intent intent = new Intent(Intent.ACTION_VIEW);
|
||||
intent.setData(Uri.parse(url));
|
||||
try {
|
||||
context.startActivity(intent);
|
||||
} catch (Exception e) {
|
||||
Toasty.error(context, context.getString(R.string.toast_error), Toast.LENGTH_LONG).show();
|
||||
}
|
||||
};
|
||||
thread.start();
|
||||
break;
|
||||
}
|
||||
return true;
|
||||
});
|
||||
popup.setOnDismissListener(menu -> BaseActivity.canShowActionMode = true);
|
||||
popup.show();
|
||||
textView.clearFocus();
|
||||
BaseActivity.canShowActionMode = false;
|
||||
}
|
||||
break;
|
||||
case R.id.action_copy_link:
|
||||
ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
|
||||
ClipData clip = ClipData.newPlainText(Helper.CLIP_BOARD, url);
|
||||
if (clipboard != null) {
|
||||
clipboard.setPrimaryClip(clip);
|
||||
Toasty.info(context, context.getString(R.string.clipboard_url), Toast.LENGTH_LONG).show();
|
||||
}
|
||||
break;
|
||||
case R.id.action_unshorten:
|
||||
Thread thread = new Thread() {
|
||||
@Override
|
||||
public void run() {
|
||||
String response = new HttpsConnection(context, null).checkUrl(url);
|
||||
|
||||
Handler mainHandler = new Handler(context.getMainLooper());
|
||||
|
||||
Runnable myRunnable = () -> {
|
||||
AlertDialog.Builder builder1 = new AlertDialog.Builder(context, style);
|
||||
if (response != null) {
|
||||
builder1.setMessage(context.getString(R.string.redirect_detected, url, response));
|
||||
builder1.setNegativeButton(R.string.copy_link, (dialog, which) -> {
|
||||
ClipboardManager clipboard1 = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
|
||||
ClipData clip1 = ClipData.newPlainText(Helper.CLIP_BOARD, response);
|
||||
if (clipboard1 != null) {
|
||||
clipboard1.setPrimaryClip(clip1);
|
||||
Toasty.info(context, context.getString(R.string.clipboard_url), Toast.LENGTH_LONG).show();
|
||||
}
|
||||
dialog.dismiss();
|
||||
});
|
||||
builder1.setNeutralButton(R.string.share_link, (dialog, which) -> {
|
||||
Intent sendIntent1 = new Intent(Intent.ACTION_SEND);
|
||||
sendIntent1.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.shared_via));
|
||||
sendIntent1.putExtra(Intent.EXTRA_TEXT, url);
|
||||
sendIntent1.setType("text/plain");
|
||||
context.startActivity(Intent.createChooser(sendIntent1, context.getString(R.string.share_with)));
|
||||
dialog.dismiss();
|
||||
});
|
||||
} else {
|
||||
builder1.setMessage(R.string.no_redirect);
|
||||
}
|
||||
builder1.setTitle(context.getString(R.string.check_redirect));
|
||||
builder1.setPositiveButton(R.string.close, (dialog, which) -> dialog.dismiss())
|
||||
.show();
|
||||
|
||||
};
|
||||
mainHandler.post(myRunnable);
|
||||
|
||||
}
|
||||
};
|
||||
thread.start();
|
||||
break;
|
||||
}
|
||||
return true;
|
||||
});
|
||||
popup.setOnDismissListener(menu -> BaseActivity.canShowActionMode = true);
|
||||
popup.show();
|
||||
textView.clearFocus();
|
||||
BaseActivity.canShowActionMode = false;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void updateDrawState(@NonNull TextPaint ds) {
|
||||
super.updateDrawState(ds);
|
||||
ds.setUnderlineText(false);
|
||||
ds.setColor(link_color);
|
||||
}
|
||||
},
|
||||
startPosition, endPosition,
|
||||
Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
|
||||
@Override
|
||||
public void updateDrawState(@NonNull TextPaint ds) {
|
||||
super.updateDrawState(ds);
|
||||
ds.setUnderlineText(false);
|
||||
ds.setColor(link_color);
|
||||
}
|
||||
},
|
||||
startPosition, endPosition,
|
||||
Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
it.remove();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2654,7 +2654,8 @@ public class Helper {
|
|||
public static List<String> restoreArrayFromString(String serializedArray) {
|
||||
Gson gson = new Gson();
|
||||
try {
|
||||
return gson.fromJson(serializedArray, List.class);
|
||||
Type listType = new TypeToken<ArrayList<String>>() {}.getType();
|
||||
return gson.fromJson(serializedArray, listType);
|
||||
} catch (Exception e) {
|
||||
return null;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,23 +0,0 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:tint="#FFFFFF"
|
||||
android:viewportWidth="582.036"
|
||||
android:viewportHeight="582.036">
|
||||
<group
|
||||
android:translateX="45.838"
|
||||
android:translateY="55.053">
|
||||
<path
|
||||
android:fillAlpha="1"
|
||||
android:fillColor="#000000"
|
||||
android:pathData="m301.21,358.7c5.135,-5.131 8.617,-9.566 11.19,-12.447 2.485,-2.96 3.805,-4.548 3.805,-4.548s-1.8,1.002 -5.179,2.885c-3.33,1.916 -8.262,4.808 -14.492,8.185 -6.154,3.489 -13.764,7.519 -22.438,12.047 -8.748,4.391 -18.56,9.312 -29.465,14.031 -10.808,4.906 -22.743,9.506 -35.369,13.89 -3.931,1.37 -7.971,2.656 -12.055,3.905 -0.81,-0.504 -1.638,-1.019 -2.617,-1.628 -2.376,-1.505 -5.65,-3.395 -8.311,-5.397 -1.457,-1.019 -3,-2.107 -4.621,-3.248 -1.631,-1.166 -3.406,-2.271 -5.125,-3.776 -1.752,-1.436 -3.591,-2.935 -5.486,-4.484 -0.953,-0.777 -1.917,-1.565 -2.907,-2.37 -0.914,-0.864 -1.84,-1.746 -2.776,-2.639 -1.894,-1.791 -3.849,-3.637 -5.841,-5.514 -1.889,-1.978 -3.718,-4.078 -5.656,-6.182 -0.964,-1.062 -1.933,-2.13 -2.912,-3.209 -0.888,-1.142 -1.78,-2.294 -2.683,-3.453 -1.752,-2.36 -3.767,-4.626 -5.41,-7.15 -1.681,-2.53 -3.373,-5.081 -5.075,-7.638 -1.616,-2.622 -3.072,-5.359 -4.626,-8.064 -1.631,-2.678 -2.88,-5.547 -4.249,-8.355 -1.379,-2.817 -2.742,-5.639 -3.843,-8.558 -1.145,-2.896 -2.414,-5.744 -3.438,-8.644 -0.998,-2.919 -1.994,-5.81 -2.962,-8.652 -0.992,-2.84 -1.704,-5.727 -2.546,-8.513 -0.821,-2.797 -1.621,-5.544 -2.239,-8.261 -0.663,-2.716 -1.315,-5.359 -1.934,-7.91 -0.603,-2.569 -1.083,-5.065 -1.593,-7.464 -1.046,-4.785 -1.857,-9.22 -2.541,-13.15 -0.728,-3.931 -1.318,-7.375 -1.746,-10.21 -0.898,-5.685 -1.414,-8.932 -1.414,-8.932s-0.077,3.291 -0.207,9.045c-0.087,2.88 -0.122,6.384 -0.11,10.398 -0.021,4.021 -0.021,8.563 0.153,13.528 0.077,2.485 0.099,5.075 0.231,7.758 0.164,2.684 0.334,5.459 0.504,8.31 0.131,2.869 0.427,5.792 0.749,8.799 0.345,3 0.542,6.094 1.024,9.209 0.476,3.133 0.953,6.312 1.445,9.532 0.515,3.225 1.303,6.455 1.955,9.745 0.607,3.301 1.505,6.574 2.436,9.87 0.931,3.291 1.729,6.653 2.956,9.889 1.155,3.252 2.223,6.569 3.483,9.795 1.374,3.198 2.748,6.384 4.106,9.541 1.341,3.189 3.087,6.133 4.615,9.179 0.794,1.509 1.571,3.004 2.359,4.498 0.876,1.424 1.752,2.842 2.618,4.249 1.762,2.797 3.448,5.611 5.212,8.278 1.889,2.579 3.733,5.104 5.529,7.557 0.903,1.231 1.801,2.451 2.683,3.645 0.947,1.129 1.883,2.24 2.809,3.329 1.867,2.187 3.663,4.298 5.393,6.324 0.164,0.207 0.35,0.385 0.52,0.585 -2.382,0.367 -4.763,0.756 -7.161,1.057 -3.576,0.497 -7.178,0.658 -10.781,1.019 -3.592,0.23 -7.194,0.372 -10.796,0.536 -14.355,0.095 -28.689,-1.274 -41.631,-5.25 -6.45,-1.981 -12.526,-4.555 -18.089,-7.702 -5.374,-3.384 -10.419,-7.03 -14.67,-11.432 -1.046,-1.113 -1.968,-2.321 -2.976,-3.461 -0.482,-0.585 -1.032,-1.128 -1.47,-1.746l-1.276,-1.896c-0.834,-1.274 -1.873,-2.408 -2.582,-3.772l-2.266,-4.006c-0.816,-1.297 -1.268,-2.814 -1.943,-4.211 -0.6,-1.435 -1.339,-2.792 -1.736,-4.329 -0.477,-1.495 -0.961,-2.985 -1.495,-4.463l-0.194,-0.559 -0.098,-0.278c-0.102,-0.44 0.082,0.441 0.049,0.288l-0.044,-0.175 -0.354,-1.395 -0.698,-2.775 -0.698,-2.761 -0.345,-1.38 -0.233,-1.176c-0.32,-1.572 -0.637,-3.133 -0.952,-4.688 -0.364,-1.505 -0.529,-3.248 -0.791,-4.868 -0.238,-1.646 -0.599,-3.284 -0.744,-4.921 -0.838,-6.543 -1.113,-13.015 -1.151,-19.348 0.069,-6.332 0.409,-12.538 1.23,-18.522 0.273,-3.022 0.884,-5.935 1.325,-8.847 0.602,-2.876 1.139,-5.723 1.829,-8.488 2.583,-11.113 6.238,-21.149 9.975,-29.942 3.783,-8.774 7.744,-16.266 11.248,-22.359 3.565,-6.039 6.545,-10.808 8.773,-13.906 2.193,-3.137 3.458,-4.779 3.458,-4.779s-1.817,0.996 -4.996,3.247c-3.147,2.277 -7.774,5.694 -13.144,10.681 -5.39,4.961 -11.577,11.459 -17.9,19.678 -6.262,8.25 -12.68,18.242 -18.076,30.133 -5.464,11.849 -9.765,25.64 -12.067,40.762 -1.133,7.561 -1.623,15.439 -1.647,23.511 0.032,4.062 0.165,8.036 0.553,12.29 0.229,2.14 0.454,4.292 0.684,6.455l0.183,1.62 0.211,1.4 0.429,2.821 0.427,2.825 0.217,1.417 0.027,0.182 0.132,0.635 0.096,0.41 0.188,0.832c0.499,2.208 1.047,4.424 1.61,6.646 0.476,2.234 1.353,4.419 2.108,6.626 0.835,2.188 1.459,4.46 2.516,6.603 3.693,8.782 9.047,17.092 15.451,24.594 6.565,7.392 14.229,13.784 22.572,18.953 8.413,4.979 17.298,8.864 26.346,11.706 18.182,5.32 36.611,6.728 54.125,5.684 4.358,-0.378 8.71,-0.689 12.981,-1.222 4.238,-0.7 8.497,-1.231 12.625,-2.081 4.116,-0.908 8.268,-1.61 12.252,-2.682 3.991,-1.068 7.983,-2.06 11.827,-3.309 15.509,-4.69 29.826,-10.742 42.791,-17.387 12.965,-6.674 24.725,-13.709 34.996,-20.98 10.354,-7.14 19.262,-14.394 26.925,-21.002 7.571,-6.747 13.948,-12.809 18.936,-18.123z" />
|
||||
<path
|
||||
android:fillAlpha="1"
|
||||
android:fillColor="#000000"
|
||||
android:pathData="m487.32,334.08c-4.479,-18.396 -12.471,-35.066 -22.142,-49.711 -2.506,-3.587 -4.948,-7.196 -7.555,-10.627 -2.716,-3.325 -5.305,-6.745 -8.113,-9.899 -2.837,-3.11 -5.519,-6.346 -8.442,-9.269 -2.919,-2.924 -5.771,-5.888 -8.781,-8.586 -11.815,-11.086 -24.209,-20.46 -36.453,-28.371 -12.252,-7.883 -24.232,-14.558 -35.663,-19.814 -11.354,-5.393 -22.097,-9.477 -31.655,-12.812 -9.62,-3.192 -18.058,-5.677 -25.153,-7.341 -7.008,-1.878 -12.591,-2.678 -16.375,-3.471 -3.805,-0.668 -5.842,-1.024 -5.842,-1.024s1.774,1.062 5.092,3.049c3.318,1.921 8.289,4.753 14.332,8.464 6.095,3.587 13.388,8.152 21.643,13.403 8.187,5.381 17.347,11.421 26.889,18.499 9.646,6.91 19.605,14.953 29.712,23.691 3.152,2.723 6.29,5.58 9.412,8.499 -0.032,0.931 -0.066,1.932 -0.099,3.065 -0.12,2.808 -0.115,6.596 -0.525,9.902 -0.153,1.758 -0.318,3.637 -0.499,5.623 -0.19,1.987 -0.267,4.08 -0.705,6.319 -0.374,2.245 -0.752,4.583 -1.141,6.996 -0.196,1.217 -0.393,2.453 -0.602,3.702 -0.295,1.226 -0.591,2.463 -0.897,3.728 -0.602,2.535 -1.228,5.146 -1.861,7.813 -0.756,2.623 -1.666,5.262 -2.52,7.988 -0.438,1.369 -0.88,2.738 -1.324,4.128 -0.547,1.342 -1.096,2.688 -1.652,4.053 -1.162,2.691 -2.113,5.566 -3.489,8.26 -1.34,2.722 -2.702,5.458 -4.067,8.212 -1.467,2.711 -3.108,5.339 -4.676,8.044 -1.5,2.744 -3.361,5.261 -5.107,7.855 -1.754,2.601 -3.511,5.197 -5.492,7.605 -1.937,2.437 -3.767,4.961 -5.77,7.292 -2.026,2.334 -4.031,4.634 -6.006,6.899 -1.971,2.271 -4.113,4.342 -6.104,6.461 -2.005,2.117 -3.991,4.176 -6.034,6.07 -2.02,1.932 -3.98,3.812 -5.88,5.628 -1.927,1.803 -3.854,3.466 -5.671,5.11 -3.621,3.305 -7.053,6.213 -10.119,8.769 -3.038,2.602 -5.727,4.829 -7.972,6.619 -4.467,3.62 -7.024,5.69 -7.024,5.69s2.885,-1.577 7.935,-4.343c2.539,-1.362 5.584,-3.083 9.066,-5.104 3.492,-1.985 7.424,-4.258 11.639,-6.893 2.107,-1.313 4.341,-2.628 6.592,-4.078 2.246,-1.49 4.566,-3.023 6.954,-4.593 2.419,-1.544 4.806,-3.269 7.249,-5.054 2.423,-1.791 5.003,-3.511 7.456,-5.485 2.476,-1.978 4.992,-3.986 7.533,-6.018 2.541,-2.064 4.939,-4.354 7.463,-6.569 2.558,-2.181 4.945,-4.596 7.329,-7.042 2.388,-2.447 4.897,-4.823 7.085,-7.499 2.247,-2.629 4.578,-5.214 6.745,-7.918 2.081,-2.792 4.162,-5.568 6.209,-8.322 2.093,-2.766 3.768,-5.748 5.64,-8.59 0.909,-1.439 1.817,-2.868 2.716,-4.292 0.798,-1.474 1.587,-2.939 2.377,-4.393 1.543,-2.927 3.13,-5.79 4.555,-8.654 1.29,-2.925 2.555,-5.788 3.789,-8.568 0.613,-1.403 1.215,-2.781 1.817,-4.144 0.493,-1.387 0.984,-2.755 1.472,-4.096 0.958,-2.705 1.889,-5.323 2.774,-7.834 0.102,-0.248 0.16,-0.5 0.248,-0.741 1.512,1.879 3.039,3.74 4.501,5.674 2.218,2.852 4.156,5.88 6.269,8.82 1.993,3.004 3.919,6.043 5.864,9.093 7.253,12.372 13.242,25.474 16.271,38.674 1.505,6.583 2.316,13.126 2.37,19.52 -0.239,6.34 -0.876,12.532 -2.563,18.417 -0.438,1.462 -1.029,2.862 -1.51,4.309 -0.27,0.713 -0.462,1.456 -0.777,2.146l-1.004,2.054c-0.683,1.352 -1.154,2.826 -1.975,4.123l-2.331,3.964c-0.724,1.352 -1.81,2.509 -2.678,3.783 -0.938,1.236 -1.753,2.557 -2.88,3.675 -1.062,1.152 -2.108,2.325 -3.127,3.525l-0.384,0.442 -0.19,0.23c-0.329,0.307 0.344,-0.295 0.225,-0.192l-0.133,0.133 -1.029,0.997 -2.052,1.995 -2.047,1.987 -1.02,0.984 -0.906,0.801c-1.194,1.058 -2.388,2.112 -3.581,3.158 -1.119,1.073 -2.541,2.079 -3.817,3.121 -1.308,1.034 -2.546,2.157 -3.893,3.105 -5.251,3.994 -10.708,7.467 -16.183,10.669 -5.514,3.105 -11.061,5.913 -16.656,8.202 -2.747,1.263 -5.578,2.2 -8.322,3.273 -2.786,0.908 -5.524,1.878 -8.267,2.655 -10.912,3.318 -21.435,5.173 -30.91,6.336 -9.495,1.109 -17.963,1.428 -24.988,1.433 -7.019,-0.061 -12.636,-0.263 -16.438,-0.635 -3.809,-0.339 -5.867,-0.608 -5.867,-0.608s1.775,1.078 5.311,2.705c3.547,1.583 8.813,3.882 15.821,6.038 6.997,2.191 15.713,4.299 25.997,5.668 10.274,1.291 22.14,1.855 35.137,0.579 12.986,-1.187 27.079,-4.357 41.325,-9.919 7.117,-2.803 14.19,-6.318 21.188,-10.332 3.499,-2.063 6.877,-4.162 10.371,-6.624 1.74,-1.271 3.49,-2.547 5.244,-3.822l1.313,-0.97 1.106,-0.881 2.222,-1.785 2.24,-1.785 1.123,-0.893 0.141,-0.113 0.483,-0.433 0.307,-0.291 0.624,-0.574c1.665,-1.54 3.308,-3.122 4.954,-4.719 1.703,-1.529 3.149,-3.378 4.683,-5.136 1.478,-1.823 3.132,-3.499 4.456,-5.48 5.761,-7.596 10.281,-16.382 13.577,-25.683 3.122,-9.373 4.83,-19.212 5.125,-29.018 0.109,-9.777 -0.964,-19.417 -3.033,-28.676z" />
|
||||
<path
|
||||
android:fillAlpha="1"
|
||||
android:fillColor="#000000"
|
||||
android:pathData="m139.26,240.86c2.053,9.92 4.111,18.478 6.225,25.451 1.877,7.008 3.98,12.247 5.184,15.916 1.331,3.629 2.032,5.568 2.032,5.568s0.032,-2.064 0.098,-5.93c0,-3.84 -0.033,-9.559 0.154,-16.644 0.065,-7.074 0.372,-15.671 0.788,-25.448 0.57,-9.778 1.215,-20.733 2.584,-32.532 1.156,-11.815 3.143,-24.451 5.662,-37.58 0.778,-4.096 1.675,-8.234 2.645,-12.401 0.833,-0.443 1.692,-0.903 2.699,-1.445 2.497,-1.308 5.775,-3.196 8.836,-4.505 1.61,-0.746 3.318,-1.533 5.125,-2.37 1.824,-0.828 3.668,-1.813 5.837,-2.546 2.124,-0.805 4.336,-1.644 6.624,-2.513 1.15,-0.433 2.315,-0.881 3.504,-1.331 1.209,-0.362 2.431,-0.723 3.68,-1.09 2.496,-0.744 5.069,-1.516 7.697,-2.293 2.65,-0.651 5.388,-1.183 8.179,-1.813 1.396,-0.301 2.81,-0.607 4.227,-0.914 1.44,-0.198 2.886,-0.395 4.336,-0.597 2.923,-0.345 5.891,-0.954 8.902,-1.106 3.034,-0.198 6.083,-0.389 9.149,-0.586 3.082,-0.082 6.182,0.028 9.301,0.028 3.133,-0.072 6.242,0.284 9.364,0.498 3.118,0.213 6.251,0.444 9.328,0.954 3.077,0.46 6.177,0.777 9.202,1.346 3.028,0.597 6.028,1.177 8.975,1.757 2.957,0.565 5.813,1.392 8.65,2.055 2.838,0.684 5.612,1.369 8.277,2.189 2.678,0.789 5.289,1.544 7.809,2.277 2.528,0.767 4.927,1.605 7.26,2.355 4.67,1.489 8.913,3.006 12.657,4.379 3.773,1.336 7.047,2.545 9.718,3.592 5.372,2.069 8.438,3.241 8.438,3.241s-2.811,-1.708 -7.731,-4.698c-2.446,-1.516 -5.458,-3.295 -8.946,-5.294 -3.47,-2.031 -7.4,-4.303 -11.787,-6.634 -2.196,-1.178 -4.451,-2.454 -6.839,-3.68 -2.408,-1.2 -4.894,-2.442 -7.446,-3.724 -2.551,-1.319 -5.232,-2.519 -7.993,-3.75 -2.77,-1.2 -5.553,-2.573 -8.496,-3.713 -2.946,-1.16 -5.936,-2.326 -8.968,-3.514 -3.056,-1.166 -6.241,-2.102 -9.416,-3.186 -3.178,-1.118 -6.451,-1.978 -9.769,-2.821 -3.318,-0.848 -6.63,-1.828 -10.042,-2.387 -3.399,-0.624 -6.806,-1.357 -10.226,-1.883 -3.462,-0.41 -6.899,-0.815 -10.315,-1.215 -3.434,-0.432 -6.861,-0.389 -10.254,-0.591 -1.703,-0.066 -3.395,-0.131 -5.075,-0.203 -1.675,0.049 -3.34,0.094 -4.994,0.143 -3.307,0.126 -6.581,0.175 -9.778,0.378 -3.176,0.343 -6.285,0.672 -9.308,1.001 -1.522,0.169 -3.022,0.34 -4.5,0.504 -1.445,0.257 -2.88,0.52 -4.282,0.767 -2.825,0.52 -5.551,1.029 -8.173,1.511 -0.258,0.038 -0.509,0.115 -0.762,0.159 0.865,-2.25 1.719,-4.506 2.661,-6.735 1.358,-3.339 3.012,-6.542 4.5,-9.843 1.61,-3.225 3.273,-6.412 4.943,-9.615 7.091,-12.477 15.446,-24.205 25.367,-33.429 4.938,-4.6 10.204,-8.575 15.713,-11.81 5.612,-2.968 11.289,-5.513 17.236,-6.997 1.478,-0.345 2.989,-0.537 4.487,-0.849 0.745,-0.121 1.484,-0.329 2.247,-0.394l2.275,-0.159c1.517,-0.087 3.024,-0.416 4.557,-0.35 1.538,0.011 3.07,0.027 4.598,0.044 1.54,-0.06 3.077,0.306 4.622,0.422 1.538,0.191 3.088,0.234 4.622,0.656 1.532,0.339 3.065,0.663 4.609,0.941l0.578,0.11 0.298,0.049c0.427,0.137 -0.428,-0.148 -0.273,-0.093l0.168,0.044 1.386,0.394 2.748,0.782 2.737,0.778 1.369,0.389 1.138,0.383c1.522,0.509 3.023,1.017 4.535,1.521 1.488,0.438 3.077,1.167 4.607,1.747 1.547,0.619 3.144,1.123 4.633,1.818 6.089,2.546 11.825,5.546 17.335,8.677 5.446,3.226 10.654,6.625 15.428,10.327 2.474,1.752 4.698,3.733 6.996,5.573 2.189,1.959 4.392,3.844 6.439,5.831 8.327,7.79 15.198,15.97 20.936,23.608 5.716,7.659 10.229,14.837 13.742,20.919 3.456,6.105 6.088,11.065 7.665,14.546 1.608,3.472 2.408,5.383 2.408,5.383s0.043,-2.07 -0.316,-5.952c-0.4,-3.854 -1.041,-9.576 -2.679,-16.72 -1.603,-7.145 -4.133,-15.751 -8.097,-25.338 -4.008,-9.549 -9.45,-20.104 -17.053,-30.726 -7.529,-10.653 -17.319,-21.275 -29.265,-30.828 -5.978,-4.763 -12.559,-9.121 -19.535,-13.184 -3.538,-1.999 -7.04,-3.876 -10.928,-5.667 -1.959,-0.87 -3.94,-1.752 -5.929,-2.634l-1.495,-0.651 -1.314,-0.515 -2.661,-1.04 -2.66,-1.041 -1.337,-0.525 -0.162,-0.065 -0.626,-0.203 -0.399,-0.12 -0.815,-0.252c-2.163,-0.674 -4.358,-1.309 -6.56,-1.938 -2.178,-0.702 -4.5,-1.036 -6.793,-1.479 -2.315,-0.373 -4.593,-0.969 -6.975,-1.122 -9.456,-1.194 -19.321,-0.712 -29.034,1.083 -9.675,1.987 -19.048,5.431 -27.688,10.074 -8.524,4.796 -16.331,10.545 -23.317,16.956 -13.698,13.086 -24.128,28.344 -31.979,44.04 -1.855,3.954 -3.761,7.879 -5.437,11.854 -1.51,4.014 -3.187,7.972 -4.511,11.969 -1.27,4.018 -2.737,7.96 -3.8,11.95 -1.073,3.992 -2.212,7.945 -3.049,11.903 -3.696,15.773 -5.611,31.191 -6.346,45.749 -0.695,14.558 -0.487,28.267 0.679,40.792 1.008,12.536 2.837,23.881 4.725,33.83z" />
|
||||
</group>
|
||||
</vector>
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:tint="#FFFFFF"
|
||||
android:viewportWidth="230.31361"
|
||||
android:viewportHeight="230.31361">
|
||||
<group
|
||||
android:translateX="29.299377"
|
||||
android:translateY="18.138252">
|
||||
<path
|
||||
android:fillAlpha="1"
|
||||
android:fillColor="#000000"
|
||||
android:pathData="m111.449,66.509c-3.922,-0.021 -8.297,2.377 -10.169,5.724 0,0 -3.554,6.361 -10.894,9.348 -6.002,2.438 -10.463,1.673 -10.463,1.673 -4.17,-0.72 -9.327,1.684 -11.462,5.338l-7.162,12.265c-2.163,3.738 -3.625,8.641 2.234,8.641h4.988c4.822,0 10.839,-3.358 13.368,-7.467 0,0 4.556,-7.396 13.546,-7.582 10.461,-0.216 19.115,8.09 19.331,18.546 0.212,10.461 -8.092,19.115 -18.553,19.328 -9.258,0.19 -14.229,-7.647 -14.229,-7.647 -2.581,-4.069 -8.642,-7.404 -13.463,-7.404l-12.239,0.078c-2.32,0.105 -4.742,0.637 -6.397,3.053l-4.524,7.748c-0.553,0.952 -1.115,1.907 -1.672,2.86 -2.133,3.65 -7.277,5.985 -11.431,5.183 0,0 -6.85,-1.327 -14.053,1.602 -14.934,6.071 -22.117,23.103 -16.048,38.035 6.073,14.937 23.104,22.119 38.039,16.048 14.935,-6.071 22.119,-23.103 16.046,-38.036 -1.785,-4.392 -2.671,-5.355 -2.671,-5.355 -2.862,-3.115 -3.458,-8.654 -1.323,-12.304l0.653,-1.675c20.191,14.881 47.402,19.238 72.339,9.097 29.874,-12.144 47.597,-41.465 46.422,-71.931l-7.399,-0.678c0,0 -2.711,0.56 -4.331,2.231 -0.282,0.456 -0.576,0.899 -0.895,1.329h-0.004c-0.095,0.24 -0.251,0.409 -0.423,0.547 -1.954,2.443 -4.539,4.435 -7.647,5.699 -4.535,1.846 -9.368,1.805 -13.631,0.246 -0.006,-0.002 -0.011,-0.004 -0.016,-0.005 0,-0 0,-0 -0.003,-0.001 -0.051,-0.019 -0.101,-0.041 -0.152,-0.06 -0.232,-0.088 -0.465,-0.176 -0.693,-0.273 -0.279,-0.118 -0.554,-0.241 -0.827,-0.372 0,-0 0,-0.001 -0.003,-0.001 -0.273,-0.131 -0.543,-0.268 -0.809,-0.411 0,-0 0,-0.001 -0.003,-0.001 -0.266,-0.144 -0.529,-0.294 -0.789,-0.45 0,-0 0,-0.001 -0.003,-0.001 -0.259,-0.156 -0.516,-0.319 -0.768,-0.488 -0,-0 0,-0 0,-0.001 -0.252,-0.169 -0.501,-0.345 -0.745,-0.526 0,-0 0,-0.001 -0.003,-0.001 -0.244,-0.181 -0.484,-0.369 -0.72,-0.562 0,-0 0,-0.001 -0.003,-0.001 -0.16,-0.132 -0.315,-0.27 -0.472,-0.407 -0.074,-0.065 -0.15,-0.126 -0.223,-0.192 -0.227,-0.205 -0.449,-0.416 -0.666,-0.633 -0.218,-0.217 -0.431,-0.44 -0.639,-0.669 0,-0 0,-0.001 0,-0.001 -0.415,-0.457 -0.809,-0.937 -1.181,-1.439 -0.186,-0.251 -0.367,-0.508 -0.541,-0.77 0,-0 0,-0.001 0,-0.001 -0.698,-1.047 -1.303,-2.18 -1.795,-3.391l-0.263,-0.649c-0.014,-0.045 -0.041,-0.092 -0.081,-0.139 -0.064,-0.076 -0.168,-0.156 -0.293,-0.237 -0.031,-0.02 -0.056,-0.04 -0.09,-0.06 -0.087,-0.052 -0.185,-0.104 -0.294,-0.157 0,-0 0,-0.001 -0.003,-0.001 -0.108,-0.053 -0.228,-0.106 -0.356,-0.159 -0.517,-0.215 -1.191,-0.437 -1.977,-0.651 -0,-0 0,-0.001 0,-0.001 -0.196,-0.053 -0.4,-0.106 -0.609,-0.158 0,-0 0,-0.001 0,-0.001 -0.009,-0.002 -0.019,-0.004 -0.028,-0.007 -0.402,-0.1 -0.828,-0.197 -1.272,-0.291 -0.01,-0.002 -0.02,-0.004 -0.03,-0.007 -0.931,-0.195 -1.941,-0.374 -2.987,-0.522l-5.347,-0.759c-0.393,-0.056 -0.793,-0.084 -1.199,-0.086z"
|
||||
android:strokeWidth="0.26458332" />
|
||||
<path
|
||||
android:fillAlpha="1"
|
||||
android:fillColor="#000000"
|
||||
android:pathData="m58.941,71.276c0,0 0,0 -1.455,-3.572 -5.252,-12.916 0.962,-27.646 13.878,-32.896 12.916,-5.254 27.645,0.959 32.896,13.878 0.917,2.252 0.917,2.252 0.917,2.252 0.441,2.54 4.228,5.101 8.42,5.693l4.327,0.611c4.189,0.594 9.238,-1.98 11.217,-5.719 0,0 1.85,-3.497 7.552,-5.814 9.691,-3.94 20.74,0.722 24.683,10.411 0.246,0.611 0.458,1.225 0.64,1.843 0.644,1.431 1.815,2.163 2.978,2.536l5.481,0.501c-0.908,-4.88 -2.321,-9.741 -4.262,-14.518C150.708,8.346 107.222,-9.997 69.089,5.511 30.954,21.014 12.609,64.498 28.114,102.634c2.643,6.506 6.121,12.419 10.229,17.703l21.562,-36.92c2.131,-3.654 1.701,-9.118 -0.964,-12.142z"
|
||||
android:strokeWidth="0.26458332" />
|
||||
</group>
|
||||
</vector>
|
||||
|
|
@ -1,83 +0,0 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:tint="#FFFFFF"
|
||||
android:viewportWidth="613.37164"
|
||||
android:viewportHeight="613.37164">
|
||||
<group
|
||||
android:translateX="81.23083"
|
||||
android:translateY="48.305824">
|
||||
<path
|
||||
android:fillAlpha="1"
|
||||
android:fillColor="#000000"
|
||||
android:pathData="m81.964,235.21c-6.988,0 -12.642,-5.66 -12.642,-12.642v-54.384c0,-6.981 5.654,-12.642 12.642,-12.642 6.976,0 12.643,5.661 12.643,12.642v54.384c0,6.982 -5.667,12.642 -12.643,12.642z" />
|
||||
<path
|
||||
android:fillAlpha="1"
|
||||
android:fillColor="#000000"
|
||||
android:pathData="m81.977,180.83c-4.371,0 -8.618,-2.265 -10.963,-6.321 -3.494,-6.043 -1.42,-13.778 4.629,-17.272l143.5,-82.853c6.037,-3.494 13.766,-1.42 17.272,4.63 3.48,6.043 1.419,13.777 -4.63,17.271l-143.5,82.853c-1.987,1.148 -4.172,1.692 -6.308,1.692z" />
|
||||
<path
|
||||
android:fillAlpha="1"
|
||||
android:fillColor="#000000"
|
||||
android:pathData="m374.5,179.62c-2.049,0 -4.136,-0.5 -6.062,-1.555l-149.05,-81.644c-6.124,-3.352 -8.371,-11.037 -5.013,-17.161 3.346,-6.124 11.025,-8.364 17.161,-5.012l149.05,81.643c6.124,3.352 8.371,11.037 5.013,17.161 -2.295,4.197 -6.629,6.568 -11.098,6.568z" />
|
||||
<path
|
||||
android:fillAlpha="1"
|
||||
android:fillColor="#000000"
|
||||
android:pathData="m374.51,262.48c-6.976,0 -12.643,-5.66 -12.643,-12.642v-82.859c0,-6.981 5.667,-12.642 12.643,-12.642 6.987,0 12.642,5.661 12.642,12.642v82.859c0,6.981 -5.655,12.642 -12.642,12.642z" />
|
||||
<path
|
||||
android:fillAlpha="1"
|
||||
android:fillColor="#000000"
|
||||
android:pathData="m168.66,213.14c-4.395,0 -8.667,-2.296 -11,-6.395 -3.444,-6.068 -1.333,-13.784 4.741,-17.235l56.815,-32.309c6.062,-3.457 13.79,-1.327 17.235,4.741 3.443,6.068 1.333,13.784 -4.741,17.235l-56.816,32.309c-1.962,1.123 -4.109,1.654 -6.234,1.654z" />
|
||||
<path
|
||||
android:fillAlpha="1"
|
||||
android:fillColor="#000000"
|
||||
android:pathData="m168.64,287.27c-6.976,0 -12.643,-5.66 -12.643,-12.643v-74.13c0,-6.982 5.667,-12.642 12.643,-12.642 6.987,0 12.642,5.66 12.642,12.642v74.13c-0.001,6.982 -5.655,12.643 -12.642,12.643z" />
|
||||
<path
|
||||
android:fillAlpha="1"
|
||||
android:fillColor="#000000"
|
||||
android:pathData="m168.64,483.97c-6.976,0 -12.643,-5.66 -12.643,-12.642v-270.83c0,-6.982 5.667,-12.642 12.643,-12.642 6.987,0 12.642,5.66 12.642,12.642v270.83c-0.001,6.981 -5.655,12.641 -12.642,12.641z" />
|
||||
<path
|
||||
android:fillAlpha="1"
|
||||
android:fillColor="#000000"
|
||||
android:pathData="m321.39,287.27h-237.97c-6.988,0 -12.643,-5.66 -12.643,-12.643 0,-6.981 5.655,-12.642 12.643,-12.642h237.97c6.975,0 12.642,5.66 12.642,12.642s-5.667,12.643 -12.642,12.643z" />
|
||||
<path
|
||||
android:fillAlpha="1"
|
||||
android:fillColor="#000000"
|
||||
android:pathData="m321.39,374.34c-6.988,0 -12.643,-5.66 -12.643,-12.642v-87.076c0,-6.981 5.654,-12.642 12.643,-12.642 6.975,0 12.642,5.66 12.642,12.642v87.076c0,6.982 -5.667,12.642 -12.642,12.642z" />
|
||||
<path
|
||||
android:fillAlpha="1"
|
||||
android:fillColor="#000000"
|
||||
android:pathData="m321.39,374.34h-308.75c-6.975,0 -12.642,-5.66 -12.642,-12.642s5.667,-12.643 12.642,-12.643h308.75c6.975,0 12.642,5.66 12.642,12.643 0,6.982 -5.667,12.642 -12.642,12.642z" />
|
||||
<path
|
||||
android:fillAlpha="1"
|
||||
android:fillColor="#000000"
|
||||
android:pathData="m225.47,516.76c-4.371,0 -8.618,-2.266 -10.963,-6.321 -3.494,-6.043 -1.419,-13.777 4.63,-17.271l212.81,-122.87c6.037,-3.5 13.778,-1.414 17.271,4.63 3.494,6.049 1.42,13.777 -4.629,17.271l-212.81,122.87c-1.988,1.149 -4.172,1.692 -6.309,1.692z" />
|
||||
<path
|
||||
android:fillAlpha="1"
|
||||
android:fillColor="#000000"
|
||||
android:pathData="m438.27,393.89c-6.976,0 -12.643,-5.66 -12.643,-12.643v-245.73c0,-6.981 5.667,-12.643 12.643,-12.643 6.987,0 12.642,5.661 12.642,12.643v245.73c-0.001,6.982 -5.655,12.643 -12.642,12.643z" />
|
||||
<path
|
||||
android:fillAlpha="1"
|
||||
android:fillColor="#000000"
|
||||
android:pathData="m438.25,148.16c-2.136,0 -4.309,-0.543 -6.309,-1.691l-212.8,-122.87c-6.049,-3.494 -8.124,-11.229 -4.63,-17.271 3.494,-6.043 11.198,-8.124 17.272,-4.63l212.81,122.87c6.049,3.494 8.123,11.223 4.629,17.272 -2.346,4.055 -6.592,6.321 -10.963,6.321z" />
|
||||
<path
|
||||
android:fillAlpha="1"
|
||||
android:fillColor="#000000"
|
||||
android:pathData="m12.655,148.16c-4.37,0 -8.617,-2.266 -10.963,-6.321 -3.481,-6.049 -1.42,-13.778 4.629,-17.272l212.82,-122.87c6.037,-3.494 13.766,-1.414 17.272,4.63 3.48,6.043 1.419,13.778 -4.63,17.271l-212.82,122.87c-1.987,1.148 -4.16,1.692 -6.308,1.692z" />
|
||||
<path
|
||||
android:fillAlpha="1"
|
||||
android:fillColor="#000000"
|
||||
android:pathData="m12.642,374.34c-6.975,0 -12.642,-5.66 -12.642,-12.642v-226.18c0,-6.981 5.667,-12.643 12.642,-12.643 6.988,0 12.643,5.661 12.643,12.643v226.18c-0.001,6.981 -5.655,12.641 -12.643,12.641z" />
|
||||
<path
|
||||
android:fillAlpha="1"
|
||||
android:fillColor="#000000"
|
||||
android:pathData="m168.63,483.97c-2.086,0 -4.197,-0.513 -6.148,-1.604l-85.223,-47.568c-6.099,-3.402 -8.284,-11.1 -4.876,-17.198 3.395,-6.105 11.099,-8.29 17.197,-4.877l85.224,47.569c6.099,3.4 8.284,11.099 4.877,17.197 -2.31,4.148 -6.619,6.481 -11.051,6.481z" />
|
||||
<path
|
||||
android:fillAlpha="1"
|
||||
android:fillColor="#000000"
|
||||
android:pathData="m374.5,262.48c-2.049,0 -4.136,-0.5 -6.062,-1.555l-149.05,-81.649c-6.124,-3.353 -8.371,-11.038 -5.013,-17.161 3.346,-6.124 11.025,-8.37 17.161,-5.013l149.05,81.649c6.124,3.352 8.371,11.037 5.013,17.161 -2.295,4.197 -6.629,6.568 -11.098,6.568z" />
|
||||
<path
|
||||
android:fillAlpha="1"
|
||||
android:fillColor="#000000"
|
||||
android:pathData="m83.421,436.4c-6.988,0 -12.643,-5.661 -12.643,-12.643v-149.13c0,-6.981 5.655,-12.642 12.643,-12.642 6.976,0 12.642,5.66 12.642,12.642v149.13c0,6.981 -5.666,12.642 -12.642,12.642z" />
|
||||
</group>
|
||||
</vector>
|
||||
|
|
@ -1,71 +0,0 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:tint="#FFFFFF"
|
||||
android:viewportWidth="234.67982"
|
||||
android:viewportHeight="234.67982">
|
||||
<group
|
||||
android:translateX="-14.955087"
|
||||
android:translateY="-14.955087">
|
||||
<path
|
||||
android:fillColor="#c5ab63"
|
||||
android:pathData="m70.933,100.886a21.594,21.594 0,0 1,-9.236 9.193l50.703,50.901 12.224,-6.195zM137.808,168.022 L125.584,174.216 151.275,200.007a21.594,21.594 0,0 1,9.237 -9.194z"
|
||||
android:strokeWidth="1.562428" />
|
||||
<path
|
||||
android:fillColor="#0a9ee6"
|
||||
android:pathData="m196.481,121.027 l-28.704,14.547 2.116,13.537 32.477,-16.46a21.594,21.594 0,0 1,-5.89 -11.624zM151.115,144.018 L83.248,178.413a21.594,21.594 0,0 1,5.891 11.625l64.093,-32.483z"
|
||||
android:strokeWidth="1.562428" />
|
||||
<path
|
||||
android:fillColor="#0a9ee6"
|
||||
android:pathData="m129.263,59.294 l-32.748,63.932 9.669,9.706 34.674,-67.689A21.594,21.594 0,0 1,129.263 59.294ZM87.997,139.857 L71.409,172.24a21.594,21.594 0,0 1,11.593 5.949l14.663,-28.626z"
|
||||
android:strokeWidth="1.562428" />
|
||||
<path
|
||||
android:fillColor="#c5ac64"
|
||||
android:pathData="m61.425,110.221a21.594,21.594 0,0 1,-10.788 2.255,21.594 21.594,0 0,1 -2.085,-0.218l9.686,61.956a21.594,21.594 0,0 1,10.788 -2.255,21.594 21.594,0 0,1 2.083,0.218z"
|
||||
android:strokeWidth="1.562428" />
|
||||
<path
|
||||
android:fillColor="#0a9ee6"
|
||||
android:pathData="m89.164,190.345a21.594,21.594 0,0 1,0.226 4.35,21.594 21.594,0 0,1 -2.278,8.519l61.943,9.94a21.594,21.594 0,0 1,-0.227 -4.35,21.594 21.594,0 0,1 2.279,-8.519z"
|
||||
android:strokeWidth="1.562428" />
|
||||
<path
|
||||
android:fillColor="#0a9ee6"
|
||||
android:pathData="m202.558,132.879 l-28.592,55.817a21.594,21.594 0,0 1,11.595 5.95l28.591,-55.817a21.594,21.594 0,0 1,-11.595 -5.95z"
|
||||
android:strokeWidth="1.562428" />
|
||||
<path
|
||||
android:fillColor="#c5ac64"
|
||||
android:pathData="m163.575,53.933a21.594,21.594 0,0 1,-9.237 9.194l44.279,44.448a21.594,21.594 0,0 1,9.236 -9.194z"
|
||||
android:strokeWidth="1.562428" />
|
||||
<path
|
||||
android:fillColor="#0a9ee6"
|
||||
android:pathData="M123.145,47.442 L67.171,75.808a21.594,21.594 0,0 1,5.89 11.624L129.035,59.065a21.594,21.594 0,0 1,-5.89 -11.623z"
|
||||
android:strokeWidth="1.562428" />
|
||||
<path
|
||||
android:fillColor="#c5ac64"
|
||||
android:pathData="m154.232,63.176a21.594,21.594 0,0 1,-10.965 2.345,21.594 21.594,0 0,1 -1.89,-0.198l4.958,31.749 13.529,2.171zM149.217,115.529 L160.94,190.593a21.594,21.594 0,0 1,10.63 -2.176,21.594 21.594,0 0,1 2.259,0.248L162.747,117.701Z"
|
||||
android:strokeWidth="1.562428" />
|
||||
<path
|
||||
android:fillColor="#c5ab63"
|
||||
android:pathData="m73.124,87.67a21.594,21.594 0,0 1,0.238 4.418,21.594 21.594,0 0,1 -2.244,8.457l31.773,5.103 6.245,-12.195zM127.58,96.415 L121.335,108.612 196.407,120.669a21.594,21.594 0,0 1,-0.218 -4.3,21.594 21.594,0 0,1 2.304,-8.564z"
|
||||
android:strokeWidth="1.562428" />
|
||||
<path
|
||||
android:fillColor="#c5ac64"
|
||||
android:pathData="M144.454,43.96m-19.601,-1.068a19.63,19.63 48.118,1 1,39.203 2.135a19.63,19.63 48.118,1 1,-39.203 -2.135"
|
||||
android:strokeWidth="1.562428" />
|
||||
<path
|
||||
android:fillColor="#0a9ee6"
|
||||
android:pathData="M217.741,117.547m-19.601,-1.068a19.63,19.63 48.118,1 1,39.203 2.135a19.63,19.63 48.118,1 1,-39.203 -2.135"
|
||||
android:strokeWidth="1.562428" />
|
||||
<path
|
||||
android:fillColor="#0a9ee6"
|
||||
android:pathData="M170.395,209.979m-19.601,-1.068a19.63,19.63 48.118,1 1,39.203 2.135a19.63,19.63 48.118,1 1,-39.203 -2.135"
|
||||
android:strokeWidth="1.562428" />
|
||||
<path
|
||||
android:fillColor="#c5ab63"
|
||||
android:pathData="M67.831,193.52m-19.601,-1.068a19.63,19.63 48.118,1 1,39.203 2.135a19.63,19.63 48.118,1 1,-39.203 -2.135"
|
||||
android:strokeWidth="1.562428" />
|
||||
<path
|
||||
android:fillColor="#0a9ee6"
|
||||
android:pathData="M51.808,90.917m-19.601,-1.068a19.63,19.63 48.118,1 1,39.203 2.135a19.63,19.63 48.118,1 1,-39.203 -2.135"
|
||||
android:strokeWidth="1.562428" />
|
||||
</group>
|
||||
</vector>
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:tint="#FFFFFF"
|
||||
android:viewportWidth="741.2781"
|
||||
android:viewportHeight="741.2781">
|
||||
<group
|
||||
android:translateX="58.379044"
|
||||
android:translateY="58.379044">
|
||||
<path
|
||||
android:fillAlpha="1"
|
||||
android:fillColor="#ffffff"
|
||||
android:pathData="m75.8,10v604.52l472.93,-411.03h-187.08l187.08,-193.49z" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="m536.23,22.51v327.36c0,89.379 -46.32,120.53 -113.1,120.53h-334.84v-447.9z"
|
||||
android:strokeWidth="25"
|
||||
android:strokeAlpha="1"
|
||||
android:strokeColor="#ffffff" />
|
||||
</group>
|
||||
</vector>
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:tint="#FFFFFF"
|
||||
android:viewportWidth="217.39131"
|
||||
android:viewportHeight="217.39131">
|
||||
<group
|
||||
android:translateX="8.695652"
|
||||
android:translateY="8.695652">
|
||||
<path
|
||||
android:fillColor="#c5ab63"
|
||||
android:pathData="m181.304,39.789c-5.267,3.372 -8.631,4.265 -15.516,4.95 0.33,4.524 2.395,9.648 -3.712,14.794 -2.541,2.141 -10.425,1.862 -18.937,-0.964 -8.222,-2.73 -17.437,-7.326 -21.71,-9.69 -5.599,-3.096 -17.625,-4.824 -26.007,-4.573 -7.235,0.217 -26.705,0.917 -36.945,15.177 -10.24,14.26 -7.848,28.444 -7.871,31.518 -6.96,5.665 -24.179,25.226 -28.653,36.934 -4.474,11.709 -8.899,24.463 -6.949,37.316 1.682,11.084 7.38,16.636 16.849,23.322 9.469,6.686 33.512,11.576 62.255,11.423 28.744,-0.153 50.133,-7.908 58.28,-18.309 -10.585,-32.392 -24.102,-58.636 -16.5,-75.525 6.766,-15.033 16.841,-11.471 35.019,-24.271 16.637,-11.715 17.381,-29.274 10.397,-42.099z" />
|
||||
<path
|
||||
android:fillColor="#0a9ee6"
|
||||
android:pathData="M154.69,25.012m-11.308,0a11.308,11.308 0,1 1,22.617 0a11.308,11.308 0,1 1,-22.617 0" />
|
||||
<path
|
||||
android:fillColor="#0a9ee6"
|
||||
android:pathData="M171.89,7.236m-7.236,0a7.236,7.236 0,1 1,14.472 0a7.236,7.236 0,1 1,-14.472 0" />
|
||||
<path
|
||||
android:fillColor="#0a9ee6"
|
||||
android:pathData="M175.955,31.449m-5.856,0a5.856,5.856 0,1 1,11.711 0a5.856,5.856 0,1 1,-11.711 0" />
|
||||
</group>
|
||||
</vector>
|
||||
|
|
@ -78,7 +78,7 @@
|
|||
android:typeface="serif" />
|
||||
</RelativeLayout>
|
||||
<!-- Main Loader -->
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<RelativeLayout
|
||||
android:id="@+id/loader"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
|
|
@ -106,5 +106,14 @@
|
|||
android:indeterminate="true" />
|
||||
</RelativeLayout>
|
||||
</RelativeLayout>
|
||||
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||
android:id="@+id/toot"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="bottom|end"
|
||||
android:layout_margin="@dimen/fab_margin_floating"
|
||||
android:contentDescription="@string/toot_it"
|
||||
android:src="@drawable/ic_edit" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||
</androidx.drawerlayout.widget.DrawerLayout>
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
Added:
|
||||
- Automatically add hashtag to messages when composing from a search
|
||||
|
||||
Fixed:
|
||||
- Some issues with content and URLs
|
||||
- Some crashes
|
||||
Loading…
Reference in New Issue