Archives
/
SmsForwarder
mirror of https://github.com/pppscn/SmsForwarder
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

优化：界面布局&用户体验优化

Browse Source
pull/115/head
pppscn 2 years ago
parent affac39bed
commit ea3fc586af
32 changed files with 539 additions and 223 deletions
Show Stats Download Patch File Download Diff File

3
app/build.gradle
Unescape Escape View File

@ -177,4 +177,7 @@ dependencies {
//jetty
implementation "org.eclipse.jetty:jetty-server:9.2.30.v20200428"
implementation "org.eclipse.jetty:jetty-servlet:9.2.30.v20200428"
//StepView
//implementation 'com.shuhart.stepview:stepview:1.5.1'
}

28
app/src/main/java/com/idormy/sms/forwarder/MainActivity.java
Unescape Escape View File

@ -18,6 +18,7 @@ import android.view.View;
import android.view.Window;
import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
@ -25,6 +26,7 @@ import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.idormy.sms.forwarder.adapter.LogAdapter;
import com.idormy.sms.forwarder.model.vo.LogVo;
import com.idormy.sms.forwarder.sender.HttpServer;
@ -110,6 +112,20 @@ public class MainActivity extends AppCompatActivity implements RefreshListView.I
} catch (Exception e) {
Log.e(TAG, "SmsHubApiTask:", e);
}
/*final StepView stepView = findViewById(R.id.step_view);
stepView.setOnStepClickListener(new StepView.OnStepClickListener() {
@Override
public void onStepClick(int step) {
Toast.makeText(MainActivity.this, "Step " + step, Toast.LENGTH_SHORT).show();
}
});
List<String> steps = new ArrayList<>();
for (int i = 0; i < 4; i++) {
steps.add("Step " + (i + 1));
}
//steps.set(steps.size() - 1, steps.get(steps.size() - 1) + " last one");
stepView.setSteps(steps);*/
}
@Override
@ -127,7 +143,17 @@ public class MainActivity extends AppCompatActivity implements RefreshListView.I
//是否关闭页面提示
TextView help_tip = findViewById(R.id.help_tip);
help_tip.setVisibility(MyApplication.showHelpTip ? View.VISIBLE : View.GONE);
FloatingActionButton btnCleanLog = findViewById(R.id.btnCleanLog);
RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) btnCleanLog.getLayoutParams();
if (MyApplication.showHelpTip) {
layoutParams.bottomMargin = CommonUtil.dp2px(this, 120);//距离底部120dp
btnCleanLog.setLayoutParams(layoutParams);
help_tip.setVisibility(View.VISIBLE);
} else {
layoutParams.bottomMargin = CommonUtil.dp2px(this, 80);
btnCleanLog.setLayoutParams(layoutParams);
help_tip.setVisibility(View.GONE);
}
// 先拿到数据并放在适配器上
initTLogs(); //初始化数据

8
app/src/main/java/com/idormy/sms/forwarder/RuleActivity.java
Unescape Escape View File

@ -23,6 +23,7 @@ import android.widget.Toast;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.idormy.sms.forwarder.adapter.RuleAdapter;
import com.idormy.sms.forwarder.model.RuleModel;
import com.idormy.sms.forwarder.model.SenderModel;
@ -130,6 +131,9 @@ public class RuleActivity extends AppCompatActivity {
//切换日志类别
int typeCheckId = getTypeCheckId(currentType);
final RadioGroup radioGroupTypeCheck = findViewById(R.id.radioGroupTypeCheck);
final FloatingActionButton addSmsRule = findViewById(R.id.addSmsRule);
final FloatingActionButton addCallRule = findViewById(R.id.addCallRule);
final FloatingActionButton addAppRule = findViewById(R.id.addAppRule);
radioGroupTypeCheck.check(typeCheckId);
radioGroupTypeCheck.setOnCheckedChangeListener((group, checkedId) -> {
RadioButton rb = findViewById(checkedId);
@ -137,6 +141,10 @@ public class RuleActivity extends AppCompatActivity {
initRules(); //初始化数据
adapter = new RuleAdapter(RuleActivity.this, R.layout.item_rule, ruleModels);
listView.setAdapter(adapter);
addSmsRule.setVisibility("sms".equals(currentType) ? View.VISIBLE : View.GONE);
addCallRule.setVisibility("call".equals(currentType) ? View.VISIBLE : View.GONE);
addAppRule.setVisibility("app".equals(currentType) ? View.VISIBLE : View.GONE);
});
}

5
app/src/main/res/drawable/ic_delete.xml
Unescape Escape View File

@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<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>

8
app/src/main/res/drawable/step_circle_current.xml
Unescape Escape View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="#1C8DD4" />
<size
android:width="30dp"
android:height="30dp" />
</shape>

8
app/src/main/res/drawable/step_circle_normal.xml
Unescape Escape View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="#CCCCCC" />
<size
android:width="30dp"
android:height="30dp" />
</shape>

4
app/src/main/res/drawable/step_rectangle_current.xml
Unescape Escape View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#1C8DD4" />
</shape>

4
app/src/main/res/drawable/step_rectangle_normal.xml
Unescape Escape View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#CCCCCC" />
</shape>

8
app/src/main/res/layout/activity_applist.xml
Unescape Escape View File

@ -37,16 +37,16 @@
android:layout_width="fill_parent"
android:layout_marginTop="5dp"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
android:background="#aadcdcdc" />
<ListView
android:id="@+id/list_view_app"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
android:layout_marginTop="0dp"
android:layout_weight="1" />

254
app/src/main/res/layout/activity_main.xml
Unescape Escape View File

@ -1,13 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_height="match_parent">
<LinearLayout
<com.google.android.material.floatingactionbutton.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:background="@color/colorPrimary"
android:contentDescription="@string/clean_log"
android:onClick="cleanLog"
android:scaleType="centerCrop"
android:src="@drawable/ic_delete"
app:elevation="8dp"
tools:ignore="UsingOnClickInXml" />
<LinearLayout
android:id="@+id/radioGroup"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_gravity="center_horizontal"
android:layout_marginTop="5dip"
android:orientation="horizontal">
@ -15,14 +34,16 @@
<RadioGroup
android:id="@+id/radioGroupTypeCheck"
style="@style/rg_style"
android:layout_width="match_parent"
android:gravity="center"
android:orientation="horizontal">
<RadioButton
android:id="@+id/btnTypeSms"
style="@style/select_style"
android:checked="true"
android:tag="sms"
android:text="@string/sms"
android:checked="true" />
android:text="@string/sms" />
<RadioButton
android:id="@+id/btnTypeCall"
@ -42,13 +63,18 @@
<com.idormy.sms.forwarder.RefreshListView
android:id="@+id/list_view_log"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_margin="5dp"
android:layout_weight="1" />
android:layout_height="match_parent"
android:layout_below="@+id/radioGroup"
android:layout_marginStart="5dp"
android:layout_marginTop="5dp"
android:layout_marginEnd="5dp"
android:layout_marginBottom="25dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:orientation="vertical">
<TextView
@ -59,7 +85,39 @@
android:text="@string/log_tips"
android:textColor="@color/colorPrimary" />
<LinearLayout
<View
android:id="@+id/radioGroupLine"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="5dp"
android:layout_marginTop="5dp"
android:layout_marginEnd="5dp"
android:background="#aadcdcdc" />
<!--<com.shuhart.stepview.StepView
android:id="@+id/step_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="5dp"
app:sv_selectedCircleColor="@color/colorPrimary"
app:sv_selectedTextColor="@color/colorPrimary"
app:sv_stepLineWidth="2dp"
app:sv_stepPadding="2dp"
app:sv_nextTextColor="@color/gray"
app:sv_nextStepLineColor="@color/gray"
app:sv_nextStepCircleEnabled="true"
app:sv_nextStepCircleColor="@color/gray"
app:sv_doneCircleColor="@color/colorPrimary"
app:sv_doneStepLineColor="@color/colorPrimary"
app:sv_doneCircleRadius="15dp"
app:sv_selectedCircleRadius="15dp"
app:sv_selectedStepNumberColor="@color/white"
app:sv_stepViewStyle="@style/StepView"
app:sv_doneStepMarkColor="@color/colorPrimaryDark"
app:sv_stepNumberTextSize="15sp"
app:sv_animationType="Line" />-->
<!--<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
@ -91,16 +149,186 @@
<Button
android:layout_width="match_parent"
android:layout_height="35dp"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:layout_marginTop="5dp"
android:layout_marginRight="10dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp"
android:layout_weight="1"
android:background="@color/colorPrimary"
android:onClick="toSendSetting"
android:text="@string/sender_setting"
tools:ignore="ButtonStyle,UsingOnClickInXml" />
</LinearLayout>-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:gravity="center_vertical">
<View
android:layout_width="15dp"
android:layout_height="match_parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/step_circle_current"
android:gravity="center"
android:text="@string/_1"
android:textColor="#fff"
android:textSize="18sp" />
<ImageView
android:layout_width="15dp"
android:layout_height="4dp"
android:layout_gravity="center"
android:src="@drawable/step_rectangle_current"
tools:ignore="ContentDescription" />
<ImageView
android:layout_width="0dp"
android:layout_height="4dp"
android:layout_weight="1"
android:src="@drawable/step_rectangle_current"
tools:ignore="ContentDescription" />
<ImageView
android:layout_width="15dp"
android:layout_height="4dp"
android:layout_gravity="center"
android:src="@drawable/step_rectangle_current"
tools:ignore="ContentDescription" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/step_circle_current"
android:gravity="center"
android:text="@string/_2"
android:textColor="#fff"
android:textSize="18sp" />
<ImageView
android:layout_width="15dp"
android:layout_height="4dp"
android:layout_gravity="center"
android:src="@drawable/step_rectangle_normal"
tools:ignore="ContentDescription" />
<ImageView
android:layout_width="0dp"
android:layout_height="4dp"
android:layout_weight="1"
android:src="@drawable/step_rectangle_normal"
tools:ignore="ContentDescription" />
<ImageView
android:layout_width="15dp"
android:layout_height="4dp"
android:layout_gravity="center"
android:src="@drawable/step_rectangle_normal"
tools:ignore="ContentDescription" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/step_circle_normal"
android:gravity="center"
android:text="@string/_3"
android:textColor="#fff"
android:textSize="18sp" />
<ImageView
android:layout_width="15dp"
android:layout_height="4dp"
android:layout_gravity="center"
android:src="@drawable/step_rectangle_normal"
tools:ignore="ContentDescription" />
<ImageView
android:layout_width="0dp"
android:layout_height="4dp"
android:layout_weight="1"
android:src="@drawable/step_rectangle_normal"
tools:ignore="ContentDescription" />
<ImageView
android:layout_width="15dp"
android:layout_height="4dp"
android:layout_gravity="center"
android:src="@drawable/step_rectangle_normal"
tools:ignore="ContentDescription" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/step_circle_normal"
android:gravity="center"
android:text="@string/_4"
android:textColor="#fff"
android:textSize="18sp" />
<View
android:layout_width="15dp"
android:layout_height="match_parent" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="5dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp">
<TextView
android:layout_width="60dp"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/step_1"
android:textSize="12sp" />
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
<TextView
android:layout_width="60dp"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/step_2"
android:textSize="12sp" />
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
<TextView
android:layout_width="60dp"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/step_3"
android:textSize="12sp" />
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
<TextView
android:layout_width="60dp"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/step_4"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</RelativeLayout>

158
app/src/main/res/layout/activity_rule.xml
Unescape Escape View File

@ -1,28 +1,79 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_height="match_parent">
<LinearLayout
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/addSmsRule"
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:background="@color/colorPrimary"
android:onClick="addRule"
android:scaleType="centerCrop"
android:src="@drawable/ic_add"
android:tag="sms"
app:elevation="8dp" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/addCallRule"
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:background="@color/colorPrimary"
android:onClick="addRule"
android:scaleType="centerCrop"
android:src="@drawable/ic_add"
android:tag="call"
app:elevation="8dp"
android:visibility="gone" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/addAppRule"
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:background="@color/colorPrimary"
android:onClick="addRule"
android:scaleType="centerCrop"
android:src="@drawable/ic_add"
android:tag="app"
app:elevation="8dp"
android:visibility="gone" />
<LinearLayout
android:id="@+id/radioGroup"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="5dip"
android:layout_alignParentTop="true"
android:layout_alignParentStart="true"
android:orientation="horizontal">
<RadioGroup
android:id="@+id/radioGroupTypeCheck"
android:layout_width="match_parent"
style="@style/rg_style"
android:orientation="horizontal">
android:orientation="horizontal"
android:gravity="center">
<RadioButton
android:id="@+id/btnTypeSms"
style="@style/select_style"
android:checked="true"
android:tag="sms"
android:text="@string/sms"
android:checked="true" />
android:text="@string/sms" />
<RadioButton
android:id="@+id/btnTypeCall"
@ -40,85 +91,34 @@
</LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_marginTop="5dp"
android:id="@+id/radioGroupLine"
android:layout_below="@+id/radioGroup"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginStart="5dp"
android:layout_marginTop="5dp"
android:layout_marginEnd="5dp"
android:background="#aadcdcdc" />
<ListView
android:id="@+id/list_view_rule"
android:layout_below="@+id/radioGroupLine"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginTop="0dp"
android:layout_height="match_parent"
android:layout_marginTop="5dp"
android:layout_marginEnd="5dp"
android:layout_marginBottom="25dp"
android:layout_marginStart="5dp"
android:layout_weight="1" />
<LinearLayout
<TextView
android:id="@+id/help_tip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/help_tip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/rule_tips"
android:textColor="@color/colorPrimary" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="5dip"
android:orientation="horizontal">
<Button
android:layout_width="match_parent"
android:layout_height="35dp"
android:layout_marginStart="10dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="10dp"
android:layout_weight="1"
android:background="@color/colorPrimary"
android:onClick="addRule"
android:tag="sms"
android:padding="0dp"
android:text="@string/new_sms_rule"
tools:ignore="ButtonStyle,UsingOnClickInXml" />
<Button
android:layout_width="match_parent"
android:layout_height="35dp"
android:layout_marginStart="10dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="10dp"
android:layout_weight="1"
android:background="@color/colorPrimary"
android:onClick="addRule"
android:tag="call"
android:padding="0dp"
android:text="@string/new_call_rule"
tools:ignore="ButtonStyle,UsingOnClickInXml" />
<Button
android:layout_width="match_parent"
android:layout_height="35dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="5dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="10dp"
android:layout_weight="1"
android:background="@color/colorPrimary"
android:onClick="addRule"
android:tag="app"
android:padding="0dp"
android:text="@string/new_app_rule"
tools:ignore="ButtonStyle,UsingOnClickInXml" />
</LinearLayout>
</LinearLayout>
android:layout_alignParentStart="true"
android:layout_alignParentBottom="true"
android:gravity="center"
android:text="@string/rule_tips"
android:textColor="@color/colorPrimary" />
</LinearLayout>
</RelativeLayout>

11
app/src/main/res/layout/activity_sender.xml
Unescape Escape View File

@ -7,9 +7,9 @@
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginRight="10dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="20dp"
android:background="@color/colorPrimary"
android:onClick="addSender"
@ -21,7 +21,7 @@
android:id="@+id/help_tip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentBottom="true"
android:gravity="center"
android:text="@string/sender_tips"
@ -31,7 +31,10 @@
android:id="@+id/list_view_sender"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="5dp"
android:layout_marginTop="5dp"
android:layout_marginEnd="5dp"
android:layout_marginBottom="25dp"
android:layout_marginStart="5dp"
android:layout_weight="1" />
</RelativeLayout>

1
app/src/main/res/layout/activity_setting.xml
Unescape Escape View File

@ -107,7 +107,6 @@
android:layout_height="wrap_content"
android:text="未接来电"
android:id="@+id/chb_music"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" />
<CheckBox

12
app/src/main/res/layout/alert_dialog_setview_bark.xml
Unescape Escape View File

@ -13,8 +13,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView
@ -48,9 +48,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:layout_marginEnd="10dp"
android:orientation="vertical">
<TextView
@ -80,9 +80,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:layout_marginEnd="10dp"
android:orientation="vertical">
<TextView

20
app/src/main/res/layout/alert_dialog_setview_dingding.xml
Unescape Escape View File

@ -13,8 +13,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView
@ -48,8 +48,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="10dp"
android:orientation="vertical">
@ -81,8 +81,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="10dp"
android:orientation="vertical">
@ -106,8 +106,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="10dp"
android:orientation="horizontal">
@ -132,8 +132,8 @@
android:id="@+id/linearLayoutDingdingAtMobiles"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="10dp"
android:orientation="vertical"
android:visibility="gone">

28
app/src/main/res/layout/alert_dialog_setview_email.xml
Unescape Escape View File

@ -13,8 +13,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView
@ -58,8 +58,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView
@ -83,8 +83,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView
@ -107,8 +107,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView
@ -142,8 +142,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="5dp"
android:orientation="horizontal"
android:visibility="gone">
@ -181,8 +181,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView
@ -206,8 +206,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView

12
app/src/main/res/layout/alert_dialog_setview_feishu.xml
Unescape Escape View File

@ -13,8 +13,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView
@ -48,8 +48,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="10dp"
android:orientation="vertical">
@ -74,8 +74,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="10dp"
android:orientation="vertical">

12
app/src/main/res/layout/alert_dialog_setview_gotify.xml
Unescape Escape View File

@ -13,8 +13,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView
@ -49,9 +49,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:layout_marginTop="5dp"
android:layout_marginRight="10dp"
android:layout_marginEnd="10dp"
android:orientation="vertical">
<LinearLayout
@ -187,8 +187,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView

32
app/src/main/res/layout/alert_dialog_setview_pushplus.xml
Unescape Escape View File

@ -13,8 +13,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView
@ -48,8 +48,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="vertical">
<LinearLayout
@ -87,8 +87,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView
@ -112,8 +112,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView
@ -137,8 +137,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView
@ -162,8 +162,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView
@ -187,8 +187,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView
@ -212,8 +212,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView

28
app/src/main/res/layout/alert_dialog_setview_qywxapp.xml
Unescape Escape View File

@ -13,8 +13,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView
@ -49,8 +49,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView
@ -74,8 +74,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView
@ -100,8 +100,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView
@ -126,8 +126,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="10dp"
android:orientation="horizontal">
@ -156,8 +156,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView
@ -181,8 +181,8 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:text="@string/specified_member_tips"
android:textSize="10sp"
tools:ignore="SmallSp" />

8
app/src/main/res/layout/alert_dialog_setview_qywxgrouprobot.xml
Unescape Escape View File

@ -13,8 +13,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView
@ -48,8 +48,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="vertical">
<LinearLayout

8
app/src/main/res/layout/alert_dialog_setview_serverchan.xml
Unescape Escape View File

@ -13,8 +13,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView
@ -48,8 +48,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="vertical">
<TextView

16
app/src/main/res/layout/alert_dialog_setview_sms.xml
Unescape Escape View File

@ -12,8 +12,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView
@ -47,9 +47,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:layout_marginTop="5dp"
android:layout_marginRight="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView
@ -87,9 +87,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:layout_marginTop="5dp"
android:layout_marginRight="10dp"
android:layout_marginEnd="10dp"
android:orientation="vertical">
<LinearLayout
@ -127,8 +127,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView

28
app/src/main/res/layout/alert_dialog_setview_telegram.xml
Unescape Escape View File

@ -13,8 +13,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView
@ -48,8 +48,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="vertical">
<TextView
@ -73,8 +73,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="10dp"
android:orientation="horizontal">
@ -112,8 +112,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="10dp"
android:orientation="vertical">
@ -176,8 +176,8 @@
android:id="@+id/layoutProxyHost"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal"
android:visibility="gone">
@ -202,8 +202,8 @@
android:id="@+id/layoutProxyPort"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal"
android:visibility="gone">
@ -242,8 +242,8 @@
android:id="@+id/layoutProxyAuthenticator"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="vertical"
android:visibility="gone">

20
app/src/main/res/layout/alert_dialog_setview_webnotify.xml
Unescape Escape View File

@ -13,8 +13,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView
@ -48,8 +48,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<TextView
@ -86,8 +86,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="vertical">
<LinearLayout
@ -124,8 +124,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="vertical">
<TextView
@ -155,8 +155,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:orientation="vertical">
<TextView

8
app/src/main/res/layout/diaolog_privacy_policy.xml
Unescape Escape View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:tools="http://schemas.android.com/tools"
android:background="#fff"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:orientation="vertical"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
@ -21,8 +21,8 @@
<TextView
android:id="@+id/textlike"
android:layout_marginRight="5dp"
android:layout_marginLeft="5dp"
android:layout_marginEnd="5dp"
android:layout_marginStart="5dp"
android:layout_marginBottom="10dp"
android:layout_width="wrap_content"
android:textColor="#000"

7
app/src/main/res/layout/edit_text_clear.xml
Unescape Escape View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout 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"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -13,8 +12,8 @@
android:id="@+id/iv_edit_left_icon"
android:layout_width="30dp"
android:layout_height="45dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
android:layout_centerVertical="true"
android:scaleType="centerInside"
android:src="@drawable/icon_login"
@ -36,7 +35,7 @@
android:layout_width="90dp"
android:layout_height="45dp"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:gravity="right">
<ImageView

1
app/src/main/res/values-en/colors.xml
Unescape Escape View File

@ -11,6 +11,7 @@
<color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
<color name="gray">#CCCCCC</color>
<color name="tv_black_333333">#333333</color>
<color name="tv_gray_999999">#999999</color>

8
app/src/main/res/values-en/strings.xml
Unescape Escape View File

@ -307,4 +307,12 @@
<string name="pushplus">PushPlus</string>
<string name="gotify">Gotify</string>
<string name="add">Add</string>
<string name="_2">2</string>
<string name="_3">3</string>
<string name="_4">4</string>
<string name="step_1">Settings</string>
<string name="step_2">Senders</string>
<string name="step_3">Rules</string>
<string name="step_4">Logs</string>
<string name="clean_log">Clean Log</string>
</resources>

1
app/src/main/res/values/colors.xml
Unescape Escape View File

@ -11,6 +11,7 @@
<color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
<color name="gray">#CCCCCC</color>
<color name="tv_black_333333">#333333</color>
<color name="tv_gray_999999">#999999</color>

11
app/src/main/res/values/strings.xml
Unescape Escape View File

@ -16,7 +16,7 @@
<string name="rule_setting">转发规则</string>
<string name="sender_setting">发送通道</string>
<string name="app_list">应用列表</string>
<string name="log_tips">提示：置顶下拉刷新，长按删除单条，选项卡切换日志类型</string>
<string name="log_tips">提示：置顶下拉刷新，长按删除单条，选项卡切换日志类型\n首次使用按以下步骤设置，该步骤点亮表示已设置！</string>
<string name="rule_tips">提示：新建规则点击“添加”，长按删除/克隆，点击编辑已有</string>
<string name="sender_tips">提示：新建发送通道点击“添加”，长按删除/克隆，点击编辑已有</string>
<string name="app_tips">提示：点击复制APP的包名，长按则启动并跳转该APP</string>
@ -306,4 +306,13 @@
<string name="pushplus">PushPlus</string>
<string name="gotify">Gotify</string>
<string name="add">添加</string>
<string name="_1">1</string>
<string name="_2">2</string>
<string name="_3">3</string>
<string name="_4">4</string>
<string name="step_1">选择功能</string>
<string name="step_2">发送通道</string>
<string name="step_3">转发规则</string>
<string name="step_4">转发日志</string>
<string name="clean_log">清理日志</string>
</resources>

2
build.gradle
Unescape Escape View File

@ -2,6 +2,7 @@
buildscript {
repositories {
jcenter()
maven { url 'https://maven.aliyun.com/repository/google' }
maven { url 'https://maven.aliyun.com/repository/central' }
maven { url 'https://maven.aliyun.com/repository/public' }
@ -17,6 +18,7 @@ buildscript {
allprojects {
repositories {
jcenter()
maven { url 'https://maven.aliyun.com/repository/google' }
maven { url 'https://maven.aliyun.com/repository/central' }
maven { url 'https://maven.aliyun.com/repository/public' }

Write Preview
Loading…
Cancel
Save