Merge pull request #9 from sz3/gfx-pt2

Version bump, more minor graphics tweaks
sz3 · Jul 10, 2021 · 531d606 · 531d606
2 parents 11451ec + 6a82045
commit 531d606
Show file tree

Hide file tree

Showing 14 changed files with 10 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "org.cimbar.camerafilecopy"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 2
-        versionName "0.5.8"
+        versionCode 3
+        versionName "0.5.9"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {

diff --git a/app/src/cpp/cfc-cpp/jni.cpp b/app/src/cpp/cfc-cpp/jni.cpp
@@ -119,7 +119,7 @@ namespace {
 	{
 		std::stringstream sstop;
 		sstop << "cfc using " << proc.num_threads() << " thread(s). " << proc.color_bits() << "..." << proc.backlog() << "? ";
-		sstop << (MultiThreadedDecoder::bytes / std::max<double>(1, MultiThreadedDecoder::decoded)) << "b v0.5.8";
+		sstop << (MultiThreadedDecoder::bytes / std::max<double>(1, MultiThreadedDecoder::decoded)) << "b v0.5.9";
 		std::stringstream ssmid;
 		ssmid << "#: " << MultiThreadedDecoder::perfect << " / " << MultiThreadedDecoder::decoded << " / " << MultiThreadedDecoder::scanned << " / " << _calls;
 		std::stringstream ssperf;

diff --git a/app/src/main/java/org/cimbar/camerafilecopy/MainActivity.java b/app/src/main/java/org/cimbar/camerafilecopy/MainActivity.java
@@ -107,6 +107,12 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
         }
     }
 
+    @Override
+    public void onStart() {
+        super.onStart();
+        Toast.makeText(this, "Encode data at https://cimbar.org! :)",  Toast.LENGTH_LONG).show();
+    }
+
     @Override
     public void onPause() {
         shutdownJNI();
@@ -125,8 +131,6 @@ public void onResume() {
             Log.d(TAG, "OpenCV library found inside package. Using it!");
             mLoaderCallback.onManagerConnected(LoaderCallbackInterface.SUCCESS);
         }
-
-        Toast.makeText(this, "Encode data at https://cimbar.org! :)",  Toast.LENGTH_LONG).show();
     }
 
     @Override

diff --git a/app/src/main/res/drawable-hdpi/ic_color4.png b/app/src/main/res/drawable-hdpi/ic_color4.png
diff --git a/app/src/main/res/drawable-hdpi/ic_color8.png b/app/src/main/res/drawable-hdpi/ic_color8.png
diff --git a/app/src/main/res/drawable-ldpi/ic_color4.png b/app/src/main/res/drawable-ldpi/ic_color4.png
diff --git a/app/src/main/res/drawable-ldpi/ic_color8.png b/app/src/main/res/drawable-ldpi/ic_color8.png
diff --git a/app/src/main/res/drawable-mdpi/ic_color4.png b/app/src/main/res/drawable-mdpi/ic_color4.png
diff --git a/app/src/main/res/drawable-mdpi/ic_color8.png b/app/src/main/res/drawable-mdpi/ic_color8.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_color4.png b/app/src/main/res/drawable-xhdpi/ic_color4.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_color8.png b/app/src/main/res/drawable-xhdpi/ic_color8.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_color4.png b/app/src/main/res/drawable-xxhdpi/ic_color4.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_color8.png b/app/src/main/res/drawable-xxhdpi/ic_color8.png
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -18,7 +18,7 @@
 
     <ToggleButton
         android:id="@+id/color_switch"
-        android:layout_width="44dp"
+        android:layout_width="48dp"
         android:layout_height="54dp"
         android:background="@android:drawable/divider_horizontal_textfield"
         android:button="@drawable/colselbg"