Skip to content

Commit 3fa8ef8

Browse files
committed
add
1 parent 7f3885a commit 3fa8ef8

33 files changed

Lines changed: 14 additions & 244 deletions

app/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ android {
1212
applicationId "com.aexon"
1313
minSdk 26
1414
targetSdk 36
15-
versionCode 1017
16-
versionName "1.3"
15+
versionCode 1018
16+
versionName "1.4"
1717
}
1818

1919
buildTypes {
@@ -47,6 +47,7 @@ dependencies {
4747
implementation 'dev.rikka.shizuku:api:13.0.0'
4848
implementation 'dev.rikka.shizuku:provider:13.0.0'
4949
implementation 'androidx.annotation:annotation:1.10.0'
50+
implementation 'androidx.appcompat:appcompat:1.7.0'
5051
}
5152

5253
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {

app/src/main/java/com/aexon/ActivasiActivity.java

Lines changed: 2 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,18 @@
11
package com.aexon;
22

3-
import android.annotation.SuppressLint;
43
import android.app.Activity;
54
import android.content.Intent;
65
import android.graphics.PorterDuff;
76
import android.net.Uri;
8-
import android.os.Build;
97
import android.os.Bundle;
10-
import android.provider.Settings;
118
import android.text.Html;
129
import android.text.method.LinkMovementMethod;
13-
import android.view.View;
1410
import android.widget.ImageView;
1511
import android.widget.LinearLayout;
1612
import android.widget.ScrollView;
1713
import android.widget.TextView;
1814

19-
import androidx.annotation.NonNull;
2015
import androidx.annotation.Nullable;
21-
import androidx.annotation.RequiresApi;
22-
import androidx.core.app.NotificationManagerCompat;
2316

2417
import com.aexon.aexon.AexonWindowHelper;
2518
import com.aexon.material.dialog.AexonAlertDialog;
@@ -45,7 +38,6 @@ public class ActivasiActivity extends Activity {
4538
private TextView textview1;
4639
private LinearLayout linear1;
4740
private LinearLayout card1;
48-
private LinearLayout card4;
4941
private LinearLayout card2;
5042
private LinearLayout card3;
5143
private LinearLayout linear11;
@@ -54,14 +46,6 @@ public class ActivasiActivity extends Activity {
5446
private AexonButton start_shizuku;
5547
private ImageView imageview6;
5648
private TextView textview2;
57-
private LinearLayout linear14;
58-
private TextView textview8;
59-
private TextView textview10;
60-
private AexonButton stepbystep;
61-
private AexonButton connect_pair;
62-
private AexonButton start_pair;
63-
private ImageView imageview7;
64-
private TextView textview9;
6549
private LinearLayout linear3;
6650
private TextView textview5;
6751
private AexonButton view_cmd;
@@ -92,7 +76,6 @@ private void initialize(@Nullable Bundle _savedInstanceState) {
9276
textview1 = findViewById(R.id.textview1);
9377
linear1 = findViewById(R.id.linear1);
9478
card1 = findViewById(R.id.card1);
95-
card4 = findViewById(R.id.card4);
9679
card2 = findViewById(R.id.card2);
9780
card3 = findViewById(R.id.card3);
9881
linear11 = findViewById(R.id.linear11);
@@ -101,14 +84,6 @@ private void initialize(@Nullable Bundle _savedInstanceState) {
10184
start_shizuku = findViewById(R.id.start_shizuku);
10285
imageview6 = findViewById(R.id.imageview6);
10386
textview2 = findViewById(R.id.textview2);
104-
linear14 = findViewById(R.id.linear14);
105-
textview8 = findViewById(R.id.textview8);
106-
textview10 = findViewById(R.id.textview10);
107-
stepbystep = findViewById(R.id.stepbystep);
108-
connect_pair = findViewById(R.id.connect_pair);
109-
start_pair = findViewById(R.id.start_pair);
110-
imageview7 = findViewById(R.id.imageview7);
111-
textview9 = findViewById(R.id.textview9);
11287
linear3 = findViewById(R.id.linear3);
11388
textview5 = findViewById(R.id.textview5);
11489
view_cmd = findViewById(R.id.view_cmd);
@@ -213,40 +188,29 @@ private void initializeLogic() {
213188
imageview2.setColorFilter(theme.getColorPrimary(), PorterDuff.Mode.SRC_ATOP);
214189
imageview4.setColorFilter(theme.getColorPrimary(), PorterDuff.Mode.SRC_ATOP);
215190
imageview6.setColorFilter(theme.getColorPrimary(), PorterDuff.Mode.SRC_ATOP);
216-
imageview7.setColorFilter(theme.getColorPrimary(), PorterDuff.Mode.SRC_ATOP);
217191
toolbar.setBackgroundColor(theme.getColorSurface());
218192
vscroll1.setBackgroundColor(theme.getColorSurface());
219193

220-
//card card1 & card2 & card3 & card4
194+
// card card1 & card2 & card3
221195
card1.setBackground(new AexonDrawable.Builder(theme.getColorSurfaceContainer()).cornerRadius(SketchwareUtil.getDimension(this, R.dimen.card_radius_medium)).build().build(ActivasiActivity.this));
222196
card2.setBackground(new AexonDrawable.Builder(theme.getColorSurfaceContainer()).cornerRadius(SketchwareUtil.getDimension(this, R.dimen.card_radius_medium)).build().build(ActivasiActivity.this));
223197
card3.setBackground(new AexonDrawable.Builder(theme.getColorSurfaceContainer()).cornerRadius(SketchwareUtil.getDimension(this, R.dimen.card_radius_medium)).build().build(ActivasiActivity.this));
224-
card4.setBackground(new AexonDrawable.Builder(theme.getColorSurfaceContainer()).cornerRadius(SketchwareUtil.getDimension(this, R.dimen.card_radius_medium)).build().build(ActivasiActivity.this));
225198

226-
//warna icon button
199+
// warna icon button
227200
connect_shizuku.setIconTint(theme.getColorOnPrimary());
228201
start_shizuku.setIconTint(theme.getColorOnPrimary());
229202
view_cmd.setIconTint(theme.getColorOnPrimary());
230203
start_root.setIconTint(theme.getColorOnPrimary());
231-
stepbystep.setIconTint(theme.getColorOnPrimary());
232-
connect_pair.setIconTint(theme.getColorOnPrimary());
233-
start_pair.setIconTint(theme.getColorOnPrimary());
234204

235205
connect_shizuku.setBackgroundColor(theme.getColorPrimary());
236206
start_shizuku.setBackgroundColor(theme.getColorPrimary());
237207
view_cmd.setBackgroundColor(theme.getColorPrimary());
238208
start_root.setBackgroundColor(theme.getColorPrimary());
239-
stepbystep.setBackgroundColor(theme.getColorPrimary());
240-
connect_pair.setBackgroundColor(theme.getColorPrimary());
241-
start_pair.setBackgroundColor(theme.getColorPrimary());
242209
AexonWindowHelper.setWindowStyle(getWindow(), theme.getColorSurface());
243210
start_root.setTextColor(theme.getColorOnPrimary());
244211
view_cmd.setTextColor(theme.getColorOnPrimary());
245212
connect_shizuku.setTextColor(theme.getColorOnPrimary());
246213
start_shizuku.setTextColor(theme.getColorOnPrimary());
247-
stepbystep.setTextColor(theme.getColorOnPrimary());
248-
connect_pair.setTextColor(theme.getColorOnPrimary());
249-
start_pair.setTextColor(theme.getColorOnPrimary());
250214

251215
textview1.setTextColor(theme.getColorOnSurface());
252216
textview2.setTextColor(theme.getColorOnSurface());
@@ -255,56 +219,6 @@ private void initializeLogic() {
255219
textview5.setTextColor(theme.getColorOnSurfaceVariant());
256220
textview6.setTextColor(theme.getColorOnSurface());
257221
textview7.setTextColor(theme.getColorOnSurfaceVariant());
258-
textview8.setTextColor(theme.getColorOnSurfaceVariant());
259-
textview9.setTextColor(theme.getColorOnSurface());
260-
textview10.setTextColor(theme.getColorOnSurfaceVariant());
261-
}
262-
263-
@SuppressLint("SetTextI18n")
264-
private void updateConnectPairState() {
265-
boolean isNotificationGranted = NotificationManagerCompat.from(this).areNotificationsEnabled();
266-
267-
if (!isNotificationGranted) {
268-
// Jika notifikasi belum diizinkan
269-
connect_pair.setIcon(R.drawable.ic_notifications);
270-
connect_pair.setText(getString(R.string.tag_btn_enable_notif));
271-
272-
connect_pair.setOnClickListener(new View.OnClickListener() {
273-
@Override
274-
public void onClick(@NonNull View _view) {
275-
// Pengecekan versi OS yang aman
276-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
277-
openNotificationSettingsModern();
278-
} else {
279-
openNotificationSettingsLegacy();
280-
}
281-
}
282-
});
283-
} else {
284-
// Jika notifikasi sudah diizinkan
285-
connect_pair.setIcon(R.drawable.ic_url);
286-
connect_pair.setText(getString(R.string.tag_btn_pairing));
287-
288-
connect_pair.setOnClickListener(new View.OnClickListener() {
289-
@Override
290-
public void onClick(@NonNull View _view) {
291-
// Masukkan logika connect pair di sini
292-
}
293-
});
294-
}
295-
}
296-
297-
@RequiresApi(api = Build.VERSION_CODES.O)
298-
private void openNotificationSettingsModern() {
299-
Intent intent = new Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS);
300-
intent.putExtra(Settings.EXTRA_APP_PACKAGE, getPackageName());
301-
startActivity(intent);
302-
}
303-
304-
private void openNotificationSettingsLegacy() {
305-
Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
306-
intent.setData(Uri.parse("package:" + getPackageName()));
307-
startActivity(intent);
308222
}
309223

310224
@Override
@@ -313,12 +227,6 @@ public void onBackPressed() {
313227
overridePendingTransition(R.anim.fade_in_back, R.anim.fade_out_back);
314228
}
315229

316-
@Override
317-
public void onResume() {
318-
super.onResume();
319-
updateConnectPairState();
320-
}
321-
322230
@Override
323231
public void onStop() {
324232
super.onStop();

app/src/main/java/com/aexon/AexonFragmentActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import android.widget.LinearLayout;
3232
import android.widget.ListView;
3333
import android.widget.TextView;
34+
import androidx.appcompat.*;
3435
import androidx.core.*;
3536
import com.aexon.material.aexonloading.AexonLoading;
3637
import com.aexon.material.edittext.AexonEditText;

app/src/main/java/com/aexon/AppearanceActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import android.widget.ImageView;
2727
import android.widget.LinearLayout;
2828
import android.widget.TextView;
29+
import androidx.appcompat.*;
2930
import androidx.core.*;
3031
import com.aexon.material.aexonswitch.AexonSwitch;
3132
import com.aexon.material.button.AexonRadioButton;

app/src/main/java/com/aexon/HomeFragmentActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import android.widget.LinearLayout;
2929
import android.widget.ScrollView;
3030
import android.widget.TextView;
31+
import androidx.appcompat.*;
3132
import androidx.core.*;
3233
import com.aexon.widget.AexonImageView;
3334
import java.io.*;

app/src/main/java/com/aexon/InfoDialogFragmentActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import android.widget.*;
2727
import android.widget.LinearLayout;
2828
import android.widget.TextView;
29+
import androidx.appcompat.*;
2930
import androidx.core.*;
3031
import com.aexon.widget.AexonButton;
3132
import com.aexon.widget.AexonImageView;

app/src/main/java/com/aexon/InfoDialogPathDialogFragmentActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import android.widget.*;
2525
import android.widget.LinearLayout;
2626
import android.widget.TextView;
27+
import androidx.appcompat.*;
2728
import androidx.core.*;
2829
import java.io.*;
2930
import java.text.*;

app/src/main/java/com/aexon/MainActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import android.widget.ImageView;
2828
import android.widget.LinearLayout;
2929
import android.widget.TextView;
30+
import androidx.appcompat.*;
3031
import androidx.core.*;
3132
import com.aexon.material.aexonloading.AexonLoading;
3233
import com.aexon.material.viewpager.AexonViewPager;

app/src/main/java/com/aexon/SettingsFragmentActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import android.widget.LinearLayout;
3131
import android.widget.ScrollView;
3232
import android.widget.TextView;
33+
import androidx.appcompat.*;
3334
import androidx.core.*;
3435
import com.aexon.material.aexonswitch.AexonSwitch;
3536
import com.aexon.material.edittext.AexonEditText;

app/src/main/java/com/aexon/annotation/RequiresApi.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@file:Suppress("DEPRECATION")
21
package com.aexon.annotation
32

43
import kotlin.annotation.AnnotationTarget

0 commit comments

Comments
 (0)