Skip to content

Commit 2313d3a

Browse files
committed
v2.2.0
1 parent 7ccf575 commit 2313d3a

File tree

3 files changed

+42
-6
lines changed

3 files changed

+42
-6
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ android {
99
defaultConfig {
1010
minSdk = 24
1111
targetSdk = 35
12-
versionCode = 8
13-
versionName = "2.1.0"
12+
versionCode = 9
13+
versionName = "2.2.0"
1414
proguardFiles += 'proguard-rules.pro'
1515
multiDexEnabled = false
1616
}

app/src/main/java/me/s1204/benesse/touch/test/Tester.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import android.os.BenesseExtension;
88
import android.os.Build;
99
import android.os.Bundle;
10+
import android.provider.Settings;
1011
import android.view.View;
1112
import android.widget.EditText;
1213
import android.widget.Spinner;
@@ -76,6 +77,9 @@ public void onCreate(Bundle savedInstanceState) {
7677
break;
7778
}
7879

80+
findViewById(R.id.btn_openSettings).setOnClickListener(view -> startActivity(new Intent(Intent.ACTION_MAIN).setClassName("com.android.settings", "com.android.settings.Settings")));
81+
findViewById(R.id.btn_openDevOpts).setOnClickListener(view -> startActivity(new Intent(Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS)));
82+
7983
findViewById(R.id.btn_enableNoSuchFunc).setOnClickListener(view -> {
8084
// 存在しない
8185
findViewById(R.id.btn_checkUsbCam).setEnabled(true);
@@ -154,7 +158,7 @@ public void onCreate(Bundle savedInstanceState) {
154158
setContentView(R.layout.layout_getint);
155159
findViewById(R.id.exec).setOnClickListener(view13 -> {
156160
Spinner varBox = findViewById(R.id.getInt_var);
157-
String var = varBox.toString();
161+
String var = varBox.getSelectedItem().toString();
158162
if (var.isEmpty()) {
159163
makeText("値を入力してください");
160164
return;
@@ -187,7 +191,7 @@ public void onCreate(Bundle savedInstanceState) {
187191
setContentView(R.layout.layout_getstring);
188192
findViewById(R.id.exec).setOnClickListener(view15 -> {
189193
Spinner varBox = findViewById(R.id.getString_var);
190-
String var = varBox.toString();
194+
String var = varBox.getSelectedItem().toString();
191195
if (var.isEmpty()) {
192196
makeText("値を入力してください");
193197
return;
@@ -210,7 +214,7 @@ public void onCreate(Bundle savedInstanceState) {
210214
findViewById(R.id.exec).setOnClickListener(view17 -> {
211215
Spinner varBox = findViewById(R.id.putInt_var);
212216
EditText valBox = findViewById(R.id.putInt_val);
213-
String var = varBox.toString();
217+
String var = varBox.getSelectedItem().toString();
214218
String val = valBox.getText().toString();
215219
if (var.isEmpty() || val.isEmpty()) {
216220
makeText("値を入力してください");
@@ -234,7 +238,7 @@ public void onCreate(Bundle savedInstanceState) {
234238
findViewById(R.id.exec).setOnClickListener(view115 -> {
235239
Spinner varBox = findViewById(R.id.putString_var);
236240
EditText valBox = findViewById(R.id.putString_val);
237-
String var = varBox.toString();
241+
String var = varBox.getSelectedItem().toString();
238242
String val = valBox.getText().toString();
239243
if (var.isEmpty() || val.isEmpty()) {
240244
makeText("値を入力してください");

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,5 +220,37 @@
220220
android:textSize="16sp" />
221221
</LinearLayout>
222222

223+
<LinearLayout
224+
android:layout_width="match_parent"
225+
android:layout_height="wrap_content"
226+
android:padding="1dp">
227+
228+
<Button
229+
android:id="@+id/btn_openSettings"
230+
android:layout_width="0dp"
231+
android:layout_height="wrap_content"
232+
android:layout_gravity="center"
233+
android:layout_weight="1"
234+
android:text="設定アプリを起動"
235+
android:textAllCaps="false"
236+
android:textSize="16sp" />
237+
</LinearLayout>
238+
239+
<LinearLayout
240+
android:layout_width="match_parent"
241+
android:layout_height="wrap_content"
242+
android:padding="1dp">
243+
244+
<Button
245+
android:id="@+id/btn_openDevOpts"
246+
android:layout_width="0dp"
247+
android:layout_height="wrap_content"
248+
android:layout_gravity="center"
249+
android:layout_weight="1"
250+
android:text="開発者向けオプションを起動"
251+
android:textAllCaps="false"
252+
android:textSize="16sp" />
253+
</LinearLayout>
254+
223255
</LinearLayout>
224256
</ScrollView>

0 commit comments

Comments
 (0)