From c96c5e3a6d228ef294c275b9f4bcf2809533ad59 Mon Sep 17 00:00:00 2001
From: hyunho <hyunho0587@gmail.com>
Date: Thu, 14 Jun 2018 22:56:57 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B0=80=EA=B3=84=EB=B6=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 54 ++++++-------------
app/build.gradle | 1 -
app/src/main/AndroidManifest.xml | 6 +--
app/src/main/res/layout/activity_settings.xml | 10 ----
app/src/main/res/values/strings.xml | 2 -
5 files changed, 19 insertions(+), 54 deletions(-)
diff --git a/README.md b/README.md
index c19546b..22ffdb8 100644
--- a/README.md
+++ b/README.md
@@ -18,46 +18,9 @@
* Android Calender
* Airsaid/AccountBook
-* googleAPI
* kotlin
* android
-### 기존 유사 프로젝트
-
-* 기존 안드로이드 달력
-<p> https://github.com/wanasit/google-calendar</p>
-<p> 국가 변경 기능이 추가되어 있지는 않지만 구글 계정 변경을 통해 변경 가능</p>
-<p> 한 계정으로 여러 국가를 설정 할 수 없음</p>
-<p> 여행 시 다른나라 공휴일을 검색 등으로 찾아봐야 하는 번거로움</p>
-
-* 차별성 & 개선 사항
-<p> 국가 변경 기능 </p>
-<p> GPS 사용을 통한 나라 자동 변경 기능 </p>
-<p> 가계부 기능 등 기타 기능 추가</p>
-<p> 모든 기능 한글화 </p>
-<p> 공휴일 한글화 </p>
-
-### View
-
-
-
-
-
-
-
-
-
-
-
-### 사용한 오픈소스 & 개선
-
-* open holiday ics파일
-* 개선한 점 : 한국 여행자 등에게 도움이 될 수 있도록 한국어로 번역
-
-* python - ics parser
-* https://github.com/oblique63/Python-GoogleCalendarParser
-* 기존 파이썬 ics parser -> kotlin ics parser
-
### License
* Apache 2.0 License
@@ -76,5 +39,20 @@
> <p> 3.나라별 공휴일 한글화 완료.</p>
> <p> 4.D-day 기능 구현(예정).</p>
> <p> 5.GPS 국가 자동 변경 기능 완료.</p>
-> <p> 6.가계부 기능 구현 완료.</p>
+> <p> 6.가계부 기능 구현(예정).</p>
+
+### ScreenShot
+
+<p> Basic</p>
+
+
+
+<p> View</p>
+
+
+
+<p> Class</p>
+
+
+
diff --git a/app/build.gradle b/app/build.gradle
index 5e0c260..9b1e2e6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -50,7 +50,6 @@ dependencies {
implementation 'joda-time:joda-time:2.9.9'
implementation 'com.facebook.stetho:stetho:1.5.0'
implementation 'com.android.support:multidex:1.0.3'
- implementation 'com.facebook.android:facebook-login:[4,5)'
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6f4eb07..7149262 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,7 +4,6 @@
package="com.simplemobiletools.calendar"
android:installLocation="auto">
-<<<<<<< HEAD
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -13,7 +12,7 @@
<uses-permission android:name="android.permission.READ_CALENDAR" />
<uses-permission android:name="android.permission.WRITE_CALENDAR" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
-=======
+
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
@@ -23,7 +22,7 @@
<uses-permission android:name="android.permission.READ_CALENDAR"/>
<uses-permission android:name="android.permission.WRITE_CALENDAR"/>
<uses-permission android:name='android.permission.WAKE_LOCK'/>
->>>>>>> 7b1782817b7b7fab67a1303f418a8f278a5c2393
+
<uses-permission
android:name="android.permission.USE_FINGERPRINT"
tools:node="remove" />
@@ -425,6 +424,7 @@
<activity android:name=".debug.AccountActivity" />
<activity android:name=".activities.CountActivity"></activity>
+
</application>
</manifest>
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 54adab6..f26766c 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -164,16 +164,6 @@
android:text="@string/event_reminders"
android:textAllCaps="true"
android:textSize="@dimen/smaller_text_size"/>
- <com.simplemobiletools.commons.views.MyTextView
- android:id="@+id/login_facebook"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="@dimen/bigger_margin"
- android:layout_marginStart="@dimen/bigger_margin"
- android:layout_marginTop="@dimen/activity_margin"
- android:text="@string/event_reminders"
- android:textAllCaps="true"
- android:textSize="@dimen/smaller_text_size"/>
<RelativeLayout
android:id="@+id/settings_gps_holder"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1c80913..53c85cb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string name="facebook_app_id">253715235190653</string>
- <string name="fb_login_protocol_scheme">fb253715235190653</string>
<string name="app_name">심플 캘린더</string>
<string name="app_launcher_name">캘린더</string>
<string name="change_view">보기 변경</string>
--
GitLab