j7b3y/LIME-beta-hiro
1
0
Fork 0
mirror of https://github.com/areteruhiro/LIME-beta-hiro.git synced 2025-02-05 21:11:39 +09:00
Code Releases Activity

通知機能のバグの修正

Browse Source 
ボタン設定のスクロールを可能に
keep read ボタンの置換を可能に
keep read　ボタンの大きさを変更可能に
This commit is contained in:
areteruhiro 2025-01-14 16:04:33 +09:00
parent d22413579a
commit d54f34fbd1
7 changed files with 121 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -10,7 +10,7 @@ android {
minSdk 28 minSdk 28
targetSdk 35 targetSdk 35
versionCode 15 versionCode 15
versionName "1.14.7.8" versionName "1.14.7.7.9.betaa"
multiDexEnabled false multiDexEnabled false
proguardFiles += 'proguard-rules.pro' proguardFiles += 'proguard-rules.pro'
buildConfigField 'String', 'HOOK_TARGET_VERSION', '"141910383"' buildConfigField 'String', 'HOOK_TARGET_VERSION', '"141910383"'

73
app/src/main/java/io/github/hiro/lime/hooks/EmbedOptions.java
View File

@ -464,8 +464,9 @@ public class EmbedOptions implements IHook {
int keep_unread_verticalMarginDp = 15; int keep_unread_verticalMarginDp = 15;
float read_button_horizontalMarginFactor = 0.6f; float read_button_horizontalMarginFactor = 0.6f;
int read_button_verticalMarginDp = 60; int read_button_verticalMarginDp = 60;
float read_checker_horizontalMarginFactor = 0.5f; // Read_checker ボタンの初期値 float read_checker_horizontalMarginFactor = 0.5f;
int read_checker_verticalMarginDp = 60; // Read_checker ボタンの初期値 int read_checker_verticalMarginDp = 60;
float keep_unread_size = 60.0f; // 新しい項目の初期値
// ファイルの内容を読み込む // ファイルの内容を読み込む
if (file.exists()) { if (file.exists()) {
@ -474,18 +475,28 @@ public class EmbedOptions implements IHook {
while ((line = reader.readLine()) != null) { while ((line = reader.readLine()) != null) {
String[] parts = line.split("=", 2); String[] parts = line.split("=", 2);
if (parts.length == 2) { if (parts.length == 2) {
if (parts[0].trim().equals("keep_unread_horizontalMarginFactor")) { switch (parts[0].trim()) {
keep_unread_horizontalMarginFactor = Float.parseFloat(parts[1].trim()); case "keep_unread_horizontalMarginFactor":
} else if (parts[0].trim().equals("keep_unread_verticalMarginDp")) { keep_unread_horizontalMarginFactor = Float.parseFloat(parts[1].trim());
keep_unread_verticalMarginDp = Integer.parseInt(parts[1].trim()); break;
} else if (parts[0].trim().equals("Read_buttom_Chat_horizontalMarginFactor")) { case "keep_unread_verticalMarginDp":
read_button_horizontalMarginFactor = Float.parseFloat(parts[1].trim()); keep_unread_verticalMarginDp = Integer.parseInt(parts[1].trim());
} else if (parts[0].trim().equals("Read_buttom_Chat_verticalMarginDp")) { break;
read_button_verticalMarginDp = Integer.parseInt(parts[1].trim()); case "Read_buttom_Chat_horizontalMarginFactor":
} else if (parts[0].trim().equals("Read_checker_horizontalMarginFactor")) { read_button_horizontalMarginFactor = Float.parseFloat(parts[1].trim());
read_checker_horizontalMarginFactor = Float.parseFloat(parts[1].trim()); break;
} else if (parts[0].trim().equals("Read_checker_verticalMarginDp")) { case "Read_buttom_Chat_verticalMarginDp":
read_checker_verticalMarginDp = Integer.parseInt(parts[1].trim()); read_button_verticalMarginDp = Integer.parseInt(parts[1].trim());
break;
case "Read_checker_horizontalMarginFactor":
read_checker_horizontalMarginFactor = Float.parseFloat(parts[1].trim());
break;
case "Read_checker_verticalMarginDp":
read_checker_verticalMarginDp = Integer.parseInt(parts[1].trim());
break;
case "keep_unread_size":
keep_unread_size = Float.parseFloat(parts[1].trim());
break;
} }
} }
} }
@ -499,19 +510,31 @@ public class EmbedOptions implements IHook {
"Read_buttom_Chat_horizontalMarginFactor=0.6\n" + "Read_buttom_Chat_horizontalMarginFactor=0.6\n" +
"Read_buttom_Chat_verticalMarginDp=60\n" + "Read_buttom_Chat_verticalMarginDp=60\n" +
"Read_checker_horizontalMarginFactor=0.5\n" + "Read_checker_horizontalMarginFactor=0.5\n" +
"Read_checker_verticalMarginDp=60"; "Read_checker_verticalMarginDp=60\n" +
"keep_unread_size=60";
writer.write(defaultSettings); writer.write(defaultSettings);
} catch (IOException ignored) { } catch (IOException ignored) {
return; return;
} }
} }
// 横マージンの入力フィールド // レイアウト設定
LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams( LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT); LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
layoutParams.setMargins(16, 16, 16, 16); layoutParams.setMargins(16, 16, 16, 16);
// "keep_unread_size" 入力フィールド
TextView keepUnreadSizeLabel = new TextView(context);
keepUnreadSizeLabel.setText(moduleContext.getResources().getString(R.string.keep_unread_size));
keepUnreadSizeLabel.setLayoutParams(layoutParams);
final EditText keepUnreadSizeInput = new EditText(context);
keepUnreadSizeInput.setText(String.valueOf(keep_unread_size));
keepUnreadSizeInput.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL);
keepUnreadSizeInput.setLayoutParams(layoutParams);
TextView horizontalLabel = new TextView(context); TextView horizontalLabel = new TextView(context);
horizontalLabel.setText(moduleContext.getResources().getString(R.string.keep_unread_horizontalMarginFactor)); horizontalLabel.setText(moduleContext.getResources().getString(R.string.keep_unread_horizontalMarginFactor));
horizontalLabel.setLayoutParams(layoutParams); horizontalLabel.setLayoutParams(layoutParams);
@ -577,6 +600,8 @@ public class EmbedOptions implements IHook {
saveButton.setLayoutParams(layoutParams); saveButton.setLayoutParams(layoutParams);
saveButton.setOnClickListener(v -> { saveButton.setOnClickListener(v -> {
try { try {
// 追加: keep_unread_size の取得
int newKeepUnreadSize = Integer.parseInt(keepUnreadSizeInput.getText().toString().trim());
float newKeepUnreadHorizontalMarginFactor = Float.parseFloat(horizontalInput.getText().toString().trim()); float newKeepUnreadHorizontalMarginFactor = Float.parseFloat(horizontalInput.getText().toString().trim());
int newKeepUnreadVerticalMarginDp = Integer.parseInt(verticalInput.getText().toString().trim()); int newKeepUnreadVerticalMarginDp = Integer.parseInt(verticalInput.getText().toString().trim());
float newReadButtonHorizontalMarginFactor = Float.parseFloat(readButtonHorizontalInput.getText().toString().trim()); float newReadButtonHorizontalMarginFactor = Float.parseFloat(readButtonHorizontalInput.getText().toString().trim());
@ -586,6 +611,8 @@ public class EmbedOptions implements IHook {
// ファイルに保存 // ファイルに保存
try (BufferedWriter writer = new BufferedWriter(new FileWriter(file))) { try (BufferedWriter writer = new BufferedWriter(new FileWriter(file))) {
// 追加: keep_unread_size の書き込み
writer.write("keep_unread_size=" + newKeepUnreadSize + "\n");
writer.write("keep_unread_horizontalMarginFactor=" + newKeepUnreadHorizontalMarginFactor + "\n"); writer.write("keep_unread_horizontalMarginFactor=" + newKeepUnreadHorizontalMarginFactor + "\n");
writer.write("keep_unread_verticalMarginDp=" + newKeepUnreadVerticalMarginDp + "\n"); writer.write("keep_unread_verticalMarginDp=" + newKeepUnreadVerticalMarginDp + "\n");
writer.write("Read_buttom_Chat_horizontalMarginFactor=" + newReadButtonHorizontalMarginFactor + "\n"); writer.write("Read_buttom_Chat_horizontalMarginFactor=" + newReadButtonHorizontalMarginFactor + "\n");
@ -604,9 +631,11 @@ public class EmbedOptions implements IHook {
context.startActivity(new Intent().setClassName(Constants.PACKAGE_NAME, "jp.naver.line.android.activity.SplashActivity")); context.startActivity(new Intent().setClassName(Constants.PACKAGE_NAME, "jp.naver.line.android.activity.SplashActivity"));
}); });
// レイアウトを構築 // レイアウトを構築
LinearLayout layout = new LinearLayout(context); LinearLayout layout = new LinearLayout(context);
layout.setOrientation(LinearLayout.VERTICAL); layout.setOrientation(LinearLayout.VERTICAL);
layout.addView(keepUnreadSizeLabel);
layout.addView(keepUnreadSizeInput);
layout.addView(horizontalLabel); layout.addView(horizontalLabel);
layout.addView(horizontalInput); layout.addView(horizontalInput);
layout.addView(verticalLabel); layout.addView(verticalLabel);
@ -621,10 +650,14 @@ public class EmbedOptions implements IHook {
layout.addView(readCheckerVerticalInput); layout.addView(readCheckerVerticalInput);
layout.addView(saveButton); layout.addView(saveButton);
// ダイアログを作成 // ScrollView を作成
ScrollView scrollView = new ScrollView(context);
scrollView.addView(layout);
// ダイアログを作成
AlertDialog.Builder builder = new AlertDialog.Builder(context); AlertDialog.Builder builder = new AlertDialog.Builder(context);
builder.setTitle(moduleContext.getResources().getString(R.string.edit_margin_settings)); builder.setTitle(moduleContext.getResources().getString(R.string.edit_margin_settings));
builder.setView(layout); builder.setView(scrollView); // ScrollView をダイアログのビューとして設定
builder.setNegativeButton(moduleContext.getResources().getString(R.string.cancel), null); builder.setNegativeButton(moduleContext.getResources().getString(R.string.cancel), null);
builder.show(); builder.show();
} }

40
app/src/main/java/io/github/hiro/lime/hooks/KeepUnread.java
View File

@ -31,7 +31,9 @@ import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.FileReader; import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.OutputStream;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -173,20 +175,48 @@ public class KeepUnread implements IHook {
} }
private void updateSwitchImage(ImageView imageView, boolean isOn, Context moduleContext) { private void updateSwitchImage(ImageView imageView, boolean isOn, Context moduleContext) {
String imageName = isOn ? "switch_on.png" : "switch_off.png"; // 拡張子を追加
File dir = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), "LimeBackup");
// ディレクトリが存在しない場合は作成
if (!dir.exists()) {
dir.mkdirs();
}
String imageName = isOn ? "unread" : "read"; File imageFile = new File(dir, imageName);
int imageResource = moduleContext.getResources().getIdentifier(imageName, "drawable", "io.github.hiro.lime");
// 画像ファイルが存在しない場合はリソースからコピー
if (!imageFile.exists()) {
try (InputStream in = moduleContext.getResources().openRawResource(
moduleContext.getResources().getIdentifier(imageName.replace(".png", ""), "drawable", "io.github.hiro.lime"));
OutputStream out = new FileOutputStream(imageFile)) {
byte[] buffer = new byte[1024];
int length;
while ((length = in.read(buffer)) > 0) {
out.write(buffer, 0, length);
}
} catch (IOException e) {
e.printStackTrace();
}
}
if (imageResource != 0) { // コピーした画像をImageViewに設定
Drawable drawable = moduleContext.getResources().getDrawable(imageResource, null); if (imageFile.exists()) {
Drawable drawable = Drawable.createFromPath(imageFile.getAbsolutePath());
if (drawable != null) { if (drawable != null) {
drawable = scaleDrawable(drawable, 86, 86); Map<String, String> settings = readSettingsFromExternalFile(moduleContext);
float sizeInDp = Float.parseFloat(settings.getOrDefault("keep_unread_size", "60")); // 既定値 38dp
int sizeInPx = dpToPx(moduleContext, sizeInDp); // dp を px に変換
drawable = scaleDrawable(drawable, sizeInPx, sizeInPx);
imageView.setImageDrawable(drawable); imageView.setImageDrawable(drawable);
} }
} }
} }
private int dpToPx(Context context, float dp) {
float density = context.getResources().getDisplayMetrics().density;
return Math.round(dp * density);
}
private Drawable scaleDrawable(Drawable drawable, int width, int height) { private Drawable scaleDrawable(Drawable drawable, int width, int height) {

57
app/src/main/java/io/github/hiro/lime/hooks/PhotoAddNotification.java
View File

@ -22,6 +22,7 @@ import java.io.InputStream;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import java.util.HashSet; import java.util.HashSet;
import java.util.Objects;
import java.util.Set; import java.util.Set;
import de.robv.android.xposed.XC_MethodHook; import de.robv.android.xposed.XC_MethodHook;
@ -90,8 +91,13 @@ public class PhotoAddNotification implements IHook {
protected void beforeHookedMethod(MethodHookParam param) throws Throwable { protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
Notification notification = (Notification) param.args[2]; Notification notification = (Notification) param.args[2];
String tag = (String) param.args[0];
if (param.args[0] != null) { int ids = (int) param.args[1];
logAllNotificationDetails("notify", ids, notification, tag);
if (Objects.equals(notification.category, "call")) {
return;
}
if (param.args[0] == null) {
param.setResult(null); param.setResult(null);
return; return;
} }
@ -123,11 +129,6 @@ public class PhotoAddNotification implements IHook {
String originalText = getNotificationText(originalNotification); String originalText = getNotificationText(originalNotification);
Notification newNotification = originalNotification; Notification newNotification = originalNotification;
if (originalText.contains("LINE音声通話を着信中") ||
originalText.contains("Incoming LINE voice call") ||
originalText.contains("LINE語音通話來電中")) {
return;
}
if (title == null) { if (title == null) {
return; return;
} }
@ -151,9 +152,7 @@ public class PhotoAddNotification implements IHook {
} }
if (originalText != null && (originalText.contains("写真を送信しました") || originalText.contains("sent a photo") || originalText.contains("傳送了照片"))) { if (originalText != null && (originalText.contains("写真を送信しました") || originalText.contains("sent a photo") || originalText.contains("傳送了照片"))) {
String tag = (String) param.args[0];
int ids = (int) param.args[1];
logAllNotificationDetails("notify", ids, notification, tag);
Bundle extras = notification.extras; Bundle extras = notification.extras;
if (extras.containsKey("line.message.id")) { if (extras.containsKey("line.message.id")) {
@ -394,42 +393,42 @@ public class PhotoAddNotification implements IHook {
private void logAllNotificationDetails(String method, int ids, Notification notification, String tag) { private void logAllNotificationDetails(String method, int ids, Notification notification, String tag) {
//XposedBridge.log(method + " called. ID: " + ids + (tag != null ? ", Tag: " + tag : "")); XposedBridge.log(method + " called. ID: " + ids + (tag != null ? ", Tag: " + tag : ""));
//XposedBridge.log("Notification Icon: " + notification.icon); XposedBridge.log("Notification Icon: " + notification.icon);
//XposedBridge.log("Notification When: " + notification.when); XposedBridge.log("Notification When: " + notification.when);
//XposedBridge.log("Notification Flags: " + notification.flags); XposedBridge.log("Notification Flags: " + notification.flags);
//XposedBridge.log("Notification Priority: " + notification.priority); XposedBridge.log("Notification Priority: " + notification.priority);
//XposedBridge.log("Notification Category: " + notification.category); XposedBridge.log("Notification Category: " + notification.category);
if (notification.extras != null) { if (notification.extras != null) {
Bundle extras = notification.extras; Bundle extras = notification.extras;
//XposedBridge.log("Notification Extras:"); XposedBridge.log("Notification Extras:");
for (String key : extras.keySet()) { for (String key : extras.keySet()) {
Object value = extras.get(key); Object value = extras.get(key);
//XposedBridge.log(" " + key + ": " + (value != null ? value.toString() : "null")); XposedBridge.log(" " + key + ": " + (value != null ? value.toString() : "null"));
} }
} else { } else {
//XposedBridge.log("Notification has no extras."); XposedBridge.log("Notification has no extras.");
} }
if (notification.actions != null) { if (notification.actions != null) {
//XposedBridge.log("Notification Actions:"); XposedBridge.log("Notification Actions:");
for (int i = 0; i < notification.actions.length; i++) { for (int i = 0; i < notification.actions.length; i++) {
Notification.Action action = notification.actions[i]; Notification.Action action = notification.actions[i];
//XposedBridge.log(" Action " + i + ": " + XposedBridge.log(" Action " + i + ": " +
// "Title=" + action.title + "Title=" + action.title +
// ", Intent=" + action.actionIntent); ", Intent=" + action.actionIntent);
} }
} else { } else {
//XposedBridge.log("No actions found."); //XposedBridge.log("No actions found.");
} }
// その他の情報 // その他の情報
//XposedBridge.log("Notification Visibility: " + notification.visibility); XposedBridge.log("Notification Visibility: " + notification.visibility);
//XposedBridge.log("Notification Color: " + notification.color); XposedBridge.log("Notification Color: " + notification.color);
//XposedBridge.log("Notification Group: " + notification.getGroup()); XposedBridge.log("Notification Group: " + notification.getGroup());
//XposedBridge.log("Notification SortKey: " + notification.getSortKey()); XposedBridge.log("Notification SortKey: " + notification.getSortKey());
//XposedBridge.log("Notification Sound: " + notification.sound); XposedBridge.log("Notification Sound: " + notification.sound);
//XposedBridge.log("Notification Vibrate: " + (notification.vibrate != null ? "Yes" : "No")); XposedBridge.log("Notification Vibrate: " + (notification.vibrate != null ? "Yes" : "No"));
} }

2
app/src/main/res/values-ja/strings.xml
View File

@ -133,7 +133,7 @@
<string name="RemoveVoiceRecord">音声ボタンを無効化</string> <string name="RemoveVoiceRecord">音声ボタンを無効化</string>
<string name="MySendMessage">(既読機能)自分以外のメッセージを表示しない</string> <string name="MySendMessage">(既読機能)自分以外のメッセージを表示しない</string>
<string name="MuteTone">(Root用)着信音のミュート</string> <string name="MuteTone">(Root用)着信音のミュート</string>
<string name="edit_margin_settings">KeepUnreadボタンの位置</string> <string name="edit_margin_settings">ボタンの設定</string>
<string name="keep_unread_horizontalMarginFactor">横マージン (KeepUnread)</string> <string name="keep_unread_horizontalMarginFactor">横マージン (KeepUnread)</string>
<string name="keep_unread_vertical">縦マージン (KeepUnread)</string> <string name="keep_unread_vertical">縦マージン (KeepUnread)</string>
<string name="DialTone">発信音を無効にする\n</string> <string name="DialTone">発信音を無効にする\n</string>

2
app/src/main/res/values-zh-rTW/strings.xml
View File

@ -127,7 +127,7 @@
<string name="MySendMessage">（閱讀功能）不要顯示您自己的資訊以外的信息</string> <string name="MySendMessage">（閱讀功能）不要顯示您自己的資訊以外的信息</string>
<string name="MuteTone">(對於 Root) 鈴聲靜音</string> <string name="MuteTone">(對於 Root) 鈴聲靜音</string>
<string name="edit_margin_settings">保留未讀按鈕位置</string> <string name="edit_margin_settings">按鈕設定</string>
<string name="keep_unread_horizontalMarginFactor">水平邊距 (KeepUnread)</string> <string name="keep_unread_horizontalMarginFactor">水平邊距 (KeepUnread)</string>
<string name="keep_unread_vertical">垂直邊距 (KeepUnread)</string> <string name="keep_unread_vertical">垂直邊距 (KeepUnread)</string>
<string name="DialTone">停用撥號音</string> <string name="DialTone">停用撥號音</string>

4
app/src/main/res/values/strings.xml
View File

@ -137,7 +137,7 @@
<string name="TEST">既読 %S</string> <string name="TEST">既読 %S</string>
<string name="MuteTone">(For Root) Mute ringtone</string> <string name="MuteTone">(For Root) Mute ringtone</string>
<string name="edit_margin_settings">KeepUnread button location</string> <string name="edit_margin_settings">button setting</string>
<string name="keep_unread_horizontalMarginFactor">Horizontal margin (KeepUnread)</string> <string name="keep_unread_horizontalMarginFactor">Horizontal margin (KeepUnread)</string>
<string name="keep_unread_vertical">Vertical margin (KeepUnread)</string> <string name="keep_unread_vertical">Vertical margin (KeepUnread)</string>
<string name="DialTone">Disable dial tone</string> <string name="DialTone">Disable dial tone</string>
@ -147,5 +147,5 @@
<string name="Read_checker_horizontalMarginFactor">Read button (horizontal margin)</string> <string name="Read_checker_horizontalMarginFactor">Read button (horizontal margin)</string>
<string name="MySendMessage">(Read function) Do not display messages other than your own</string> <string name="MySendMessage">(Read function) Do not display messages other than your own</string>
<string name="keep_unread_size">keep unread button size</string>
</resources> </resources>