Merge pull request #296 from mubeen1519/work

UI redesign, digital assitant support, always screen on feature, dependencies update

Author: CrazyMarvin

.idea/misc.xml

@@ -4,10 +4,10 @@ android {
     compileSdk 36
     defaultConfig {
         applicationId "rocks.poopjournal.flashy"
-        minSdk 19
+        minSdk 21
         targetSdk 36
-        versionCode 30
-        versionName "3.0"
+        versionCode 31
+        versionName "3.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         resConfigs "en", "cs", "de", "es", "hr", "lt", "nb-rNO", "pt", "pt-rBR", "ru", "sat", "tr", "zh-rCN"
@@ -41,6 +41,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.7.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
     implementation 'androidx.preference:preference:1.2.1'
+    implementation 'androidx.activity:activity:1.10.1'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.2.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
@@ -51,6 +52,6 @@ dependencies {
 
     implementation 'me.tankery.lib:circularSeekBar:1.4.2'
     //to resolve dependency conflicts
-    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.6.2'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.9.1'
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.1"
 }

app/build.gradle

@@ -8,18 +8,29 @@
     <uses-permission
         android:name="android.permission.CAMERA"
         android:maxSdkVersion="23" />
+
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" />
 
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:localeConfig="@xml/locales_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        android:localeConfig="@xml/locales_config"
         tools:ignore="GoogleAppIndexingWarning">
+        <activity
+            android:name=".activities.AssistToggleActivity"
+            android:exported="true"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar">
+
+            <intent-filter>
+                <action android:name="android.intent.action.ASSIST" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".activities.SettingsActivity"
             android:exported="false"
@@ -89,17 +100,15 @@
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
-
         <activity
             android:name=".activities.AboutActivity"
             android:exported="false"
-            android:parentActivityName=".activities.MainActivity"
-            android:label="@string/about">
+            android:label="@string/about"
+            android:parentActivityName=".activities.MainActivity">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
-
         <activity
             android:name=".activities.InvisibleActivity"
             android:exported="false"
@@ -110,7 +119,6 @@
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
-
         <activity
             android:name=".activities.MainActivity"
             android:configChanges="orientation"

app/src/main/AndroidManifest.xml

@@ -23,28 +23,14 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         ActivityAboutBinding binding = ActivityAboutBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
-        setSupportActionBar(binding.toolbarAbout);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null)
             actionBar.setDisplayHomeAsUpEnabled(true);
-        binding.appVersion.setText(getString(R.string.version_license, BuildConfig.VERSION_NAME));
+        binding.appVersion.setText(getString(R.string.version_text, BuildConfig.VERSION_NAME));
+        binding.appacheVersion.setText(getString(R.string.version_license));
+        binding.backIcon.setOnClickListener(v -> finish());
         setupClickToGoToWebsite(binding.appVersion, "https://github.com/Crazy-Marvin/Flashy/blob/development/LICENSE");
         setupClickToGoToWebsite(binding.appIcon, "https://crazymarvin.com/flashy/");
-        setupClickToGoToWebsite(binding.fahadsaleemGithub, "https://github.com/FahadSaleem/");
-        setupClickToGoToWebsite(binding.crazymarvinGithub, "https://github.com/CrazyMarvin/");
-        binding.crazymarvinEmail.setOnClickListener(v -> {
-            try {
-                Intent intent = new Intent(Intent.ACTION_SENDTO)
-                        .setData(Uri.parse("mailto:"))
-                        .putExtra(Intent.EXTRA_EMAIL, new String[]{"marvin@poopjournal.rocks"})
-                        .putExtra(Intent.EXTRA_SUBJECT, "crazymarvin.com Contact")
-                        .putExtra(Intent.EXTRA_TEXT, "Hello Marvin,\n...\n");
-                startActivity(intent);
-            } catch (ActivityNotFoundException e) {
-                Toast.makeText(this, R.string.no_app_can_handle, Toast.LENGTH_SHORT).show();
-            }
-        });
-        setupClickToGoToWebsite(binding.crazymarvinTwitter, "https://twitter.com/CrazyMarvinApps");
         setupClickToGoToWebsite(binding.sourceCode, "https://github.com/Crazy-Marvin/Flashy");
         setupClickToGoToWebsite(binding.reportProblem, "https://github.com/Crazy-Marvin/Flashy/issues");
         setupClickToGoToWebsite(binding.translate, "https://hosted.weblate.org/engage/flashy/");

app/src/main/java/rocks/poopjournal/flashy/activities/AboutActivity.java

@@ -0,0 +1,24 @@
+package rocks.poopjournal.flashy.activities;
+
+import android.os.Bundle;
+
+import androidx.activity.EdgeToEdge;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+
+import rocks.poopjournal.flashy.R;
+import rocks.poopjournal.flashy.utils.CameraHelper;
+
+public class AssistToggleActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        CameraHelper helper = CameraHelper.getInstance(this);
+        helper.toggleNormalFlash(this);  // toggle flashlight
+
+        finish();  // immediately close activity (no UI)
+    }
+}