diff --git a/app/build.gradle b/app/build.gradle index 64ea980..c72311b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation 'androidx.core:core:1.3.0' + implementation 'androidx.core:core:1.3.2' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' } @@ -18,6 +18,8 @@ android { versionName "2.36.0" setProperty("archivesBaseName", archivesBaseName + "-" + versionName) + vectorDrawables.useSupportLibrary = true + ndk { abiFilters "armeabi-v7a" abiFilters "x86" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 097dfdf..bd7ff0e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,7 +13,7 @@ = 16) builder = builder.setPriority(Notification.PRIORITY_DEFAULT); if (Build.VERSION.SDK_INT >= 21) diff --git a/app/src/main/java/org/purplei2p/i2pd/I2PDActivity.java b/app/src/main/java/org/purplei2p/i2pd/I2PDActivity.java index f9ddee3..bbb3a1f 100644 --- a/app/src/main/java/org/purplei2p/i2pd/I2PDActivity.java +++ b/app/src/main/java/org/purplei2p/i2pd/I2PDActivity.java @@ -34,13 +34,6 @@ import androidx.annotation.NonNull; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; -// For future package update checking - -import android.webkit.WebSettings; -import android.webkit.WebView; -import android.webkit.WebViewClient; - - import static android.provider.Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS; public class I2PDActivity extends Activity { @@ -66,7 +59,7 @@ public class I2PDActivity extends Activity { if (textView == null) return; Throwable tr = daemon.getLastThrowable(); - if (tr!=null) { + if (tr != null) { textView.setText(throwableToString(tr)); return; } @@ -98,15 +91,16 @@ public class I2PDActivity extends Activity { public void onCreate(Bundle savedInstanceState) { Log.i(TAG, "onCreate"); super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); - if (daemon==null) { + textView = (TextView) findViewById(R.id.textView); + + if (daemon == null) { ConnectivityManager connectivityManager = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); daemon = new DaemonWrapper(getAssets(), connectivityManager); } ForegroundService.init(daemon); - textView = new TextView(this); - setContentView(textView); daemon.addStateChangeListener(daemonStateUpdatedListener); daemonStateUpdatedListener.daemonStateUpdate(DaemonWrapper.State.uninitialized, daemon.getState()); @@ -119,7 +113,6 @@ public class I2PDActivity extends Activity { } } - // set the app be foreground doBindService(); final Timer gracefulQuitTimer = getGracefulQuitTimer(); @@ -478,6 +471,6 @@ public class I2PDActivity extends Activity { } catch (Throwable tr) { Log.e(TAG, "", tr); } - System.exit(0); + //System.exit(0); } } diff --git a/app/src/main/java/org/purplei2p/i2pd/WebConsoleActivity.java b/app/src/main/java/org/purplei2p/i2pd/WebConsoleActivity.java index ad5c752..1e24ebf 100644 --- a/app/src/main/java/org/purplei2p/i2pd/WebConsoleActivity.java +++ b/app/src/main/java/org/purplei2p/i2pd/WebConsoleActivity.java @@ -35,13 +35,13 @@ public class WebConsoleActivity extends Activity { @Override public void onRefresh() { swipeRefreshLayout.setRefreshing(true); - new Handler().postDelayed(new Runnable() { + new Handler().post(new Runnable() { @Override public void run() { swipeRefreshLayout.setRefreshing(false); webView.reload(); } - }, 1000); + }); } }); } diff --git a/app/src/main/res/drawable/ic_logo.xml b/app/src/main/res/drawable/ic_logo.xml new file mode 100644 index 0000000..11d6d32 --- /dev/null +++ b/app/src/main/res/drawable/ic_logo.xml @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_notification_icon.xml b/app/src/main/res/drawable/ic_notification_icon.xml new file mode 100644 index 0000000..57bfab5 --- /dev/null +++ b/app/src/main/res/drawable/ic_notification_icon.xml @@ -0,0 +1,16 @@ + + + + diff --git a/app/src/main/res/drawable/icon.png b/app/src/main/res/drawable/icon.png deleted file mode 100644 index 9a2f740..0000000 Binary files a/app/src/main/res/drawable/icon.png and /dev/null differ diff --git a/app/src/main/res/drawable/itoopie_notification_icon.png b/app/src/main/res/drawable/itoopie_notification_icon.png deleted file mode 100644 index fa99e7f..0000000 Binary files a/app/src/main/res/drawable/itoopie_notification_icon.png and /dev/null differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..dd5823f --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/template-dimens.xml b/app/src/main/res/values/dimens.xml similarity index 69% rename from app/src/main/res/values/template-dimens.xml rename to app/src/main/res/values/dimens.xml index 36847c9..6d41f4e 100644 --- a/app/src/main/res/values/template-dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,16 +1,12 @@ - - - 4dp 8dp 16dp 32dp 64dp - - @dimen/margin_medium @dimen/margin_medium - + @dimen/margin_medium + @dimen/margin_medium \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 52161ef..b9bc84a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,6 +2,7 @@ i2pd + Start Stop Graceful Stop Cancel Graceful Stop