mirror of
https://github.com/pppscn/SmsForwarder
synced 2024-11-04 06:00:11 +00:00
优化:界面优化 & 适配暗夜模式
This commit is contained in:
parent
89cd86326a
commit
1de62505fb
@ -139,7 +139,7 @@ dependencies {
|
|||||||
//noinspection GradleDependency
|
//noinspection GradleDependency
|
||||||
implementation 'androidx.appcompat:appcompat:1.4.1'
|
implementation 'androidx.appcompat:appcompat:1.4.1'
|
||||||
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
|
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
|
||||||
//implementation 'com.google.android.material:material:1.5.0'
|
implementation 'com.google.android.material:material:1.5.0'
|
||||||
testImplementation 'junit:junit:4.13.2'
|
testImplementation 'junit:junit:4.13.2'
|
||||||
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
|
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
|
||||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
|
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
|
||||||
@ -182,9 +182,6 @@ dependencies {
|
|||||||
implementation "org.eclipse.jetty:jetty-server:9.2.30.v20200428"
|
implementation "org.eclipse.jetty:jetty-server:9.2.30.v20200428"
|
||||||
implementation "org.eclipse.jetty:jetty-servlet:9.2.30.v20200428"
|
implementation "org.eclipse.jetty:jetty-servlet:9.2.30.v20200428"
|
||||||
|
|
||||||
//FloatingActionButton
|
|
||||||
implementation 'com.melnykov:floatingactionbutton:1.3.0'
|
|
||||||
|
|
||||||
//友盟统计SDK
|
//友盟统计SDK
|
||||||
implementation 'com.umeng.umsdk:common:9.4.7'// (必选)
|
implementation 'com.umeng.umsdk:common:9.4.7'// (必选)
|
||||||
implementation 'com.umeng.umsdk:asms:1.6.0'// 必选
|
implementation 'com.umeng.umsdk:asms:1.6.0'// 必选
|
||||||
|
@ -55,7 +55,7 @@
|
|||||||
android:networkSecurityConfig="@xml/network_security_config"
|
android:networkSecurityConfig="@xml/network_security_config"
|
||||||
android:requestLegacyExternalStorage="true"
|
android:requestLegacyExternalStorage="true"
|
||||||
android:supportsRtl="true"
|
android:supportsRtl="true"
|
||||||
android:theme="@style/AppTheme"
|
android:theme="@style/Theme.App"
|
||||||
android:usesCleartextTraffic="true"
|
android:usesCleartextTraffic="true"
|
||||||
tools:ignore="DataExtractionRules,UnusedAttribute">
|
tools:ignore="DataExtractionRules,UnusedAttribute">
|
||||||
|
|
||||||
@ -66,7 +66,6 @@
|
|||||||
<activity
|
<activity
|
||||||
android:name=".MainActivity"
|
android:name=".MainActivity"
|
||||||
android:exported="true"
|
android:exported="true"
|
||||||
android:label="@string/app_name"
|
|
||||||
tools:ignore="IntentFilterExportedReceiver">
|
tools:ignore="IntentFilterExportedReceiver">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
|
@ -26,6 +26,7 @@ import androidx.annotation.NonNull;
|
|||||||
import androidx.appcompat.app.AlertDialog;
|
import androidx.appcompat.app.AlertDialog;
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
|
||||||
|
import com.google.android.material.floatingactionbutton.FloatingActionButton;
|
||||||
import com.hjq.permissions.OnPermissionCallback;
|
import com.hjq.permissions.OnPermissionCallback;
|
||||||
import com.hjq.permissions.Permission;
|
import com.hjq.permissions.Permission;
|
||||||
import com.hjq.permissions.XXPermissions;
|
import com.hjq.permissions.XXPermissions;
|
||||||
@ -50,7 +51,6 @@ import com.idormy.sms.forwarder.utils.SharedPreferencesHelper;
|
|||||||
import com.idormy.sms.forwarder.utils.SmsUtil;
|
import com.idormy.sms.forwarder.utils.SmsUtil;
|
||||||
import com.idormy.sms.forwarder.utils.TimeUtil;
|
import com.idormy.sms.forwarder.utils.TimeUtil;
|
||||||
import com.idormy.sms.forwarder.view.StepBar;
|
import com.idormy.sms.forwarder.view.StepBar;
|
||||||
import com.melnykov.fab.FloatingActionButton;
|
|
||||||
import com.umeng.commonsdk.UMConfigure;
|
import com.umeng.commonsdk.UMConfigure;
|
||||||
|
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
|
@ -26,6 +26,7 @@ import android.widget.TextView;
|
|||||||
import androidx.appcompat.app.AlertDialog;
|
import androidx.appcompat.app.AlertDialog;
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
|
||||||
|
import com.google.android.material.floatingactionbutton.FloatingActionButton;
|
||||||
import com.hjq.toast.ToastUtils;
|
import com.hjq.toast.ToastUtils;
|
||||||
import com.idormy.sms.forwarder.adapter.RuleAdapter;
|
import com.idormy.sms.forwarder.adapter.RuleAdapter;
|
||||||
import com.idormy.sms.forwarder.model.RuleModel;
|
import com.idormy.sms.forwarder.model.RuleModel;
|
||||||
@ -38,7 +39,6 @@ import com.idormy.sms.forwarder.utils.LogUtil;
|
|||||||
import com.idormy.sms.forwarder.utils.RuleUtil;
|
import com.idormy.sms.forwarder.utils.RuleUtil;
|
||||||
import com.idormy.sms.forwarder.utils.SettingUtil;
|
import com.idormy.sms.forwarder.utils.SettingUtil;
|
||||||
import com.idormy.sms.forwarder.view.StepBar;
|
import com.idormy.sms.forwarder.view.StepBar;
|
||||||
import com.melnykov.fab.FloatingActionButton;
|
|
||||||
|
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
@ -41,6 +41,7 @@ import androidx.appcompat.app.AlertDialog;
|
|||||||
import androidx.appcompat.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
|
import com.google.android.material.floatingactionbutton.FloatingActionButton;
|
||||||
import com.hjq.permissions.OnPermissionCallback;
|
import com.hjq.permissions.OnPermissionCallback;
|
||||||
import com.hjq.permissions.Permission;
|
import com.hjq.permissions.Permission;
|
||||||
import com.hjq.permissions.XXPermissions;
|
import com.hjq.permissions.XXPermissions;
|
||||||
@ -78,7 +79,6 @@ import com.idormy.sms.forwarder.utils.LogUtil;
|
|||||||
import com.idormy.sms.forwarder.utils.RuleUtil;
|
import com.idormy.sms.forwarder.utils.RuleUtil;
|
||||||
import com.idormy.sms.forwarder.view.ClearEditText;
|
import com.idormy.sms.forwarder.view.ClearEditText;
|
||||||
import com.idormy.sms.forwarder.view.StepBar;
|
import com.idormy.sms.forwarder.view.StepBar;
|
||||||
import com.melnykov.fab.FloatingActionButton;
|
|
||||||
|
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
import java.net.Proxy;
|
import java.net.Proxy;
|
||||||
@ -432,16 +432,16 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
Log.d(TAG, "onCheckedChanged:" + isChecked);
|
Log.d(TAG, "onCheckedChanged:" + isChecked);
|
||||||
});
|
});
|
||||||
|
|
||||||
Button buttonDingdingOk = view1.findViewById(R.id.buttonDingdingOk);
|
Button buttonOk = view1.findViewById(R.id.buttonOk);
|
||||||
Button buttonDingdingDel = view1.findViewById(R.id.buttonDingdingDel);
|
Button buttonDel = view1.findViewById(R.id.buttonDel);
|
||||||
Button buttonDingdingTest = view1.findViewById(R.id.buttonDingdingTest);
|
Button buttonTest = view1.findViewById(R.id.buttonTest);
|
||||||
alertDialog71
|
alertDialog71
|
||||||
.setTitle(R.string.setdingdingtitle)
|
.setTitle(R.string.setdingdingtitle)
|
||||||
.setIcon(R.mipmap.dingding)
|
.setIcon(R.mipmap.dingding)
|
||||||
.setView(view1)
|
.setView(view1)
|
||||||
.create();
|
.create();
|
||||||
final AlertDialog show = alertDialog71.show();
|
final AlertDialog show = alertDialog71.show();
|
||||||
buttonDingdingOk.setOnClickListener(view -> {
|
buttonOk.setOnClickListener(view -> {
|
||||||
String senderName = editTextDingdingName.getText().toString().trim();
|
String senderName = editTextDingdingName.getText().toString().trim();
|
||||||
int senderStatus = switchDingdingEnable.isChecked() ? STATUS_ON : STATUS_OFF;
|
int senderStatus = switchDingdingEnable.isChecked() ? STATUS_ON : STATUS_OFF;
|
||||||
String token = editTextDingdingToken.getText().trim();
|
String token = editTextDingdingToken.getText().trim();
|
||||||
@ -480,7 +480,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
show.dismiss();
|
show.dismiss();
|
||||||
});
|
});
|
||||||
|
|
||||||
buttonDingdingDel.setOnClickListener(view -> {
|
buttonDel.setOnClickListener(view -> {
|
||||||
if (senderModel != null) {
|
if (senderModel != null) {
|
||||||
SenderUtil.delSender(senderModel.getId());
|
SenderUtil.delSender(senderModel.getId());
|
||||||
initSenders();
|
initSenders();
|
||||||
@ -489,7 +489,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
show.dismiss();
|
show.dismiss();
|
||||||
});
|
});
|
||||||
|
|
||||||
buttonDingdingTest.setOnClickListener(view -> {
|
buttonTest.setOnClickListener(view -> {
|
||||||
String token = editTextDingdingToken.getText().trim();
|
String token = editTextDingdingToken.getText().trim();
|
||||||
if (CommonUtil.checkUrl(token, true)) {
|
if (CommonUtil.checkUrl(token, true)) {
|
||||||
ToastUtils.delayedShow(R.string.invalid_token, 3000);
|
ToastUtils.delayedShow(R.string.invalid_token, 3000);
|
||||||
@ -552,9 +552,9 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
editTextEmailTitle.setText(emailSettingVo.getTitle());
|
editTextEmailTitle.setText(emailSettingVo.getTitle());
|
||||||
}
|
}
|
||||||
|
|
||||||
Button buttonEmailOk = view1.findViewById(R.id.buttonEmailOk);
|
Button buttonOk = view1.findViewById(R.id.buttonOk);
|
||||||
Button buttonEmailDel = view1.findViewById(R.id.buttonEmailDel);
|
Button buttonDel = view1.findViewById(R.id.buttonDel);
|
||||||
Button buttonEmailTest = view1.findViewById(R.id.buttonEmailTest);
|
Button buttonTest = view1.findViewById(R.id.buttonTest);
|
||||||
alertDialog71
|
alertDialog71
|
||||||
.setTitle(R.string.setemailtitle)
|
.setTitle(R.string.setemailtitle)
|
||||||
.setIcon(R.mipmap.email)
|
.setIcon(R.mipmap.email)
|
||||||
@ -562,7 +562,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
.create();
|
.create();
|
||||||
final AlertDialog show = alertDialog71.show();
|
final AlertDialog show = alertDialog71.show();
|
||||||
|
|
||||||
buttonEmailOk.setOnClickListener(view -> {
|
buttonOk.setOnClickListener(view -> {
|
||||||
String senderName = editTextEmailName.getText().toString().trim();
|
String senderName = editTextEmailName.getText().toString().trim();
|
||||||
int senderStatus = switchEmailEnable.isChecked() ? STATUS_ON : STATUS_OFF;
|
int senderStatus = switchEmailEnable.isChecked() ? STATUS_ON : STATUS_OFF;
|
||||||
if (TextUtils.isEmpty(senderName)) {
|
if (TextUtils.isEmpty(senderName)) {
|
||||||
@ -610,7 +610,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
show.dismiss();
|
show.dismiss();
|
||||||
});
|
});
|
||||||
|
|
||||||
buttonEmailDel.setOnClickListener(view -> {
|
buttonDel.setOnClickListener(view -> {
|
||||||
if (senderModel != null) {
|
if (senderModel != null) {
|
||||||
SenderUtil.delSender(senderModel.getId());
|
SenderUtil.delSender(senderModel.getId());
|
||||||
initSenders();
|
initSenders();
|
||||||
@ -619,7 +619,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
show.dismiss();
|
show.dismiss();
|
||||||
});
|
});
|
||||||
|
|
||||||
buttonEmailTest.setOnClickListener(view -> {
|
buttonTest.setOnClickListener(view -> {
|
||||||
String protocol = radioGroupEmailProtocol.getCheckedRadioButtonId() == R.id.radioEmailProtocolSmtp ? "SMTP" : "IMAP";
|
String protocol = radioGroupEmailProtocol.getCheckedRadioButtonId() == R.id.radioEmailProtocolSmtp ? "SMTP" : "IMAP";
|
||||||
String host = editTextEmailHost.getText().toString().trim();
|
String host = editTextEmailHost.getText().toString().trim();
|
||||||
String port = editTextEmailPort.getText().toString().trim();
|
String port = editTextEmailPort.getText().toString().trim();
|
||||||
@ -717,9 +717,9 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
radioGroupBarkLevel.check(barkSettingVo.getLevelId());
|
radioGroupBarkLevel.check(barkSettingVo.getLevelId());
|
||||||
}
|
}
|
||||||
|
|
||||||
Button buttonBarkOk = view1.findViewById(R.id.buttonBarkOk);
|
Button buttonOk = view1.findViewById(R.id.buttonOk);
|
||||||
Button buttonBarkDel = view1.findViewById(R.id.buttonBarkDel);
|
Button buttonDel = view1.findViewById(R.id.buttonDel);
|
||||||
Button buttonBarkTest = view1.findViewById(R.id.buttonBarkTest);
|
Button buttonTest = view1.findViewById(R.id.buttonTest);
|
||||||
alertDialog71
|
alertDialog71
|
||||||
.setTitle(R.string.setbarktitle)
|
.setTitle(R.string.setbarktitle)
|
||||||
.setIcon(R.mipmap.bark)
|
.setIcon(R.mipmap.bark)
|
||||||
@ -727,7 +727,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
.create();
|
.create();
|
||||||
final AlertDialog show = alertDialog71.show();
|
final AlertDialog show = alertDialog71.show();
|
||||||
|
|
||||||
buttonBarkOk.setOnClickListener(view -> {
|
buttonOk.setOnClickListener(view -> {
|
||||||
String senderName = editTextBarkName.getText().toString().trim();
|
String senderName = editTextBarkName.getText().toString().trim();
|
||||||
int senderStatus = switchBarkEnable.isChecked() ? STATUS_ON : STATUS_OFF;
|
int senderStatus = switchBarkEnable.isChecked() ? STATUS_ON : STATUS_OFF;
|
||||||
if (TextUtils.isEmpty(senderName)) {
|
if (TextUtils.isEmpty(senderName)) {
|
||||||
@ -770,7 +770,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
show.dismiss();
|
show.dismiss();
|
||||||
});
|
});
|
||||||
|
|
||||||
buttonBarkDel.setOnClickListener(view -> {
|
buttonDel.setOnClickListener(view -> {
|
||||||
if (senderModel != null) {
|
if (senderModel != null) {
|
||||||
SenderUtil.delSender(senderModel.getId());
|
SenderUtil.delSender(senderModel.getId());
|
||||||
initSenders();
|
initSenders();
|
||||||
@ -779,7 +779,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
show.dismiss();
|
show.dismiss();
|
||||||
});
|
});
|
||||||
|
|
||||||
buttonBarkTest.setOnClickListener(view -> {
|
buttonTest.setOnClickListener(view -> {
|
||||||
String barkServer = editTextBarkServer.getText().trim();
|
String barkServer = editTextBarkServer.getText().trim();
|
||||||
String icon = editTextBarkIcon.getText().toString().trim(); //消息图标
|
String icon = editTextBarkIcon.getText().toString().trim(); //消息图标
|
||||||
String title = editTextBarkTitle.getText().toString().trim(); //标题模板
|
String title = editTextBarkTitle.getText().toString().trim(); //标题模板
|
||||||
@ -865,9 +865,9 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
radioGroupWebNotifyMethod.check(webNotifySettingVo.getWebNotifyMethodCheckId());
|
radioGroupWebNotifyMethod.check(webNotifySettingVo.getWebNotifyMethodCheckId());
|
||||||
}
|
}
|
||||||
|
|
||||||
Button buttonWebNotifyOk = view1.findViewById(R.id.buttonWebNotifyOk);
|
Button buttonOk = view1.findViewById(R.id.buttonOk);
|
||||||
Button buttonWebNotifyDel = view1.findViewById(R.id.buttonWebNotifyDel);
|
Button buttonDel = view1.findViewById(R.id.buttonDel);
|
||||||
Button buttonWebNotifyTest = view1.findViewById(R.id.buttonWebNotifyTest);
|
Button buttonTest = view1.findViewById(R.id.buttonTest);
|
||||||
alertDialog71
|
alertDialog71
|
||||||
.setTitle(R.string.setwebnotifytitle)
|
.setTitle(R.string.setwebnotifytitle)
|
||||||
.setIcon(R.mipmap.webhook)
|
.setIcon(R.mipmap.webhook)
|
||||||
@ -875,7 +875,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
.create();
|
.create();
|
||||||
final AlertDialog show = alertDialog71.show();
|
final AlertDialog show = alertDialog71.show();
|
||||||
|
|
||||||
buttonWebNotifyOk.setOnClickListener(view -> {
|
buttonOk.setOnClickListener(view -> {
|
||||||
String senderName = editTextWebNotifyName.getText().toString().trim();
|
String senderName = editTextWebNotifyName.getText().toString().trim();
|
||||||
int senderStatus = switchWebNotifyEnable.isChecked() ? STATUS_ON : STATUS_OFF;
|
int senderStatus = switchWebNotifyEnable.isChecked() ? STATUS_ON : STATUS_OFF;
|
||||||
if (TextUtils.isEmpty(senderName)) {
|
if (TextUtils.isEmpty(senderName)) {
|
||||||
@ -913,7 +913,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
show.dismiss();
|
show.dismiss();
|
||||||
});
|
});
|
||||||
|
|
||||||
buttonWebNotifyDel.setOnClickListener(view -> {
|
buttonDel.setOnClickListener(view -> {
|
||||||
if (senderModel != null) {
|
if (senderModel != null) {
|
||||||
SenderUtil.delSender(senderModel.getId());
|
SenderUtil.delSender(senderModel.getId());
|
||||||
initSenders();
|
initSenders();
|
||||||
@ -922,7 +922,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
show.dismiss();
|
show.dismiss();
|
||||||
});
|
});
|
||||||
|
|
||||||
buttonWebNotifyTest.setOnClickListener(view -> {
|
buttonTest.setOnClickListener(view -> {
|
||||||
String webServer = editTextWebNotifyWebServer.getText().toString().trim();
|
String webServer = editTextWebNotifyWebServer.getText().toString().trim();
|
||||||
String secret = editTextWebNotifySecret.getText().trim();
|
String secret = editTextWebNotifySecret.getText().trim();
|
||||||
String method = radioGroupWebNotifyMethod.getCheckedRadioButtonId() == R.id.radioWebNotifyMethodGet ? "GET" : "POST";
|
String method = radioGroupWebNotifyMethod.getCheckedRadioButtonId() == R.id.radioWebNotifyMethodGet ? "GET" : "POST";
|
||||||
@ -970,9 +970,9 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
editTextQYWXGroupRobotWebHook.setText(qywxGroupRobotSettingVo.getWebHook());
|
editTextQYWXGroupRobotWebHook.setText(qywxGroupRobotSettingVo.getWebHook());
|
||||||
}
|
}
|
||||||
|
|
||||||
Button buttonQyWxGroupRobotOk = view1.findViewById(R.id.buttonQyWxGroupRobotOk);
|
Button buttonOk = view1.findViewById(R.id.buttonOk);
|
||||||
Button buttonQyWxGroupRobotDel = view1.findViewById(R.id.buttonQyWxGroupRobotDel);
|
Button buttonDel = view1.findViewById(R.id.buttonDel);
|
||||||
Button buttonQyWxGroupRobotTest = view1.findViewById(R.id.buttonQyWxGroupRobotTest);
|
Button buttonTest = view1.findViewById(R.id.buttonTest);
|
||||||
alertDialog71
|
alertDialog71
|
||||||
.setTitle(R.string.setqywxgrouprobottitle)
|
.setTitle(R.string.setqywxgrouprobottitle)
|
||||||
.setIcon(R.mipmap.qywx)
|
.setIcon(R.mipmap.qywx)
|
||||||
@ -980,7 +980,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
.create();
|
.create();
|
||||||
final AlertDialog show = alertDialog71.show();
|
final AlertDialog show = alertDialog71.show();
|
||||||
|
|
||||||
buttonQyWxGroupRobotOk.setOnClickListener(view -> {
|
buttonOk.setOnClickListener(view -> {
|
||||||
String senderName = editTextQYWXGroupRobotName.getText().toString().trim();
|
String senderName = editTextQYWXGroupRobotName.getText().toString().trim();
|
||||||
int senderStatus = switchQYWXGroupRobotEnable.isChecked() ? STATUS_ON : STATUS_OFF;
|
int senderStatus = switchQYWXGroupRobotEnable.isChecked() ? STATUS_ON : STATUS_OFF;
|
||||||
if (TextUtils.isEmpty(senderName)) {
|
if (TextUtils.isEmpty(senderName)) {
|
||||||
@ -1016,7 +1016,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
show.dismiss();
|
show.dismiss();
|
||||||
});
|
});
|
||||||
|
|
||||||
buttonQyWxGroupRobotDel.setOnClickListener(view -> {
|
buttonDel.setOnClickListener(view -> {
|
||||||
if (senderModel != null) {
|
if (senderModel != null) {
|
||||||
SenderUtil.delSender(senderModel.getId());
|
SenderUtil.delSender(senderModel.getId());
|
||||||
initSenders();
|
initSenders();
|
||||||
@ -1025,7 +1025,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
show.dismiss();
|
show.dismiss();
|
||||||
});
|
});
|
||||||
|
|
||||||
buttonQyWxGroupRobotTest.setOnClickListener(view -> {
|
buttonTest.setOnClickListener(view -> {
|
||||||
String webHook = editTextQYWXGroupRobotWebHook.getText().trim();
|
String webHook = editTextQYWXGroupRobotWebHook.getText().trim();
|
||||||
if (!CommonUtil.checkUrl(webHook, false)) {
|
if (!CommonUtil.checkUrl(webHook, false)) {
|
||||||
ToastUtils.delayedShow(R.string.invalid_webhook, 3000);
|
ToastUtils.delayedShow(R.string.invalid_webhook, 3000);
|
||||||
@ -1088,16 +1088,16 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
Log.d(TAG, "onCheckedChanged:" + isChecked);
|
Log.d(TAG, "onCheckedChanged:" + isChecked);
|
||||||
});
|
});
|
||||||
|
|
||||||
Button buttonQYWXAppOk = view1.findViewById(R.id.buttonQYWXAppOk);
|
Button buttonOk = view1.findViewById(R.id.buttonOk);
|
||||||
Button buttonQYWXAppDel = view1.findViewById(R.id.buttonQYWXAppDel);
|
Button buttonDel = view1.findViewById(R.id.buttonDel);
|
||||||
Button buttonQYWXAppTest = view1.findViewById(R.id.buttonQYWXAppTest);
|
Button buttonTest = view1.findViewById(R.id.buttonTest);
|
||||||
alertDialog71
|
alertDialog71
|
||||||
.setTitle(R.string.setqywxapptitle)
|
.setTitle(R.string.setqywxapptitle)
|
||||||
.setIcon(R.mipmap.qywxapp)
|
.setIcon(R.mipmap.qywxapp)
|
||||||
.setView(view1)
|
.setView(view1)
|
||||||
.create();
|
.create();
|
||||||
final AlertDialog show = alertDialog71.show();
|
final AlertDialog show = alertDialog71.show();
|
||||||
buttonQYWXAppOk.setOnClickListener(view -> {
|
buttonOk.setOnClickListener(view -> {
|
||||||
String senderName = editTextQYWXAppName.getText().toString().trim();
|
String senderName = editTextQYWXAppName.getText().toString().trim();
|
||||||
int senderStatus = switchQYWXAppEnable.isChecked() ? STATUS_ON : STATUS_OFF;
|
int senderStatus = switchQYWXAppEnable.isChecked() ? STATUS_ON : STATUS_OFF;
|
||||||
if (TextUtils.isEmpty(senderName)) {
|
if (TextUtils.isEmpty(senderName)) {
|
||||||
@ -1145,7 +1145,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
show.dismiss();
|
show.dismiss();
|
||||||
});
|
});
|
||||||
|
|
||||||
buttonQYWXAppDel.setOnClickListener(view -> {
|
buttonDel.setOnClickListener(view -> {
|
||||||
if (senderModel != null) {
|
if (senderModel != null) {
|
||||||
SenderUtil.delSender(senderModel.getId());
|
SenderUtil.delSender(senderModel.getId());
|
||||||
initSenders();
|
initSenders();
|
||||||
@ -1154,7 +1154,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
show.dismiss();
|
show.dismiss();
|
||||||
});
|
});
|
||||||
|
|
||||||
buttonQYWXAppTest.setOnClickListener(view -> {
|
buttonTest.setOnClickListener(view -> {
|
||||||
QYWXAppSettingVo QYWXAppSettingVoNew = new QYWXAppSettingVo(
|
QYWXAppSettingVo QYWXAppSettingVoNew = new QYWXAppSettingVo(
|
||||||
editTextQYWXAppCorpID.getText().toString().trim(),
|
editTextQYWXAppCorpID.getText().toString().trim(),
|
||||||
editTextQYWXAppAgentID.getText().toString().trim(),
|
editTextQYWXAppAgentID.getText().toString().trim(),
|
||||||
@ -1205,9 +1205,9 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
if (serverchanSettingVo != null)
|
if (serverchanSettingVo != null)
|
||||||
editTextServerChanSendKey.setText(serverchanSettingVo.getSendKey());
|
editTextServerChanSendKey.setText(serverchanSettingVo.getSendKey());
|
||||||
|
|
||||||
Button buttonServerChanOk = view1.findViewById(R.id.buttonServerChanOk);
|
Button buttonOk = view1.findViewById(R.id.buttonOk);
|
||||||
Button buttonServerChanDel = view1.findViewById(R.id.buttonServerChanDel);
|
Button buttonDel = view1.findViewById(R.id.buttonDel);
|
||||||
Button buttonServerChanTest = view1.findViewById(R.id.buttonServerChanTest);
|
Button buttonTest = view1.findViewById(R.id.buttonTest);
|
||||||
alertDialog71
|
alertDialog71
|
||||||
.setTitle(R.string.setserverchantitle)
|
.setTitle(R.string.setserverchantitle)
|
||||||
.setIcon(R.mipmap.serverchan)
|
.setIcon(R.mipmap.serverchan)
|
||||||
@ -1215,7 +1215,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
.create();
|
.create();
|
||||||
final AlertDialog show = alertDialog71.show();
|
final AlertDialog show = alertDialog71.show();
|
||||||
|
|
||||||
buttonServerChanOk.setOnClickListener(view -> {
|
buttonOk.setOnClickListener(view -> {
|
||||||
String senderName = editTextServerChanName.getText().toString().trim();
|
String senderName = editTextServerChanName.getText().toString().trim();
|
||||||
int senderStatus = switchServerChanEnable.isChecked() ? STATUS_ON : STATUS_OFF;
|
int senderStatus = switchServerChanEnable.isChecked() ? STATUS_ON : STATUS_OFF;
|
||||||
if (TextUtils.isEmpty(senderName)) {
|
if (TextUtils.isEmpty(senderName)) {
|
||||||
@ -1251,7 +1251,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
show.dismiss();
|
show.dismiss();
|
||||||
});
|
});
|
||||||
|
|
||||||
buttonServerChanDel.setOnClickListener(view -> {
|
buttonDel.setOnClickListener(view -> {
|
||||||
if (senderModel != null) {
|
if (senderModel != null) {
|
||||||
SenderUtil.delSender(senderModel.getId());
|
SenderUtil.delSender(senderModel.getId());
|
||||||
initSenders();
|
initSenders();
|
||||||
@ -1260,7 +1260,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
show.dismiss();
|
show.dismiss();
|
||||||
});
|
});
|
||||||
|
|
||||||
buttonServerChanTest.setOnClickListener(view -> {
|
buttonTest.setOnClickListener(view -> {
|
||||||
String serverChanServer = editTextServerChanSendKey.getText().trim();
|
String serverChanServer = editTextServerChanSendKey.getText().trim();
|
||||||
if (TextUtils.isEmpty(serverChanServer)) {
|
if (TextUtils.isEmpty(serverChanServer)) {
|
||||||
ToastUtils.delayedShow(R.string.invalid_sendkey, 3000);
|
ToastUtils.delayedShow(R.string.invalid_sendkey, 3000);
|
||||||
@ -1357,9 +1357,9 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
editTextProxyPassword.setText(telegramSettingVo.getProxyPassword());
|
editTextProxyPassword.setText(telegramSettingVo.getProxyPassword());
|
||||||
}
|
}
|
||||||
|
|
||||||
Button buttonTelegramOk = view1.findViewById(R.id.buttonTelegramOk);
|
Button buttonOk = view1.findViewById(R.id.buttonOk);
|
||||||
Button buttonTelegramDel = view1.findViewById(R.id.buttonTelegramDel);
|
Button buttonDel = view1.findViewById(R.id.buttonDel);
|
||||||
Button buttonTelegramTest = view1.findViewById(R.id.buttonTelegramTest);
|
Button buttonTest = view1.findViewById(R.id.buttonTest);
|
||||||
alertDialog71
|
alertDialog71
|
||||||
.setTitle(R.string.settelegramtitle)
|
.setTitle(R.string.settelegramtitle)
|
||||||
.setIcon(R.mipmap.telegram)
|
.setIcon(R.mipmap.telegram)
|
||||||
@ -1367,7 +1367,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
.create();
|
.create();
|
||||||
final AlertDialog show = alertDialog71.show();
|
final AlertDialog show = alertDialog71.show();
|
||||||
|
|
||||||
buttonTelegramOk.setOnClickListener(view -> {
|
buttonOk.setOnClickListener(view -> {
|
||||||
String senderName = editTextTelegramName.getText().toString().trim();
|
String senderName = editTextTelegramName.getText().toString().trim();
|
||||||
int senderStatus = switchTelegramEnable.isChecked() ? STATUS_ON : STATUS_OFF;
|
int senderStatus = switchTelegramEnable.isChecked() ? STATUS_ON : STATUS_OFF;
|
||||||
if (TextUtils.isEmpty(senderName)) {
|
if (TextUtils.isEmpty(senderName)) {
|
||||||
@ -1422,7 +1422,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
show.dismiss();
|
show.dismiss();
|
||||||
});
|
});
|
||||||
|
|
||||||
buttonTelegramDel.setOnClickListener(view -> {
|
buttonDel.setOnClickListener(view -> {
|
||||||
if (senderModel != null) {
|
if (senderModel != null) {
|
||||||
SenderUtil.delSender(senderModel.getId());
|
SenderUtil.delSender(senderModel.getId());
|
||||||
initSenders();
|
initSenders();
|
||||||
@ -1431,7 +1431,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
show.dismiss();
|
show.dismiss();
|
||||||
});
|
});
|
||||||
|
|
||||||
buttonTelegramTest.setOnClickListener(view -> {
|
buttonTest.setOnClickListener(view -> {
|
||||||
String apiToken = editTextTelegramApiToken.getText().trim();
|
String apiToken = editTextTelegramApiToken.getText().trim();
|
||||||
String chatId = editTextTelegramChatId.getText().toString().trim();
|
String chatId = editTextTelegramChatId.getText().toString().trim();
|
||||||
if (apiToken.isEmpty() || chatId.isEmpty()) {
|
if (apiToken.isEmpty() || chatId.isEmpty()) {
|
||||||
@ -1529,9 +1529,9 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
switchSmsOnlyNoNetwork.setChecked(smsSettingVo.getOnlyNoNetwork());
|
switchSmsOnlyNoNetwork.setChecked(smsSettingVo.getOnlyNoNetwork());
|
||||||
}
|
}
|
||||||
|
|
||||||
Button buttonSmsOk = view1.findViewById(R.id.buttonSmsOk);
|
Button buttonOk = view1.findViewById(R.id.buttonOk);
|
||||||
Button buttonSmsDel = view1.findViewById(R.id.buttonSmsDel);
|
Button buttonDel = view1.findViewById(R.id.buttonDel);
|
||||||
Button buttonSmsTest = view1.findViewById(R.id.buttonSmsTest);
|
Button buttonTest = view1.findViewById(R.id.buttonTest);
|
||||||
alertDialog71
|
alertDialog71
|
||||||
.setTitle(R.string.setsmstitle)
|
.setTitle(R.string.setsmstitle)
|
||||||
.setIcon(R.mipmap.sms)
|
.setIcon(R.mipmap.sms)
|
||||||
@ -1539,7 +1539,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
.create();
|
.create();
|
||||||
final AlertDialog show = alertDialog71.show();
|
final AlertDialog show = alertDialog71.show();
|
||||||
|
|
||||||
buttonSmsOk.setOnClickListener(view -> {
|
buttonOk.setOnClickListener(view -> {
|
||||||
String senderName = editTextSmsName.getText().toString().trim();
|
String senderName = editTextSmsName.getText().toString().trim();
|
||||||
int senderStatus = switchSmsEnable.isChecked() ? STATUS_ON : STATUS_OFF;
|
int senderStatus = switchSmsEnable.isChecked() ? STATUS_ON : STATUS_OFF;
|
||||||
if (TextUtils.isEmpty(senderName)) {
|
if (TextUtils.isEmpty(senderName)) {
|
||||||
@ -1585,7 +1585,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
show.dismiss();
|
show.dismiss();
|
||||||
});
|
});
|
||||||
|
|
||||||
buttonSmsDel.setOnClickListener(view -> {
|
buttonDel.setOnClickListener(view -> {
|
||||||
if (senderModel != null) {
|
if (senderModel != null) {
|
||||||
SenderUtil.delSender(senderModel.getId());
|
SenderUtil.delSender(senderModel.getId());
|
||||||
initSenders();
|
initSenders();
|
||||||
@ -1594,7 +1594,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
show.dismiss();
|
show.dismiss();
|
||||||
});
|
});
|
||||||
|
|
||||||
buttonSmsTest.setOnClickListener(view -> {
|
buttonTest.setOnClickListener(view -> {
|
||||||
int simSlot = R.id.btnSmsSimSlot2 == radioGroupSmsSimSlot.getCheckedRadioButtonId() ? 1 : 0;
|
int simSlot = R.id.btnSmsSimSlot2 == radioGroupSmsSimSlot.getCheckedRadioButtonId() ? 1 : 0;
|
||||||
Boolean onlyNoNetwork = switchSmsOnlyNoNetwork.isChecked();
|
Boolean onlyNoNetwork = switchSmsOnlyNoNetwork.isChecked();
|
||||||
String mobiles = editTextSmsMobiles.getText().toString().trim();
|
String mobiles = editTextSmsMobiles.getText().toString().trim();
|
||||||
@ -1641,16 +1641,16 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
editTextFeishuSecret.setText(feiShuSettingVo.getSecret());
|
editTextFeishuSecret.setText(feiShuSettingVo.getSecret());
|
||||||
}
|
}
|
||||||
|
|
||||||
Button buttonFeishuOk = view1.findViewById(R.id.buttonFeishuOk);
|
Button buttonOk = view1.findViewById(R.id.buttonOk);
|
||||||
Button buttonFeishuDel = view1.findViewById(R.id.buttonFeishuDel);
|
Button buttonDel = view1.findViewById(R.id.buttonDel);
|
||||||
Button buttonFeishuTest = view1.findViewById(R.id.buttonFeishuTest);
|
Button buttonTest = view1.findViewById(R.id.buttonTest);
|
||||||
alertDialog71
|
alertDialog71
|
||||||
.setTitle(R.string.setfeishutitle)
|
.setTitle(R.string.setfeishutitle)
|
||||||
.setIcon(R.mipmap.feishu)
|
.setIcon(R.mipmap.feishu)
|
||||||
.setView(view1)
|
.setView(view1)
|
||||||
.create();
|
.create();
|
||||||
final AlertDialog show = alertDialog71.show();
|
final AlertDialog show = alertDialog71.show();
|
||||||
buttonFeishuOk.setOnClickListener(view -> {
|
buttonOk.setOnClickListener(view -> {
|
||||||
String senderName = editTextFeishuName.getText().toString().trim();
|
String senderName = editTextFeishuName.getText().toString().trim();
|
||||||
int senderStatus = switchFeishuEnable.isChecked() ? STATUS_ON : STATUS_OFF;
|
int senderStatus = switchFeishuEnable.isChecked() ? STATUS_ON : STATUS_OFF;
|
||||||
if (TextUtils.isEmpty(senderName)) {
|
if (TextUtils.isEmpty(senderName)) {
|
||||||
@ -1687,7 +1687,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
show.dismiss();
|
show.dismiss();
|
||||||
});
|
});
|
||||||
|
|
||||||
buttonFeishuDel.setOnClickListener(view -> {
|
buttonDel.setOnClickListener(view -> {
|
||||||
if (senderModel != null) {
|
if (senderModel != null) {
|
||||||
SenderUtil.delSender(senderModel.getId());
|
SenderUtil.delSender(senderModel.getId());
|
||||||
initSenders();
|
initSenders();
|
||||||
@ -1696,7 +1696,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
show.dismiss();
|
show.dismiss();
|
||||||
});
|
});
|
||||||
|
|
||||||
buttonFeishuTest.setOnClickListener(view -> {
|
buttonTest.setOnClickListener(view -> {
|
||||||
String webHook = editTextFeishuWebhook.getText().toString().trim();
|
String webHook = editTextFeishuWebhook.getText().toString().trim();
|
||||||
String secret = editTextFeishuSecret.getText().trim();
|
String secret = editTextFeishuSecret.getText().trim();
|
||||||
if (!CommonUtil.checkUrl(webHook, false)) {
|
if (!CommonUtil.checkUrl(webHook, false)) {
|
||||||
@ -1755,16 +1755,16 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
editTextPushPlusTitle.setText(pushPlusSettingVo.getTitleTemplate());
|
editTextPushPlusTitle.setText(pushPlusSettingVo.getTitleTemplate());
|
||||||
}
|
}
|
||||||
|
|
||||||
Button buttonPushPlusOk = view1.findViewById(R.id.buttonPushPlusOk);
|
Button buttonOk = view1.findViewById(R.id.buttonOk);
|
||||||
Button buttonPushPlusDel = view1.findViewById(R.id.buttonPushPlusDel);
|
Button buttonDel = view1.findViewById(R.id.buttonDel);
|
||||||
Button buttonPushPlusTest = view1.findViewById(R.id.buttonPushPlusTest);
|
Button buttonTest = view1.findViewById(R.id.buttonTest);
|
||||||
alertDialog71
|
alertDialog71
|
||||||
.setTitle(R.string.setpushplustitle)
|
.setTitle(R.string.setpushplustitle)
|
||||||
.setIcon(R.mipmap.pushplus)
|
.setIcon(R.mipmap.pushplus)
|
||||||
.setView(view1)
|
.setView(view1)
|
||||||
.create();
|
.create();
|
||||||
final AlertDialog show = alertDialog71.show();
|
final AlertDialog show = alertDialog71.show();
|
||||||
buttonPushPlusOk.setOnClickListener(view -> {
|
buttonOk.setOnClickListener(view -> {
|
||||||
String senderName = editTextPushPlusName.getText().toString().trim();
|
String senderName = editTextPushPlusName.getText().toString().trim();
|
||||||
int senderStatus = switchPushPlusEnable.isChecked() ? STATUS_ON : STATUS_OFF;
|
int senderStatus = switchPushPlusEnable.isChecked() ? STATUS_ON : STATUS_OFF;
|
||||||
if (TextUtils.isEmpty(senderName)) {
|
if (TextUtils.isEmpty(senderName)) {
|
||||||
@ -1809,7 +1809,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
show.dismiss();
|
show.dismiss();
|
||||||
});
|
});
|
||||||
|
|
||||||
buttonPushPlusDel.setOnClickListener(view -> {
|
buttonDel.setOnClickListener(view -> {
|
||||||
if (senderModel != null) {
|
if (senderModel != null) {
|
||||||
SenderUtil.delSender(senderModel.getId());
|
SenderUtil.delSender(senderModel.getId());
|
||||||
initSenders();
|
initSenders();
|
||||||
@ -1818,7 +1818,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
show.dismiss();
|
show.dismiss();
|
||||||
});
|
});
|
||||||
|
|
||||||
buttonPushPlusTest.setOnClickListener(view -> {
|
buttonTest.setOnClickListener(view -> {
|
||||||
|
|
||||||
String title = editTextPushPlusTitle.getText().toString().trim();
|
String title = editTextPushPlusTitle.getText().toString().trim();
|
||||||
if (title.isEmpty()) title = "SmsForwarder Title";
|
if (title.isEmpty()) title = "SmsForwarder Title";
|
||||||
@ -1908,9 +1908,9 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
editTextGotifyPriority.setText(gotifySettingVo.getPriority());
|
editTextGotifyPriority.setText(gotifySettingVo.getPriority());
|
||||||
}
|
}
|
||||||
|
|
||||||
Button buttonGotifyOk = view1.findViewById(R.id.buttonGotifyOk);
|
Button buttonOk = view1.findViewById(R.id.buttonOk);
|
||||||
Button buttonGotifyDel = view1.findViewById(R.id.buttonGotifyDel);
|
Button buttonDel = view1.findViewById(R.id.buttonDel);
|
||||||
Button buttonGotifyTest = view1.findViewById(R.id.buttonGotifyTest);
|
Button buttonTest = view1.findViewById(R.id.buttonTest);
|
||||||
alertDialog71
|
alertDialog71
|
||||||
.setTitle(R.string.setgotifytitle)
|
.setTitle(R.string.setgotifytitle)
|
||||||
.setIcon(R.mipmap.gotify)
|
.setIcon(R.mipmap.gotify)
|
||||||
@ -1918,7 +1918,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
.create();
|
.create();
|
||||||
final AlertDialog show = alertDialog71.show();
|
final AlertDialog show = alertDialog71.show();
|
||||||
|
|
||||||
buttonGotifyOk.setOnClickListener(view -> {
|
buttonOk.setOnClickListener(view -> {
|
||||||
String senderName = editTextGotifyName.getText().toString().trim();
|
String senderName = editTextGotifyName.getText().toString().trim();
|
||||||
int senderStatus = switchGotifyEnable.isChecked() ? STATUS_ON : STATUS_OFF;
|
int senderStatus = switchGotifyEnable.isChecked() ? STATUS_ON : STATUS_OFF;
|
||||||
if (TextUtils.isEmpty(senderName)) {
|
if (TextUtils.isEmpty(senderName)) {
|
||||||
@ -1960,7 +1960,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
show.dismiss();
|
show.dismiss();
|
||||||
});
|
});
|
||||||
|
|
||||||
buttonGotifyDel.setOnClickListener(view -> {
|
buttonDel.setOnClickListener(view -> {
|
||||||
if (senderModel != null) {
|
if (senderModel != null) {
|
||||||
SenderUtil.delSender(senderModel.getId());
|
SenderUtil.delSender(senderModel.getId());
|
||||||
initSenders();
|
initSenders();
|
||||||
@ -1969,7 +1969,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||||||
show.dismiss();
|
show.dismiss();
|
||||||
});
|
});
|
||||||
|
|
||||||
buttonGotifyTest.setOnClickListener(view -> {
|
buttonTest.setOnClickListener(view -> {
|
||||||
String webServer = editTextGotifyWebServer.getText().trim();
|
String webServer = editTextGotifyWebServer.getText().trim();
|
||||||
if (!CommonUtil.checkUrl(webServer, false)) {
|
if (!CommonUtil.checkUrl(webServer, false)) {
|
||||||
ToastUtils.delayedShow(R.string.invalid_webserver, 3000);
|
ToastUtils.delayedShow(R.string.invalid_webserver, 3000);
|
||||||
|
@ -2,6 +2,7 @@ package com.idormy.sms.forwarder.model.vo;
|
|||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
|
@SuppressWarnings("UnusedReturnValue")
|
||||||
@Data
|
@Data
|
||||||
public class ResVo<T> {
|
public class ResVo<T> {
|
||||||
public static final int ERROR_CODE = 500;
|
public static final int ERROR_CODE = 500;
|
||||||
|
@ -128,7 +128,7 @@ public class PhoneStateReceiver extends BroadcastReceiver {
|
|||||||
SettingUtil.setPrevNoticeHash(phoneNumber, currHash);
|
SettingUtil.setPrevNoticeHash(phoneNumber, currHash);
|
||||||
|
|
||||||
SmsVo smsVo = new SmsVo(phoneNumber, getTypeText(context, type, name, viaNumber), new Date(), simInfo);
|
SmsVo smsVo = new SmsVo(phoneNumber, getTypeText(context, type, name, viaNumber), new Date(), simInfo);
|
||||||
Log.d(TAG, "send_msg" + smsVo.toString());
|
Log.d(TAG, "send_msg" + smsVo);
|
||||||
SendUtil.send_msg(context, smsVo, simId, "call");
|
SendUtil.send_msg(context, smsVo, simId, "call");
|
||||||
|
|
||||||
//SmsHubApi
|
//SmsHubApi
|
||||||
|
@ -72,7 +72,7 @@ public class SenderBarkMsg extends SenderBaseMsg {
|
|||||||
}
|
}
|
||||||
|
|
||||||
RequestBody body = builder.build();
|
RequestBody body = builder.build();
|
||||||
Log.d(TAG, "method = POST, Body = " + body.toString());
|
Log.d(TAG, "method = POST, Body = " + body);
|
||||||
|
|
||||||
OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder();
|
OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder();
|
||||||
//设置重试拦截器
|
//设置重试拦截器
|
||||||
|
@ -6,17 +6,24 @@ import android.util.Log;
|
|||||||
|
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
import com.idormy.sms.forwarder.model.vo.SmsHubVo;
|
import com.idormy.sms.forwarder.model.vo.SmsHubVo;
|
||||||
import com.idormy.sms.forwarder.utils.*;
|
import com.idormy.sms.forwarder.utils.HttpUtil;
|
||||||
|
import com.idormy.sms.forwarder.utils.SettingUtil;
|
||||||
|
import com.idormy.sms.forwarder.utils.SmsHubActionHandler;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.List;
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.Timer;
|
||||||
|
import java.util.TimerTask;
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 主动发送短信轮询任务
|
* 主动发送短信轮询任务
|
||||||
|
*
|
||||||
* @author xxc
|
* @author xxc
|
||||||
* 2022/1/10 9:53
|
* 2022/1/10 9:53
|
||||||
*/
|
*/
|
||||||
|
@SuppressWarnings("CodeBlock2Expr")
|
||||||
public class SmsHubApiTask extends TimerTask {
|
public class SmsHubApiTask extends TimerTask {
|
||||||
private static Boolean hasInit = false;
|
private static Boolean hasInit = false;
|
||||||
public static final long DELAY_SECONDS = 30;
|
public static final long DELAY_SECONDS = 30;
|
||||||
|
@ -201,7 +201,7 @@ public class BatteryService extends Service {
|
|||||||
Log.i(TAG, msg);
|
Log.i(TAG, msg);
|
||||||
try {
|
try {
|
||||||
SmsVo smsVo = new SmsVo("88888888", msg, new Date(), "电池状态监听");
|
SmsVo smsVo = new SmsVo("88888888", msg, new Date(), "电池状态监听");
|
||||||
Log.d(TAG, "send_msg" + smsVo.toString());
|
Log.d(TAG, "send_msg" + smsVo);
|
||||||
SendUtil.send_msg(context, smsVo, 1, "app");
|
SendUtil.send_msg(context, smsVo, 1, "app");
|
||||||
|
|
||||||
//SmsHubApi
|
//SmsHubApi
|
||||||
|
@ -89,7 +89,7 @@ public class NotifyService extends NotificationListenerService {
|
|||||||
SettingUtil.setPrevNoticeHash(packageName, currHash);
|
SettingUtil.setPrevNoticeHash(packageName, currHash);
|
||||||
|
|
||||||
SmsVo smsVo = new SmsVo(packageName, text, new Date(), title);
|
SmsVo smsVo = new SmsVo(packageName, text, new Date(), title);
|
||||||
Log.d(TAG, "send_msg" + smsVo.toString());
|
Log.d(TAG, "send_msg" + smsVo);
|
||||||
SendUtil.send_msg(this, smsVo, 1, "app");
|
SendUtil.send_msg(this, smsVo, 1, "app");
|
||||||
|
|
||||||
//SmsHubApi
|
//SmsHubApi
|
||||||
|
@ -17,9 +17,9 @@ import android.widget.ScrollView;
|
|||||||
import androidx.core.app.ActivityCompat;
|
import androidx.core.app.ActivityCompat;
|
||||||
import androidx.core.app.NotificationManagerCompat;
|
import androidx.core.app.NotificationManagerCompat;
|
||||||
|
|
||||||
|
import com.google.android.material.floatingactionbutton.FloatingActionButton;
|
||||||
import com.idormy.sms.forwarder.MyApplication;
|
import com.idormy.sms.forwarder.MyApplication;
|
||||||
import com.idormy.sms.forwarder.service.NotifyService;
|
import com.idormy.sms.forwarder.service.NotifyService;
|
||||||
import com.melnykov.fab.FloatingActionButton;
|
|
||||||
|
|
||||||
import java.security.MessageDigest;
|
import java.security.MessageDigest;
|
||||||
import java.security.NoSuchAlgorithmException;
|
import java.security.NoSuchAlgorithmException;
|
||||||
|
@ -156,14 +156,14 @@ class RuleLine {
|
|||||||
} else {
|
} else {
|
||||||
//生成了一个中间体
|
//生成了一个中间体
|
||||||
middleList.add(buildMiddleWord.toString());
|
middleList.add(buildMiddleWord.toString());
|
||||||
logg("get Middle++:" + buildMiddleWord.toString());
|
logg("get Middle++:" + buildMiddleWord);
|
||||||
|
|
||||||
buildMiddleWord = new StringBuilder();
|
buildMiddleWord = new StringBuilder();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
//把w拼接到中间体上
|
//把w拼接到中间体上
|
||||||
buildMiddleWord.append(w);
|
buildMiddleWord.append(w);
|
||||||
logg("buildMiddleWord length:" + buildMiddleWord.length() + "buildMiddleWord:" + buildMiddleWord.toString());
|
logg("buildMiddleWord length:" + buildMiddleWord.length() + "buildMiddleWord:" + buildMiddleWord);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -174,7 +174,7 @@ class RuleLine {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
logg("isDealValue done valueBuilder:" + valueBuilder.toString());
|
logg("isDealValue done valueBuilder:" + valueBuilder);
|
||||||
|
|
||||||
|
|
||||||
if (middleList.size() != 4) {
|
if (middleList.size() != 4) {
|
||||||
|
10
app/src/main/res/drawable/ic_about.xml
Normal file
10
app/src/main/res/drawable/ic_about.xml
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="24dp"
|
||||||
|
android:height="24dp"
|
||||||
|
android:viewportWidth="24"
|
||||||
|
android:viewportHeight="24"
|
||||||
|
android:tint="?attr/colorControlNormal">
|
||||||
|
<path
|
||||||
|
android:fillColor="@android:color/white"
|
||||||
|
android:pathData="M7,20h4c0,1.1 -0.9,2 -2,2S7,21.1 7,20zM5,19h8v-2H5V19zM16.5,9.5c0,3.82 -2.66,5.86 -3.77,6.5H5.27C4.16,15.36 1.5,13.32 1.5,9.5C1.5,5.36 4.86,2 9,2S16.5,5.36 16.5,9.5zM21.37,7.37L20,8l1.37,0.63L22,10l0.63,-1.37L24,8l-1.37,-0.63L22,6L21.37,7.37zM19,6l0.94,-2.06L22,3l-2.06,-0.94L19,0l-0.94,2.06L16,3l2.06,0.94L19,6z" />
|
||||||
|
</vector>
|
@ -1,5 +1,10 @@
|
|||||||
<vector android:height="24dp" android:tint="#FFFFFF"
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:viewportHeight="24" android:viewportWidth="24"
|
android:width="24dp"
|
||||||
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
android:height="24dp"
|
||||||
<path android:fillColor="@android:color/white" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
|
android:tint="?attr/colorOnPrimary"
|
||||||
|
android:viewportWidth="24"
|
||||||
|
android:viewportHeight="24">
|
||||||
|
<path
|
||||||
|
android:fillColor="@android:color/white"
|
||||||
|
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
|
||||||
</vector>
|
</vector>
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
<vector android:height="24dp" android:tint="#FFFFFF"
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:viewportHeight="24" android:viewportWidth="24"
|
android:width="24dp"
|
||||||
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
android:height="24dp"
|
||||||
<path android:fillColor="@android:color/white" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,7L6,7v12zM8.46,11.88l1.41,-1.41L12,12.59l2.12,-2.12 1.41,1.41L13.41,14l2.12,2.12 -1.41,1.41L12,15.41l-2.12,2.12 -1.41,-1.41L10.59,14l-2.13,-2.12zM15.5,4l-1,-1h-5l-1,1L5,4v2h14L19,4z"/>
|
android:tint="?attr/colorOnPrimary"
|
||||||
|
android:viewportWidth="24"
|
||||||
|
android:viewportHeight="24">
|
||||||
|
<path
|
||||||
|
android:fillColor="@android:color/white"
|
||||||
|
android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,7L6,7v12zM8.46,11.88l1.41,-1.41L12,12.59l2.12,-2.12 1.41,1.41L13.41,14l2.12,2.12 -1.41,1.41L12,15.41l-2.12,2.12 -1.41,-1.41L10.59,14l-2.13,-2.12zM15.5,4l-1,-1h-5l-1,1L5,4v2h14L19,4z" />
|
||||||
</vector>
|
</vector>
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:width="24dp"
|
android:width="24dp"
|
||||||
android:height="24dp"
|
android:height="24dp"
|
||||||
|
android:tint="?attr/colorControlNormal"
|
||||||
android:viewportWidth="24"
|
android:viewportWidth="24"
|
||||||
android:viewportHeight="24"
|
android:viewportHeight="24">
|
||||||
android:tint="?attr/colorControlNormal">
|
<path
|
||||||
<path
|
android:fillColor="@android:color/white"
|
||||||
android:fillColor="@android:color/white"
|
android:pathData="M19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM12.01,18c-0.7,0 -1.26,-0.56 -1.26,-1.26c0,-0.71 0.56,-1.25 1.26,-1.25c0.71,0 1.25,0.54 1.25,1.25C13.25,17.43 12.72,18 12.01,18zM15.02,10.6c-0.76,1.11 -1.48,1.46 -1.87,2.17c-0.16,0.29 -0.22,0.48 -0.22,1.41h-1.82c0,-0.49 -0.08,-1.29 0.31,-1.98c0.49,-0.87 1.42,-1.39 1.96,-2.16c0.57,-0.81 0.25,-2.33 -1.37,-2.33c-1.06,0 -1.58,0.8 -1.8,1.48L8.56,8.49C9.01,7.15 10.22,6 11.99,6c1.48,0 2.49,0.67 3.01,1.52C15.44,8.24 15.7,9.59 15.02,10.6z" />
|
||||||
android:pathData="M11,18h2v-2h-2v2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5 0,-2.21 -1.79,-4 -4,-4z"/>
|
|
||||||
</vector>
|
</vector>
|
||||||
|
@ -1,21 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<!-- 连框颜色值 -->
|
|
||||||
<item>
|
|
||||||
<shape>
|
|
||||||
<corners android:radius="0dp" />
|
|
||||||
<solid android:color="#757575" />
|
|
||||||
</shape>
|
|
||||||
</item>
|
|
||||||
<!-- 主体背景颜色值 -->
|
|
||||||
<item
|
|
||||||
android:bottom="1dp"
|
|
||||||
android:left="0dp"
|
|
||||||
android:right="0dp"
|
|
||||||
android:top="0dp">
|
|
||||||
<shape>
|
|
||||||
<corners android:radius="0dp" />
|
|
||||||
<solid android:color="@color/white" />
|
|
||||||
</shape>
|
|
||||||
</item>
|
|
||||||
</layer-list>
|
|
@ -6,15 +6,16 @@
|
|||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical"
|
||||||
|
android:background="@color/setting_bg_color">
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="2dp"
|
android:layout_marginTop="2dp"
|
||||||
android:background="@android:color/white"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
|
android:background="@color/setting_bar_color"
|
||||||
android:padding="15dp">
|
android:padding="15dp">
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
@ -41,6 +42,9 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="5dp"
|
||||||
android:text="@string/check_for_updates" />
|
android:text="@string/check_for_updates" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
@ -49,9 +53,9 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="2dp"
|
android:layout_marginTop="2dp"
|
||||||
android:background="@android:color/white"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
|
android:background="@color/setting_bar_color"
|
||||||
android:padding="15dp">
|
android:padding="15dp">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
@ -74,9 +78,9 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="2dp"
|
android:layout_marginTop="2dp"
|
||||||
android:background="@android:color/white"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
|
android:background="@color/setting_bar_color"
|
||||||
android:padding="15dp">
|
android:padding="15dp">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
@ -99,9 +103,9 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="2dp"
|
android:layout_marginTop="2dp"
|
||||||
android:background="@android:color/white"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
|
android:background="@color/setting_bar_color"
|
||||||
android:padding="15dp">
|
android:padding="15dp">
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
@ -133,13 +137,20 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="5dp"
|
||||||
android:text="@string/join_qq_group1" />
|
android:text="@string/join_qq_group1" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/join_qq_group2"
|
android:id="@+id/join_qq_group2"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="5dp"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="5dp"
|
||||||
android:text="@string/join_qq_group2" />
|
android:text="@string/join_qq_group2" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
@ -147,9 +158,9 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="2dp"
|
android:layout_marginTop="2dp"
|
||||||
android:background="@android:color/white"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
|
android:background="@color/setting_bar_color"
|
||||||
android:padding="15dp">
|
android:padding="15dp">
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
@ -176,6 +187,9 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="5dp"
|
||||||
android:text="@string/purge" />
|
android:text="@string/purge" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
@ -19,6 +19,12 @@
|
|||||||
<RadioButton
|
<RadioButton
|
||||||
android:id="@+id/btnTypeUser"
|
android:id="@+id/btnTypeUser"
|
||||||
style="@style/select_style"
|
style="@style/select_style"
|
||||||
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:paddingStart="10dp"
|
||||||
|
android:paddingTop="5dp"
|
||||||
|
android:paddingEnd="10dp"
|
||||||
|
android:paddingBottom="5dp"
|
||||||
android:checked="true"
|
android:checked="true"
|
||||||
android:tag="user"
|
android:tag="user"
|
||||||
android:text="@string/user_app" />
|
android:text="@string/user_app" />
|
||||||
@ -26,6 +32,12 @@
|
|||||||
<RadioButton
|
<RadioButton
|
||||||
android:id="@+id/btnTypeSys"
|
android:id="@+id/btnTypeSys"
|
||||||
style="@style/select_style"
|
style="@style/select_style"
|
||||||
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:paddingStart="10dp"
|
||||||
|
android:paddingTop="5dp"
|
||||||
|
android:paddingEnd="10dp"
|
||||||
|
android:paddingBottom="5dp"
|
||||||
android:tag="sys"
|
android:tag="sys"
|
||||||
android:text="@string/system_app" />
|
android:text="@string/system_app" />
|
||||||
|
|
||||||
@ -39,7 +51,7 @@
|
|||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="5dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginEnd="5dp"
|
android:layout_marginEnd="5dp"
|
||||||
android:background="#aadcdcdc" />
|
android:background="@color/line_color" />
|
||||||
|
|
||||||
<ListView
|
<ListView
|
||||||
android:id="@+id/list_view_app"
|
android:id="@+id/list_view_app"
|
||||||
@ -54,6 +66,7 @@
|
|||||||
android:id="@+id/help_tip"
|
android:id="@+id/help_tip"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:background="@color/tip_bar_color"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:text="@string/app_tips"
|
android:text="@string/app_tips"
|
||||||
android:textColor="@color/colorPrimary" />
|
android:textColor="@color/colorPrimary" />
|
||||||
|
@ -4,34 +4,20 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
<!--<com.google.android.material.floatingactionbutton.FloatingActionButton
|
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||||
android:id="@+id/btnCleanLog"
|
android:id="@+id/btnCleanLog"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignParentEnd="true"
|
android:layout_alignParentEnd="true"
|
||||||
android:layout_alignParentBottom="true"
|
android:layout_alignParentBottom="true"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="20dp"
|
||||||
android:layout_marginBottom="90dp"
|
android:layout_marginBottom="40dp"
|
||||||
android:contentDescription="@string/clean_log"
|
android:backgroundTint="@color/colorPrimary"
|
||||||
|
android:contentDescription="@string/clear_logs"
|
||||||
android:scaleType="centerCrop"
|
android:scaleType="centerCrop"
|
||||||
android:src="@drawable/ic_delete"
|
android:src="@drawable/ic_delete"
|
||||||
app:borderWidth="0dp"
|
android:tint="?attr/colorOnPrimary"
|
||||||
app:elevation="5dp"
|
app:fabSize="mini" />
|
||||||
app:fabSize="mini" />-->
|
|
||||||
|
|
||||||
<com.melnykov.fab.FloatingActionButton
|
|
||||||
android:id="@+id/btnCleanLog"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_alignParentEnd="true"
|
|
||||||
android:layout_alignParentBottom="true"
|
|
||||||
android:layout_marginEnd="10dp"
|
|
||||||
android:layout_marginBottom="90dp"
|
|
||||||
android:src="@drawable/ic_delete"
|
|
||||||
app:fab_type="mini"
|
|
||||||
app:fab_colorNormal="@color/colorPrimary"
|
|
||||||
app:fab_colorPressed="@color/colorPrimaryDark"
|
|
||||||
app:fab_colorRipple="@color/colorAccent" />
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/radioGroup"
|
android:id="@+id/radioGroup"
|
||||||
@ -54,18 +40,36 @@
|
|||||||
android:id="@+id/btnTypeSms"
|
android:id="@+id/btnTypeSms"
|
||||||
style="@style/select_style"
|
style="@style/select_style"
|
||||||
android:checked="true"
|
android:checked="true"
|
||||||
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:paddingStart="10dp"
|
||||||
|
android:paddingTop="5dp"
|
||||||
|
android:paddingEnd="10dp"
|
||||||
|
android:paddingBottom="5dp"
|
||||||
android:tag="sms"
|
android:tag="sms"
|
||||||
android:text="@string/sms" />
|
android:text="@string/sms" />
|
||||||
|
|
||||||
<RadioButton
|
<RadioButton
|
||||||
android:id="@+id/btnTypeCall"
|
android:id="@+id/btnTypeCall"
|
||||||
style="@style/select_style"
|
style="@style/select_style"
|
||||||
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:paddingStart="10dp"
|
||||||
|
android:paddingTop="5dp"
|
||||||
|
android:paddingEnd="10dp"
|
||||||
|
android:paddingBottom="5dp"
|
||||||
android:tag="call"
|
android:tag="call"
|
||||||
android:text="@string/call" />
|
android:text="@string/call" />
|
||||||
|
|
||||||
<RadioButton
|
<RadioButton
|
||||||
android:id="@+id/btnTypeApp"
|
android:id="@+id/btnTypeApp"
|
||||||
style="@style/select_style"
|
style="@style/select_style"
|
||||||
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:paddingStart="10dp"
|
||||||
|
android:paddingTop="5dp"
|
||||||
|
android:paddingEnd="10dp"
|
||||||
|
android:paddingBottom="5dp"
|
||||||
android:tag="app"
|
android:tag="app"
|
||||||
android:text="@string/app" />
|
android:text="@string/app" />
|
||||||
</RadioGroup>
|
</RadioGroup>
|
||||||
|
@ -4,34 +4,20 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
<!--<com.google.android.material.floatingactionbutton.FloatingActionButton
|
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||||
android:id="@+id/btnFloat"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_alignParentEnd="true"
|
|
||||||
android:layout_alignParentBottom="true"
|
|
||||||
android:layout_marginEnd="10dp"
|
|
||||||
android:layout_marginBottom="20dp"
|
|
||||||
android:contentDescription="@string/setrule"
|
|
||||||
android:scaleType="centerCrop"
|
|
||||||
android:src="@drawable/ic_add"
|
|
||||||
app:borderWidth="0dp"
|
|
||||||
app:elevation="5dp"
|
|
||||||
app:fabSize="mini" />-->
|
|
||||||
|
|
||||||
<com.melnykov.fab.FloatingActionButton
|
|
||||||
android:id="@+id/btnAddRule"
|
android:id="@+id/btnAddRule"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignParentEnd="true"
|
android:layout_alignParentEnd="true"
|
||||||
android:layout_alignParentBottom="true"
|
android:layout_alignParentBottom="true"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="20dp"
|
||||||
android:layout_marginBottom="90dp"
|
android:layout_marginBottom="40dp"
|
||||||
|
android:backgroundTint="@color/colorPrimary"
|
||||||
|
android:contentDescription="@string/add_rule"
|
||||||
|
android:scaleType="centerCrop"
|
||||||
android:src="@drawable/ic_add"
|
android:src="@drawable/ic_add"
|
||||||
app:fab_type="mini"
|
android:tint="?attr/colorOnPrimary"
|
||||||
app:fab_colorNormal="@color/colorPrimary"
|
app:fabSize="mini" />
|
||||||
app:fab_colorPressed="@color/colorPrimaryDark"
|
|
||||||
app:fab_colorRipple="@color/colorAccent" />
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/radioGroup"
|
android:id="@+id/radioGroup"
|
||||||
@ -54,18 +40,36 @@
|
|||||||
android:id="@+id/btnTypeSms"
|
android:id="@+id/btnTypeSms"
|
||||||
style="@style/select_style"
|
style="@style/select_style"
|
||||||
android:checked="true"
|
android:checked="true"
|
||||||
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:paddingStart="10dp"
|
||||||
|
android:paddingTop="5dp"
|
||||||
|
android:paddingEnd="10dp"
|
||||||
|
android:paddingBottom="5dp"
|
||||||
android:tag="sms"
|
android:tag="sms"
|
||||||
android:text="@string/sms" />
|
android:text="@string/sms" />
|
||||||
|
|
||||||
<RadioButton
|
<RadioButton
|
||||||
android:id="@+id/btnTypeCall"
|
android:id="@+id/btnTypeCall"
|
||||||
style="@style/select_style"
|
style="@style/select_style"
|
||||||
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:paddingStart="10dp"
|
||||||
|
android:paddingTop="5dp"
|
||||||
|
android:paddingEnd="10dp"
|
||||||
|
android:paddingBottom="5dp"
|
||||||
android:tag="call"
|
android:tag="call"
|
||||||
android:text="@string/call" />
|
android:text="@string/call" />
|
||||||
|
|
||||||
<RadioButton
|
<RadioButton
|
||||||
android:id="@+id/btnTypeApp"
|
android:id="@+id/btnTypeApp"
|
||||||
style="@style/select_style"
|
style="@style/select_style"
|
||||||
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:paddingStart="10dp"
|
||||||
|
android:paddingTop="5dp"
|
||||||
|
android:paddingEnd="10dp"
|
||||||
|
android:paddingBottom="5dp"
|
||||||
android:tag="app"
|
android:tag="app"
|
||||||
android:text="@string/app" />
|
android:text="@string/app" />
|
||||||
</RadioGroup>
|
</RadioGroup>
|
||||||
|
@ -1,38 +1,23 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
<!--<com.google.android.material.floatingactionbutton.FloatingActionButton
|
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||||
android:id="@+id/btnAddSender"
|
android:id="@+id/btnAddSender"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignParentEnd="true"
|
android:layout_alignParentEnd="true"
|
||||||
android:layout_alignParentBottom="true"
|
android:layout_alignParentBottom="true"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="20dp"
|
||||||
android:layout_marginBottom="20dp"
|
android:layout_marginBottom="40dp"
|
||||||
android:contentDescription="@string/new_sender"
|
android:backgroundTint="@color/colorPrimary"
|
||||||
|
android:contentDescription="@string/add_sender"
|
||||||
android:scaleType="centerCrop"
|
android:scaleType="centerCrop"
|
||||||
android:src="@drawable/ic_add"
|
android:src="@drawable/ic_add"
|
||||||
app:borderWidth="0dp"
|
android:tint="?attr/colorOnPrimary"
|
||||||
app:elevation="5dp"
|
app:fabSize="mini" />
|
||||||
app:fabSize="mini" />-->
|
|
||||||
|
|
||||||
<com.melnykov.fab.FloatingActionButton
|
|
||||||
android:id="@+id/btnAddSender"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_alignParentEnd="true"
|
|
||||||
android:layout_alignParentBottom="true"
|
|
||||||
android:layout_marginEnd="10dp"
|
|
||||||
android:layout_marginBottom="90dp"
|
|
||||||
android:src="@drawable/ic_add"
|
|
||||||
app:fab_type="mini"
|
|
||||||
app:fab_colorNormal="@color/colorPrimary"
|
|
||||||
app:fab_colorPressed="@color/colorPrimaryDark"
|
|
||||||
app:fab_colorRipple="@color/colorAccent" />
|
|
||||||
|
|
||||||
<ListView
|
<ListView
|
||||||
android:id="@+id/list_view_sender"
|
android:id="@+id/list_view_sender"
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_marginBottom="85dp"
|
android:layout_marginBottom="85dp"
|
||||||
android:background="@color/colorBackground">
|
android:background="@color/setting_bg_color">
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
@ -49,7 +49,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="2dp"
|
android:layout_marginTop="2dp"
|
||||||
android:background="@android:color/white"
|
android:background="@color/setting_bar_color"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:padding="15dp">
|
android:padding="15dp">
|
||||||
@ -90,7 +90,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="2dp"
|
android:layout_marginTop="2dp"
|
||||||
android:background="@android:color/white"
|
android:background="@color/setting_bar_color"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:padding="15dp">
|
android:padding="15dp">
|
||||||
@ -174,7 +174,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="2dp"
|
android:layout_marginTop="2dp"
|
||||||
android:background="@android:color/white"
|
android:background="@color/setting_bar_color"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:padding="15dp">
|
android:padding="15dp">
|
||||||
@ -265,7 +265,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="2dp"
|
android:layout_marginTop="2dp"
|
||||||
android:background="@android:color/white"
|
android:background="@color/setting_bar_color"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:padding="15dp">
|
android:padding="15dp">
|
||||||
@ -306,7 +306,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="2dp"
|
android:layout_marginTop="2dp"
|
||||||
android:background="@android:color/white"
|
android:background="@color/setting_bar_color"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:padding="15dp">
|
android:padding="15dp">
|
||||||
@ -334,12 +334,8 @@
|
|||||||
<com.idormy.sms.forwarder.view.ClearEditText
|
<com.idormy.sms.forwarder.view.ClearEditText
|
||||||
android:id="@+id/editText_text_sms_hub_url"
|
android:id="@+id/editText_text_sms_hub_url"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="36dp"
|
android:layout_height="wrap_content"
|
||||||
android:background="@drawable/line_bg_white_only_bottom_d8"
|
app:showEye="true" />
|
||||||
app:showEye="true"
|
|
||||||
app:textColor="@color/tv_black_333333"
|
|
||||||
app:textColorHint="@color/tv_gray_999999"
|
|
||||||
app:textSize="14sp" />
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<Switch
|
<Switch
|
||||||
@ -380,7 +376,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="2dp"
|
android:layout_marginTop="2dp"
|
||||||
android:background="@android:color/white"
|
android:background="@color/setting_bar_color"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:padding="15dp">
|
android:padding="15dp">
|
||||||
@ -421,7 +417,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="2dp"
|
android:layout_marginTop="2dp"
|
||||||
android:background="@android:color/white"
|
android:background="@color/setting_bar_color"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:padding="15dp">
|
android:padding="15dp">
|
||||||
@ -543,7 +539,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="2dp"
|
android:layout_marginTop="2dp"
|
||||||
android:background="@android:color/white"
|
android:background="@color/setting_bar_color"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:padding="15dp">
|
android:padding="15dp">
|
||||||
@ -571,7 +567,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="2dp"
|
android:layout_marginTop="2dp"
|
||||||
android:background="@android:color/white"
|
android:background="@color/setting_bar_color"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:padding="15dp">
|
android:padding="15dp">
|
||||||
@ -612,7 +608,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="2dp"
|
android:layout_marginTop="2dp"
|
||||||
android:background="@android:color/white"
|
android:background="@color/setting_bar_color"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:padding="15dp">
|
android:padding="15dp">
|
||||||
@ -653,7 +649,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="2dp"
|
android:layout_marginTop="2dp"
|
||||||
android:background="@android:color/white"
|
android:background="@color/setting_bar_color"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:padding="15dp">
|
android:padding="15dp">
|
||||||
@ -757,7 +753,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="2dp"
|
android:layout_marginTop="2dp"
|
||||||
android:background="@android:color/white"
|
android:background="@color/setting_bar_color"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:padding="15dp">
|
android:padding="15dp">
|
||||||
@ -786,7 +782,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="2dp"
|
android:layout_marginTop="2dp"
|
||||||
android:background="@android:color/white"
|
android:background="@color/setting_bar_color"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:padding="15dp">
|
android:padding="15dp">
|
||||||
@ -828,7 +824,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="2dp"
|
android:layout_marginTop="2dp"
|
||||||
android:background="@android:color/white"
|
android:background="@color/setting_bar_color"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:padding="15dp">
|
android:padding="15dp">
|
||||||
@ -870,7 +866,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="2dp"
|
android:layout_marginTop="2dp"
|
||||||
android:background="@android:color/white"
|
android:background="@color/setting_bar_color"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:padding="15dp">
|
android:padding="15dp">
|
||||||
@ -912,7 +908,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="2dp"
|
android:layout_marginTop="2dp"
|
||||||
android:background="@android:color/white"
|
android:background="@color/setting_bar_color"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:padding="15dp"
|
android:padding="15dp"
|
||||||
@ -956,65 +952,80 @@
|
|||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_sender"
|
android:id="@+id/bt_insert_sender"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_marginBottom="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorPrimary"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
android:onClick="toInsertLabel"
|
android:onClick="toInsertLabel"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_sender"
|
android:text="@string/insert_sender"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights,UsingOnClickInXml" />
|
tools:ignore="ButtonStyle,NestedWeights,UsingOnClickInXml" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_content"
|
android:id="@+id/bt_insert_content"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="3dp"
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_marginBottom="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorPrimary"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
android:onClick="toInsertLabel"
|
android:onClick="toInsertLabel"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_content"
|
android:text="@string/insert_content"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights,UsingOnClickInXml" />
|
tools:ignore="ButtonStyle,NestedWeights,UsingOnClickInXml" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_extra"
|
android:id="@+id/bt_insert_extra"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="3dp"
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_marginBottom="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorPrimary"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
android:onClick="toInsertLabel"
|
android:onClick="toInsertLabel"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_extra"
|
android:text="@string/insert_extra"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights,UsingOnClickInXml" />
|
tools:ignore="ButtonStyle,NestedWeights,UsingOnClickInXml" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_time"
|
android:id="@+id/bt_insert_time"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="3dp"
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_marginBottom="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorPrimary"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
android:onClick="toInsertLabel"
|
android:onClick="toInsertLabel"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_time"
|
android:text="@string/insert_time"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights,UsingOnClickInXml" />
|
tools:ignore="ButtonStyle,NestedWeights,UsingOnClickInXml" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_device_name"
|
android:id="@+id/bt_insert_device_name"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="3dp"
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_marginBottom="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorPrimary"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
android:onClick="toInsertLabel"
|
android:onClick="toInsertLabel"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_device_name"
|
android:text="@string/insert_device_name"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights,UsingOnClickInXml" />
|
tools:ignore="ButtonStyle,NestedWeights,UsingOnClickInXml" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
@ -1025,7 +1036,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="2dp"
|
android:layout_marginTop="2dp"
|
||||||
android:background="@android:color/white"
|
android:background="@color/setting_bar_color"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:padding="15dp">
|
android:padding="15dp">
|
||||||
|
@ -64,6 +64,7 @@
|
|||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="5dp"
|
||||||
android:text="@string/set_bark_server_tips"
|
android:text="@string/set_bark_server_tips"
|
||||||
android:textSize="10sp"
|
android:textSize="10sp"
|
||||||
tools:ignore="SmallSp" />
|
tools:ignore="SmallSp" />
|
||||||
@ -73,11 +74,7 @@
|
|||||||
android:id="@+id/editTextBarkServer"
|
android:id="@+id/editTextBarkServer"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:background="@drawable/line_bg_white_only_bottom_d8"
|
app:showEye="true" />
|
||||||
app:showEye="true"
|
|
||||||
app:textColor="@color/tv_black_333333"
|
|
||||||
app:textColorHint="@color/tv_gray_999999"
|
|
||||||
app:textSize="15sp" />
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
@ -242,7 +239,7 @@
|
|||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
android:orientation="horizontal">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
@ -283,7 +280,6 @@
|
|||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginTop="10dp"
|
android:layout_marginTop="10dp"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
android:background="@android:color/white"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
@ -326,48 +322,68 @@
|
|||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_sender"
|
android:id="@+id/bt_insert_sender"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginBottom="5dp"
|
android:layout_marginBottom="5dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorBlueGrey"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="5dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_sender"
|
android:text="@string/insert_sender"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_extra"
|
android:id="@+id/bt_insert_extra"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="5dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginBottom="5dp"
|
android:layout_marginBottom="5dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorBlueGrey"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="5dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_extra"
|
android:text="@string/insert_extra"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_time"
|
android:id="@+id/bt_insert_time"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="5dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginBottom="5dp"
|
android:layout_marginBottom="5dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorBlueGrey"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="5dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_time"
|
android:text="@string/insert_time"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_device_name"
|
android:id="@+id/bt_insert_device_name"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="5dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginBottom="5dp"
|
android:layout_marginBottom="5dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorBlueGrey"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="5dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_device_name"
|
android:text="@string/insert_device_name"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
@ -381,28 +397,31 @@
|
|||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonBarkTest"
|
android:id="@+id/buttonTest"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/test"
|
android:text="@string/test"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonBarkDel"
|
android:id="@+id/buttonDel"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/del"
|
android:text="@string/del"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonBarkOk"
|
android:id="@+id/buttonOk"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/ok"
|
android:text="@string/ok"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
|
@ -67,11 +67,7 @@
|
|||||||
android:id="@+id/editTextDingdingToken"
|
android:id="@+id/editTextDingdingToken"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:background="@drawable/line_bg_white_only_bottom_d8"
|
app:showEye="true" />
|
||||||
app:showEye="true"
|
|
||||||
app:textColor="@color/tv_black_333333"
|
|
||||||
app:textColorHint="@color/tv_gray_999999"
|
|
||||||
app:textSize="15sp" />
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
@ -92,11 +88,7 @@
|
|||||||
android:id="@+id/editTextDingdingSecret"
|
android:id="@+id/editTextDingdingSecret"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:background="@drawable/line_bg_white_only_bottom_d8"
|
app:showEye="true" />
|
||||||
app:showEye="true"
|
|
||||||
app:textColor="@color/tv_black_333333"
|
|
||||||
app:textColorHint="@color/tv_gray_999999"
|
|
||||||
app:textSize="15sp" />
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
@ -159,6 +151,7 @@
|
|||||||
tools:ignore="LabelFor" />
|
tools:ignore="LabelFor" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
@ -166,28 +159,31 @@
|
|||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonDingdingTest"
|
android:id="@+id/buttonTest"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/test"
|
android:text="@string/test"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonDingdingDel"
|
android:id="@+id/buttonDel"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/del"
|
android:text="@string/del"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonDingdingOk"
|
android:id="@+id/buttonOk"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/ok"
|
android:text="@string/ok"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
|
@ -93,11 +93,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="5dp"
|
||||||
android:background="@drawable/line_bg_white_only_bottom_d8"
|
app:showEye="true" />
|
||||||
app:showEye="true"
|
|
||||||
app:textColor="@color/tv_black_333333"
|
|
||||||
app:textColorHint="@color/tv_gray_999999"
|
|
||||||
app:textSize="15sp" />
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
@ -253,7 +249,6 @@
|
|||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
android:background="@android:color/white"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
@ -294,7 +289,6 @@
|
|||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
android:background="@android:color/white"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
@ -335,48 +329,68 @@
|
|||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_sender"
|
android:id="@+id/bt_insert_sender"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginBottom="5dp"
|
android:layout_marginBottom="5dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorBlueGrey"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="5dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_sender"
|
android:text="@string/insert_sender"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_extra"
|
android:id="@+id/bt_insert_extra"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="5dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginBottom="5dp"
|
android:layout_marginBottom="5dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorBlueGrey"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="5dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_extra"
|
android:text="@string/insert_extra"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_time"
|
android:id="@+id/bt_insert_time"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="5dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginBottom="5dp"
|
android:layout_marginBottom="5dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorBlueGrey"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="5dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_time"
|
android:text="@string/insert_time"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_device_name"
|
android:id="@+id/bt_insert_device_name"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="5dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginBottom="5dp"
|
android:layout_marginBottom="5dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorBlueGrey"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="5dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_device_name"
|
android:text="@string/insert_device_name"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
@ -390,28 +404,31 @@
|
|||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonEmailTest"
|
android:id="@+id/buttonTest"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/test"
|
android:text="@string/test"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonEmailDel"
|
android:id="@+id/buttonDel"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/del"
|
android:text="@string/del"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonEmailOk"
|
android:id="@+id/buttonOk"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/ok"
|
android:text="@string/ok"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
|
@ -87,11 +87,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="5dp"
|
||||||
android:background="@drawable/line_bg_white_only_bottom_d8"
|
app:showEye="true" />
|
||||||
app:showEye="true"
|
|
||||||
app:textColor="@color/tv_black_333333"
|
|
||||||
app:textColorHint="@color/tv_gray_999999"
|
|
||||||
app:textSize="15sp" />
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
@ -101,28 +97,31 @@
|
|||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonFeishuTest"
|
android:id="@+id/buttonTest"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/test"
|
android:text="@string/test"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonFeishuDel"
|
android:id="@+id/buttonDel"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/del"
|
android:text="@string/del"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonFeishuOk"
|
android:id="@+id/buttonOk"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/ok"
|
android:text="@string/ok"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
|
@ -50,35 +50,24 @@
|
|||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<LinearLayout
|
<TextView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="horizontal">
|
android:text="@string/GotifyWebServer"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/GotifyWebServer"
|
android:text="@string/GotifyWebServerTips"
|
||||||
android:textStyle="bold" />
|
android:textSize="10sp"
|
||||||
|
tools:ignore="SmallSp" />
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="5dp"
|
|
||||||
android:text="@string/GotifyWebServerTips"
|
|
||||||
android:textSize="10sp"
|
|
||||||
tools:ignore="SmallSp" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<com.idormy.sms.forwarder.view.ClearEditText
|
<com.idormy.sms.forwarder.view.ClearEditText
|
||||||
android:id="@+id/editTextGotifyWebServer"
|
android:id="@+id/editTextGotifyWebServer"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:background="@drawable/line_bg_white_only_bottom_d8"
|
app:showEye="true" />
|
||||||
app:showEye="true"
|
|
||||||
app:textColor="@color/tv_black_333333"
|
|
||||||
app:textColorHint="@color/tv_gray_999999"
|
|
||||||
app:textSize="15sp" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
@ -89,7 +78,6 @@
|
|||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginTop="10dp"
|
android:layout_marginTop="10dp"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
android:background="@android:color/white"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
@ -132,48 +120,68 @@
|
|||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_sender"
|
android:id="@+id/bt_insert_sender"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginBottom="5dp"
|
android:layout_marginBottom="5dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorBlueGrey"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="5dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_sender"
|
android:text="@string/insert_sender"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_extra"
|
android:id="@+id/bt_insert_extra"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="5dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginBottom="5dp"
|
android:layout_marginBottom="5dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorBlueGrey"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="5dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_extra"
|
android:text="@string/insert_extra"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_time"
|
android:id="@+id/bt_insert_time"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="5dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginBottom="5dp"
|
android:layout_marginBottom="5dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorBlueGrey"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="5dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_time"
|
android:text="@string/insert_time"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_device_name"
|
android:id="@+id/bt_insert_device_name"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="5dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginBottom="5dp"
|
android:layout_marginBottom="5dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorBlueGrey"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="5dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_device_name"
|
android:text="@string/insert_device_name"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
@ -215,28 +223,31 @@
|
|||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonGotifyTest"
|
android:id="@+id/buttonTest"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/test"
|
android:text="@string/test"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonGotifyDel"
|
android:id="@+id/buttonDel"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/del"
|
android:text="@string/del"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonGotifyOk"
|
android:id="@+id/buttonOk"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/ok"
|
android:text="@string/ok"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
|
@ -74,11 +74,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="5dp"
|
||||||
android:background="@drawable/line_bg_white_only_bottom_d8"
|
app:showEye="true" />
|
||||||
app:showEye="true"
|
|
||||||
app:textColor="@color/tv_black_333333"
|
|
||||||
app:textColorHint="@color/tv_gray_999999"
|
|
||||||
app:textSize="15sp" />
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
@ -238,7 +234,6 @@
|
|||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginTop="10dp"
|
android:layout_marginTop="10dp"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
android:background="@android:color/white"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
@ -281,48 +276,68 @@
|
|||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_sender"
|
android:id="@+id/bt_insert_sender"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginBottom="5dp"
|
android:layout_marginBottom="5dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorBlueGrey"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="5dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_sender"
|
android:text="@string/insert_sender"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_extra"
|
android:id="@+id/bt_insert_extra"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="5dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginBottom="5dp"
|
android:layout_marginBottom="5dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorBlueGrey"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="5dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_extra"
|
android:text="@string/insert_extra"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_time"
|
android:id="@+id/bt_insert_time"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="5dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginBottom="5dp"
|
android:layout_marginBottom="5dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorBlueGrey"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="5dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_time"
|
android:text="@string/insert_time"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_device_name"
|
android:id="@+id/bt_insert_device_name"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="5dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginBottom="5dp"
|
android:layout_marginBottom="5dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorBlueGrey"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="5dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_device_name"
|
android:text="@string/insert_device_name"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
@ -336,28 +351,31 @@
|
|||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonPushPlusTest"
|
android:id="@+id/buttonTest"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/test"
|
android:text="@string/test"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonPushPlusDel"
|
android:id="@+id/buttonDel"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/del"
|
android:text="@string/del"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonPushPlusOk"
|
android:id="@+id/buttonOk"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/ok"
|
android:text="@string/ok"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
|
@ -113,11 +113,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:background="@drawable/line_bg_white_only_bottom_d8"
|
app:showEye="true" />
|
||||||
app:showEye="true"
|
|
||||||
app:textColor="@color/tv_black_333333"
|
|
||||||
app:textColorHint="@color/tv_gray_999999"
|
|
||||||
app:textSize="15sp" />
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
@ -192,28 +188,31 @@
|
|||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonQYWXAppTest"
|
android:id="@+id/buttonTest"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/test"
|
android:text="@string/test"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonQYWXAppDel"
|
android:id="@+id/buttonDel"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/del"
|
android:text="@string/del"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonQYWXAppOk"
|
android:id="@+id/buttonOk"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/ok"
|
android:text="@string/ok"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
|
@ -49,35 +49,24 @@
|
|||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<LinearLayout
|
<TextView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="horizontal">
|
android:text="@string/QYWXGroupRobotWebHook"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/QYWXGroupRobotWebHook"
|
android:text="@string/QYWXGroupRobotWebHookTips"
|
||||||
android:textStyle="bold" />
|
android:textSize="10sp"
|
||||||
|
tools:ignore="SmallSp" />
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="5dp"
|
|
||||||
android:text="@string/QYWXGroupRobotWebHookTips"
|
|
||||||
android:textSize="10sp"
|
|
||||||
tools:ignore="SmallSp" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<com.idormy.sms.forwarder.view.ClearEditText
|
<com.idormy.sms.forwarder.view.ClearEditText
|
||||||
android:id="@+id/editTextQYWXGroupRobotWebHook"
|
android:id="@+id/editTextQYWXGroupRobotWebHook"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:background="@drawable/line_bg_white_only_bottom_d8"
|
app:showEye="true" />
|
||||||
app:showEye="true"
|
|
||||||
app:textColor="@color/tv_black_333333"
|
|
||||||
app:textColorHint="@color/tv_gray_999999"
|
|
||||||
app:textSize="15sp" />
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
@ -87,28 +76,31 @@
|
|||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonQyWxGroupRobotTest"
|
android:id="@+id/buttonTest"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/test"
|
android:text="@string/test"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonQyWxGroupRobotDel"
|
android:id="@+id/buttonDel"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/del"
|
android:text="@string/del"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonQyWxGroupRobotOk"
|
android:id="@+id/buttonOk"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/ok"
|
android:text="@string/ok"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent">
|
||||||
@ -241,7 +242,6 @@
|
|||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
android:background="@android:color/white"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
@ -270,7 +270,6 @@
|
|||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
android:background="@android:color/white"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:visibility="gone">
|
android:visibility="gone">
|
||||||
@ -300,85 +299,107 @@
|
|||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_sender"
|
android:id="@+id/bt_insert_sender"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_marginBottom="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorPrimary"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_sender"
|
android:text="@string/insert_sender"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_content"
|
android:id="@+id/bt_insert_content"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_marginBottom="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorPrimary"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:layout_marginStart="3dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_content"
|
android:text="@string/insert_content"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_extra"
|
android:id="@+id/bt_insert_extra"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_marginBottom="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorPrimary"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:layout_marginStart="3dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_extra"
|
android:text="@string/insert_extra"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_sender_app"
|
android:id="@+id/bt_insert_sender_app"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_marginBottom="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorPrimary"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:layout_marginStart="3dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_sender_app"
|
android:text="@string/insert_sender_app"
|
||||||
|
android:textSize="11sp"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_content_app"
|
android:id="@+id/bt_insert_content_app"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_marginBottom="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorPrimary"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:layout_marginStart="3dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_content_app"
|
android:text="@string/insert_content_app"
|
||||||
|
android:textSize="11sp"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_time"
|
android:id="@+id/bt_insert_time"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_marginBottom="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorPrimary"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:layout_marginStart="3dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_time"
|
android:text="@string/insert_time"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_device_name"
|
android:id="@+id/bt_insert_device_name"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_marginBottom="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorPrimary"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:layout_marginStart="3dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_device_name"
|
android:text="@string/insert_device_name"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
@ -391,7 +412,6 @@
|
|||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
android:background="@android:color/white"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
@ -420,7 +440,6 @@
|
|||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
android:background="@android:color/white"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:visibility="gone">
|
android:visibility="gone">
|
||||||
@ -450,7 +469,6 @@
|
|||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
android:background="@android:color/white"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
@ -476,14 +494,13 @@
|
|||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_margin="5dp"
|
android:layout_margin="10dp"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonRuleTest"
|
android:id="@+id/buttonRuleTest"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:text="@string/test"
|
android:text="@string/test"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
@ -492,7 +509,7 @@
|
|||||||
android:id="@+id/buttonRuleDel"
|
android:id="@+id/buttonRuleDel"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:text="@string/del"
|
android:text="@string/del"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
@ -501,6 +518,7 @@
|
|||||||
android:id="@+id/buttonRuleOk"
|
android:id="@+id/buttonRuleOk"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:text="@string/ok"
|
android:text="@string/ok"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent">
|
||||||
@ -242,7 +243,6 @@
|
|||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
android:background="@android:color/white"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
@ -271,7 +271,6 @@
|
|||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
android:background="@android:color/white"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:visibility="gone">
|
android:visibility="gone">
|
||||||
@ -301,86 +300,108 @@
|
|||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_sender"
|
android:id="@+id/bt_insert_sender"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_marginBottom="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorPrimary"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_sender"
|
android:text="@string/insert_sender"
|
||||||
|
android:textSize="11sp"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_content"
|
android:id="@+id/bt_insert_content"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="3dp"
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_marginBottom="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorPrimary"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_content"
|
android:text="@string/insert_content"
|
||||||
|
android:textSize="11sp"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_extra"
|
android:id="@+id/bt_insert_extra"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="3dp"
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_marginBottom="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorPrimary"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_extra"
|
android:text="@string/insert_extra"
|
||||||
|
android:textSize="11sp"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_sender_app"
|
android:id="@+id/bt_insert_sender_app"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginStart="3dp"
|
||||||
android:layout_marginBottom="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorPrimary"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_sender_app"
|
android:text="@string/insert_sender_app"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_content_app"
|
android:id="@+id/bt_insert_content_app"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="3dp"
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_marginBottom="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorPrimary"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_content_app"
|
android:text="@string/insert_content_app"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_time"
|
android:id="@+id/bt_insert_time"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="3dp"
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_marginBottom="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorPrimary"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_time"
|
android:text="@string/insert_time"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_device_name"
|
android:id="@+id/bt_insert_device_name"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="3dp"
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_marginBottom="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorPrimary"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_device_name"
|
android:text="@string/insert_device_name"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
@ -393,7 +414,6 @@
|
|||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
android:background="@android:color/white"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
@ -422,7 +442,6 @@
|
|||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
android:background="@android:color/white"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:visibility="gone">
|
android:visibility="gone">
|
||||||
@ -452,7 +471,6 @@
|
|||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
android:background="@android:color/white"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
@ -478,14 +496,13 @@
|
|||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_margin="5dp"
|
android:layout_margin="10dp"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonRuleTest"
|
android:id="@+id/buttonRuleTest"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:text="@string/test"
|
android:text="@string/test"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
@ -494,7 +511,7 @@
|
|||||||
android:id="@+id/buttonRuleDel"
|
android:id="@+id/buttonRuleDel"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:text="@string/del"
|
android:text="@string/del"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
@ -503,6 +520,7 @@
|
|||||||
android:id="@+id/buttonRuleOk"
|
android:id="@+id/buttonRuleOk"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:text="@string/ok"
|
android:text="@string/ok"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent">
|
||||||
@ -244,7 +245,6 @@
|
|||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
android:background="@android:color/white"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
@ -273,7 +273,6 @@
|
|||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
android:background="@android:color/white"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:visibility="gone">
|
android:visibility="gone">
|
||||||
@ -303,86 +302,108 @@
|
|||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_sender"
|
android:id="@+id/bt_insert_sender"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_marginBottom="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorPrimary"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_sender"
|
android:text="@string/insert_sender"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_content"
|
android:id="@+id/bt_insert_content"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="3dp"
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_marginBottom="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorPrimary"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_content"
|
android:text="@string/insert_content"
|
||||||
|
android:textSize="11sp"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_extra"
|
android:id="@+id/bt_insert_extra"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="3dp"
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_marginBottom="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorPrimary"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_extra"
|
android:text="@string/insert_extra"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_sender_app"
|
android:id="@+id/bt_insert_sender_app"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginStart="3dp"
|
||||||
android:layout_marginBottom="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorPrimary"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_sender_app"
|
android:text="@string/insert_sender_app"
|
||||||
|
android:textSize="11sp"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_content_app"
|
android:id="@+id/bt_insert_content_app"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="3dp"
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_marginBottom="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorPrimary"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_content_app"
|
android:text="@string/insert_content_app"
|
||||||
|
android:textSize="11sp"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_time"
|
android:id="@+id/bt_insert_time"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="3dp"
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_marginBottom="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorPrimary"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_time"
|
android:text="@string/insert_time"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bt_insert_device_name"
|
android:id="@+id/bt_insert_device_name"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="25dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="3dp"
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_marginBottom="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/colorPrimary"
|
android:minWidth="0dp"
|
||||||
|
android:minHeight="0dp"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/insert_device_name"
|
android:text="@string/insert_device_name"
|
||||||
|
android:textSize="11sp"
|
||||||
|
app:backgroundTint="@color/colorBlueGrey"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
@ -395,7 +416,6 @@
|
|||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
android:background="@android:color/white"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
@ -424,7 +444,6 @@
|
|||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
android:background="@android:color/white"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:visibility="gone">
|
android:visibility="gone">
|
||||||
@ -454,7 +473,6 @@
|
|||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
android:background="@android:color/white"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
@ -480,14 +498,13 @@
|
|||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_margin="5dp"
|
android:layout_margin="10dp"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonRuleTest"
|
android:id="@+id/buttonRuleTest"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:text="@string/test"
|
android:text="@string/test"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
@ -496,7 +513,7 @@
|
|||||||
android:id="@+id/buttonRuleDel"
|
android:id="@+id/buttonRuleDel"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:text="@string/del"
|
android:text="@string/del"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
@ -505,6 +522,7 @@
|
|||||||
android:id="@+id/buttonRuleOk"
|
android:id="@+id/buttonRuleOk"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:text="@string/ok"
|
android:text="@string/ok"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
@ -60,11 +60,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="5dp"
|
||||||
android:background="@drawable/line_bg_white_only_bottom_d8"
|
app:showEye="true" />
|
||||||
app:showEye="true"
|
|
||||||
app:textColor="@color/tv_black_333333"
|
|
||||||
app:textColorHint="@color/tv_gray_999999"
|
|
||||||
app:textSize="15sp" />
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
@ -74,28 +70,31 @@
|
|||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonServerChanTest"
|
android:id="@+id/buttonTest"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/test"
|
android:text="@string/test"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonServerChanDel"
|
android:id="@+id/buttonDel"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/del"
|
android:text="@string/del"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonServerChanOk"
|
android:id="@+id/buttonOk"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/ok"
|
android:text="@string/ok"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
|
@ -92,6 +92,7 @@
|
|||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:gravity="bottom"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
@ -101,9 +102,14 @@
|
|||||||
android:textStyle="bold" />
|
android:textStyle="bold" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="5dp"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:ellipsize="end"
|
||||||
|
android:gravity="start"
|
||||||
|
android:maxEms="8"
|
||||||
|
android:maxLines="1"
|
||||||
android:text="@string/SmsMobilesTips"
|
android:text="@string/SmsMobilesTips"
|
||||||
android:textSize="10sp"
|
android:textSize="10sp"
|
||||||
tools:ignore="SmallSp" />
|
tools:ignore="SmallSp" />
|
||||||
@ -150,28 +156,31 @@
|
|||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonSmsTest"
|
android:id="@+id/buttonTest"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/test"
|
android:text="@string/test"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonSmsDel"
|
android:id="@+id/buttonDel"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/del"
|
android:text="@string/del"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonSmsOk"
|
android:id="@+id/buttonOk"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/ok"
|
android:text="@string/ok"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
|
@ -60,11 +60,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="5dp"
|
||||||
android:background="@drawable/line_bg_white_only_bottom_d8"
|
app:showEye="true" />
|
||||||
app:showEye="true"
|
|
||||||
app:textColor="@color/tv_black_333333"
|
|
||||||
app:textColorHint="@color/tv_gray_999999"
|
|
||||||
app:textSize="15sp" />
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
@ -73,12 +69,12 @@
|
|||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginTop="10dp"
|
android:layout_marginTop="10dp"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:paddingTop="5dp"
|
|
||||||
android:text="@string/Method"
|
android:text="@string/Method"
|
||||||
android:textStyle="bold" />
|
android:textStyle="bold" />
|
||||||
|
|
||||||
@ -280,11 +276,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="5dp"
|
||||||
android:background="@drawable/line_bg_white_only_bottom_d8"
|
app:showEye="true" />
|
||||||
app:showEye="true"
|
|
||||||
app:textColor="@color/tv_black_333333"
|
|
||||||
app:textColorHint="@color/tv_gray_999999"
|
|
||||||
app:textSize="15sp" />
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
@ -295,28 +287,31 @@
|
|||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonTelegramTest"
|
android:id="@+id/buttonTest"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/test"
|
android:text="@string/test"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonTelegramDel"
|
android:id="@+id/buttonDel"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/del"
|
android:text="@string/del"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonTelegramOk"
|
android:id="@+id/buttonOk"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/ok"
|
android:text="@string/ok"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
|
@ -47,12 +47,12 @@
|
|||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:paddingTop="5dp"
|
|
||||||
android:text="@string/Method"
|
android:text="@string/Method"
|
||||||
android:textStyle="bold" />
|
android:textStyle="bold" />
|
||||||
|
|
||||||
@ -167,11 +167,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="5dp"
|
||||||
android:background="@drawable/line_bg_white_only_bottom_d8"
|
app:showEye="true" />
|
||||||
app:showEye="true"
|
|
||||||
app:textColor="@color/tv_black_333333"
|
|
||||||
app:textColorHint="@color/tv_gray_999999"
|
|
||||||
app:textSize="15sp" />
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
@ -181,28 +177,31 @@
|
|||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonWebNotifyTest"
|
android:id="@+id/buttonTest"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/test"
|
android:text="@string/test"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonWebNotifyDel"
|
android:id="@+id/buttonDel"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/del"
|
android:text="@string/del"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonWebNotifyOk"
|
android:id="@+id/buttonOk"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="10dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:singleLine="true"
|
||||||
android:text="@string/ok"
|
android:text="@string/ok"
|
||||||
tools:ignore="ButtonStyle,NestedWeights" />
|
tools:ignore="ButtonStyle,NestedWeights" />
|
||||||
|
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:background="@android:color/white"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:padding="5dp"
|
android:padding="5dp"
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:background="@android:color/white"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:padding="5dp"
|
android:padding="5dp"
|
||||||
|
@ -3,14 +3,13 @@
|
|||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:background="#ffffff"
|
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/txHelpTip"
|
android:id="@+id/txHelpTip"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:background="#10000000"
|
android:background="@color/tip_bar_color"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:padding="2dp"
|
android:padding="2dp"
|
||||||
android:text="@string/log_tips"
|
android:text="@string/log_tips"
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
app:showAsAction="never" />
|
app:showAsAction="never" />
|
||||||
<item
|
<item
|
||||||
android:id="@+id/to_about"
|
android:id="@+id/to_about"
|
||||||
android:icon="@drawable/ic_forwarder"
|
android:icon="@drawable/ic_about"
|
||||||
android:orderInCategory="100"
|
android:orderInCategory="100"
|
||||||
android:title="@string/about"
|
android:title="@string/about"
|
||||||
app:showAsAction="never" />
|
app:showAsAction="never" />
|
||||||
|
@ -21,6 +21,9 @@
|
|||||||
<string name="rule_tips">Tips: Tap "NEW SMS/Call Fw. RULE" to add a new rule; Long press a rule to delete; Tap an existing rule to edit.</string>
|
<string name="rule_tips">Tips: Tap "NEW SMS/Call Fw. RULE" to add a new rule; Long press a rule to delete; Tap an existing rule to edit.</string>
|
||||||
<string name="sender_tips">Tips: Tap "NEW SENDER" to add a new sender; Long press a sender to delete; Tap an existing sender to edit.</string>
|
<string name="sender_tips">Tips: Tap "NEW SENDER" to add a new sender; Long press a sender to delete; Tap an existing sender to edit.</string>
|
||||||
<string name="app_tips">Tips: Tap to copy the package name of an App; Long press an App to start and jump to it.</string>
|
<string name="app_tips">Tips: Tap to copy the package name of an App; Long press an App to start and jump to it.</string>
|
||||||
|
<string name="clear_logs">Clear logs</string>
|
||||||
|
<string name="add_rule">Add rule</string>
|
||||||
|
<string name="add_sender">Add sender</string>
|
||||||
<!--AboutActivity-->
|
<!--AboutActivity-->
|
||||||
<string name="version">Version</string>
|
<string name="version">Version</string>
|
||||||
<string name="check_for_updates">Check for updates</string>
|
<string name="check_for_updates">Check for updates</string>
|
||||||
|
17
app/src/main/res/values-night/colors.xml
Normal file
17
app/src/main/res/values-night/colors.xml
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<color name="colorPrimary">#1C8DD4</color>
|
||||||
|
<color name="colorPrimaryDark">#1B8DD4</color>
|
||||||
|
<color name="colorAccent">#63C2FA</color>
|
||||||
|
<color name="colorBlueGrey">#78909C</color>
|
||||||
|
<color name="colorBlueGreyDark">#546E7A</color>
|
||||||
|
<color name="gray_text_light">#979797</color>
|
||||||
|
|
||||||
|
<color name="white">#FFFFFF</color>
|
||||||
|
<color name="black">#000000</color>
|
||||||
|
|
||||||
|
<color name="line_color">#aadcdcdc</color>
|
||||||
|
<color name="setting_bg_color">#000000</color>
|
||||||
|
<color name="setting_bar_color">#979797</color>
|
||||||
|
<color name="tip_bar_color">#30979797</color>
|
||||||
|
</resources>
|
105
app/src/main/res/values-night/themes.xml
Normal file
105
app/src/main/res/values-night/themes.xml
Normal file
@ -0,0 +1,105 @@
|
|||||||
|
<resources xmlns:tools="http://schemas.android.com/tools">
|
||||||
|
<!-- Base application theme. -->
|
||||||
|
<style name="Theme.App" parent="Theme.MaterialComponents.DayNight">
|
||||||
|
<!-- Primary brand color. -->
|
||||||
|
<item name="colorPrimary">@color/colorPrimary</item>
|
||||||
|
<item name="colorPrimaryVariant">@color/colorPrimaryDark</item>
|
||||||
|
<item name="colorOnPrimary">@color/white</item>
|
||||||
|
<item name="colorOnPrimaryContainer">@color/white</item>
|
||||||
|
<!-- Secondary brand color. -->
|
||||||
|
<item name="colorSecondary">@color/colorBlueGreyDark</item>
|
||||||
|
<item name="colorSecondaryVariant">@color/colorBlueGrey</item>
|
||||||
|
<item name="colorOnSecondary">@color/white</item>
|
||||||
|
<!-- Status bar color. -->
|
||||||
|
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
|
||||||
|
<!-- Customize your theme here. -->
|
||||||
|
<item name="android:windowBackground">@color/black</item>
|
||||||
|
<item name="colorControlActivated">@color/colorPrimary</item>
|
||||||
|
<item name="actionOverflowMenuStyle">@style/OverflowMenu</item>
|
||||||
|
<item name="toolbarStyle">@style/MyToolbar</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="MyToolbar" parent="Widget.MaterialComponents.Toolbar.Primary">
|
||||||
|
<item name="android:textColor">@color/white</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="OverflowMenu" parent="Widget.MaterialComponents.PopupMenu.Overflow">
|
||||||
|
<item name="android:dropDownWidth">100dp</item>
|
||||||
|
<!-- 是否覆盖锚点,默认为true,即盖住Toolbar -->
|
||||||
|
<item name="overlapAnchor">false</item>
|
||||||
|
<item name="android:textColor">@color/colorPrimary</item>
|
||||||
|
<item name="android:popupBackground">@color/black</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="rg_style">
|
||||||
|
<item name="android:layout_width">match_parent</item>
|
||||||
|
<item name="android:layout_height">wrap_content</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="rg_rb_style">
|
||||||
|
<item name="android:layout_width">wrap_content</item>
|
||||||
|
<item name="android:layout_height">wrap_content</item>
|
||||||
|
<item name="android:layout_weight">1</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<!-- 选择框自定义主题 -->
|
||||||
|
<style name="select_style">
|
||||||
|
<item name="android:layout_width">wrap_content</item>
|
||||||
|
<item name="android:layout_height">wrap_content</item>
|
||||||
|
<item name="android:layout_marginLeft">5dp</item>
|
||||||
|
<item name="android:layout_marginRight">5dp</item>
|
||||||
|
<item name="android:paddingLeft">10dp</item>
|
||||||
|
<item name="android:paddingRight">10dp</item>
|
||||||
|
<item name="android:paddingTop">5dp</item>
|
||||||
|
<item name="android:paddingBottom">5dp</item>
|
||||||
|
<item name="android:background">@drawable/select_selector</item>
|
||||||
|
<item name="android:button">@null</item>
|
||||||
|
<item name="android:gravity">center</item>
|
||||||
|
<item name="android:textSize">13sp</item>
|
||||||
|
<item name="android:letterSpacing">0.1</item>
|
||||||
|
<item name="android:minWidth">0dp</item>
|
||||||
|
<item name="android:minHeight">0dp</item>
|
||||||
|
<item name="android:textColor">@drawable/txt_select_selector</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="dialog" parent="@android:style/Theme.Dialog">
|
||||||
|
<item name="android:windowFrame">@null</item><!--边框-->
|
||||||
|
<item name="android:windowIsFloating">true</item><!--是否浮现在activity之上-->
|
||||||
|
<item name="android:windowIsTranslucent">true</item><!--半透明-->
|
||||||
|
<item name="android:windowNoTitle">true</item><!--无标题-->
|
||||||
|
<item name="android:windowBackground">@android:color/transparent</item><!--背景透明-->
|
||||||
|
<item name="android:backgroundDimEnabled">true</item><!--模糊-->
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<declare-styleable name="ClearEditText">
|
||||||
|
<attr name="showClean" format="boolean" />
|
||||||
|
<attr name="drawableClean" format="reference" />
|
||||||
|
<attr name="cleanPadding" format="dimension" />
|
||||||
|
<attr name="showEye" format="boolean" />
|
||||||
|
<attr name="drawableEyeOpen" format="reference" />
|
||||||
|
<attr name="drawableEyeClose" format="reference" />
|
||||||
|
<attr name="drawableLeft" format="reference" />
|
||||||
|
<attr name="hint" format="string" />
|
||||||
|
<attr name="text" format="string" />
|
||||||
|
<attr name="textColorHint" format="reference|color" />
|
||||||
|
<attr name="textColor" format="reference|color" />
|
||||||
|
<attr name="textSize" format="dimension" />
|
||||||
|
<attr name="maxLength" format="integer" />
|
||||||
|
<attr name="maxLines" format="integer" />
|
||||||
|
<attr name="inputType">
|
||||||
|
<enum name="none" value="0" />
|
||||||
|
<enum name="number" value="1" />
|
||||||
|
<enum name="textPassword" value="2" />
|
||||||
|
</attr>
|
||||||
|
</declare-styleable>
|
||||||
|
|
||||||
|
<style name="dialog_menu" parent="@android:style/Theme.Dialog">
|
||||||
|
<item name="android:windowBackground">@android:color/transparent</item>
|
||||||
|
<item name="android:windowNoTitle">true</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<declare-styleable name="StepBar">
|
||||||
|
<attr name="current_step" format="string" />
|
||||||
|
<attr name="help_tip" format="string" />
|
||||||
|
</declare-styleable>
|
||||||
|
</resources>
|
@ -5,11 +5,13 @@
|
|||||||
<color name="colorAccent">#63C2FA</color>
|
<color name="colorAccent">#63C2FA</color>
|
||||||
<color name="colorBlueGrey">#78909C</color>
|
<color name="colorBlueGrey">#78909C</color>
|
||||||
<color name="colorBlueGreyDark">#546E7A</color>
|
<color name="colorBlueGreyDark">#546E7A</color>
|
||||||
<color name="colorBackground">#DCDCDC</color>
|
|
||||||
<color name="gray_text_light">#979797</color>
|
<color name="gray_text_light">#979797</color>
|
||||||
|
|
||||||
<color name="white">#FFFFFFFF</color>
|
<color name="white">#FFFFFF</color>
|
||||||
|
<color name="black">#000000</color>
|
||||||
|
|
||||||
<color name="tv_black_333333">#333333</color>
|
<color name="line_color">#aadcdcdc</color>
|
||||||
<color name="tv_gray_999999">#999999</color>
|
<color name="setting_bg_color">#10000000</color>
|
||||||
|
<color name="setting_bar_color">#ffffff</color>
|
||||||
|
<color name="tip_bar_color">#10000000</color>
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -21,6 +21,9 @@
|
|||||||
<string name="rule_tips">提示:新建规则点击“添加”,长按删除/克隆,点击编辑已有</string>
|
<string name="rule_tips">提示:新建规则点击“添加”,长按删除/克隆,点击编辑已有</string>
|
||||||
<string name="sender_tips">提示:新建发送通道点击“添加”,长按删除/克隆,点击编辑已有</string>
|
<string name="sender_tips">提示:新建发送通道点击“添加”,长按删除/克隆,点击编辑已有</string>
|
||||||
<string name="app_tips">提示:点击复制APP的包名,长按则启动并跳转该APP</string>
|
<string name="app_tips">提示:点击复制APP的包名,长按则启动并跳转该APP</string>
|
||||||
|
<string name="clear_logs">清空日志</string>
|
||||||
|
<string name="add_rule">清空日志</string>
|
||||||
|
<string name="add_sender">添加发送通道</string>
|
||||||
<!--AboutActivity-->
|
<!--AboutActivity-->
|
||||||
<string name="version">当前版本</string>
|
<string name="version">当前版本</string>
|
||||||
<string name="check_for_updates">检查新版本</string>
|
<string name="check_for_updates">检查新版本</string>
|
||||||
@ -151,7 +154,7 @@
|
|||||||
<string name="QYWXGroupRobotWebHook">WebHook地址</string>
|
<string name="QYWXGroupRobotWebHook">WebHook地址</string>
|
||||||
<string name="QYWXGroupRobotWebHookTips">示例:https://qyapi.weixin.qq.com/cgixx?key=xxx</string>
|
<string name="QYWXGroupRobotWebHookTips">示例:https://qyapi.weixin.qq.com/cgixx?key=xxx</string>
|
||||||
<string name="ServerChanSendKey">Server酱·Turbo版的SendKey</string>
|
<string name="ServerChanSendKey">Server酱·Turbo版的SendKey</string>
|
||||||
<string name="TelegramApiToken">Telegram机器人的ApiToken 或 自定义地址(http开头)</string>
|
<string name="TelegramApiToken">Tg机器人的 ApiToken 或 自定义地址(http开头)</string>
|
||||||
<string name="TelegramChatId">被通知人(或群组)的ChatId</string>
|
<string name="TelegramChatId">被通知人(或群组)的ChatId</string>
|
||||||
<string name="Method" formatted="false">请求方式</string>
|
<string name="Method" formatted="false">请求方式</string>
|
||||||
<string name="WebNotifyWebServer">WebServer</string>
|
<string name="WebNotifyWebServer">WebServer</string>
|
||||||
|
@ -1,18 +1,33 @@
|
|||||||
<resources>
|
<resources xmlns:tools="http://schemas.android.com/tools">
|
||||||
|
|
||||||
<!-- Base application theme. -->
|
<!-- Base application theme. -->
|
||||||
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
|
<style name="Theme.App" parent="Theme.MaterialComponents.DayNight">
|
||||||
<!-- Customize your theme here. -->
|
<!-- Primary brand color. -->
|
||||||
<item name="colorPrimary">@color/colorPrimary</item>
|
<item name="colorPrimary">@color/colorPrimary</item>
|
||||||
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
<item name="colorPrimaryVariant">@color/colorPrimaryDark</item>
|
||||||
<item name="colorAccent">@color/colorAccent</item>
|
<item name="colorOnPrimary">@color/white</item>
|
||||||
|
<item name="colorOnPrimaryContainer">@color/white</item>
|
||||||
|
<!-- Secondary brand color. -->
|
||||||
|
<item name="colorSecondary">@color/colorBlueGreyDark</item>
|
||||||
|
<item name="colorSecondaryVariant">@color/colorBlueGrey</item>
|
||||||
|
<item name="colorOnSecondary">@color/white</item>
|
||||||
|
<!-- Status bar color. -->
|
||||||
|
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
|
||||||
|
<!-- Customize your theme here. -->
|
||||||
|
<item name="android:windowBackground">@color/white</item>
|
||||||
|
<item name="colorControlActivated">@color/colorPrimary</item>
|
||||||
<item name="actionOverflowMenuStyle">@style/OverflowMenu</item>
|
<item name="actionOverflowMenuStyle">@style/OverflowMenu</item>
|
||||||
|
<item name="toolbarStyle">@style/MyToolbar</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="OverflowMenu" parent="Base.Widget.AppCompat.PopupMenu.Overflow">
|
<style name="MyToolbar" parent="Widget.MaterialComponents.Toolbar.Primary">
|
||||||
|
<item name="android:textColor">@color/white</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="OverflowMenu" parent="Widget.MaterialComponents.PopupMenu.Overflow">
|
||||||
<item name="android:dropDownWidth">100dp</item>
|
<item name="android:dropDownWidth">100dp</item>
|
||||||
<!-- 是否覆盖锚点,默认为true,即盖住Toolbar -->
|
<!-- 是否覆盖锚点,默认为true,即盖住Toolbar -->
|
||||||
<item name="overlapAnchor">false</item>
|
<item name="overlapAnchor">false</item>
|
||||||
|
<item name="android:textColor">@color/white</item>
|
||||||
<item name="android:popupBackground">@color/colorPrimary</item>
|
<item name="android:popupBackground">@color/colorPrimary</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
@ -31,17 +46,19 @@
|
|||||||
<style name="select_style">
|
<style name="select_style">
|
||||||
<item name="android:layout_width">wrap_content</item>
|
<item name="android:layout_width">wrap_content</item>
|
||||||
<item name="android:layout_height">wrap_content</item>
|
<item name="android:layout_height">wrap_content</item>
|
||||||
<item name="android:layout_marginLeft">5dip</item>
|
<item name="android:layout_marginLeft">5dp</item>
|
||||||
<item name="android:layout_marginRight">5dip</item>
|
<item name="android:layout_marginRight">5dp</item>
|
||||||
<item name="android:paddingLeft">10dip</item>
|
<item name="android:paddingLeft">10dp</item>
|
||||||
<item name="android:paddingRight">10dip</item>
|
<item name="android:paddingRight">10dp</item>
|
||||||
<item name="android:paddingTop">5dip</item>
|
<item name="android:paddingTop">5dp</item>
|
||||||
<item name="android:paddingBottom">5dip</item>
|
<item name="android:paddingBottom">5dp</item>
|
||||||
<item name="android:background">@drawable/select_selector</item>
|
<item name="android:background">@drawable/select_selector</item>
|
||||||
<item name="android:button">@null</item>
|
<item name="android:button">@null</item>
|
||||||
<item name="android:gravity">center</item>
|
<item name="android:gravity">center</item>
|
||||||
<item name="android:textSize">13sp</item>
|
<item name="android:textSize">13sp</item>
|
||||||
<item name="android:letterSpacing">0.1</item>
|
<item name="android:letterSpacing">0.1</item>
|
||||||
|
<item name="android:minWidth">0dp</item>
|
||||||
|
<item name="android:minHeight">0dp</item>
|
||||||
<item name="android:textColor">@drawable/txt_select_selector</item>
|
<item name="android:textColor">@drawable/txt_select_selector</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user