Skip to content

Commit 55455dc

Browse files
choiman1559choiman1559
committed
Edge-To-Edge Status Bar Color Correspondence for Android 15
1 parent 1b0454e commit 55455dc

15 files changed

+49
-47
lines changed

‎.idea/deploymentTargetSelector.xml‎

Lines changed: 3 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ android {
2424
defaultConfig {
2525
applicationId "com.noti.main"
2626
minSdkVersion 23
27-
targetSdkVersion 34
28-
versionCode 1012203
29-
versionName "1.22.3"
27+
targetSdkVersion 35
28+
versionCode 1012204
29+
versionName "1.22.4"
3030

3131
multiDexEnabled true
3232
ndk.abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
@@ -55,7 +55,7 @@ android {
5555
includeInBundle false
5656
}
5757

58-
compileSdk 34
58+
compileSdk 35
5959
ndkVersion '25.2.9519653'
6060
namespace 'com.noti.main'
6161
buildFeatures {
@@ -82,11 +82,11 @@ dependencies {
8282
implementation 'androidx.navigation:navigation-fragment-ktx:2.8.3'
8383
implementation 'androidx.navigation:navigation-ui-ktx:2.8.3'
8484
implementation "androidx.documentfile:documentfile:1.0.1"
85-
implementation 'androidx.core:core-ktx:1.13.1'
85+
implementation 'androidx.core:core-ktx:1.15.0'
8686
implementation 'androidx.palette:palette-ktx:1.0.0'
8787
implementation 'androidx.preference:preference-ktx:1.2.1'
8888
implementation 'androidx.appcompat:appcompat:1.7.0'
89-
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
89+
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
9090
implementation 'androidx.multidex:multidex:2.0.1'
9191
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01"
9292
implementation "androidx.media:media:1.7.0"

‎app/src/main/java/com/noti/main/service/refiler/FileDetailActivity.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
8686
The maximum download file size is 100MB,
8787
increasing up to 2GB with subscription.
8888
""";
89-
} else {
90-
if(!remoteFile.getPath().startsWith("/storage/emulated/0")) {
91-
bigFileWarning = "Warning: Downloading files from the SD card may fail.";
92-
}
9389
}
9490

9591
fileNameItem.setIconDrawable(intent.getIntExtra(EXTRA_FILE_ICON, R.drawable.ic_fluent_document_24_regular));

‎app/src/main/java/com/noti/main/service/refiler/ReFileActivity.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,15 @@
1212
import android.widget.ScrollView;
1313
import android.widget.TextView;
1414

15+
1516
import androidx.activity.OnBackPressedCallback;
17+
1618
import androidx.annotation.Nullable;
1719
import androidx.appcompat.app.AppCompatActivity;
1820
import androidx.appcompat.view.ContextThemeWrapper;
1921
import androidx.appcompat.widget.LinearLayoutCompat;
22+
import androidx.core.content.ContextCompat;
23+
2024
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
2125

2226
import com.google.android.material.appbar.MaterialToolbar;
@@ -77,7 +81,7 @@ public void handleOnBackPressed() {
7781
protected void onCreate(@Nullable Bundle savedInstanceState) {
7882
super.onCreate(savedInstanceState);
7983
setContentView(R.layout.activity_refiler);
80-
getWindow().setStatusBarColor(getResources().getColor(R.color.ui_bg_toolbar, null));
84+
getWindow().setStatusBarColor(ContextCompat.getColor(this, R.color.ui_bg_toolbar));
8185
prefs = getSharedPreferences(Application.PREFS_NAME, Context.MODE_PRIVATE);
8286

8387
Intent intent = getIntent();

‎app/src/main/java/com/noti/main/service/refiler/RemoteFile.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ public class RemoteFile implements Comparable<RemoteFile>, Serializable {
1818
List<RemoteFile> list;
1919

2020
public RemoteFile(JSONObject jsonObject) throws JSONException {
21-
path = "/storage/emulated";
21+
path = "/storage";
2222
list = new ArrayList<>();
2323

2424
for (Iterator<String> it = jsonObject.keys(); it.hasNext(); ) {
2525
String key = it.next();
2626
Object obj = jsonObject.get(key);
2727
switch (key) {
2828
case ReFileConst.DATA_TYPE_LAST_MODIFIED -> lastModified = (Long) obj;
29-
case ReFileConst.DATA_TYPE_INTERNAL_STORAGE -> list.add(new RemoteFile(this ,(JSONObject) obj, path + "/0"));
29+
case ReFileConst.DATA_TYPE_INTERNAL_STORAGE -> list.add(new RemoteFile(this ,(JSONObject) obj, path + "/emulated/0"));
3030
default -> list.add(new RemoteFile(this, (JSONObject) obj, path + "/" + key));
3131
}
3232
}

‎app/src/main/java/com/noti/main/ui/pair/action/LiveNotificationActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ private class LiveNotiItemHolder {
141141
ImageView liveNotiBigIcon;
142142

143143
public LiveNotiItemHolder(Context context, NotificationsData liveNotificationObj) {
144-
liveNotiItem = (CoordinatorLayout) View.inflate(context, R.layout.cardview_rilenoti_item, null);
144+
liveNotiItem = (CoordinatorLayout) View.inflate(context, R.layout.cardview_livenoti_item, null);
145145
liveNotiItemParent = liveNotiItem.findViewById(R.id.liveNotiItemParent);
146146

147147
liveNotiTitle = liveNotiItem.findViewById(R.id.notiTitle);

‎app/src/main/java/com/noti/main/ui/prefs/HistoryFragment.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import android.view.LayoutInflater;
1010
import android.view.View;
1111
import android.view.ViewGroup;
12-
import android.widget.LinearLayout;
1312
import android.widget.ProgressBar;
1413

1514
import androidx.annotation.NonNull;
@@ -144,7 +143,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
144143
LinearLayoutCompat layout = view.findViewById(R.id.noneLayout);
145144

146145
String list_data = prefs.getString(mode == 0 ? "sendLogs" : "receivedLogs", "");
147-
if (!list_data.equals("")) {
146+
if (!list_data.isEmpty()) {
148147
progress.setVisibility(View.VISIBLE);
149148
listView.setVisibility(View.GONE);
150149
layout.setVisibility(View.GONE);

‎app/src/main/java/com/noti/main/ui/prefs/HistoryViewAdapter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public void onBindViewHolder(@NonNull HistoryViewHolder holder, int position) {
9595
final String finalContent = content;
9696

9797
holder.title.setSelected(true);
98-
holder.title.setText(title.equals("") ? "No Title" : title);
98+
holder.title.setText(title.isEmpty() ? "No Title" : title);
9999
holder.information.setSelected(true);
100100
holder.information.setText(information);
101101

@@ -114,7 +114,7 @@ public void onBindViewHolder(@NonNull HistoryViewHolder holder, int position) {
114114
builder.setMessage(Html.fromHtml(message));
115115
builder.setPositiveButton("Close", (dialog, which) -> { });
116116
builder.setNeutralButton("Send Again", (dialog, which) -> {
117-
if(!prefs.getString("UID", "").equals("") && prefs.getBoolean("serviceToggle", false)) {
117+
if(!prefs.getString("UID", "").isEmpty() && prefs.getBoolean("serviceToggle", false)) {
118118
sendNormalNotificationAgain(finalPackage, finalDate, finalTitle, finalContent);
119119
} else {
120120
ToastHelper.show(mContext, "Please check service type and toggle and try again!","DISMISS", ToastHelper.LENGTH_SHORT);

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<androidx.appcompat.widget.LinearLayoutCompat
2+
<androidx.coordinatorlayout.widget.CoordinatorLayout
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:app="http://schemas.android.com/apk/res-auto"
55
xmlns:tools="http://schemas.android.com/tools"
@@ -29,14 +29,17 @@
2929
android:layout_height="match_parent"
3030
android:background="@color/ui_bg_toolbar"
3131
app:layout_collapseMode="pin"
32+
app:contentScrim="@color/ui_bg_toolbar"
33+
app:statusBarScrim="@android:color/transparent"
3234
app:navigationIcon="@drawable/back_btn_selector"
3335
app:navigationIconTint="@color/ui_fg"
3436
app:title="Live Notifications" />
3537
</com.google.android.material.appbar.AppBarLayout>
3638

3739
<androidx.constraintlayout.widget.ConstraintLayout
3840
android:layout_width="match_parent"
39-
android:layout_height="match_parent">
41+
android:layout_height="match_parent"
42+
app:layout_behavior="@string/appbar_scrolling_view_behavior">
4043

4144
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
4245
android:id="@+id/liveNotiRefreshLayout"
@@ -91,4 +94,4 @@
9194
android:textSize="18sp" />
9295
</androidx.appcompat.widget.LinearLayoutCompat>
9396
</androidx.constraintlayout.widget.ConstraintLayout>
94-
</androidx.appcompat.widget.LinearLayoutCompat>
97+
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<androidx.appcompat.widget.LinearLayoutCompat
2+
<androidx.coordinatorlayout.widget.CoordinatorLayout
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:app="http://schemas.android.com/apk/res-auto"
55
xmlns:tools="http://schemas.android.com/tools"
@@ -38,10 +38,9 @@
3838
android:id="@+id/pingStateLayout"
3939
android:layout_width="match_parent"
4040
android:layout_height="match_parent"
41-
android:layout_gravity="center"
4241
android:gravity="center"
4342
android:orientation="vertical"
44-
app:layout_constraintTop_toTopOf="parent">
43+
app:layout_behavior="@string/appbar_scrolling_view_behavior">
4544

4645
<androidx.appcompat.widget.AppCompatImageView
4746
android:id="@+id/pingStateEmoji"
@@ -76,4 +75,4 @@
7675
android:textColor="@color/ui_fg_disabled"
7776
android:textSize="15sp" />
7877
</androidx.appcompat.widget.LinearLayoutCompat>
79-
</androidx.appcompat.widget.LinearLayoutCompat>
78+
</androidx.coordinatorlayout.widget.CoordinatorLayout>

0 commit comments

Comments
 (0)