Merge branch 'master' of gitea.com:mmarif/GitNex

# Conflicts: # app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java # app/src/main/java/org/mian/gitnex/activities/MainActivity.java # app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java # app/src/main/java/org/mian/gitnex/adapters/CollaboratorsAdapter.java # app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java # app/src/main/java/org/mian/gitnex/adapters/MembersByOrgAdapter.java # app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java # app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java # app/src/main/java/org/mian/gitnex/adapters/ProfileFollowersAdapter.java # app/src/main/java/org/mian/gitnex/adapters/ProfileFollowingAdapter.java # app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java # app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java # app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java # app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java # app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java # app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java # app/src/main/java/org/mian/gitnex/fragments/ProfileFragment.java # app/src/main/res/layout/activity_issue_detail.xml # app/src/main/res/layout/admin_users_list.xml # app/src/main/res/layout/fragment_profile.xml # app/src/main/res/layout/issue_comments.xml # app/src/main/res/layout/my_repos_list.xml # app/src/main/res/layout/nav_header.xml # app/src/main/res/layout/organizations_list.xml # app/src/main/res/layout/profile_followers_list.xml # app/src/main/res/layout/profile_following_list.xml # app/src/main/res/layout/repos_list.xml # app/src/main/res/layout/repositories_by_org_list.xml # app/src/main/res/layout/starred_repos_list.xml
2019-10-01 10:14:45 +05:00
parent 5f402c2c60 85140fbee0
commit 62a5452437
403 changed files with 0 additions and 28060 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,71 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion 28
-    defaultConfig {
-        applicationId "org.mian.gitnex"
-        minSdkVersion 21
-        targetSdkVersion 28
-        versionCode 55
-        versionName "2.0.0"
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-    lintOptions {
-        //checkReleaseBuilds false
-        abortOnError false
-    }
-}
-
-dependencies {
-    def lifecycle_version = "2.2.0-alpha05"
-    final def  markwon_version =  "4.1.1"
-
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.google.android.material:material:1.1.0-alpha10'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    implementation 'com.github.vihtarb:tooltip:0.2.0'
-    implementation 'com.squareup.okhttp3:okhttp:3.12.1'
-    implementation 'com.google.code.gson:gson:2.8.5'
-    implementation 'com.squareup.picasso:picasso:2.71828'
-    implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
-    implementation 'com.squareup.retrofit2:retrofit:2.5.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
-    implementation 'com.squareup.retrofit2:converter-scalars:2.5.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.12.1'
-    implementation 'org.ocpsoft.prettytime:prettytime:4.0.1.Final'
-    implementation "com.vdurmont:emoji-java:4.0.0"
-    implementation "com.pes.materialcolorpicker:library:1.2.5"
-
-    implementation "io.noties.markwon:core:$markwon_version"
-    implementation "io.noties.markwon:ext-latex:$markwon_version"
-    implementation "io.noties.markwon:ext-strikethrough:$markwon_version"
-    implementation "io.noties.markwon:ext-tables:$markwon_version"
-    implementation "io.noties.markwon:ext-tasklist:$markwon_version"
-    implementation "io.noties.markwon:html:$markwon_version"
-    implementation "io.noties.markwon:image:$markwon_version"
-    implementation "io.noties.markwon:image-picasso:$markwon_version"
-    implementation "io.noties.markwon:linkify:$markwon_version"
-    implementation "io.noties.markwon:recycler:$markwon_version"
-    implementation "io.noties.markwon:recycler-table:$markwon_version"
-    implementation "io.noties.markwon:simple-ext:$markwon_version"
-    implementation "io.noties.markwon:syntax-highlight:$markwon_version"
-    implementation "com.caverock:androidsvg:1.4"
-    implementation "pl.droidsonroids.gif:android-gif-drawable:1.2.14"
-
-    implementation "com.hendraanggrian.appcompat:socialview:0.2"
-    implementation "com.hendraanggrian.appcompat:socialview-commons:0.2"
-
-    implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
-}