diff --git a/.idea/gradle.xml b/.idea/gradle.xml index e9969a1..7b46144 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -14,7 +14,6 @@ - diff --git a/app/build.gradle b/app/build.gradle index 668ccd8..550889d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,18 +3,19 @@ plugins { } android { - compileSdk 30 + compileSdk 32 defaultConfig { applicationId "com.mahdi.yumnote" - minSdk 21 - targetSdk 30 + minSdk 23 + targetSdk 32 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + //adding--for--binding dataBinding { @@ -33,53 +34,47 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } } dependencies { + //default - implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'com.google.android.material:material:1.3.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' - implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' + implementation 'androidx.appcompat:appcompat:1.5.0' + implementation 'com.google.android.material:material:1.6.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //about viewmodel - implementation 'androidx.activity:activity-ktx:1.2.0-alpha05' - implementation 'androidx.fragment:fragment-ktx:1.3.0-alpha05' - implementation "androidx.lifecycle:lifecycle-viewmodel:2.2.0" - + implementation 'androidx.lifecycle:lifecycle-viewmodel:2.5.1' //retrofit - implementation 'com.squareup.retrofit2:retrofit:2.4.0' - implementation 'com.squareup.retrofit2:adapter-rxjava:2.4.0' - implementation 'com.squareup.retrofit2:converter-gson:2.4.0' - implementation 'com.google.code.gson:gson:2.8.2' - implementation 'com.github.bumptech.glide:glide:4.12.0' + implementation 'com.squareup.retrofit2:retrofit:2.9.0' + implementation 'com.squareup.retrofit2:adapter-rxjava:2.9.0' + implementation 'com.squareup.retrofit2:converter-gson:2.9.0' + implementation 'com.google.code.gson:gson:2.9.0' //rxjava and rxandroid implementation "com.github.akarnokd:rxjava3-retrofit-adapter:3.0.0" implementation 'io.reactivex.rxjava3:rxandroid:3.0.0' - implementation 'io.reactivex.rxjava3:rxjava:3.0.3' + implementation 'io.reactivex.rxjava3:rxjava:3.1.5' //Dagger - implementation 'org.jetbrains:annotations:15.0' - implementation 'com.google.dagger:dagger:2.33' - implementation 'com.google.ar:core:1.23.0' - implementation 'androidx.legacy:legacy-support-v4:1.0.0' - annotationProcessor 'com.google.dagger:dagger-compiler:2.33' + implementation 'com.google.dagger:dagger:2.43.2' + annotationProcessor 'com.google.dagger:dagger-compiler:2.43.2' //daimajia slider , picasso library - implementation "com.android.support:support-v4:+" implementation 'com.squareup.picasso:picasso:2.3.2' implementation 'com.nineoldandroids:library:2.4.0' implementation 'com.daimajia.slider:library:1.1.5@aar' - + implementation 'com.github.bumptech.glide:glide:4.0.0' + annotationProcessor 'com.github.bumptech.glide:compiler:4.13.2' + implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0' //Bottom Navygation implementation 'com.github.felixsoares:BottomNavygation:1.8.6' @@ -90,10 +85,7 @@ dependencies { - - - testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' -} \ No newline at end of file +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7ef46d3..a7b6510 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,7 +2,6 @@ - @@ -10,12 +9,11 @@ - @@ -24,14 +22,11 @@ android:exported="true" android:screenOrientation="portrait" android:windowSoftInputMode="stateHidden|adjustResize" /> - - - - \ No newline at end of file diff --git a/app/src/main/icon-playstore.png b/app/src/main/icon-playstore.png new file mode 100644 index 0000000..a2edc3b Binary files /dev/null and b/app/src/main/icon-playstore.png differ diff --git a/app/src/main/java/com/mahdi/yumnote/di/Modules/mainactivity/ModuleFragment.java b/app/src/main/java/com/mahdi/yumnote/di/Modules/mainactivity/ModuleFragment.java index 5e24127..ab3953b 100644 --- a/app/src/main/java/com/mahdi/yumnote/di/Modules/mainactivity/ModuleFragment.java +++ b/app/src/main/java/com/mahdi/yumnote/di/Modules/mainactivity/ModuleFragment.java @@ -1,11 +1,11 @@ package com.mahdi.yumnote.di.Modules.mainactivity; + import com.mahdi.yumnote.di.other.DefaultFragment; import dagger.Module; import dagger.Provides; - @Module public class ModuleFragment { diff --git a/app/src/main/java/com/mahdi/yumnote/di/Modules/notefragment/ModuleSlider.java b/app/src/main/java/com/mahdi/yumnote/di/Modules/notefragment/ModuleSlider.java index 1a9bc69..429bae6 100644 --- a/app/src/main/java/com/mahdi/yumnote/di/Modules/notefragment/ModuleSlider.java +++ b/app/src/main/java/com/mahdi/yumnote/di/Modules/notefragment/ModuleSlider.java @@ -5,7 +5,6 @@ import dagger.Module; import dagger.Provides; - @Module public class ModuleSlider { diff --git a/app/src/main/java/com/mahdi/yumnote/di/Modules/profilefragment/ModuleImageUploadRx.java b/app/src/main/java/com/mahdi/yumnote/di/Modules/profilefragment/ModuleImageUploadRx.java index 3d95e53..0d2ac0a 100644 --- a/app/src/main/java/com/mahdi/yumnote/di/Modules/profilefragment/ModuleImageUploadRx.java +++ b/app/src/main/java/com/mahdi/yumnote/di/Modules/profilefragment/ModuleImageUploadRx.java @@ -19,5 +19,4 @@ public ImageUploadRx getShowValueRx() } - } diff --git a/app/src/main/java/com/mahdi/yumnote/di/component/AppComponent.java b/app/src/main/java/com/mahdi/yumnote/di/component/AppComponent.java index 4839c69..0ae0875 100644 --- a/app/src/main/java/com/mahdi/yumnote/di/component/AppComponent.java +++ b/app/src/main/java/com/mahdi/yumnote/di/component/AppComponent.java @@ -1,12 +1,12 @@ package com.mahdi.yumnote.di.component; -import com.mahdi.yumnote.di.other.DefaultFragment; import com.mahdi.yumnote.other.SliderView.Slider; import com.mahdi.yumnote.other.bottomnavigation.BottomNavigation; import com.mahdi.yumnote.rx.main.fragments.note.JsonDisplayRx; import com.mahdi.yumnote.rx.main.fragments.profile.ImageUploadRx; import com.mahdi.yumnote.rx.main.fragments.profile.ShowValueRx; +import com.mahdi.yumnote.di.other.DefaultFragment; import dagger.Component; diff --git a/app/src/main/java/com/mahdi/yumnote/di/other/DefaultFragment.java b/app/src/main/java/com/mahdi/yumnote/di/other/DefaultFragment.java index dc70871..b11bd6f 100644 --- a/app/src/main/java/com/mahdi/yumnote/di/other/DefaultFragment.java +++ b/app/src/main/java/com/mahdi/yumnote/di/other/DefaultFragment.java @@ -10,7 +10,6 @@ - public class DefaultFragment { @Inject diff --git a/app/src/main/java/com/mahdi/yumnote/other/SliderView/CustomSliderView.java b/app/src/main/java/com/mahdi/yumnote/other/SliderView/CustomSliderView.java index 3aa5eb0..7ebd04d 100644 --- a/app/src/main/java/com/mahdi/yumnote/other/SliderView/CustomSliderView.java +++ b/app/src/main/java/com/mahdi/yumnote/other/SliderView/CustomSliderView.java @@ -8,7 +8,6 @@ import android.widget.ImageView; import android.widget.LinearLayout; import com.daimajia.slider.library.SliderTypes.BaseSliderView; -import com.mahdi.yumnote.R; @@ -21,9 +20,9 @@ public CustomSliderView(Context context) { public View getView() { - View view = LayoutInflater.from(this.getContext()).inflate(R.layout.render_type_text, null); - ImageView target = view.findViewById(R.id.daimajia_slider_image); - LinearLayout frame = view.findViewById(R.id.description_layout); + View view = LayoutInflater.from(this.getContext()).inflate(com.daimajia.slider.library.R.layout.render_type_text, null); + ImageView target = view.findViewById(com.daimajia.slider.library.R.id.daimajia_slider_image); + LinearLayout frame = view.findViewById(com.daimajia.slider.library.R.id.description_layout); frame.setBackgroundColor(Color.TRANSPARENT); this.bindEventAndShow(view, target); diff --git a/app/src/main/java/com/mahdi/yumnote/rx/main/fragments/note/JsonDisplayRx.java b/app/src/main/java/com/mahdi/yumnote/rx/main/fragments/note/JsonDisplayRx.java index d8ad027..db75ca8 100644 --- a/app/src/main/java/com/mahdi/yumnote/rx/main/fragments/note/JsonDisplayRx.java +++ b/app/src/main/java/com/mahdi/yumnote/rx/main/fragments/note/JsonDisplayRx.java @@ -40,10 +40,6 @@ public JsonDisplayRx() { } - public JsonDisplayRx(View view) { - this.view = view; - } - public void jsoning(View view) { ApiServices2 api = JsonClient.getApiServices(); @@ -65,7 +61,7 @@ public void onNext(@NonNull List list) { recyclerView.setAdapter(adabter); - Clicking(); + Clicking(view); } @Override @@ -84,7 +80,7 @@ public void onComplete() { - public void Clicking() + public void Clicking(View vc) { adabter.setOnItemClickListener(new CustomAdabter.ClickListener() { @Override @@ -92,21 +88,21 @@ public void onItemClick(int position, View v) { switch (position) { case 0: - view.getContext().startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse("https://login.wordpress.org"))); + vc.getContext().startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse("https://login.wordpress.org"))); break; case 1: - view.getContext().startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse("https://www.codechef.com"))); + vc.getContext().startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse("https://www.codechef.com"))); break; case 2: - view.getContext().startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse("https://www.base64encode.org"))); + vc.getContext().startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse("https://www.base64encode.org"))); break; case 3: - view.getContext().startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse("https://developer.android.com"))); + vc.getContext().startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse("https://developer.android.com"))); break; case 4: - view.getContext().startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse("https://stackoverflow.com"))); + vc.getContext().startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse("https://stackoverflow.com"))); break; } diff --git a/app/src/main/java/com/mahdi/yumnote/rx/main/fragments/profile/ShowValueRx.java b/app/src/main/java/com/mahdi/yumnote/rx/main/fragments/profile/ShowValueRx.java index 56d12d2..d7fa3c4 100644 --- a/app/src/main/java/com/mahdi/yumnote/rx/main/fragments/profile/ShowValueRx.java +++ b/app/src/main/java/com/mahdi/yumnote/rx/main/fragments/profile/ShowValueRx.java @@ -8,9 +8,7 @@ import com.mahdi.yumnote.model.retrofit.api1.ProfileServer; import com.mahdi.yumnote.networking.retrofit.api.ApiServices1; import com.mahdi.yumnote.networking.retrofit.client.RetrofitClient; - import javax.inject.Inject; - import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; import io.reactivex.rxjava3.annotations.NonNull; import io.reactivex.rxjava3.core.Observable; diff --git a/app/src/main/java/com/mahdi/yumnote/ui/login/LoginActivity.java b/app/src/main/java/com/mahdi/yumnote/ui/login/LoginActivity.java index bf5ef75..a71749b 100644 --- a/app/src/main/java/com/mahdi/yumnote/ui/login/LoginActivity.java +++ b/app/src/main/java/com/mahdi/yumnote/ui/login/LoginActivity.java @@ -1,5 +1,6 @@ package com.mahdi.yumnote.ui.login; + import android.content.Intent; import android.os.Bundle; import android.view.View; diff --git a/app/src/main/java/com/mahdi/yumnote/ui/login/LoginViewmodel.java b/app/src/main/java/com/mahdi/yumnote/ui/login/LoginViewmodel.java index 8e604fd..891b252 100644 --- a/app/src/main/java/com/mahdi/yumnote/ui/login/LoginViewmodel.java +++ b/app/src/main/java/com/mahdi/yumnote/ui/login/LoginViewmodel.java @@ -1,6 +1,6 @@ package com.mahdi.yumnote.ui.login; -import android.content.Context; + import android.text.method.HideReturnsTransformationMethod; import android.text.method.PasswordTransformationMethod; import android.view.View; diff --git a/app/src/main/res/layout/activity_ha.xml b/app/src/main/res/layout/activity_ha.xml new file mode 100644 index 0000000..3a2968b --- /dev/null +++ b/app/src/main/res/layout/activity_ha.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/icon.xml b/app/src/main/res/mipmap-anydpi-v26/icon.xml new file mode 100644 index 0000000..ff91dec --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/icon.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/icon.png b/app/src/main/res/mipmap-hdpi/icon.png new file mode 100644 index 0000000..559cd34 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/icon.png differ diff --git a/app/src/main/res/mipmap-hdpi/icon_foreground.png b/app/src/main/res/mipmap-hdpi/icon_foreground.png new file mode 100644 index 0000000..2621ce9 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/icon_foreground.png differ diff --git a/app/src/main/res/mipmap-mdpi/icon.png b/app/src/main/res/mipmap-mdpi/icon.png new file mode 100644 index 0000000..f1a5795 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/icon.png differ diff --git a/app/src/main/res/mipmap-mdpi/icon_foreground.png b/app/src/main/res/mipmap-mdpi/icon_foreground.png new file mode 100644 index 0000000..424f762 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/icon_foreground.png differ diff --git a/app/src/main/res/mipmap-xhdpi/icon.png b/app/src/main/res/mipmap-xhdpi/icon.png new file mode 100644 index 0000000..480f571 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/icon.png differ diff --git a/app/src/main/res/mipmap-xhdpi/icon_foreground.png b/app/src/main/res/mipmap-xhdpi/icon_foreground.png new file mode 100644 index 0000000..9cf35db Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/icon_foreground.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon.png b/app/src/main/res/mipmap-xxhdpi/icon.png new file mode 100644 index 0000000..ba88381 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/icon.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_foreground.png b/app/src/main/res/mipmap-xxhdpi/icon_foreground.png new file mode 100644 index 0000000..164697a Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/icon_foreground.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/icon.png b/app/src/main/res/mipmap-xxxhdpi/icon.png new file mode 100644 index 0000000..70f5164 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/icon.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/icon_foreground.png b/app/src/main/res/mipmap-xxxhdpi/icon_foreground.png new file mode 100644 index 0000000..749b94e Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/icon_foreground.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/icon_round.png b/app/src/main/res/mipmap-xxxhdpi/icon_round.png new file mode 100644 index 0000000..bc4ac51 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/icon_round.png differ diff --git a/app/src/main/res/values/foreground.xml b/app/src/main/res/values/foreground.xml new file mode 100644 index 0000000..a26b9e5 --- /dev/null +++ b/app/src/main/res/values/foreground.xml @@ -0,0 +1,4 @@ + + + #F0F1CB + \ No newline at end of file diff --git a/build.gradle b/build.gradle index a149415..a550ce3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,23 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath "com.android.tools.build:gradle:7.0.0" - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } -} - -allprojects { - repositories { - maven { url 'https://jitpack.io' } - maven { url "https://oss.jfrog.org/libs-snapshot" } - google() - mavenCentral() - } +plugins { + id 'com.android.application' version '7.2.1' apply false + id 'com.android.library' version '7.2.1' apply false } task clean(type: Delete) { diff --git a/gradle.properties b/gradle.properties index 52f5917..a5134b1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,19 +1,17 @@ -# Project-wide Gradle settings. -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. -# For more details on how to configure your build environment visit +## For more details on how to configure your build environment visit # http://www.gradle.org/docs/current/userguide/build_environment.html +# # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +# Default value: -Xmx1024m -XX:MaxPermSize=256m +# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +# # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true -# AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app"s APK -# https://developer.android.com/topic/libraries/support-library/androidx-rn +#Mon Aug 15 20:18:46 IRDT 2022 +android.nonTransitiveRClass=true +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding\=UTF-8 android.useAndroidX=true -# Automatically convert third-party libraries to use AndroidX -android.enableJetifier=true \ No newline at end of file +android.enableJetifier=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0c11292..6a9adab 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Sep 04 19:51:01 IRDT 2021 +#Mon Aug 15 20:00:41 IRDT 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index b20ef9e..61e6e92 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,20 @@ - +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + jcenter() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + jcenter() + maven { url 'https://jitpack.io' } + maven { url "https://oss.jfrog.org/libs-snapshot" } + } +} rootProject.name = "YumNote" include ':app'