Bug Fixes and Reorganization

.gitignore

@@ -7,6 +7,7 @@
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
+/.idea
 .DS_Store
 /build
 /captures

app/build.gradle

@@ -8,7 +8,7 @@ android {
     compileSdk 32
 
     defaultConfig {
-        applicationId "com.example.ribs_demo_android"
+        applicationId "com.solacestudios.ribs_demo_android"
         minSdk 23
         targetSdk 32
         versionCode 1
@@ -61,20 +61,21 @@ dependencies {
     def retrofit_version = "2.9.0"
     implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
     implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
+    implementation "com.squareup.retrofit2:adapter-rxjava3:$retrofit_version"
+
+    implementation 'com.jakewharton.rxbinding4:rxbinding-core:4.0.0'
 
     def glide_version = "4.11.0"
     implementation "com.github.bumptech.glide:glide:$glide_version"
     kapt "com.github.bumptech.glide:compiler:$glide_version"
 
-    implementation 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.4'
-
     testImplementation 'junit:junit:4.12'
     testImplementation "org.mockito:mockito-core:3.10.0"
     testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
     testImplementation "com.google.truth:truth:0.43"
     testImplementation "com.google.testing.compile:compile-testing:0.17"
     //testImplementation "org.mockito:mockito-all:1.10.19"
     testImplementation 'org.mockito:mockito-inline:2.13.0'
+
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.2.1'
 }

app/src/androidTest/java/com/example/ribs_demo_android/ExampleInstrumentedTest.kt → app/src/androidTest/java/com/solacestudios/ribs_demo_android/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package com.example.ribs_demo_android
+package com.solacestudios.ribs_demo_android
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.example.ribs_demo_android", appContext.packageName)
+        assertEquals("com.solacestudios.ribs_demo_android", appContext.packageName)
     }
 }

app/src/main/AndroidManifest.xml

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.ribs_demo_android">
+    package="com.solacestudios.ribs_demo_android">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
-        android:name=".App"
+        android:name="com.solacestudios.ribs_demo_android.App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.RibsDemoAndroid">
         <activity
-            android:name=".ribs.MainActivity"
+            android:name="com.solacestudios.ribs_demo_android.ribs.MainActivity"
             android:exported="true"
             android:screenOrientation="portrait">
             <intent-filter>