rxjava add

app/build.gradle

@@ -38,9 +38,13 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 
-    implementation  'com.squareup.retrofit2:retrofit:2.0.2'
-    implementation  'com.squareup.retrofit2:converter-gson:2.0.2'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.4.1'
+    implementation  'com.squareup.retrofit2:retrofit:2.4.0'
+    implementation  'com.squareup.retrofit2:converter-gson:2.4.0'
+    
+    implementation  'com.squareup.retrofit2:adapter-rxjava2:2.4.0'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
+
+    implementation  'com.squareup.okhttp3:logging-interceptor:3.4.1'
     implementation('com.github.ihsanbal:LoggingInterceptor:3.1.0-rc5') {
         exclude group: 'org.json', module: 'json'
     }

app/src/main/AndroidManifest.xml

@@ -9,16 +9,16 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        android:networkSecurityConfig="@xml/network_security_config"
-        >
-        <activity android:name=".MainActivity"></activity>
-        <activity android:name=".Main2Activity">
+        android:networkSecurityConfig="@xml/network_security_config">
+        <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".java.CallActivity"></activity>
+        <activity android:name=".java.RxActivity"></activity>
     </application>
 
 </manifest>
\ No newline at end of file

app/src/main/java/com/mxdl/retrofit/MainActivity.kt

 package com.mxdl.retrofit
 
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import com.mxdl.retrofit.java.CallActivity
+import com.mxdl.retrofit.java.RxActivity
+import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+        btn_call.setOnClickListener {
+            startActivity(Intent(this, CallActivity::class.java))
+        }
+        btn_rx.setOnClickListener {
+            startActivity(Intent(this, RxActivity::class.java))
+        }
     }
 
 }

app/src/main/java/com/mxdl/retrofit/api/confit/Config.java

-package com.mxdl.retrofit.api.http;
+package com.mxdl.retrofit.api.confit;
 
 /**
  * Description: <Config><br>

app/src/main/java/com/mxdl/retrofit/java/CallActivity.java

-package com.mxdl.retrofit;
+package com.mxdl.retrofit.java;
 
 import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
-import com.mxdl.retrofit.api.call.CommonCallService;
-import com.mxdl.retrofit.api.call.RetrofitCallManager;
+
+import com.mxdl.retrofit.R;
+import com.mxdl.retrofit.java.api.service.CommonCallService;
+import com.mxdl.retrofit.java.api.manager.RetrofitCallManager;
 import com.mxdl.retrofit.api.entity.Token;
 import com.mxdl.retrofit.api.entity.User;
 

app/src/main/java/com/mxdl/retrofit/java/RxActivity.java

-package com.mxdl.retrofit;
+package com.mxdl.retrofit.java;
 
 import android.os.Bundle;
 import android.view.View;
 
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.mxdl.retrofit.api.call.RetrofitCallManager;
+import com.mxdl.retrofit.R;
 import com.mxdl.retrofit.api.entity.Token;
 import com.mxdl.retrofit.api.entity.User;
-import com.mxdl.retrofit.api.rxjava.CommonRxService;
-import com.mxdl.retrofit.api.rxjava.RetrofitRxManager;
+import com.mxdl.retrofit.java.api.service.CommonRxService;
+import com.mxdl.retrofit.java.api.manager.RetrofitRxManager;
 
 import io.reactivex.Observable;
 import io.reactivex.Observer;
-import io.reactivex.Scheduler;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;

app/src/main/java/com/mxdl/retrofit/java/api/manager/RetrofitCallManager.java

-package com.mxdl.retrofit.api.call;
+package com.mxdl.retrofit.java.api.manager;
 
 import android.content.Context;
 import android.text.TextUtils;
 
 import com.ihsanbal.logging.Level;
 import com.ihsanbal.logging.LoggingInterceptor;
+import com.mxdl.retrofit.java.api.service.CommonCallService;
 import com.mxdl.retrofit.api.confit.Config;
 
 import org.jetbrains.annotations.NotNull;

app/src/main/java/com/mxdl/retrofit/java/api/manager/RetrofitRxManager.java

-package com.mxdl.retrofit.api.rxjava;
+package com.mxdl.retrofit.java.api.manager;
 
 import android.content.Context;
 import android.text.TextUtils;
 
 import com.ihsanbal.logging.Level;
 import com.ihsanbal.logging.LoggingInterceptor;
-import com.mxdl.retrofit.api.call.CommonCallService;
 import com.mxdl.retrofit.api.confit.Config;
+import com.mxdl.retrofit.java.api.service.CommonRxService;
 
 import org.jetbrains.annotations.NotNull;
 

app/src/main/java/com/mxdl/retrofit/java/api/service/CommonCallService.java

-package com.mxdl.retrofit.api.call;
+package com.mxdl.retrofit.java.api.service;
 
 import com.mxdl.retrofit.api.entity.Token;
 import com.mxdl.retrofit.api.entity.User;

app/src/main/java/com/mxdl/retrofit/java/api/service/CommonRxService.java

-package com.mxdl.retrofit.api.rxjava;
+package com.mxdl.retrofit.java.api.service;
 
 import com.mxdl.retrofit.api.entity.Token;
 import com.mxdl.retrofit.api.entity.User;

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

 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Main2Activity">
-
-</androidx.constraintlayout.widget.ConstraintLayout>
+    android:orientation="vertical">
+    <Button
+        android:id="@+id/btn_call"
\ No newline at end of file
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="CallAdapter"
+        />
+    <Button
+        android:id="@+id/btn_rx"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="RxAdapter"
+        />
+</LinearLayout>
\ No newline at end of file

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

@@ -6,6 +6,7 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:textAllCaps">false</item>
     </style>
 
 </resources>