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

chore: remove old dependency and make app runnable #96

Merged
merged 4 commits into from
May 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions .github/workflows/label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@ on:
- pull_request_target

jobs:
triage:
Labeler:
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@main
- uses: actions/labeler@v5
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
4 changes: 2 additions & 2 deletions .github/workflows/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v3
with:
java-version: 11
java-version: 17
distribution: temurin

- name: Set up Android SDK
uses: android-actions/setup-android@v2
with:
android-sdk-version: 29
android-sdk-version: 34

- name: make gradlew executable
run: chmod +x gradlew
Expand Down
74 changes: 38 additions & 36 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
import io.gitlab.arturbosch.detekt.Detekt

apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'
apply plugin: "io.gitlab.arturbosch.detekt"

apply plugin: 'kotlin-parcelize'

android {

compileSdkVersion 29
compileSdk 34

defaultConfig {
applicationId "education.mahmoud.quranyapp"
minSdkVersion 21
targetSdkVersion 29
versionCode 30
versionName "3.0.0"
targetSdkVersion 34
versionCode 31
versionName "3.0.1"
multiDexEnabled true
// testInstrumentationRumannner "android.support.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
}

buildTypes {
release {
minifyEnabled true
Expand All @@ -27,55 +28,56 @@ android {
}
sourceSets { main { assets.srcDirs = ['src/main/assets', 'src/main/assets/'] } }
compileOptions {
sourceCompatibility = '1.8'
targetCompatibility = '1.8'
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_17
}
testOptions {
unitTests.returnDefaultValues = true
}
dataBinding {
enabled = true

buildFeatures{
viewBinding = true
dataBinding = true
}
namespace 'education.mahmoud.quranyapp'
}

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')

testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.4.0-beta02'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0-beta02'


// kotlin
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test:runner:1.5.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'


def support_version = '1.3.0'
def support_version = '1.6.1'
implementation "androidx.appcompat:appcompat:$support_version"
implementation "com.google.android.material:material:$support_version"
def material_version = '1.12.0'
implementation "com.google.android.material:material:$material_version"


implementation 'androidx.core:core-ktx:1.5.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'androidx.core:core-ktx:1.13.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'

implementation 'com.android.support:multidex:1.0.3'

implementation 'com.jakewharton:butterknife:10.1.0'
annotationProcessor "com.jakewharton:butterknife-compiler:10.1.0"
// implementation "com.balsikandar.android:crashreporter:1.0.9"

implementation 'com.google.code.gson:gson:2.8.5'
implementation 'com.google.code.gson:gson:2.10.1'

implementation 'com.intuit.sdp:sdp-android:1.0.6'
implementation 'com.intuit.ssp:ssp-android:1.0.6'

implementation files('libs/AppRate_1.1.jar')

// Room
implementation 'androidx.room:room-runtime:2.3.0'
kapt 'androidx.room:room-compiler:2.3.0'
implementation 'androidx.room:room-rxjava2:2.3.0'
implementation 'androidx.room:room-runtime:2.6.1'
kapt 'androidx.room:room-compiler:2.6.1'
implementation 'androidx.room:room-rxjava2:2.6.1'


implementation 'pub.devrel:easypermissions:1.1.1'
Expand All @@ -85,17 +87,17 @@ dependencies {

implementation "com.github.ybq:Android-SpinKit:1.2.0"

implementation 'com.squareup.retrofit2:retrofit:2.7.2'
implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'

implementation 'androidx.annotation:annotation:1.0.2'
implementation 'androidx.annotation:annotation:1.7.1'

implementation 'com.jpardogo.materialtabstrip:library:1.0.6'

implementation 'com.flipboard:bottomsheet-core:1.5.3'
implementation 'com.flipboard:bottomsheet-commons:1.5.3'

implementation 'org.greenrobot:eventbus:3.1.1'
implementation 'org.greenrobot:eventbus:3.3.1'


//rx
Expand All @@ -122,18 +124,18 @@ dependencies {

detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:1.18.1"


implementation 'com.github.Zhuinden:fragmentviewbindingdelegate-kt:1.0.0'
}

apply plugin: "org.jlleitschuh.gradle.ktlint"

task detektFormat(type: io.gitlab.arturbosch.detekt.Detekt) {
tasks.register('detektFormat', Detekt) {
description = "Runs autocorrect enabled detekt build."
source = files("src/main/java")
config.from(files("$rootDir/Scripts/detekt-config.yml"))
autoCorrect = true
reports {
html{
html {
enabled = true
destination = file("build/reports/detekt-formatted.html")
}
Expand Down
7 changes: 4 additions & 3 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="education.mahmoud.quranyapp">
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
Expand All @@ -21,6 +20,7 @@
tools:ignore="UnusedAttribute"
tools:replace="allowBackup">
<activity
android:exported="false"
android:name=".feature.listening_activity.ListenActivity"
android:screenOrientation="landscape"/>

Expand Down Expand Up @@ -52,6 +52,7 @@
<activity
android:name=".feature.home_Activity.HomeActivity"
android:label="@string/app_name"
android:exported="true"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down Expand Up @@ -82,7 +83,7 @@
android:exported="true"
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="adjustPan" />
<activity android:name=".feature.setting.SettingActivity" />
<activity android:name=".feature.setting.SettingActivity" android:exported="false" />
<activity
android:name=".feature.ayahs_search.ShowSearchResults"
android:exported="true"
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package education.mahmoud.quranyapp.datalayer.local

import androidx.room.Entity
import androidx.room.Ignore
import androidx.room.PrimaryKey

@Entity(tableName = "ayahs")
class AyahItem {
@PrimaryKey
var ayahIndex: Int
var surahIndex: Int
var ayahInSurahIndex: Int
var text: String
var textClean: String
var audioPath: String? = null

constructor(
ayahIndex: Int,
surahIndex: Int,
ayahInSurahIndex: Int,
text: String,
textClean: String,
audioPath: String?
) {
this.ayahIndex = ayahIndex
this.surahIndex = surahIndex
this.ayahInSurahIndex = ayahInSurahIndex
this.text = text
this.textClean = textClean
this.audioPath = audioPath
}

@Ignore
constructor(
ayahIndex: Int,
surahIndex: Int,
ayahInSurahIndex: Int,
text: String,
textClean: String
) {
this.ayahIndex = ayahIndex
this.surahIndex = surahIndex
this.ayahInSurahIndex = ayahInSurahIndex
this.text = text
this.textClean = textClean
}
}
Loading
Loading