changing the url build

FdevTech · Apr 1, 2021 · 58bd0c8 · 58bd0c8
1 parent 621d718
commit 58bd0c8
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,3 +1,5 @@
+import javax.crypto.SecretKey
+
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
@@ -21,9 +23,16 @@ android {
     }
 
     buildTypes {
+          debug{
+              buildConfigField 'String', "clientID", Access_Key
+              buildConfigField 'String', 'clientSecret', Secret_key
+          }
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+
+            buildConfigField 'String', "clientID", Access_Key
+            buildConfigField 'String', 'clientSecret', Secret_key
         }
     }
     compileOptions {

diff --git a/...5i/onlinegallery/authenticationModule/authorizationData/UnsplashWebServiceLoginModel.java b/...5i/onlinegallery/authenticationModule/authorizationData/UnsplashWebServiceLoginModel.java
@@ -4,6 +4,7 @@
 import android.net.Uri;
 import android.util.Log;
 
+import com.example.p5i.onlinegallery.BuildConfig;
 import com.example.p5i.onlinegallery.authenticationModule.authorizationData.AutorizationInterface;
 import com.example.p5i.onlinegallery.authenticationModule.authorizationData.AutorizationResponsePJO;
 import com.example.p5i.onlinegallery.authenticationModule.authorizationData.LoginStateModel;
@@ -19,25 +20,37 @@
 public class UnsplashWebServiceLoginModel
 {
     private static final String TAG = "LoginModel";
+
     private Retrofit retrofit;
     private AutorizationInterface mAutorizationInterface;
     private MutableLiveData<Boolean> isLogedIn;
     private LoginStateModel mLoginStateModel;
 
-    private String clientID="U4e3aiPSmYENZTwqMYUMv1P2XftujdL6byd9e_jM_UI";
-    private String clientSecret="TVnudFDwuYEJuL0GvB8qcCAR9Vqsr14GcMYVwa8B0OM";
+    private String clientID= BuildConfig.clientID;
+    private String clientSecret=BuildConfig.clientSecret;
     private String redirect_uri="curta://callback";
+    private String scope="public read_user write_user read_photos write_photos write_likes write_followers read_collections write_collections";
+
+
+    private Uri.Builder builder=new Uri.Builder();
+
+    String URL;
 
-    /*private String url="https://unsplash.com/oauth/authorize?client_id="+clientID+"&redirect_uri="+redirect_uri +
-            "&response_type=code&scope=public read_user write_user read_photos write_photos write_likes write_followers read_collections write_collections";*/
 
-    private String url="https://unsplash.com/oauth/authorize?" +
-            "client_id=U4e3aiPSmYENZTwqMYUMv1P2XftujdL6byd9e_jM_UI&" +
-            "redirect_uri=curta://callback&" +
-            "response_type=code" +
-            "&scope=public read_user write_user read_photos write_photos write_likes write_followers read_collections write_collections";
     public UnsplashWebServiceLoginModel(Context context)
     {
+        builder.scheme("https")
+                .authority("unsplash.com")
+                .appendPath("oauth")
+                .appendPath("authorize")
+                 .appendQueryParameter("client_id",clientID)
+                 .appendQueryParameter("redirect_uri",redirect_uri)
+                .appendQueryParameter("response_type","code")
+                 .appendQueryParameter("scope",scope)
+                 .build();
+         URL=builder.toString();
+
+
         mLoginStateModel=new LoginStateModel(context);
         isLogedIn=new MutableLiveData<>();
         isLogedIn.setValue(false);
@@ -78,6 +91,6 @@ public MutableLiveData<Boolean> getIsLogedIn() {
     }
 
     public String getUrl() {
-        return url;
+        return URL;
     }
 }
diff --git a/app/src/main/java/com/example/p5i/onlinegallery/photosModule/repository/PhotoRepository.kt b/app/src/main/java/com/example/p5i/onlinegallery/photosModule/repository/PhotoRepository.kt
@@ -2,6 +2,8 @@ package com.example.p5i.onlinegallery.photosModule.repository
 
 import android.util.Log
 import android.widget.Toast
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Transformations
 import com.example.p5i.onlinegallery.collectionsModule.datlayer.network.CollectionAPI
 import com.example.p5i.onlinegallery.databse.UnsplashDatabase
@@ -32,6 +34,12 @@ class PhotoRepository(private val unsplashDatabase: UnsplashDatabase,private val
         it.asUserLikedPhotoDomainModel()
     }
 
+    private var _eroorCode=MutableLiveData<Int>()
+    val eroorCode:LiveData<Int>
+    get() {
+        return _eroorCode
+    }
+
 
 
     suspend fun like_unlikePhoto(photo_id:String)
@@ -87,6 +95,7 @@ class PhotoRepository(private val unsplashDatabase: UnsplashDatabase,private val
             val xtotal= response.headers().get("X-Total")
             Log.d(TAG, "referchPhotosToTest: xtotal: $xtotal")
             val pages:Int?=(xtotal?.toInt()?.div(30))?.toInt()
+            _eroorCode.postValue(response.code())
             if(photosList!=null)
             {
                 try {
@@ -115,6 +124,7 @@ class PhotoRepository(private val unsplashDatabase: UnsplashDatabase,private val
             val response=Photos.PhotosAPI.photos.getPhotoFromTopic(credentials,topicName = topicName)
             var photosList= response.body()
             val xtotal= Photos.PhotosAPI.photos.getPhotos(credentials).headers().get("X-Total")
+            _eroorCode.postValue(response.code())
             Log.d(TAG, "retrivePhotoFromTopicsToTest: xtotal: $xtotal")
             Log.d(TAG, "retrivePhotoFromTopicsToTest: body ${response.body()?.size}")
             Log.d(TAG, "retrivePhotoFromTopicsToTest: response errorBody ${response.errorBody()}")
@@ -143,6 +153,7 @@ class PhotoRepository(private val unsplashDatabase: UnsplashDatabase,private val
             var photosList= response.body()
             val xtotal= response.headers().get("X-Total")
             Log.d(TAG, "retrivePhotoFromCollectionToTest: xtotal: $xtotal")
+            _eroorCode.postValue(response.code())
             val pages:Int?=(xtotal?.toInt()?.div(30))?.toInt()
             Log.d(TAG, "retrivePhotoFromCollectionToTest: pages $pages")
             Log.d(TAG, "retrivePhotoFromCollectionToTest: code: ${response.code()}")
@@ -217,6 +228,7 @@ class PhotoRepository(private val unsplashDatabase: UnsplashDatabase,private val
                Log.d(TAG, "retriveUserPhotosToTest: xtotal: $xtotal")
                val pages:Int?=(xtotal?.toInt()?.div(30))?.toInt()
                Log.d(TAG, "retriveUserPhotosToTest: pages $pages")
+               _eroorCode.postValue(response.code())
                if(photosList!=null)
                {
                    try {
@@ -258,10 +270,12 @@ class PhotoRepository(private val unsplashDatabase: UnsplashDatabase,private val
                val response=Photos.PhotosAPI.photos.getUserLikedPhotos(credentials,username = userName!!)
                var photosList= response.body()
                val xtotal= response.headers().get("X-Total")
+               _eroorCode.postValue(response.code())
                Log.d(TAG, "retriveUserLikedPhotosToTest: xtotal: $xtotal")
                val pages:Int?=(xtotal?.toInt()?.div(30))?.toInt()
                Log.d(TAG, "retriveUserLikedPhotosToTest: pages $pages")
                Log.d(TAG, "retriveUserLikedPhotosToTest: code ${response.code()}")
+               _eroorCode.postValue(response.code())
                if(photosList!=null)
                {
                    try {
@@ -301,6 +315,7 @@ class PhotoRepository(private val unsplashDatabase: UnsplashDatabase,private val
                 unsplashDatabase.photosDao.insertLikedByUser(photoid,!photolikedornot)
                 unsplashDatabase.photosDao.addOrRemoveLiked(photoid,numberOflikes)
             }
+            _eroorCode.postValue(responseRequest.code())
         }catch (e:Exception)
         {
             Log.d(TAG, "likeDesLikePhoto: ${e.message}")

diff --git a/app/src/main/res/anim/enter_from.xml b/app/src/main/res/anim/enter_from.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+    <alpha
+        android:fromAlpha="0.0"
+        android:toAlpha="1.0"
+        />
+</set>
diff --git a/app/src/main/res/anim/exit_to.xml b/app/src/main/res/anim/exit_to.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false"
+    android:duration="500">
+   <alpha
+       android:fromAlpha="1.0"
+       android:toAlpha="0.0"
+       />
+</set>
diff --git a/gradle.properties b/gradle.properties
@@ -18,4 +18,6 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
+kotlin.code.style=official
+Access_Key ="U4e3aiPSmYENZTwqMYUMv1P2XftujdL6byd9e_jM_UI"
+Secret_key="TVnudFDwuYEJuL0GvB8qcCAR9Vqsr14GcMYVwa8B0OM"