Skip to content

Commit fb6585f

Browse files
author
Patrick Jackson
committed
Merge branch 'refactor/presenter-functions'
2 parents 46f5aca + a2fe227 commit fb6585f

File tree

162 files changed

+4506
-1442
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+4506
-1442
lines changed

android/build.gradle

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ android {
1515
sourceCompatibility JavaVersion.VERSION_1_8
1616
targetCompatibility JavaVersion.VERSION_1_8
1717
}
18-
compileSdkVersion 28
18+
compileSdkVersion 29
1919
defaultConfig {
20-
applicationId "com.jackson.openlibrary"
20+
applicationId "org.reduxkotlin.readinglist"
2121
minSdkVersion 26
22-
targetSdkVersion 28
22+
targetSdkVersion 29
2323
versionCode 1
2424
versionName "1.0"
2525
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -52,14 +52,12 @@ android {
5252
dependencies {
5353
implementation fileTree(dir: 'libs', include: ['*.jar'])
5454
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
55-
implementation 'androidx.appcompat:appcompat:1.0.2'
56-
implementation 'com.google.android.material:material:1.1.0-alpha07'
55+
implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
56+
implementation 'com.google.android.material:material:1.1.0-alpha09'
5757
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
5858
implementation "android.arch.navigation:navigation-fragment-ktx:$ktxVersion"
5959
implementation "android.arch.navigation:navigation-ui-ktx:$ktxVersion"
6060

61-
implementation "com.facebook.stetho:stetho:$stethoVersion"
62-
implementation "com.facebook.stetho:stetho-okhttp3:$stethoVersion"
6361
implementation "com.github.bumptech.glide:glide:$glideVersion"
6462
implementation "com.github.bumptech.glide:okhttp3-integration:$glideVersion"
6563

@@ -71,20 +69,18 @@ dependencies {
7169
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
7270
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
7371
implementation project(':common')
74-
implementation 'nl.dionsegijn:konfetti:1.1.2'
7572
implementation "com.russhwolf:multiplatform-settings:$multiplatformSettingsVersion"
7673
implementation "com.squareup.sqldelight:android-driver:$sqldelightVersion"
74+
implementation "org.reduxkotlin:redux-kotlin:0.2.6"
75+
implementation "org.reduxkotlin:presenter-middleware:0.2.10"
7776

7877

7978
kapt 'com.github.bumptech.glide:compiler:4.8.0'
8079
testImplementation 'junit:junit:4.12'
81-
androidTestImplementation 'androidx.test:runner:1.1.1'
82-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
80+
androidTestImplementation 'androidx.test:runner:1.2.0'
81+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
8382

84-
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta1'
85-
implementation 'com.google.firebase:firebase-core:16.0.8'
86-
implementation 'com.google.firebase:firebase-auth:16.2.1'
87-
implementation 'com.firebaseui:firebase-ui-auth:4.3.2'
83+
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2'
8884
debugImplementation 'com.willowtreeapps.hyperion:hyperion-core:0.9.27'
8985
releaseImplementation 'com.willowtreeapps.hyperion:hyperion-core-no-op:0.9.27'
9086
debugImplementation 'com.willowtreeapps.hyperion:hyperion-measurement:0.9.27'
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.jackson.openlibrary">
3+
package="org.reduxkotlin.readinglist">
44

55
<uses-permission android:name="android.permission.INTERNET"/>
66

77
<application
8-
android:name=".OpenLibraryApp"
8+
android:name="org.reduxkotlin.readinglist.OpenLibraryApp"
99
android:allowBackup="true"
1010
android:icon="@mipmap/ic_launcher"
1111
android:label="@string/app_name"
1212
android:roundIcon="@mipmap/ic_launcher_round"
1313
android:supportsRtl="true"
1414
android:theme="@style/LibraryAppTheme">
1515
<activity
16-
android:name=".MainActivity"
16+
android:name="org.reduxkotlin.readinglist.MainActivity"
1717
android:label="@string/app_name"
18+
android:windowSoftInputMode="adjustPan"
1819
android:theme="@style/LibraryAppTheme">
1920
<intent-filter>
2021
<action android:name="android.intent.action.MAIN" />
2122

2223
<category android:name="android.intent.category.LAUNCHER" />
2324
</intent-filter>
2425
</activity>
25-
<activity android:name=".DetailsActivity"/>
2626
</application>
2727

2828
</manifest>

android/src/main/java/com/jackson/openlibrary/DetailsActivity.kt

Lines changed: 0 additions & 25 deletions
This file was deleted.

android/src/main/java/com/jackson/openlibrary/MainActivity.kt

Lines changed: 0 additions & 112 deletions
This file was deleted.

android/src/main/java/com/jackson/openlibrary/scriminsets/OnInsetsCallback.java

Lines changed: 0 additions & 14 deletions
This file was deleted.

android/src/main/java/com/jackson/openlibrary/scriminsets/ScrimInsetsFrameLayout.java

Lines changed: 0 additions & 135 deletions
This file was deleted.

0 commit comments

Comments
 (0)