- Migrated project to new Android project folder and file structure

- Updated dependencies
- Solved library conflicts
- Added separate project and module `build.gradle` files, as per the current Android documentation
- Updated `gradle.properties` and created `settings.gradle` files, to follow the current Android guidelines
- Deleted obsolete files and classes

app/.gitignore

@@ -0,0 +1 @@
+/build

app/build.gradle

@@ -0,0 +1,38 @@
+plugins {
+    id 'com.android.application'
+}
+
+dependencies {
+    implementation 'com.quickbirdstudios:opencv:3.4.15'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.preference:preference:1.2.0'
+    implementation 'com.google.android.material:material:1.6.1'
+    api "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
+}
+
+android {
+    namespace 'gr.scify.icsee'
+    compileSdkVersion 32
+    defaultConfig {
+        applicationId "gr.scify.icsee"
+        minSdkVersion 16
+        targetSdkVersion 32
+        versionCode 13
+        versionName "4.0.1"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    buildFeatures {
+        viewBinding true
+    }
+
+}

app/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

AndroidManifest.xml → app/src/main/AndroidManifest.xml

@@ -17,18 +17,14 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/ic_launchernew"
+        android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:logo="@drawable/icsee_logo"
         android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen">
         <activity
             android:name=".ICSeeSettingsActivity"
             android:exported="false"
             android:label="@string/title_activity_icsee_settings" />
-        <activity
-            android:name=".SettingsActivity"
-            android:exported="false"
-            android:label="@string/title_activity_settings" />
         <activity
             android:name=".ImgViewerActivity"
             android:exported="false"

src/gr/scify/icsee/ImgViewerActivity.java → app/src/main/java/gr/scify/icsee/ImgViewerActivity.java

@@ -1,57 +1,57 @@
-package gr.scify.icsee;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.os.Bundle;
-import android.view.Menu;
-import android.widget.ImageView;
-
-import gr.scify.icsee.events.SimpleGestureFilter;
-import gr.scify.icsee.events.SimpleGestureFilter.SimpleGestureListener;
-
-public class ImgViewerActivity extends Activity implements SimpleGestureListener {
-	public final static String IMG_ITEM = "photo";
-
-	protected ImageView ivCur;
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_img_viewer);
-		Intent iCaller = getIntent();
-		byte[] baBmp = iCaller.getByteArrayExtra(IMG_ITEM);
-		Bitmap bmp = BitmapFactory.decodeByteArray(baBmp, 0, baBmp.length);
-		ivCur = (ImageView)findViewById(R.id.processedImageView);
-		ivCur.setImageBitmap(bmp);
-		new SimpleGestureFilter(this, this);
-	}
-
-	@Override
-	public void onDoubleTap() {
-		finish();		
-	}
-
-	@Override
-	public void onLongPress() {
-		// Ignore		
-	}
-
-	@Override
-	public void onSingleTapUp() {
-		// Ignore
-	}
-	@Override
-	public void onSwipe(int direction) {
-		// Ignore
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		// Inflate the menu; this adds items to the action bar if it is present.
-		getMenuInflater().inflate(R.menu.img_viewer, menu);
-		return true;
-	}
-
-}
+package gr.scify.icsee;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.os.Bundle;
+import android.view.Menu;
+import android.widget.ImageView;
+
+import gr.scify.icsee.events.SimpleGestureFilter;
+import gr.scify.icsee.events.SimpleGestureFilter.SimpleGestureListener;
+
+public class ImgViewerActivity extends Activity implements SimpleGestureListener {
+	public final static String IMG_ITEM = "photo";
+
+	protected ImageView ivCur;
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.activity_img_viewer);
+		Intent iCaller = getIntent();
+		byte[] baBmp = iCaller.getByteArrayExtra(IMG_ITEM);
+		Bitmap bmp = BitmapFactory.decodeByteArray(baBmp, 0, baBmp.length);
+		ivCur = (ImageView)findViewById(R.id.processedImageView);
+		ivCur.setImageBitmap(bmp);
+		new SimpleGestureFilter(this, this);
+	}
+
+	@Override
+	public void onDoubleTap() {
+		finish();		
+	}
+
+	@Override
+	public void onLongPress() {
+		// Ignore		
+	}
+
+	@Override
+	public void onSingleTapUp() {
+		// Ignore
+	}
+	@Override
+	public void onSwipe(int direction) {
+		// Ignore
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		// Inflate the menu; this adds items to the action bar if it is present.
+		getMenuInflater().inflate(R.menu.img_viewer, menu);
+		return true;
+	}
+
+}