Ns1-j/oplogy
5
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into murakumo_URLコピペボタン

Browse Source 
# Conflicts:
#	app/src/main/java/com/example/oplogy/MainActivity.java
This commit is contained in:
nemukemo 2024-07-16 14:30:59 +09:00
commit 98f35c6555
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/com/example/oplogy/MainActivity.java
View File

@ -3,6 +3,7 @@ package com.example.oplogy;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
import android.app.ProgressDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
@ -29,7 +30,7 @@ import java.util.concurrent.Executors;
public class MainActivity extends AppCompatActivity implements View.OnClickListener {
private static final String URL_TO_COPY = "https://www.youtube.com/";
private static final String URL_TO_COPY = "https://docs.google.com/forms/d/e/1FAIpQLScKI_ca01nO7die7SqZyThiqa7NB7gcucMJtiV_-sc3eZX6KQ/viewform";
// ダイアログの宣言
private AlertDialog alertDialog;
// ID作成のTextViewとImageView
@ -358,6 +359,12 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
}
private void createRoute(ExecutorService executor) {
// ProgressDialogを作成
ProgressDialog progressDialog = new ProgressDialog(MainActivity.this);
progressDialog.setMessage("Loading...");
progressDialog.setCancelable(false);
progressDialog.show();
executor.execute(() -> {
List<MyDataClass> myDataList = null;
while (myDataList == null) {
@ -366,6 +373,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
Thread.sleep(3000);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
runOnUiThread(progressDialog::dismiss); // 進行状況ダイアログを閉じる
return;
}
}
@ -385,7 +393,9 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
}
Boolean finalNotDuplicatesBoolean = notDuplicatesBoolean;
Log.d("MainActivity", "重複判定" + String.valueOf(finalNotDuplicatesBoolean));
runOnUiThread(() -> {
progressDialog.dismiss(); // 進行状況ダイアログを閉じる
if (finalNotDuplicatesBoolean) {
Log.d("MainActivity", "スケジュール作成成功");
saveMyDataList(finalMyDataList);
@ -393,7 +403,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
toRoot.putExtra("startPointLatLngString", startPointLatLngString);
startActivity(toRoot);
} else {
//保護者の重複による警告ダイアログ
// 保護者の重複による警告ダイアログ
showErrorDialog(finalMyDataList);
}
});
@ -403,6 +413,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
});
}
private void saveMyDataList(List<MyDataClass> myDataList) {
// 共有プリファレンスのインスタンスを取得
SharedPreferences sharedPreferences = getSharedPreferences("MyDataList", MODE_PRIVATE);