移动振动位置

.idea/misc.xml

@@ -47,6 +47,8 @@
         <entry key="app/src/main/res/layout/item_refresh.xml" value="0.1" />
         <entry key="app/src/main/res/layout/item_sure.xml" value="0.1" />
         <entry key="app/src/main/res/layout/item_switch.xml" value="0.55" />
+        <entry key="app/src/main/res/layout/item_switch_footer.xml" value="0.37771739130434784" />
+        <entry key="app/src/main/res/layout/item_switch_right.xml" value="0.625" />
         <entry key="app/src/main/res/layout/item_textfield.xml" value="0.16236068895643363" />
         <entry key="app/src/main/res/layout/item_title.xml" value="0.25769927536231885" />
         <entry key="app/src/main/res/layout/item_title_about.xml" value="0.396875" />

app/src/main/java/com/xplora/xpsettings/Activity/SoundModeActivity.java

@@ -47,7 +47,11 @@ public class SoundModeActivity extends BaseActivity {
             model.title = stringList[i].trim();
             if (i == 0){
                 model.cellType = Constant.CellType.TITLE;
-            }  else if (i == 1){
+            } else if (i == 1){
+                int isVibrate = DataManager.getIsVibrate();
+                model.isOn = isVibrate >= 1;
+                model.cellType = Constant.CellType.SWITCH_RIGHT;
+            } else if (i == 2){
                 model.cellType = Constant.CellType.TITLE_SUBTITLE;
                 model.subTitle = ringTone != null ? ringTone.getTitle(this) : "";
             }
@@ -87,6 +91,8 @@ public class SoundModeActivity extends BaseActivity {
                 startActivity(intent1);
                 break;
             case 1:
+                break;
+            case 2:
                 Intent intent2 = new Intent(SoundModeActivity.this, RingToneActivity.class);
                 startActivityForResult(intent2, 112);
                 break;
@@ -100,7 +106,7 @@ public class SoundModeActivity extends BaseActivity {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == 112 && resultCode == RESULT_OK) {
             Ringtone ringTone = DataManager.getDefaultRingTone();
-            BaseModel model = mDataList.get(1);
+            BaseModel model = mDataList.get(2);
             model.subTitle = ringTone.getTitle(this);
             mAdapter.setBaseObjects(mDataList);
             mAdapter.notifyDataSetInvalidated();

app/src/main/java/com/xplora/xpsettings/Adapter/BaseListAdapter.java

@@ -84,6 +84,8 @@ public class BaseListAdapter extends ArrayAdapter<BaseModel> {
             view = LayoutInflater.from(getContext()).inflate(R.layout.item_xpstyle2, null);
         } else if (model.cellType == Constant.CellType.SWITCH) {
             view = LayoutInflater.from(getContext()).inflate(R.layout.item_switch, null);
+        } else if (model.cellType == Constant.CellType.SWITCH_RIGHT) {
+            view = LayoutInflater.from(getContext()).inflate(R.layout.item_switch_right, null);
         } else if (model.cellType == Constant.CellType.SWITCH_FOOTER) {
             view = LayoutInflater.from(getContext()).inflate(R.layout.item_switch_footer, null);
         } else if (model.cellType == Constant.CellType.CHECKBOX) {

app/src/main/java/com/xplora/xpsettings/Utils/Constant.java

@@ -41,6 +41,7 @@ public class Constant {
         XPSTYLE,
         XPSTYLE2,
         SWITCH,
+        SWITCH_RIGHT,
         SWITCH_FOOTER,
         CHECKBOX,
         CHECKBOX_HIGHLIGHT,

app/src/main/res/layout/item_switch_right.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="40dp"
+        >
+
+        <TextView
+            android:id="@+id/item_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="2dp"
+            android:layout_marginBottom="2dp"
+            android:layout_centerVertical="true"
+            android:layout_alignParentStart="true"
+            android:textAlignment="center"
+            android:fontFamily="Roboto"
+            android:textColor="@color/white"
+            android:textSize="13sp" />
+
+        <Switch
+            android:id="@+id/item_switch"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_marginEnd="14dp"
+            android:layout_centerVertical="true"
+            android:thumb="@drawable/selector_switch_thumb"
+            android:track="@drawable/selector_switch_track">
+        </Switch>
+    </RelativeLayout>
+
+</LinearLayout>

app/src/main/res/values-b+sr+Latn/arrays.xml

@@ -30,13 +30,13 @@
 
     <string-array name="soundmode_title_array_ex">
         <item>Jačina zvuka</item>
+        <item>Vibriraj</item>
         <item>Melodija</item>
     </string-array>
 
     <string-array name="volume_title_array_ex">
         <item>Sistem</item>
         <item>Sadržaji</item>
-        <item>Vibriraj</item>
     </string-array>
 
     <string-array name="screen_time_value_array">

app/src/main/res/values-da/arrays.xml

@@ -30,13 +30,13 @@
 
     <string-array name="soundmode_title_array_ex">
         <item>Volume</item>
+        <item>Vibrere</item>
         <item>Ringetone</item>
     </string-array>
 
     <string-array name="volume_title_array_ex">
         <item>System</item>
         <item>Medier</item>
-        <item>Vibrere</item>
     </string-array>
 
     <string-array name="screen_time_value_array">

app/src/main/res/values-de/arrays.xml

@@ -30,13 +30,13 @@
 
     <string-array name="soundmode_title_array_ex">
         <item>Lautstärke</item>
+        <item>Vibrieren</item>
         <item>Klingelton</item>
     </string-array>
 
     <string-array name="volume_title_array_ex">
         <item>System</item>
         <item>Medien</item>
-        <item>Vibrieren</item>
     </string-array>
 
     <string-array name="screen_time_value_array">

app/src/main/res/values-es/arrays.xml

@@ -30,13 +30,13 @@
 
     <string-array name="soundmode_title_array_ex">
         <item>Volumen</item>
+        <item>Vibrar</item>
         <item>Tono de llamada</item>
     </string-array>
 
     <string-array name="volume_title_array_ex">
         <item>Sistema</item>
         <item>Media</item>
-        <item>Vibrar</item>
     </string-array>
 
     <string-array name="screen_time_value_array">

app/src/main/res/values-et/arrays.xml

@@ -30,13 +30,13 @@
 
     <string-array name="soundmode_title_array_ex">
         <item>Helitugevus</item>
+        <item>Vibreerige</item>
         <item>Helinatoon</item>
     </string-array>
 
     <string-array name="volume_title_array_ex">
         <item>Süsteem</item>
         <item>Meedia</item>
-        <item>Vibreerige</item>
     </string-array>
 
     <string-array name="screen_time_value_array">

app/src/main/res/values-fi/arrays.xml

@@ -30,13 +30,13 @@
 
     <string-array name="soundmode_title_array_ex">
         <item>Äänenvoimakkuus</item>
+        <item>Värinä</item>
         <item>Soittoääni</item>
     </string-array>
 
     <string-array name="volume_title_array_ex">
         <item>Järjestelmä</item>
         <item>Media</item>
-        <item>Värinä</item>
     </string-array>
 
     <string-array name="screen_time_value_array">

app/src/main/res/values-fr/arrays.xml

@@ -30,13 +30,13 @@
 
     <string-array name="soundmode_title_array_ex">
         <item>Volume</item>
+        <item>Vibrer</item>
         <item>Sonnerie</item>
     </string-array>
 
     <string-array name="volume_title_array_ex">
         <item>Système</item>
         <item>Médias</item>
-        <item>Vibrer</item>
     </string-array>
 
     <string-array name="screen_time_value_array">

app/src/main/res/values-hu/arrays.xml

@@ -30,13 +30,13 @@
 
     <string-array name="soundmode_title_array_ex">
         <item>Hangerő</item>
+        <item>Rezegés</item>
         <item>Csengőhang</item>
     </string-array>
 
     <string-array name="volume_title_array_ex">
         <item>Rendszer</item>
         <item>Média</item>
-        <item>Rezegés</item>
     </string-array>
 
     <string-array name="screen_time_value_array">

app/src/main/res/values-is/arrays.xml

@@ -30,13 +30,13 @@
 
     <string-array name="soundmode_title_array_ex">
         <item>Hljóðstyrkur</item>
+        <item>Titra</item>
         <item>Hringitónn</item>
     </string-array>
 
     <string-array name="volume_title_array_ex">
         <item>Kerfi</item>
         <item>Margmiðlunarefni</item>
-        <item>Titra</item>
     </string-array>
 
     <string-array name="screen_time_value_array">

app/src/main/res/values-it/arrays.xml

@@ -30,13 +30,13 @@
 
     <string-array name="soundmode_title_array_ex">
         <item>Volume</item>
+        <item>Vibrazione</item>
         <item>Tono suoneria</item>
     </string-array>
 
     <string-array name="volume_title_array_ex">
         <item>Sistema</item>
         <item>Media</item>
-        <item>Vibrazione</item>
     </string-array>
 
     <string-array name="screen_time_value_array">

app/src/main/res/values-lt/arrays.xml

@@ -30,13 +30,13 @@
 
     <string-array name="soundmode_title_array_ex">
         <item>Garsumas</item>
+        <item>Vibravimas</item>
         <item>Skambėjimo tonas</item>
     </string-array>
 
     <string-array name="volume_title_array_ex">
         <item>Sistema</item>
         <item>Medija</item>
-        <item>Vibravimas</item>
     </string-array>
 
     <string-array name="screen_time_value_array">

app/src/main/res/values-nb/arrays.xml

@@ -30,13 +30,13 @@
 
     <string-array name="soundmode_title_array_ex">
         <item>Volum</item>
+        <item>Vibrere</item>
         <item>Ringetone</item>
     </string-array>
 
     <string-array name="volume_title_array_ex">
         <item>System</item>
         <item>Media</item>
-        <item>Vibrere</item>
     </string-array>
 
     <string-array name="screen_time_value_array">

app/src/main/res/values-nl/arrays.xml

@@ -30,13 +30,13 @@
 
     <string-array name="soundmode_title_array_ex">
         <item>Volume</item>
+        <item>Trillen</item>
         <item>Beltoon</item>
     </string-array>
 
     <string-array name="volume_title_array_ex">
         <item>Systeem</item>
         <item>Media</item>
-        <item>Trillen</item>
     </string-array>
 
     <string-array name="screen_time_value_array">

app/src/main/res/values-pl/arrays.xml

@@ -30,13 +30,13 @@
 
     <string-array name="soundmode_title_array_ex">
         <item>Głośność</item>
+        <item>Wibracje</item>
         <item>Dzwonek</item>
     </string-array>
 
     <string-array name="volume_title_array_ex">
         <item>System</item>
         <item>Media</item>
-        <item>Wibracje</item>
     </string-array>
 
     <string-array name="screen_time_value_array">

app/src/main/res/values-pt/arrays.xml

@@ -30,13 +30,13 @@
 
     <string-array name="soundmode_title_array_ex">
         <item>Volume</item>
+        <item>Vibrar</item>
         <item>Toque</item>
     </string-array>
 
     <string-array name="volume_title_array_ex">
         <item>Sistema</item>
         <item>Média</item>
-        <item>Vibrar</item>
     </string-array>
 
     <string-array name="screen_time_value_array">

app/src/main/res/values-sl/arrays.xml

@@ -30,13 +30,13 @@
 
     <string-array name="soundmode_title_array_ex">
         <item>Glasnost</item>
+        <item>Vibriraj</item>
         <item>Melodija zvonjenja</item>
     </string-array>
 
     <string-array name="volume_title_array_ex">
         <item>Sistem</item>
         <item>Mediji</item>
-        <item>Vibriraj</item>
     </string-array>
 
     <string-array name="screen_time_value_array">

app/src/main/res/values-sv/arrays.xml

@@ -30,13 +30,13 @@
 
     <string-array name="soundmode_title_array_ex">
         <item>Volym</item>
+        <item>Vibrera</item>
         <item>Ringsignal</item>
     </string-array>
 
     <string-array name="volume_title_array_ex">
         <item>System</item>
         <item>Media</item>
-        <item>Vibrera</item>
     </string-array>
 
     <string-array name="screen_time_value_array">

app/src/main/res/values/arrays.xml

@@ -30,13 +30,13 @@
 
     <string-array name="soundmode_title_array_ex">
         <item>Volume</item>
+        <item>Vibrate</item>
         <item>Ringtone</item>
     </string-array>
 
     <string-array name="volume_title_array_ex">
         <item>System</item>
         <item>Media</item>
-        <item>Vibrate</item>
     </string-array>
 
     <string-array name="screen_time_value_array">