diff --git a/app/build.gradle b/app/build.gradle index c96b3ea1..233f0b10 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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' } \ No newline at end of file diff --git a/app/src/main/java/com/idormy/sms/forwarder/MainActivity.java b/app/src/main/java/com/idormy/sms/forwarder/MainActivity.java index 0ef97ec0..4fd6b3f1 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/MainActivity.java +++ b/app/src/main/java/com/idormy/sms/forwarder/MainActivity.java @@ -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 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(); //初始化数据 diff --git a/app/src/main/java/com/idormy/sms/forwarder/RuleActivity.java b/app/src/main/java/com/idormy/sms/forwarder/RuleActivity.java index 0add6c92..d1f0120c 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/RuleActivity.java +++ b/app/src/main/java/com/idormy/sms/forwarder/RuleActivity.java @@ -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); }); } diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml new file mode 100644 index 00000000..f54f7d4d --- /dev/null +++ b/app/src/main/res/drawable/ic_delete.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/step_circle_current.xml b/app/src/main/res/drawable/step_circle_current.xml new file mode 100644 index 00000000..3d674eb0 --- /dev/null +++ b/app/src/main/res/drawable/step_circle_current.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/step_circle_normal.xml b/app/src/main/res/drawable/step_circle_normal.xml new file mode 100644 index 00000000..20c6a080 --- /dev/null +++ b/app/src/main/res/drawable/step_circle_normal.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/step_rectangle_current.xml b/app/src/main/res/drawable/step_rectangle_current.xml new file mode 100644 index 00000000..1d0bf523 --- /dev/null +++ b/app/src/main/res/drawable/step_rectangle_current.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/step_rectangle_normal.xml b/app/src/main/res/drawable/step_rectangle_normal.xml new file mode 100644 index 00000000..ff11851f --- /dev/null +++ b/app/src/main/res/drawable/step_rectangle_normal.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_applist.xml b/app/src/main/res/layout/activity_applist.xml index b7bdb25c..4cafd79f 100644 --- a/app/src/main/res/layout/activity_applist.xml +++ b/app/src/main/res/layout/activity_applist.xml @@ -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" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index bb06ead4..3035b9d2 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,13 +1,32 @@ - + android:layout_height="match_parent"> - + + @@ -15,14 +34,16 @@ + android:text="@string/sms" /> + 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" /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_rule.xml b/app/src/main/res/layout/activity_rule.xml index 5c3c25bd..8a03d1ea 100644 --- a/app/src/main/res/layout/activity_rule.xml +++ b/app/src/main/res/layout/activity_rule.xml @@ -1,28 +1,79 @@ - + android:layout_height="match_parent"> - + + + + + + + android:orientation="horizontal" + android:gravity="center"> + android:text="@string/sms" /> - - - - - - -