Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compose #3

Open
wants to merge 49 commits into
base: dev
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
bade7dc
# splash screen on compose
Oct 11, 2021
84cefc2
# error screen on compose + flows in cache
Oct 11, 2021
3317975
# error screen on compose fixes
Oct 11, 2021
f238e33
# theme fix
Oct 11, 2021
2416e90
# pokemons screen on compose - done partially
Oct 11, 2021
2609594
# crash fixes
Oct 11, 2021
8aadcdd
# swipe refresh + fixes
Oct 12, 2021
d0aa4c9
# pagination
Oct 12, 2021
d12b2c7
# pagination
Oct 12, 2021
223ab30
# empty view
Oct 12, 2021
36e0192
# formatting
Oct 12, 2021
6639653
# trashHold fix
Oct 12, 2021
929b70b
# item click + crash fix
Oct 12, 2021
05804f8
# cleanup
Oct 12, 2021
1bb6015
# detail screen on compose + cleanup
Oct 12, 2021
45c92d9
# detail screen on compose done + cleanup
Oct 13, 2021
42628de
# gradle update
Oct 13, 2021
ad7ea59
# themes + smaller icons
Oct 13, 2021
4b6b55b
# unused libraries removed
Oct 13, 2021
3ca764a
# fucking hilt
Oct 13, 2021
e39da76
# cleanup
Oct 13, 2021
f054b6b
# cleanup
Oct 13, 2021
e028296
# todos
Oct 13, 2021
16720b4
# error handling while loading image
Oct 13, 2021
fe8c5e5
# mvi improvement
Nov 12, 2021
d9d7245
# mvi improvement
Nov 13, 2021
6bd93c0
# libs update
Nov 17, 2021
7d08878
Merge remote-tracking branch 'origin/compose' into compose
Nov 17, 2021
674a21c
# libs update
Dec 13, 2021
14f1606
# libs update
Dec 13, 2021
778998c
# libs update
Mar 22, 2022
ab17101
# migration fixes
Mar 22, 2022
17aa679
Merge remote-tracking branch 'origin/compose' into compose
Mar 22, 2022
bac456f
# merge fix
Mar 22, 2022
3bcc74c
# libs update
Apr 11, 2022
c68ea13
# mvi update (partial states)
Jun 16, 2022
c87b76e
# libs update
Jun 16, 2022
990f072
# cleanup
Jun 16, 2022
224f425
# libs update + room fixes
Nov 11, 2022
0d4aa1a
# mvi
Apr 21, 2023
c05bf82
# libs update
Apr 21, 2023
0d359a4
# agp migration
Apr 21, 2023
6898741
# agp migration to 8.0.0
Apr 21, 2023
1a2ca58
# agp migration fix
Apr 21, 2023
0d54991
# unit tests fixed
Apr 22, 2023
3e13b08
# duplication removed
Apr 22, 2023
ac675da
# migration
Apr 25, 2023
2f3ffdc
# review improvement
Sep 11, 2023
dbff4f1
# dsl migration
Sep 12, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
# agp migration
  • Loading branch information
DanDdl committed Apr 21, 2023
commit 0d359a4d87494e91c159b4e957d5aa234648b160
1 change: 1 addition & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -41,6 +41,7 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
namespace 'com.mdgd.pokemon'
}

dependencies {
3 changes: 1 addition & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.mdgd.pokemon">
xmlns:tools="http://schemas.android.com/tools">

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

2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.3.1'
classpath 'com.android.tools.build:gradle:7.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.45"
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
2 changes: 1 addition & 1 deletion models/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<manifest package="com.mdgd.pokemon.models" />
<manifest />
1 change: 1 addition & 0 deletions models_impl/build.gradle
Original file line number Diff line number Diff line change
@@ -30,6 +30,7 @@ android {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
}
namespace 'com.mdgd.pokemon.models_impl'
}

dependencies {
2 changes: 1 addition & 1 deletion models_impl/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<manifest package="com.mdgd.pokemon.models_impl" />
<manifest />
1 change: 1 addition & 0 deletions mvi/build.gradle
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
namespace 'com.mdgd.mvi'
}

dependencies {
2 changes: 1 addition & 1 deletion mvi/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<manifest package="com.mdgd.mvi" />
<manifest />