Version 0.9.2 add gallery image picker

Author: mightytry

app/build.gradle

@@ -3,14 +3,14 @@ plugins {
 }
 
 android {
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.example.picturetopc"
         minSdk 28
-        targetSdk 33
-        versionCode 4
-        versionName "v0.9.1"
+        targetSdk 34
+        versionCode 5
+        versionName "v0.9.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -32,11 +32,11 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.navigation:navigation-fragment:2.3.5'
-    implementation 'androidx.navigation:navigation-ui:2.3.5'
+    implementation 'androidx.navigation:navigation-fragment:2.7.5'
+    implementation 'androidx.navigation:navigation-ui:2.7.5'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
     def camerax_version = "1.1.0"
     implementation "androidx.camera:camera-core:${camerax_version}"
     implementation "androidx.camera:camera-camera2:${camerax_version}"
@@ -46,18 +46,18 @@ dependencies {
     implementation "androidx.camera:camera-view:${camerax_version}"
     implementation "androidx.camera:camera-extensions:${camerax_version}"
 
-    implementation 'androidx.activity:activity:1.5.1'
-    implementation 'androidx.fragment:fragment:1.5.1'
+    implementation 'androidx.activity:activity:1.8.1'
+    implementation 'androidx.fragment:fragment:1.6.2'
 
-    implementation 'androidx.appcompat:appcompat:1.5.1'
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.10.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
 
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.1.0'
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }

app/src/main/java/com/example/picturetopc/MainActivity.java

@@ -11,24 +11,24 @@
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ProgressBar;
-import android.widget.TextView;
 
 import androidx.activity.result.ActivityResult;
 import androidx.activity.result.ActivityResultCallback;
 import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.PickVisualMediaRequest;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
-
-
-
+import java.io.InputStream;
 
 
 class Listener implements View.OnClickListener {
@@ -56,6 +56,7 @@ class IoHandler {
 
     Button ButtonOkay;
     Button ButtonCancel;
+    Button ButtonCooseImgGalery;
 
     ProgressBar ProgressBar;
     MainActivity Main;
@@ -73,13 +74,15 @@ public IoHandler(SharedPreferences sharedPreferences, EditText nameEdit, EditTex
         ButtonConnect = buttonConnect;
         ButtonCancel = main.dialog.findViewById(R.id.btn_cancel);
         ButtonOkay = main.dialog.findViewById(R.id.btn_okay);
+        ButtonCooseImgGalery = main.findViewById(R.id.btn_chooseGalery);
 
         ProgressBar =progessBar;
         Main = main;
 
         ButtonConnect.setOnClickListener(new Listener(this));
         ButtonCancel.setOnClickListener(new Listener(this));
         ButtonOkay.setOnClickListener(new Listener(this));
+        ButtonCooseImgGalery.setOnClickListener(new Listener(this));
 
 
 
@@ -106,6 +109,8 @@ public void Save() {
         Editor.commit();
     }
 
+
+
     public void OnClick(View view) {
         if (ButtonConnect.equals(view)) {
             Main.GetImage();
@@ -116,6 +121,8 @@ else if (ButtonCancel.equals(view)){
         else if (ButtonOkay.equals(view)){
             Main.download();
             Main.dialog.dismiss();
+        } else if (ButtonCooseImgGalery.equals(view)) {
+            Main.ChooseImgGallery();
         }
     }
 
@@ -171,6 +178,12 @@ protected void onSaveInstanceState(@NonNull Bundle outState) {
 
     }
 
+    public void ChooseImgGallery(){
+        pickMultipleMedia.launch(new PickVisualMediaRequest.Builder()
+                .setMediaType(ActivityResultContracts.PickVisualMedia.ImageOnly.INSTANCE)
+                .build());
+
+    }
 
     public void GetImage(){
         Intent intent = new Intent(this, Camera.class);
@@ -179,7 +192,31 @@ public void GetImage(){
 
 
     }
-
+    private final ActivityResultLauncher<PickVisualMediaRequest> pickMultipleMedia = registerForActivityResult(
+            new ActivityResultContracts.PickMultipleVisualMedia(), uris -> {
+                // Callback is invoked after the user selects media items or closes the
+                // photo picker.
+                if (!uris.isEmpty()) {
+                    for ( Uri uri: uris
+                         ) {
+                        BitmapFactory.Options options = new BitmapFactory.Options();
+                        InputStream imageStream = null;
+                        try {
+                            imageStream = getContentResolver().openInputStream(uri);
+                        } catch (FileNotFoundException e) {
+                            continue;
+                        }
+                        Bitmap bitmap = BitmapFactory.decodeStream(imageStream, null, options);
+                        connection.onPicture(bitmap);
+                        try {
+                            imageStream.close();
+                        } catch (IOException e) {
+                            continue;
+                        }
+                    }
+                } else {
+                }
+            });
     private final ActivityResultLauncher<Intent> canmeraActivity = registerForActivityResult(
             new ActivityResultContracts.StartActivityForResult(),
             new ActivityResultCallback<ActivityResult>() {

app/src/main/res/layout/activity_main.xml

@@ -41,6 +41,19 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.186" />
 
+    <Button
+        android:id="@+id/btn_chooseGalery"
+        android:layout_width="114dp"
+        android:layout_height="56dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="4dp"
+        android:text="Choose gallery"
+        app:layout_constraintBottom_toTopOf="@+id/IpAdress"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.46"
+        app:layout_constraintStart_toStartOf="@+id/guideline2"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.262" />
     <Button
         android:id="@+id/ConnectBtn"
         android:layout_width="204dp"
@@ -90,4 +103,5 @@
         app:layout_constraintGuide_percent="0.5"
         app:layout_constraintStart_toStartOf="parent" />
 
+
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/strings.xml

@@ -1,7 +1,7 @@
 <resources>
     <string name="app_name">PictureToPC</string>
     <string name="IPField">Code</string>
-    <string name="connect">Connect</string>
+    <string name="connect">Take Picture</string>
     <string name="done_btn">Done</string>
     <string name="takepicture_btn">TakePicture</string>
     <string name="NameField">Name</string>