Merge branch 'tempmaster'

app/build.gradle

@@ -26,10 +26,17 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:26.1.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     testImplementation 'junit:junit:4.12'
+<<<<<<< HEAD
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     implementation 'com.google.firebase:firebase-core:16.0.8'
     implementation 'com.google.firebase:firebase-database:16.1.0'
+=======
+    androidTestImplementation 'com.android.support.test:runner:1.0.1'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    implementation 'com.google.firebase:firebase-core:11.8.0'
+    implementation 'com.google.firebase:firebase-database:11.8.0'
+>>>>>>> tempmaster
     implementation 'com.android.support:cardview-v7:26.1.0'
     implementation 'com.squareup.okhttp:okhttp:2.7.2'
     implementation 'com.google.firebase:firebase-ads:11.8.0'

app/src/main/java/com/leejoonhee/hangulclockforandroid/MainActivity.java

@@ -1,20 +1,25 @@
 package com.leejoonhee.hangulclockforandroid;
 
 import android.app.Activity;
+<<<<<<< HEAD
 import android.content.Context;
 import android.content.DialogInterface;
+=======
+>>>>>>> tempmaster
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
+<<<<<<< HEAD
 import android.os.PowerManager;
 import android.provider.Settings;
 import android.support.v7.app.AlertDialog;
+=======
+>>>>>>> tempmaster
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.google.android.gms.ads.AdSize;
 import com.google.android.gms.ads.AdView;
@@ -78,6 +83,7 @@ protected void onCreate(Bundle savedInstanceState){
         setContentView(R.layout.activity_main);
 
         sentence = findViewById(R.id.sentence);
+<<<<<<< HEAD
 
 		sets = getSharedPreferences("usersets", Activity.MODE_PRIVATE); //MainActivity가 꺼져도 NewAppWidget에서 값을 받아 올 수 있도록 SharedPreference를 사용하였습니다
 		sentence.setText(sets.getString("title", "설정이 필요합니다"));
@@ -131,6 +137,34 @@ public void onClick(DialogInterface dialog, int which) {
 					.create()
 					.show();
 		}
+=======
+
+		sets = getSharedPreferences("usersets", Activity.MODE_PRIVATE); //MainActivity가 꺼져도 NewAppWidget에서 값을 받아 올 수 있도록 SharedPreference를 사용하였습니다
+		sentence.setText(sets.getString("title", "설정이 필요합니다"));
+
+		String str = sets.getString("title", "설정이필요합니다");
+
+		weathersaved = sets.getString("weatherurl", "날씨 설정이 필요합니다");
+
+		txtText = (TextView)findViewById(R.id.txtText);
+
+		new ReceiveShortWeather().execute();
+
+		if(str.equals("**weather**")){
+			sentence.setText(data);
+		}
+
+		weathertext = (TextView)findViewById(R.id.weather);
+
+		mversion = (TextView)findViewById(R.id.version);
+		mdownloads = (TextView)findViewById(R.id.download);
+
+		mAdView = (AdView) findViewById(R.id.adView);
+
+		AdView adView = new AdView(this);
+		adView.setAdSize(AdSize.BANNER);
+		adView.setAdUnitId("ca-app-pub-8081631582008293/5576438546");
+>>>>>>> tempmaster
 		/*
 			Intent intent = new Intent(this, PopupActivity.class);
 			startActivity(intent);

build.gradle

@@ -10,8 +10,13 @@ buildscript {
         }
     }
     dependencies {
+<<<<<<< HEAD
         classpath 'com.android.tools.build:gradle:3.4.1'
         classpath 'com.google.gms:google-services:4.0.1'
+=======
+        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.google.gms:google-services:3.1.0'
+>>>>>>> tempmaster
 
 
         // NOTE: Do not place your application dependencies here; they belong