Skip to content

Commit

Permalink
Merge pull request #127 from Spikeysanju/Refactor-Code
Browse files Browse the repository at this point in the history
Refactor code
  • Loading branch information
Spikeysanju authored Jul 25, 2021
2 parents 78f0d0a + b31d137 commit 5dfc487
Show file tree
Hide file tree
Showing 25 changed files with 22,098 additions and 16,481 deletions.
6 changes: 6 additions & 0 deletions .idea/kotlinScripting.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ Our open source community strives to:
* **Be friendly and patient.**
* **Be welcoming**: We strive to be a community that welcomes and supports people of all backgrounds and identities. This includes, but is not limited to members of any race, ethnicity, culture, national origin, colour, immigration status, social and economic class, educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief, religion, and mental and physical ability.

* **Be considerate**: Your work will be used by other people, and you in turn will depend on the work of others. Any decision you take will affect users and colleagues, and you should take those consequences into account when making decisions. Remember that we're a world-wide community, so you might not be communicating in someone else's primary language.
* **Be considerate**: Your work will be used by other people, and you in turn will depend on the work of others. Any decision you take will affect users and colleagues, and you should take those consequences into account when making decisions. Remember that we"re a world-wide community, so you might not be communicating in someone else"s primary language.

* **Be respectful**: Not all of us will agree all the time, but disagreement is no excuse for poor behavior and poor manners. We might all experience some frustration now and then, but we cannot allow that frustration to turn into a personal attack. It’s important to remember that a community where people feel uncomfortable or threatened is not a productive one.

* **Be careful in the words that you choose**: we are a community of professionals, and we conduct ourselves professionally. Be kind to others. Do not insult or put down other participants. Harassment and other exclusionary behavior aren't acceptable. This includes, but is not limited to:
* **Be careful in the words that you choose**: we are a community of professionals, and we conduct ourselves professionally. Be kind to others. Do not insult or put down other participants. Harassment and other exclusionary behavior aren"t acceptable. This includes, but is not limited to:
* Violent threats or language directed against another person.
* Discriminatory jokes and language.
* Posting sexually explicit or violent material.
* Posting (or threatening to post) other people's personally identifying information ("doxing").
* Posting (or threatening to post) other people"s personally identifying information ("doxing").
* Personal insults, especially those using racist or sexist terms.
* Unwelcome sexual attention.
* Advocating for, or encouraging, any of the above behavior.
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTION.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ You can contribute to this repository by filing issues, bugs and PRs.
- Repo owner will contact you there.
- If your proposed change is approved, Fork this repo and do changes.
- Open PR against latest `dev` branch. Add nice description in PR.
- You're done!
- You"re done!
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Android. *Made with love ❤️ by [Spikeysanju](https://github.com/Spikeysanju)
- [Flow](https://kotlinlang.org/docs/reference/coroutines/flow.html) - A flow is an asynchronous
version of a Sequence, a type of collection whose values are lazily produced.
- [ViewModel](https://developer.android.com/topic/libraries/architecture/viewmodel) - Stores
UI-related data that isn't destroyed on UI changes.
UI-related data that isn"t destroyed on UI changes.
- [Jetpack Compose Navigation](https://developer.android.com/jetpack/compose/navigation) - The
Navigation component provides support for Jetpack Compose applications.
- [DataStore](https://developer.android.com/topic/libraries/architecture/datastore) - Jetpack
Expand All @@ -52,7 +52,7 @@ View-Model)***](https://developer.android.com/jetpack/docs/guide#recommended-app

## Contribute 🤝

If you want to contribute to this library, you're always welcome!
If you want to contribute to this library, you"re always welcome!
See [Contributing Guidelines](https://github.com/Spikeysanju/JetQuotes/blob/master/CONTRIBUTION.md).

## Contact 📩
Expand Down
121 changes: 0 additions & 121 deletions app/build.gradle

This file was deleted.

132 changes: 132 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
/*
*
* *
* * * MIT License
* * *
* * * Copyright (c) 2020 Sanju S
* * *
* * * Permission is hereby granted, free of charge, to any person obtaining a copy
* * * of this software and associated documentation files (the "Software"), to deal
* * * in the Software without restriction, including without limitation the rights
* * * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* * * copies of the Software, and to permit persons to whom the Software is
* * * furnished to do so, subject to the following conditions:
* * *
* * * The above copyright notice and this permission notice shall be included in all
* * * copies or substantial portions of the Software.
* * *
* * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* * * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* * * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* * * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* * * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* * * SOFTWARE.
* *
*
*/

plugins {
id("com.android.application")
id("kotlin-android")
id("kotlin-kapt")
id("dagger.hilt.android.plugin")
kotlin("plugin.serialization") version "1.5.20"
}

android {
compileSdk = 30
buildToolsVersion = "30.0.3"

defaultConfig {
applicationId = "www.spikeysanju.jetquotes"
minSdk = 21
targetSdk = 30
versionCode = 2
versionName = "1.4.0"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
useSupportLibrary = true
}
}

buildTypes {
release {
isMinifyEnabled = false
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
}
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = "11"
}

buildFeatures {
compose = true
}

composeOptions {
kotlinCompilerExtensionVersion = rootProject.extra["compose_version"] as String
}
}

dependencies {

implementation("androidx.core:core-ktx:${rootProject.extra["ktxCoreVersion"]}")
implementation("androidx.appcompat:appcompat:${rootProject.extra["materialVersion"]}")
implementation("com.google.android.material:material:${rootProject.extra["materialVersion"]}")
implementation("androidx.compose.ui:ui:${rootProject.extra["compose_version"]}")
implementation("androidx.compose.material:material:${rootProject.extra["compose_version"]}")
implementation("androidx.compose.ui:ui-tooling:${rootProject.extra["compose_version"]}")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:${rootProject.extra["lifeCycleVersion"]}")
implementation("androidx.activity:activity-compose:${rootProject.extra["composeActivityVersion"]}")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.3")
androidTestImplementation("androidx.test.espresso:espresso-core:${rootProject.extra["expressoVersion"]}")
androidTestImplementation("androidx.compose.ui:ui-test-junit4:${rootProject.extra["compose_version"]}")

//compose navigation
implementation("androidx.navigation:navigation-compose:${rootProject.extra["composeNavigationVersion"]}")
implementation("androidx.hilt:hilt-navigation-compose:${rootProject.extra["hiltComposeNavVersion"]}")

// Preferences DataStore
implementation("androidx.datastore:datastore-preferences:${rootProject.extra["dataStoreVersion"]}")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha07")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.3.1")

// Room
implementation("androidx.room:room-runtime:${rootProject.extra["roomVersion"]}")
kapt("org.xerial:sqlite-jdbc:3.34.0")
kapt("androidx.room:room-compiler:${rootProject.extra["roomVersion"]}")
implementation("androidx.room:room-ktx:${rootProject.extra["roomVersion"]}")

// Coroutines
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${rootProject.extra["coroutinesVersion"]}")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:${rootProject.extra["coroutinesVersion"]}")

// Dagger Hilt
implementation("com.google.dagger:hilt-android:${rootProject.extra["hiltVersion"]}")
kapt("com.google.dagger:hilt-android-compiler:${rootProject.extra["hiltVersion"]}")
implementation("androidx.hilt:hilt-lifecycle-viewmodel:${rootProject.extra["hiltAndroidXVersion"]}")
kapt("androidx.hilt:hilt-compiler:${rootProject.extra["hiltCompilerVersion"]}")
implementation("androidx.hilt:hilt-navigation-compose:${rootProject.extra["hiltComposeVersion"]}")
implementation("androidx.hilt:hilt-common:${rootProject.extra["hiltCompilerVersion"]}")
kapt("com.google.dagger:hilt-compiler:${rootProject.extra["hiltVersion"]}")

// Lottie
implementation("com.airbnb.android:lottie-compose:1.0.0-rc02-1")

// KotlinX Serialization
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:${rootProject.extra["kotlinSerializationVersion"]}")


}
2 changes: 1 addition & 1 deletion app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
# proguardFiles setting in build.gradle.kts.kts.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
Expand Down
Loading

0 comments on commit 5dfc487

Please sign in to comment.