From 14d2b4923cd668698d4711ee2823cfd4fba0baec Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Tue, 11 Jul 2017 12:12:54 +0800
Subject: [PATCH] add: discard record

---
 app/src/main/java/com/stardust/scriptdroid/Pref.java          | 2 +-
 .../floatingwindow/menu/content/RecordNavigatorContent.java   | 1 +
 app/src/main/res/layout/floating_window_record.xml            | 4 ++--
 app/src/main/res/values/strings.xml                           | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/stardust/scriptdroid/Pref.java b/app/src/main/java/com/stardust/scriptdroid/Pref.java
index 07f848d8..39802750 100644
--- a/app/src/main/java/com/stardust/scriptdroid/Pref.java
+++ b/app/src/main/java/com/stardust/scriptdroid/Pref.java
@@ -99,7 +99,7 @@ public class Pref {
     }
 
     private static String getString(int id) {
-        return App.getResString(id);
+        return App.getApp().getString(id);
     }
 
     public static int getMaxTextLengthForCodeCompletion() {
diff --git a/app/src/main/java/com/stardust/scriptdroid/external/floatingwindow/menu/content/RecordNavigatorContent.java b/app/src/main/java/com/stardust/scriptdroid/external/floatingwindow/menu/content/RecordNavigatorContent.java
index 3a12d667..5f67a444 100644
--- a/app/src/main/java/com/stardust/scriptdroid/external/floatingwindow/menu/content/RecordNavigatorContent.java
+++ b/app/src/main/java/com/stardust/scriptdroid/external/floatingwindow/menu/content/RecordNavigatorContent.java
@@ -153,6 +153,7 @@ public class RecordNavigatorContent implements NavigatorContent, Recorder.OnStat
 
     private void setState(int state) {
         mStopRecord.setVisibility(state == Recorder.STATE_STOPPED ? View.GONE : View.VISIBLE);
+        mDiscardRecord.setVisibility(state == Recorder.STATE_STOPPED ? View.GONE : View.VISIBLE);
         mStartOrPauseRecordIcon.setImageResource(state == Recorder.STATE_RECORDING ? R.drawable.ic_pause_white_24dp : R.drawable.ic_play_arrow_white_48dp);
         //我知道这样写代码会被打 但我懒...
         mStartOrPauseRecordText.setText(state == Recorder.STATE_RECORDING ? R.string.text_pause_record :
diff --git a/app/src/main/res/layout/floating_window_record.xml b/app/src/main/res/layout/floating_window_record.xml
index 8399258c..08243531 100644
--- a/app/src/main/res/layout/floating_window_record.xml
+++ b/app/src/main/res/layout/floating_window_record.xml
@@ -168,12 +168,12 @@
                 android:layout_width="30dp"
                 android:layout_height="30dp"
                 android:layout_marginRight="8dp"
-                android:src="@drawable/discard"/>
+                android:src="@drawable/ic_close_white_24dp"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/text_stop_record"
+                android:text="@string/text_discard_record"
                 android:textColor="@android:color/primary_text_dark"
                 android:textSize="16sp"/>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0847fbc5..bded5bcb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -206,6 +206,7 @@
     <string name="hint_loop_delay">延迟多少秒后开始循环</string>
     <string name="text_number_format_error">格式错误</string>
     <string name="text_accessibility_settings">打开无障碍服务</string>
+    <string name="text_discard_record">放弃录制</string>
 
     <string-array name="record_control_keys">
         <item>无</item>