Skip to content

Commit f09d484

Browse files
msnodevemsnodeve
committed
develop merge
2 parents 4d37a5b + 5eaaf3e commit f09d484

117 files changed

Lines changed: 1616 additions & 438 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.idea/modules.xml‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/navEditor.xml‎

Lines changed: 83 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/render.experimental.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Makefile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@ set_env:
33
echo "GITHUB_CLIENT_SECRET=\"client_secret\"" >> app/gradle.properties
44
echo "REDIRECT_CALLBACK_URL=\"gfd://github.for.developer\"" >> app/gradle.properties
55
echo "PREFERENCES_FILE=\"file_name\"" >> app/gradle.properties
6-
echo "PREFERENCES_TOKEN_KEY=\"token_key\"" >> app/gradle.properties
6+
echo "PREFERENCES_TOKEN_KEY=\"token_key\"" >> app/gradle.properties
7+
echo "BASIC_AUTH_KEY=\"basic_auth_key\"" >> app/gradle.properties
8+
echo "GFD_API_URL=\"gfd_api_url\"" >> app/gradle.properties

‎README.md‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,22 @@
66
***
77

88
# Release
9-
v0.6.2 릴리즈 [Google Play Store](https://play.google.com/store/apps/details?id=com.seok.gitfordeveloper)
9+
10+
v1.10.3 릴리즈 [Google Paly Store](https://play.google.com/store/apps/details?id=com.seok.gitfordeveloper)
1011

1112
# Preview
1213

13-
<img src="./img/preview01.jpeg" width="40%" height="40%">
14+
<img src="./img/preview01.png" width="40%" height="40%">
15+
<img src="./img/preview02.png" width="40%" height="40%">
1416

1517

1618
# Notice
1719

18-
v0.6.2 릴리즈 작업 완료
20+
v1.6.2 릴리즈 작업 완료
1921
- Backend 작업
2022
- UX/UI 개선 작업
2123
- 자동 로그인 구현
2224

23-
유저들과 서로 소통할 수 있기 위한 Backend 작업 중
25+
v1.10.3 릴리즈 작업 완료
26+
- 금일 커밋 랭킹 서비스 구축
27+
- 프로필, 랭킹 프래그먼트로 분리

‎app/build.gradle‎

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,25 @@ apply plugin: 'kotlin-kapt'
1414
android {
1515
compileSdkVersion 28
1616
defaultConfig {
17-
applicationId "com.seok.gitfordeveloper"
17+
applicationId "com.seok.gfd"
1818
minSdkVersion 21
1919
targetSdkVersion 28
20-
versionCode 4
21-
versionName "0.6.2"
20+
versionCode 5
21+
versionName "1.10.3"
2222
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2323
}
2424
buildTypes {
2525
release {
2626
minifyEnabled false
2727
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
2828
testCoverageEnabled false
29-
// buildConfigField "String", "GITHUB_CLIENT_ID", GITHUB_CLIENT_ID
30-
// buildConfigField "String", "GITHUB_CLIENT_SECRET", GITHUB_CLIENT_SECRET
31-
// buildConfigField "String", "REDIRECT_CALLBACK_URL", REDIRECT_CALLBACK_URL
32-
// buildConfigField "String", "PREFERENCES_FILE", PREFERENCES_FILE
33-
// buildConfigField "String", "PREFERENCES_TOKEN_KEY", PREFERENCES_TOKEN_KEY
29+
buildConfigField "String", "GITHUB_CLIENT_ID", GITHUB_CLIENT_ID
30+
buildConfigField "String", "GITHUB_CLIENT_SECRET", GITHUB_CLIENT_SECRET
31+
buildConfigField "String", "REDIRECT_CALLBACK_URL", REDIRECT_CALLBACK_URL
32+
buildConfigField "String", "PREFERENCES_FILE", PREFERENCES_FILE
33+
buildConfigField "String", "PREFERENCES_TOKEN_KEY", PREFERENCES_TOKEN_KEY
34+
buildConfigField "String", "BASIC_AUTH_KEY", BASIC_AUTH_KEY
35+
buildConfigField "String", "GFD_API_URL", GFD_API_URL
3436
}
3537
debug {
3638
testCoverageEnabled true
@@ -39,6 +41,8 @@ android {
3941
buildConfigField "String", "REDIRECT_CALLBACK_URL", REDIRECT_CALLBACK_URL
4042
buildConfigField "String", "PREFERENCES_FILE", PREFERENCES_FILE
4143
buildConfigField "String", "PREFERENCES_TOKEN_KEY", PREFERENCES_TOKEN_KEY
44+
buildConfigField "String", "BASIC_AUTH_KEY", BASIC_AUTH_KEY
45+
buildConfigField "String", "GFD_API_URL", GFD_API_URL
4246
}
4347
}
4448
compileOptions {
@@ -66,16 +70,19 @@ jacocoAndroidUnitTestReport {
6670
dependencies {
6771
implementation fileTree(dir: 'libs', include: ['*.jar'])
6872
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
69-
implementation 'androidx.appcompat:appcompat:1.0.2'
73+
implementation 'androidx.appcompat:appcompat:1.1.0'
7074
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
75+
implementation 'com.android.support:design:28.0.0'
76+
implementation "androidx.recyclerview:recyclerview:1.0.0"
7177

7278
// test implementation
79+
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
7380
testImplementation 'junit:junit:4.12'
7481
testImplementation 'org.robolectric:robolectric:4.3'
7582
testImplementation 'org.powermock:powermock-api-mockito:1.4.12'
7683
testImplementation 'org.powermock:powermock-module-junit4:1.6.2'
7784
testImplementation 'org.mockito:mockito-core:2.28.2'
78-
testImplementation 'androidx.arch.core:core-testing:2.0.1'
85+
testImplementation 'androidx.arch.core:core-testing:2.1.0'
7986
androidTestImplementation 'androidx.test:runner:1.2.0'
8087
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
8188
androidTestImplementation 'androidx.test:runner:1.2.0'
@@ -89,7 +96,7 @@ dependencies {
8996
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.2.0'
9097

9198
// Google Ads
92-
implementation 'com.google.android.gms:play-services-ads:18.1.1'
99+
implementation 'com.google.android.gms:play-services-ads:18.2.0'
93100

94101
// OkHttp && logger
95102
implementation 'com.squareup.okhttp3:okhttp:3.12.0'
@@ -101,14 +108,14 @@ dependencies {
101108
implementation 'com.google.code.gson:gson:2.8.5'
102109

103110
// room
104-
implementation 'androidx.room:room-runtime:2.1.0'
105-
kapt 'androidx.room:room-compiler:2.1.0'
106-
kaptTest 'androidx.room:room-testing:2.1.0'
111+
implementation 'androidx.room:room-runtime:2.2.0'
112+
kapt 'androidx.room:room-compiler:2.2.0'
113+
kaptTest 'androidx.room:room-testing:2.2.0'
107114

108115
// Lifecycle components
109-
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
116+
implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
110117
implementation 'android.arch.lifecycle:viewmodel:1.1.1'
111-
annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.0.0'
118+
annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.1.0'
112119

113120
// Coroutines
114121
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutine_version"
@@ -118,15 +125,19 @@ dependencies {
118125
implementation 'com.github.bumptech.glide:glide:4.9.0'
119126
kapt 'com.github.bumptech.glide:compiler:4.9.0'
120127

121-
//jsoup, anko
128+
// jsoup, anko
122129
implementation 'org.jsoup:jsoup:1.11.3'
123130
implementation "org.jetbrains.anko:anko:$rootProject.anko_version"
124131
implementation 'androidx.gridlayout:gridlayout:1.0.0'
125132

126-
//lombok
133+
// lombok
127134
compileOnly 'org.projectlombok:lombok:1.18.8'
128135
annotationProcessor 'org.projectlombok:lombok:1.18.8'
129136

130-
//ProgressBar
137+
// ProgressBar
131138
implementation 'com.wang.avi:library:2.1.3'
139+
140+
// NavigationBar
141+
implementation 'androidx.navigation:navigation-fragment-ktx:2.1.0'
142+
implementation 'androidx.navigation:navigation-ui-ktx:2.1.0'
132143
}

‎app/release/output.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":4,"versionName":"0.6.2","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
1+
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":5,"versionName":"1.10.3","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

app/src/androidTest/java/com/seok/gitfordeveloper/ExampleInstrumentedTest.kt renamed to app/src/androidTest/java/com/seok/gfd/ExampleInstrumentedTest.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
package com.seok.gitfordeveloper
1+
package com.seok.gfd
22

3-
import androidx.test.platform.app.InstrumentationRegistry
43
import androidx.test.ext.junit.runners.AndroidJUnit4
54

65
import org.junit.Test
76
import org.junit.runner.RunWith
87

9-
import org.junit.Assert.*
10-
118
/**
129
* Instrumented test, which will execute on an Android device.
1310
*

app/src/androidTest/java/com/seok/gitfordeveloper/GithubRetrofitTest.kt renamed to app/src/androidTest/java/com/seok/gfd/GithubRetrofitTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.seok.gitfordeveloper
1+
package com.seok.gfd
22

33
import androidx.test.ext.junit.runners.AndroidJUnit4
4-
import com.seok.gitfordeveloper.retrofit.service.UserService
4+
import com.seok.gfd.retrofit.service.UserService
55
import org.junit.Before
66
import org.junit.Test
77
import org.junit.runner.RunWith

‎app/src/main/AndroidManifest.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
4-
package="com.seok.gitfordeveloper">
4+
package="com.seok.gfd">
55

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

88
<application
99
android:allowBackup="true"
1010
android:fullBackupContent="@xml/backup_descriptor"
11-
android:icon="@mipmap/ic_launcher_gfd"
11+
android:icon="@drawable/gfd_logo_foreground"
1212
android:label="@string/app_name"
13-
android:roundIcon="@mipmap/ic_launcher_gfd_round"
1413
android:supportsRtl="true"
1514
android:theme="@style/AppTheme"
15+
android:networkSecurityConfig="@xml/network_security_config"
1616
tools:ignore="GoogleAppIndexingWarning">
1717

1818
<meta-data
1919
android:name="com.google.android.gms.ads.APPLICATION_ID"
2020
android:value="@string/admob_app_id"/>
2121

2222
<activity
23-
android:name=".views.LoginActivity"
23+
android:name="com.seok.gfd.views.LoginActivity"
2424
android:launchMode="singleTask">
2525
<intent-filter>
2626
<action android:name="android.intent.action.VIEW" />
@@ -31,14 +31,14 @@
3131
<data android:scheme="gfd" />
3232
</intent-filter>
3333
</activity>
34-
<activity android:name=".views.LauncherActivity">
34+
<activity android:name="com.seok.gfd.views.LauncherActivity">
3535
<intent-filter>
3636
<action android:name="android.intent.action.MAIN" />
3737

3838
<category android:name="android.intent.category.LAUNCHER" />
3939
</intent-filter>
4040
</activity>
41-
<activity android:name=".views.MainActivity" />
41+
<activity android:name="com.seok.gfd.views.MainActivity" />
4242
</application>
4343

4444
</manifest>

0 commit comments

Comments
 (0)