From 36f0cc501c433181ddd318e0c0b9e1ad11aa51ae Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Fri, 21 Oct 2022 03:32:14 +0200 Subject: Commit DemoApp. --- ClientApp/app/.gitignore | 1 + ClientApp/app/build.gradle | 56 +++++++ ClientApp/app/proguard-rules.pro | 21 +++ .../example/clientapp/ExampleInstrumentedTest.kt | 24 +++ ClientApp/app/src/main/AndroidManifest.xml | 31 ++++ .../java/com/example/clientapp/MainActivity.kt | 128 ++++++++++++++++ .../java/com/example/clientapp/data/ImageData.kt | 6 + .../clientapp/interfaces/ImageApiInterface.kt | 16 ++ .../res/drawable-v24/ic_launcher_foreground.xml | 30 ++++ .../main/res/drawable/ic_launcher_background.xml | 170 +++++++++++++++++++++ .../app/src/main/res/layout/activity_main.xml | 61 ++++++++ .../src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 5 + .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 5 + .../app/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../main/res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes .../app/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../main/res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../app/src/main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../main/res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../src/main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../main/res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../src/main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../main/res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes ClientApp/app/src/main/res/values-night/themes.xml | 16 ++ ClientApp/app/src/main/res/values/colors.xml | 10 ++ ClientApp/app/src/main/res/values/strings.xml | 3 + ClientApp/app/src/main/res/values/themes.xml | 16 ++ ClientApp/app/src/main/res/xml/backup_rules.xml | 13 ++ .../app/src/main/res/xml/data_extraction_rules.xml | 19 +++ .../java/com/example/clientapp/ExampleUnitTest.kt | 17 +++ 30 files changed, 648 insertions(+) create mode 100644 ClientApp/app/.gitignore create mode 100644 ClientApp/app/build.gradle create mode 100644 ClientApp/app/proguard-rules.pro create mode 100644 ClientApp/app/src/androidTest/java/com/example/clientapp/ExampleInstrumentedTest.kt create mode 100644 ClientApp/app/src/main/AndroidManifest.xml create mode 100644 ClientApp/app/src/main/java/com/example/clientapp/MainActivity.kt create mode 100644 ClientApp/app/src/main/java/com/example/clientapp/data/ImageData.kt create mode 100644 ClientApp/app/src/main/java/com/example/clientapp/interfaces/ImageApiInterface.kt create mode 100644 ClientApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml create mode 100644 ClientApp/app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 ClientApp/app/src/main/res/layout/activity_main.xml create mode 100644 ClientApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 ClientApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 ClientApp/app/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 ClientApp/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 ClientApp/app/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 ClientApp/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 ClientApp/app/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 ClientApp/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 ClientApp/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 ClientApp/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 ClientApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 ClientApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 ClientApp/app/src/main/res/values-night/themes.xml create mode 100644 ClientApp/app/src/main/res/values/colors.xml create mode 100644 ClientApp/app/src/main/res/values/strings.xml create mode 100644 ClientApp/app/src/main/res/values/themes.xml create mode 100644 ClientApp/app/src/main/res/xml/backup_rules.xml create mode 100644 ClientApp/app/src/main/res/xml/data_extraction_rules.xml create mode 100644 ClientApp/app/src/test/java/com/example/clientapp/ExampleUnitTest.kt (limited to 'ClientApp/app') diff --git a/ClientApp/app/.gitignore b/ClientApp/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/ClientApp/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/ClientApp/app/build.gradle b/ClientApp/app/build.gradle new file mode 100644 index 0000000..584bedb --- /dev/null +++ b/ClientApp/app/build.gradle @@ -0,0 +1,56 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' +} + +android { + namespace 'com.example.clientapp' + compileSdk 32 + + defaultConfig { + applicationId "com.example.clientapp" + minSdk 21 + targetSdk 32 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + buildFeatures { + viewBinding = true + } +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.6.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + + + + //retrofit2 + implementation 'com.squareup.retrofit2:retrofit:2.7.2' + implementation 'com.squareup.retrofit2:converter-gson:2.7.2' + + + +} \ No newline at end of file diff --git a/ClientApp/app/proguard-rules.pro b/ClientApp/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/ClientApp/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 \ No newline at end of file diff --git a/ClientApp/app/src/androidTest/java/com/example/clientapp/ExampleInstrumentedTest.kt b/ClientApp/app/src/androidTest/java/com/example/clientapp/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..39c5f8e --- /dev/null +++ b/ClientApp/app/src/androidTest/java/com/example/clientapp/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.example.clientapp + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.example.clientapp", appContext.packageName) + } +} \ No newline at end of file diff --git a/ClientApp/app/src/main/AndroidManifest.xml b/ClientApp/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..b8425a1 --- /dev/null +++ b/ClientApp/app/src/main/AndroidManifest.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ClientApp/app/src/main/java/com/example/clientapp/MainActivity.kt b/ClientApp/app/src/main/java/com/example/clientapp/MainActivity.kt new file mode 100644 index 0000000..ce9a717 --- /dev/null +++ b/ClientApp/app/src/main/java/com/example/clientapp/MainActivity.kt @@ -0,0 +1,128 @@ +package com.example.clientapp + +import android.content.Intent +import android.graphics.Bitmap +import android.graphics.BitmapFactory +import android.media.Image +import android.net.Uri +import android.os.Bundle +import android.provider.MediaStore +import android.util.Base64 +import android.util.Log +import androidx.appcompat.app.AppCompatActivity +import com.example.clientapp.data.ImageData +import com.example.clientapp.databinding.ActivityMainBinding +import com.example.clientapp.interfaces.Base_URL +import com.example.clientapp.interfaces.ImageService +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory +import java.io.ByteArrayOutputStream + + +class MainActivity : AppCompatActivity() { + private lateinit var binding: ActivityMainBinding + val PICK_IMAGE = 1 + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + binding=ActivityMainBinding.inflate(layoutInflater) + setContentView(binding.root) + + binding.randomImage.setOnClickListener{ + getRandomImage() + } + + binding.addImage.setOnClickListener{ + addImage() + } + getRandomImage() + + + + + } + private fun addImage(){ + val intent = Intent() + intent.type = "image/*" + intent.action = Intent.ACTION_GET_CONTENT + startActivityForResult(Intent.createChooser(intent, "Select Picture"), PICK_IMAGE) + } + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + if (requestCode == PICK_IMAGE && resultCode== RESULT_OK) { + var imageUri=data?.data + var base64String=getImageBase64(imageUri!!) + val image=ImageData("",base64String) + uploadImage(image) + + + } + } + + private fun getImageBase64(imageUri:Uri):String{ + var str="" + val bitmap = MediaStore.Images.Media.getBitmap(contentResolver,imageUri) + val byteArrayOutputStream = ByteArrayOutputStream() + bitmap.compress(Bitmap.CompressFormat.PNG, 100, byteArrayOutputStream) + val byteArray = byteArrayOutputStream.toByteArray() + str = Base64.encodeToString(byteArray, Base64.DEFAULT) + return str + } + + + + + private fun uploadImage(image:ImageData){ + val api = Retrofit.Builder() + .addConverterFactory(GsonConverterFactory.create()) + .baseUrl(Base_URL) + .build() + .create(ImageService::class.java) + + val data=api.uploadImage(image) + data.enqueue(object : Callback { + override fun onResponse(call: Call, response: Response) { + + val imageBytes = Base64.decode(response.body()!!.image, Base64.DEFAULT) + val decodedImage = BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.size) + binding.randomImageView.setImageBitmap(decodedImage) + + } + + override fun onFailure(call: Call, t: Throwable) { + } + }) + } + + + + + + private fun getRandomImage() { + val api = Retrofit.Builder() + .addConverterFactory(GsonConverterFactory.create()) + .baseUrl(Base_URL) + .build() + .create(ImageService::class.java) + + val data=api.getRandomImage() + data.enqueue(object : Callback { + override fun onResponse(call: Call, response: Response) { + + val imageBytes = Base64.decode(response.body()!!.image, Base64.DEFAULT) + val decodedImage = BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.size) + binding.randomImageView.setImageBitmap(decodedImage) + + } + + override fun onFailure(call: Call, t: Throwable) { + } + }) + + + + + } +} diff --git a/ClientApp/app/src/main/java/com/example/clientapp/data/ImageData.kt b/ClientApp/app/src/main/java/com/example/clientapp/data/ImageData.kt new file mode 100644 index 0000000..9e1b451 --- /dev/null +++ b/ClientApp/app/src/main/java/com/example/clientapp/data/ImageData.kt @@ -0,0 +1,6 @@ +package com.example.clientapp.data + +data class ImageData ( + val _id:String, + val image:String + ) \ No newline at end of file diff --git a/ClientApp/app/src/main/java/com/example/clientapp/interfaces/ImageApiInterface.kt b/ClientApp/app/src/main/java/com/example/clientapp/interfaces/ImageApiInterface.kt new file mode 100644 index 0000000..0a3b826 --- /dev/null +++ b/ClientApp/app/src/main/java/com/example/clientapp/interfaces/ImageApiInterface.kt @@ -0,0 +1,16 @@ +package com.example.clientapp.interfaces + +import com.example.clientapp.data.ImageData +import retrofit2.Call +import retrofit2.http.Body +import retrofit2.http.GET +import retrofit2.http.POST + +const val Base_URL="http://10.0.2.2:5276" + +interface ImageService { + @GET("/api/Image") + fun getRandomImage():Call + @POST("/api/Image") + fun uploadImage(@Body obj:ImageData):Call +} \ No newline at end of file diff --git a/ClientApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/ClientApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/ClientApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/ClientApp/app/src/main/res/drawable/ic_launcher_background.xml b/ClientApp/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/ClientApp/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ClientApp/app/src/main/res/layout/activity_main.xml b/ClientApp/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..b69623b --- /dev/null +++ b/ClientApp/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ClientApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/ClientApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/ClientApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/ClientApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/ClientApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/ClientApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/ClientApp/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/ClientApp/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 Binary files /dev/null and b/ClientApp/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/ClientApp/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/ClientApp/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d Binary files /dev/null and b/ClientApp/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/ClientApp/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/ClientApp/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 Binary files /dev/null and b/ClientApp/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/ClientApp/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/ClientApp/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d Binary files /dev/null and b/ClientApp/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/ClientApp/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/ClientApp/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 Binary files /dev/null and b/ClientApp/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/ClientApp/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/ClientApp/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 Binary files /dev/null and b/ClientApp/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/ClientApp/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/ClientApp/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 Binary files /dev/null and b/ClientApp/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/ClientApp/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/ClientApp/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 Binary files /dev/null and b/ClientApp/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/ClientApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/ClientApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 Binary files /dev/null and b/ClientApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/ClientApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/ClientApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 Binary files /dev/null and b/ClientApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/ClientApp/app/src/main/res/values-night/themes.xml b/ClientApp/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..8c329c2 --- /dev/null +++ b/ClientApp/app/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/ClientApp/app/src/main/res/values/colors.xml b/ClientApp/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/ClientApp/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/ClientApp/app/src/main/res/values/strings.xml b/ClientApp/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..34f0ab2 --- /dev/null +++ b/ClientApp/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + ClientApp + \ No newline at end of file diff --git a/ClientApp/app/src/main/res/values/themes.xml b/ClientApp/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..ce8d181 --- /dev/null +++ b/ClientApp/app/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/ClientApp/app/src/main/res/xml/backup_rules.xml b/ClientApp/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 0000000..fa0f996 --- /dev/null +++ b/ClientApp/app/src/main/res/xml/backup_rules.xml @@ -0,0 +1,13 @@ + + + + \ No newline at end of file diff --git a/ClientApp/app/src/main/res/xml/data_extraction_rules.xml b/ClientApp/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 0000000..9ee9997 --- /dev/null +++ b/ClientApp/app/src/main/res/xml/data_extraction_rules.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/ClientApp/app/src/test/java/com/example/clientapp/ExampleUnitTest.kt b/ClientApp/app/src/test/java/com/example/clientapp/ExampleUnitTest.kt new file mode 100644 index 0000000..e43b4a2 --- /dev/null +++ b/ClientApp/app/src/test/java/com/example/clientapp/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.example.clientapp + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file -- cgit v1.2.3