diff --git a/app/src/main/java/run/evan/gost/MainActivity.java b/app/src/main/java/run/evan/gost/MainActivity.java index f7df22b..dfaf5c0 100644 --- a/app/src/main/java/run/evan/gost/MainActivity.java +++ b/app/src/main/java/run/evan/gost/MainActivity.java @@ -44,6 +44,8 @@ public class MainActivity extends AppCompatActivity { ArrayAdapter starAdapter; + Spinner sp; + MyHandler handler = new MyHandler(this); private static final String TAG = "run.evan.gost"; @@ -96,7 +98,7 @@ public class MainActivity extends AppCompatActivity { appPreferences = getSharedPreferences("app", MODE_PRIVATE); - Spinner sp = findViewById(R.id.spinner); + sp = findViewById(R.id.spinner); starAdapter = new ArrayAdapter(this, R.layout.item_select); starAdapter.setDropDownViewResource(R.layout.item_dropdown); sp.setAdapter(starAdapter); @@ -202,6 +204,12 @@ public class MainActivity extends AppCompatActivity { String basedir = getApplication().getApplicationInfo().nativeLibraryDir; String config = configEditText.getText().toString(); + if (null != sp.getSelectedItem()) { + String key = sp.getSelectedItem().toString(); + appPreferences.edit().putString("lastConfig", key).apply(); + } + + if (process == null) { if ("".contains(config)) { Toast.makeText(getApplicationContext(), R.string.toast_tip_config_empty, Toast.LENGTH_LONG).show(); @@ -285,8 +293,19 @@ public class MainActivity extends AppCompatActivity { private void reloadConfig() { starAdapter.clear(); Map all = configPreferences.getAll(); + String lastConfig = appPreferences.getString("lastConfig", ""); + int count = 0; + boolean lastValid = false; for (String s : all.keySet()) { starAdapter.add(s); + if (s.equals(lastConfig)) { + sp.setSelection(count); + lastValid = true; + } + count++; + } + if (!lastValid) { + appPreferences.edit().putString("lastConfig", "").apply(); } } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 35bf19f..986c0a3 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -20,6 +20,7 @@ android:id="@+id/textTipConfig" android:layout_width="match_parent" android:layout_height="wrap_content" + android:textSize="18sp" android:text="@string/text_tip_config" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_select.xml b/app/src/main/res/layout/item_select.xml index 9b1ba37..9254b4b 100644 --- a/app/src/main/res/layout/item_select.xml +++ b/app/src/main/res/layout/item_select.xml @@ -1,4 +1,6 @@ \ No newline at end of file + android:layout_height="match_parent" + android:textSize="18sp" + /> \ No newline at end of file