diff --git a/.gitignore b/.gitignore
index 39fb081..d8a92a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@
/build
/captures
.externalNativeBuild
+
+.idea/
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
deleted file mode 100644
index 6b5935d..0000000
Binary files a/.idea/caches/build_file_checksums.ser and /dev/null differ
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
deleted file mode 100644
index cc4ee1c..0000000
Binary files a/.idea/caches/gradle_models.ser and /dev/null differ
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 15a15b2..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index f43d428..0000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 99202cc..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 1ece83b..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 7a9ba52..4e28692 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,14 +1,14 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 26
+ compileSdkVersion 28
defaultConfig {
applicationId "com.leejoonhee.hangulclockforandroid"
minSdkVersion 19
- targetSdkVersion 26
- versionCode 15
- versionName "3.2.1"
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ targetSdkVersion 28
+ versionCode 17//Last Modified : Dec. 22. 2019
+ versionName "3.2.5"//Last Modified : Dec. 22. 2019
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
@@ -23,15 +23,15 @@ android {
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
- implementation 'com.android.support:appcompat-v7:26.1.0'
- implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+ implementation 'androidx.appcompat:appcompat:1.0.2'
+ implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+ implementation 'com.google.android.material:material:1.0.0'
+ implementation 'androidx.cardview:cardview:1.0.0'
testImplementation 'junit:junit:4.12'
- implementation 'com.google.android.gms:play-services-ads:17.2.0'
- androidTestImplementation 'com.android.support.test:runner:1.0.2'
- androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+ androidTestImplementation 'androidx.test.ext:junit:1.1.0'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
implementation 'com.google.firebase:firebase-core:16.0.8'
implementation 'com.google.firebase:firebase-database:16.1.0'
- 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'
diff --git a/app/src/main/AndroidManifest (1).xml b/app/src/main/AndroidManifest (1).xml
new file mode 100644
index 0000000..acc4d01
--- /dev/null
+++ b/app/src/main/AndroidManifest (1).xml
@@ -0,0 +1,158 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 55acab8..803df2a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,11 +3,8 @@
xmlns:tools="http://schemas.android.com/tools"
package="com.leejoonhee.hangulclockforandroid">
-
-
-
@@ -45,17 +42,30 @@
+
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/java/com/leejoonhee/hangulclockforandroid/MainActivity.java b/app/src/main/java/com/leejoonhee/hangulclockforandroid/MainActivity.java
index 29a8d4c..f17b398 100644
--- a/app/src/main/java/com/leejoonhee/hangulclockforandroid/MainActivity.java
+++ b/app/src/main/java/com/leejoonhee/hangulclockforandroid/MainActivity.java
@@ -11,17 +11,11 @@
import android.os.Bundle;
import android.os.PowerManager;
import android.provider.Settings;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
import android.view.View;
import android.widget.TextView;
import android.widget.Toast;
-
-import com.google.ads.mediation.admob.AdMobAdapter;
-import com.google.android.gms.ads.AdRequest;
-import com.google.android.gms.ads.AdSize;
-import com.google.android.gms.ads.AdView;
-import com.google.android.gms.ads.MobileAds;
import com.google.firebase.database.DataSnapshot;
import com.google.firebase.database.DatabaseError;
import com.google.firebase.database.DatabaseReference;
@@ -29,17 +23,6 @@
import com.google.firebase.database.ValueEventListener;
import com.leejoonhee.hangulclockforandroid.Service.HelpActivity;
import com.leejoonhee.hangulclockforandroid.Service.SettingActivity;
-import com.leejoonhee.hangulclockforandroid.Service.Weather.WeatherInfo;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.Response;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserFactory;
-
-import java.io.StringReader;
-import java.net.URL;
-import java.util.ArrayList;
public class MainActivity extends AppCompatActivity
{
@@ -55,27 +38,10 @@ public class MainActivity extends AppCompatActivity
static SharedPreferences sets;
- static public String weathersaved = "No data";
-
- static TextView weathertext;
-
static String data = "";
TextView txtText;
- AdView mAdView;
-
- double RE = 6371.00877; // 지구 반경(km)
- double GRID = 5.0; // 격자 간격(km)
- double SLAT1 = 30.0; // 투영 위도1(degree)
- double SLAT2 = 60.0; // 투영 위도2(degree)
- double OLON = 126.0; // 기준점 경도(degree)
- double OLAT = 38.0; // 기준점 위도(degree)
- double XO = 43; // 기준점 X좌표(GRID)
- double YO = 136; // 기1준점 Y좌표(GRID)
-
- double longitude, latitude = 0;
-
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -88,29 +54,15 @@ protected void onCreate(Bundle savedInstanceState) {
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);
-
- //TODO not working do it again
- AdView adView = new AdView(this);
- adView.setAdSize(AdSize.BANNER);
- adView.setAdUnitId("ca-app-pub-8081631582008293/5576438546");
-
-
PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
boolean isWhiteListing = false;
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
@@ -130,18 +82,12 @@ public void onClick(DialogInterface dialog, int which) {
.setNegativeButton("아니오", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
- Toast.makeText(MainActivity.this, "설정을 취소했습니다.", Toast.LENGTH_SHORT).show();
+ Toast.makeText(MainActivity.this, "설정을 취소했습니다", Toast.LENGTH_SHORT).show();
}
})
.create()
.show();
}
- /*
- Intent intent = new Intent(this, PopupActivity.class);
- startActivity(intent);
- */
-
- adviewinit();
}
public void setting(View v){
@@ -205,7 +151,7 @@ public void onCancelled(DatabaseError databaseError) {
public void onDataChange(DataSnapshot dataSnapshot) {
String text = dataSnapshot.getValue(String.class);
- if(text.equals("3.2.1"))
+ if(text.equals("3.2.2"))//Last Modified : Dec. 22. 2019
mversion.setText("현재 최신버전입니다");
else
@@ -219,121 +165,4 @@ public void onCancelled(DatabaseError databaseError) {
});
}
-
- public static class ReceiveShortWeather extends AsyncTask {
-
- ArrayList shortWeathers = new ArrayList();
-
- protected Long doInBackground(URL... urls) {
-
- String url = sets.getString("weatherurl", "http://www.kma.go.kr/wid/queryDFSRSS.jsp?zone=1159068000");
-
- OkHttpClient client = new OkHttpClient();
-
- Request request = new Request.Builder()
- .url(url)
- .build();
-
- Response response = null;
-
- try {
- response = client.newCall(request).execute();
- parseXML(response.body().string());
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- return null;
- }
-
- public void onPostExecute(Long result) {
-
- data = shortWeathers.get(0).getTemp() + "도 . " +
- shortWeathers.get(0).getWfKor() + " . 강수량 " +
- shortWeathers.get(0).getPop();
-
- weathertext.setText(data);
- weathersaved = data;
- }
-
- void parseXML(String xml) {
- try {
- String tagName = "";
- boolean onHour = false;
- boolean onDay = false;
- boolean onTem = false;
- boolean onWfKor = false;
- boolean onPop = false;
- boolean onEnd = false;
- boolean isItemTag1 = false;
- int i = 0;
-
- XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
- XmlPullParser parser = factory.newPullParser();
-
- parser.setInput(new StringReader(xml));
-
- int eventType = parser.getEventType();
-
- while (eventType != XmlPullParser.END_DOCUMENT) {
- if (eventType == XmlPullParser.START_TAG) {
- tagName = parser.getName();
- if (tagName.equals("data")) {
- shortWeathers.add(new WeatherInfo());
- onEnd = false;
- isItemTag1 = true;
- }
- } else if (eventType == XmlPullParser.TEXT && isItemTag1) {
- if (tagName.equals("hour") && !onHour) {
- shortWeathers.get(i).setHour(parser.getText());
- onHour = true;
- }
- if (tagName.equals("day") && !onDay) {
- shortWeathers.get(i).setDay(parser.getText());
- onDay = true;
- }
- if (tagName.equals("temp") && !onTem) {
- shortWeathers.get(i).setTemp(parser.getText());
- onTem = true;
- }
- if (tagName.equals("wfKor") && !onWfKor) {
- shortWeathers.get(i).setWfKor(parser.getText());
- onWfKor = true;
- }
- if (tagName.equals("pop") && !onPop) {
- shortWeathers.get(i).setPop(parser.getText());
- onPop = true;
- }
- } else if (eventType == XmlPullParser.END_TAG) {
- if (tagName.equals("s06") && onEnd == false) {
- i++;
- onHour = false;
- onDay = false;
- onTem = false;
- onWfKor = false;
- onPop = false;
- isItemTag1 = false;
- onEnd = true;
- }
- }
-
- eventType = parser.next();
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
- public void adviewinit(){
- MobileAds.initialize(this, getString(R.string.ad_id));
- AdView mAdView = findViewById(R.id.adView);
- Bundle extras = new Bundle();
- extras.putString("max_ad_content_rating", "G"); // 앱이 3세 이상 사용가능이라면 광고레벨을 설정해줘야 한다
- AdRequest adRequest = new AdRequest.Builder()
- .addNetworkExtrasBundle(AdMobAdapter.class, extras)
- .build();
- mAdView.loadAd(adRequest);
- }
-
}
diff --git a/app/src/main/java/com/leejoonhee/hangulclockforandroid/Service/HelpActivity.java b/app/src/main/java/com/leejoonhee/hangulclockforandroid/Service/HelpActivity.java
index fdb93a8..96603e8 100644
--- a/app/src/main/java/com/leejoonhee/hangulclockforandroid/Service/HelpActivity.java
+++ b/app/src/main/java/com/leejoonhee/hangulclockforandroid/Service/HelpActivity.java
@@ -1,6 +1,6 @@
package com.leejoonhee.hangulclockforandroid.Service;
import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
import com.leejoonhee.hangulclockforandroid.R;
diff --git a/app/src/main/java/com/leejoonhee/hangulclockforandroid/Service/PopupActivity.java b/app/src/main/java/com/leejoonhee/hangulclockforandroid/Service/PopupActivity.java
deleted file mode 100644
index f40e390..0000000
--- a/app/src/main/java/com/leejoonhee/hangulclockforandroid/Service/PopupActivity.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.leejoonhee.hangulclockforandroid.Service;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.view.View;
-import android.view.Window;
-import android.widget.TextView;
-
-import com.google.firebase.database.DataSnapshot;
-import com.google.firebase.database.DatabaseError;
-import com.google.firebase.database.DatabaseReference;
-import com.google.firebase.database.FirebaseDatabase;
-import com.google.firebase.database.ValueEventListener;
-import com.leejoonhee.hangulclockforandroid.R;
-
-public class PopupActivity extends Activity {
-
- TextView txtText;
-
- String inst;
-
- DatabaseReference rootRef = FirebaseDatabase.getInstance().getReference();
- DatabaseReference notice = rootRef.child("notice");
-
- SharedPreferences sets;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- requestWindowFeature(Window.FEATURE_NO_TITLE);
- setContentView(R.layout.popup_activity);
-
- sets = getSharedPreferences("usersets", Activity.MODE_PRIVATE); //MainActivity가 꺼져도 NewAppWidget에서 값을 받아 올 수 있도록 SharedPreference를 사용하였습니다
-
- txtText = (TextView)findViewById(R.id.txtText);
-
- inst = sets.getString("notice","1");
- }
-
- public void mOnClose(View v){
-
- Intent intent = new Intent();
- intent.putExtra("result", "Close Popup");
- setResult(RESULT_OK, intent);
-
- int numInt = Integer.parseInt(inst);
- numInt++;
- String numStr = String.valueOf(numInt);
-
- SharedPreferences.Editor editor = sets.edit();
- editor.putString("notice", numStr);
- editor.commit();
-
- finish();
- }
-
- @Override
- protected void onStart(){
- super.onStart();
-
- notice.addValueEventListener(new ValueEventListener() {
- @Override
- public void onDataChange(DataSnapshot dataSnapshot) {
- String text = dataSnapshot.getValue(String.class);
-
- txtText.setText(text);
- }
-
- @Override
- public void onCancelled(DatabaseError databaseError) {
-
- }
- });
-
- }
-
-}
diff --git a/app/src/main/java/com/leejoonhee/hangulclockforandroid/Service/SentenceActivity.java b/app/src/main/java/com/leejoonhee/hangulclockforandroid/Service/SentenceActivity.java
index c7d78e2..92f521c 100755
--- a/app/src/main/java/com/leejoonhee/hangulclockforandroid/Service/SentenceActivity.java
+++ b/app/src/main/java/com/leejoonhee/hangulclockforandroid/Service/SentenceActivity.java
@@ -3,7 +3,7 @@
import android.app.Activity;
import android.content.SharedPreferences;
import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
import android.view.View;
import android.widget.EditText;
@@ -33,10 +33,4 @@ public void save(View V){
editor.putString("title", word); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
editor.commit();
}
-
- public void weatheruse(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putString("title", "**weather**");
- editor.commit();
- }
}
diff --git a/app/src/main/java/com/leejoonhee/hangulclockforandroid/Service/SettingActivity.java b/app/src/main/java/com/leejoonhee/hangulclockforandroid/Service/SettingActivity.java
index 8f354a6..2cae00f 100755
--- a/app/src/main/java/com/leejoonhee/hangulclockforandroid/Service/SettingActivity.java
+++ b/app/src/main/java/com/leejoonhee/hangulclockforandroid/Service/SettingActivity.java
@@ -6,7 +6,7 @@
import android.content.SharedPreferences;
import android.graphics.Color;
import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.FrameLayout;
@@ -16,7 +16,6 @@
import com.leejoonhee.hangulclockforandroid.MainActivity;
import com.leejoonhee.hangulclockforandroid.R;
-import com.leejoonhee.hangulclockforandroid.Service.Weather.WeatherSetting;
import com.leejoonhee.hangulclockforandroid.lockscreen.lockset;
public class SettingActivity extends AppCompatActivity
@@ -30,6 +29,8 @@ public class SettingActivity extends AppCompatActivity
TextView sentence;
+ int pick = 0;
+
@Override
protected void onCreate(Bundle savedInstanceState){
super.onCreate(savedInstanceState);
@@ -48,642 +49,134 @@ protected void onCreate(Bundle savedInstanceState){
sets = getSharedPreferences("usersets", Activity.MODE_PRIVATE); //MainActivity가 꺼져도 NewAppWidget에서 값을 받아 올 수 있도록 SharedPreference를 사용하였습니다
sentence.setText(sets.getString("title", "설정이 필요합니다"));
- String str = sets.getString("title", "설정이필요합니다");
-
- if(str.equals("**weather**")){
- sentence.setText(MainActivity.weathersaved);
- }
-
- if (sets.getInt("color", 0) == 1 || sets.getInt("color", 0) == 0){
- image1.setBackgroundColor(getResources().getColor(R.color.white));
- image2.setBackgroundColor(getResources().getColor(R.color.white));
- image3.setBackgroundColor(getResources().getColor(R.color.white));
- image4.setBackgroundColor(getResources().getColor(R.color.white));
- sentence.setTextColor(Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 2){
- image1.setBackgroundColor(getResources().getColor(R.color.black));
- image2.setBackgroundColor(getResources().getColor(R.color.black));
- image3.setBackgroundColor(getResources().getColor(R.color.black));
- image4.setBackgroundColor(getResources().getColor(R.color.black));
- sentence.setTextColor(Color.BLACK);
- }
-
- if(sets.getInt("color", 0) == 3){
- image1.setBackgroundColor(getResources().getColor(R.color.claret));
- image2.setBackgroundColor(getResources().getColor(R.color.claret));
- image3.setBackgroundColor(getResources().getColor(R.color.claret));
- image4.setBackgroundColor(getResources().getColor(R.color.claret));
- sentence.setTextColor(getResources().getColor(R.color.claret));
- }
-
- if(sets.getInt("color", 0) == 4){
- image1.setBackgroundColor(getResources().getColor(R.color.clarett));
- image2.setBackgroundColor(getResources().getColor(R.color.clarett));
- image3.setBackgroundColor(getResources().getColor(R.color.clarett));
- image4.setBackgroundColor(getResources().getColor(R.color.clarett));
- sentence.setTextColor(getResources().getColor(R.color.clarett));
- }
-
- if(sets.getInt("color", 0) == 5){
- image1.setBackgroundColor(getResources().getColor(R.color.clarettt));
- image2.setBackgroundColor(getResources().getColor(R.color.clarettt));
- image3.setBackgroundColor(getResources().getColor(R.color.clarettt));
- image4.setBackgroundColor(getResources().getColor(R.color.clarettt));
- sentence.setTextColor(getResources().getColor(R.color.clarettt));
- }
-
- if(sets.getInt("color", 0) == 6){
- image1.setBackgroundColor(getResources().getColor(R.color.red));
- image2.setBackgroundColor(getResources().getColor(R.color.red));
- image3.setBackgroundColor(getResources().getColor(R.color.red));
- image4.setBackgroundColor(getResources().getColor(R.color.red));
- sentence.setTextColor(getResources().getColor(R.color.red));
- }
-
- if(sets.getInt("color", 0) == 7){
- image1.setBackgroundColor(getResources().getColor(R.color.redd));
- image2.setBackgroundColor(getResources().getColor(R.color.redd));
- image3.setBackgroundColor(getResources().getColor(R.color.redd));
- image4.setBackgroundColor(getResources().getColor(R.color.redd));
- sentence.setTextColor(getResources().getColor(R.color.redd));
- }
-
- if(sets.getInt("color", 0) == 8){
- image1.setBackgroundColor(getResources().getColor(R.color.reddd));
- image2.setBackgroundColor(getResources().getColor(R.color.reddd));
- image3.setBackgroundColor(getResources().getColor(R.color.reddd));
- image4.setBackgroundColor(getResources().getColor(R.color.reddd));
- sentence.setTextColor(getResources().getColor(R.color.reddd));
- }
-
- if(sets.getInt("color", 0) == 9){
- image1.setBackgroundColor(getResources().getColor(R.color.pink));
- image2.setBackgroundColor(getResources().getColor(R.color.pink));
- image3.setBackgroundColor(getResources().getColor(R.color.pink));
- image4.setBackgroundColor(getResources().getColor(R.color.pink));
- sentence.setTextColor(getResources().getColor(R.color.pink));
- }
+ String str = sets.getString("title", "프레임 색상을 설정합니다");
- if(sets.getInt("color", 0) == 10){
- image1.setBackgroundColor(getResources().getColor(R.color.pinkk));
- image2.setBackgroundColor(getResources().getColor(R.color.pinkk));
- image3.setBackgroundColor(getResources().getColor(R.color.pinkk));
- image4.setBackgroundColor(getResources().getColor(R.color.pinkk));
- sentence.setTextColor(getResources().getColor(R.color.pinkk));
- }
-
- if(sets.getInt("color", 0) == 11){
- image1.setBackgroundColor(getResources().getColor(R.color.orange));
- image2.setBackgroundColor(getResources().getColor(R.color.orange));
- image3.setBackgroundColor(getResources().getColor(R.color.orange));
- image4.setBackgroundColor(getResources().getColor(R.color.orange));
- sentence.setTextColor(getResources().getColor(R.color.orange));
- }
+ //text color 가져오기
- if(sets.getInt("color", 0) == 12){
- image1.setBackgroundColor(getResources().getColor(R.color.orangee));
- image2.setBackgroundColor(getResources().getColor(R.color.orangee));
- image3.setBackgroundColor(getResources().getColor(R.color.orangee));
- image4.setBackgroundColor(getResources().getColor(R.color.orangee));
- sentence.setTextColor(getResources().getColor(R.color.orangee));
- }
+ int colorAlpha = sets.getInt("colorAlpha", 255);
+ int colorRed = sets.getInt("colorRed", 255);
+ int colorGreen = sets.getInt("colorGreen", 255);
+ int colorBlue = sets.getInt("colorBlue", 255);
- if(sets.getInt("color", 0) == 13){
- image1.setBackgroundColor(getResources().getColor(R.color.orangeee));
- image2.setBackgroundColor(getResources().getColor(R.color.orangeee));
- image3.setBackgroundColor(getResources().getColor(R.color.orangeee));
- image4.setBackgroundColor(getResources().getColor(R.color.orangeee));
- sentence.setTextColor(getResources().getColor(R.color.orangeee));
- }
-
- if(sets.getInt("color", 0) == 14){
- image1.setBackgroundColor(getResources().getColor(R.color.yellow));
- image2.setBackgroundColor(getResources().getColor(R.color.yellow));
- image3.setBackgroundColor(getResources().getColor(R.color.yellow));
- image4.setBackgroundColor(getResources().getColor(R.color.yellow));
- sentence.setTextColor(getResources().getColor(R.color.yellow));
- }
+ sentence.setTextColor(Color.argb(colorAlpha, colorRed, colorGreen, colorBlue));
- if(sets.getInt("color", 0) == 15){
- image1.setBackgroundColor(getResources().getColor(R.color.yelloww));
- image2.setBackgroundColor(getResources().getColor(R.color.yelloww));
- image3.setBackgroundColor(getResources().getColor(R.color.yelloww));
- image4.setBackgroundColor(getResources().getColor(R.color.yelloww));
- sentence.setTextColor(getResources().getColor(R.color.yelloww));
- }
+ //frame color 가져오기
+ frameColor(sets.getInt("color", R.color.white));
+ }
- if(sets.getInt("color", 0) == 16){
- image1.setBackgroundColor(getResources().getColor(R.color.green));
- image2.setBackgroundColor(getResources().getColor(R.color.green));
- image3.setBackgroundColor(getResources().getColor(R.color.green));
- image4.setBackgroundColor(getResources().getColor(R.color.green));
- sentence.setTextColor(getResources().getColor(R.color.green));
- }
+ void sentenceColor(int A, int R, int G, int B){
+ sentence.setTextColor(Color.argb(A, R, G, B));
+ }
- if(sets.getInt("color", 0) == 17){
- image1.setBackgroundColor(getResources().getColor(R.color.greenn));
- image2.setBackgroundColor(getResources().getColor(R.color.greenn));
- image3.setBackgroundColor(getResources().getColor(R.color.greenn));
- image4.setBackgroundColor(getResources().getColor(R.color.greenn));
- sentence.setTextColor(getResources().getColor(R.color.greenn));
- }
+ void clockColor(int Color){
- if(sets.getInt("color", 0) == 18){
- image1.setBackgroundColor(getResources().getColor(R.color.greennn));
- image2.setBackgroundColor(getResources().getColor(R.color.greennn));
- image3.setBackgroundColor(getResources().getColor(R.color.greennn));
- image4.setBackgroundColor(getResources().getColor(R.color.greennn));
- sentence.setTextColor(getResources().getColor(R.color.greennn));
- }
+ }
- if(sets.getInt("color", 0) == 19){
- image1.setBackgroundColor(getResources().getColor(R.color.bluegreen));
- image2.setBackgroundColor(getResources().getColor(R.color.bluegreen));
- image3.setBackgroundColor(getResources().getColor(R.color.bluegreen));
- image4.setBackgroundColor(getResources().getColor(R.color.bluegreen));
- sentence.setTextColor(getResources().getColor(R.color.bluegreen));
- }
+ public void frameColorClicked(View V) {pick = 0;}
- if(sets.getInt("color", 0) == 20){
- image1.setBackgroundColor(getResources().getColor(R.color.bluegreenn));
- image2.setBackgroundColor(getResources().getColor(R.color.bluegreenn));
- image3.setBackgroundColor(getResources().getColor(R.color.bluegreenn));
- image4.setBackgroundColor(getResources().getColor(R.color.bluegreenn));
- sentence.setTextColor(getResources().getColor(R.color.bluegreenn));
- }
+ public void sentenceColorClicked(View V) {pick = 1;}
- if(sets.getInt("color", 0) == 21){
- image1.setBackgroundColor(getResources().getColor(R.color.navy));
- image2.setBackgroundColor(getResources().getColor(R.color.navy));
- image3.setBackgroundColor(getResources().getColor(R.color.navy));
- image4.setBackgroundColor(getResources().getColor(R.color.navy));
- sentence.setTextColor(getResources().getColor(R.color.navy));
- }
+ //public void clockColorClicked(View V) {pick = 2;}
- if(sets.getInt("color", 0) == 22){
- image1.setBackgroundColor(getResources().getColor(R.color.navyy));
- image2.setBackgroundColor(getResources().getColor(R.color.navyy));
- image3.setBackgroundColor(getResources().getColor(R.color.navyy));
- image4.setBackgroundColor(getResources().getColor(R.color.navyy));
- sentence.setTextColor(getResources().getColor(R.color.navyy));
- }
+ public void setColor(int Color){
- if(sets.getInt("color", 0) == 23){
- image1.setBackgroundColor(getResources().getColor(R.color.darkblue));
- image2.setBackgroundColor(getResources().getColor(R.color.darkblue));
- image3.setBackgroundColor(getResources().getColor(R.color.darkblue));
- image4.setBackgroundColor(getResources().getColor(R.color.darkblue));
- sentence.setTextColor(getResources().getColor(R.color.darkblue));
- }
+ SharedPreferences.Editor editor = sets.edit();
- if(sets.getInt("color", 0) == 24){
- image1.setBackgroundColor(getResources().getColor(R.color.blue));
- image2.setBackgroundColor(getResources().getColor(R.color.blue));
- image3.setBackgroundColor(getResources().getColor(R.color.blue));
- image4.setBackgroundColor(getResources().getColor(R.color.blue));
- sentence.setTextColor(getResources().getColor(R.color.blue));
- }
+ if(pick == 0){
+ editor.putInt("color", Color); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
+ editor.commit();
- if(sets.getInt("color", 0) == 25){
- image1.setBackgroundColor(getResources().getColor(R.color.bluee));
- image2.setBackgroundColor(getResources().getColor(R.color.bluee));
- image3.setBackgroundColor(getResources().getColor(R.color.bluee));
- image4.setBackgroundColor(getResources().getColor(R.color.bluee));
- sentence.setTextColor(getResources().getColor(R.color.bluee));
+ frameColor(Color);
+ Toast.makeText(getApplicationContext(), "프레임 색상이 선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
}
- if(sets.getInt("color", 0) == 26){
- image1.setBackgroundColor(getResources().getColor(R.color.violet));
- image2.setBackgroundColor(getResources().getColor(R.color.violet));
- image3.setBackgroundColor(getResources().getColor(R.color.violet));
- image4.setBackgroundColor(getResources().getColor(R.color.violet));
- sentence.setTextColor(getResources().getColor(R.color.violet));
- }
+ if(pick == 1){
- if(sets.getInt("color", 0) == 27){
- image1.setBackgroundColor(getResources().getColor(R.color.violett));
- image2.setBackgroundColor(getResources().getColor(R.color.violett));
- image3.setBackgroundColor(getResources().getColor(R.color.violett));
- image4.setBackgroundColor(getResources().getColor(R.color.violett));
- sentence.setTextColor(getResources().getColor(R.color.violett));
- }
+ editor.putInt("colorAlpha", 255);
+ editor.putInt("colorRed", 255);
+ editor.putInt("colorGreen", 255);
+ editor.putInt("colorBlue", 255);
+ editor.commit();
- if(sets.getInt("color", 0) == 28){
- image1.setBackgroundColor(getResources().getColor(R.color.violettt));
- image2.setBackgroundColor(getResources().getColor(R.color.violettt));
- image3.setBackgroundColor(getResources().getColor(R.color.violettt));
- image4.setBackgroundColor(getResources().getColor(R.color.violettt));
- sentence.setTextColor(getResources().getColor(R.color.violettt));
+ //sentenceColor(Color);
+ Toast.makeText(getApplicationContext(), "문장 색상이 선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
}
- if(sets.getInt("color", 0) == 29){
- image1.setBackgroundColor(getResources().getColor(R.color.violetttt));
- image2.setBackgroundColor(getResources().getColor(R.color.violetttt));
- image3.setBackgroundColor(getResources().getColor(R.color.violetttt));
- image4.setBackgroundColor(getResources().getColor(R.color.violetttt));
- sentence.setTextColor(getResources().getColor(R.color.violetttt));
- }
+ if(pick == 2){
+ editor.putInt("clockColor", Color);
+ editor.commit();
- if(sets.getInt("color", 0) == 30){
- image1.setBackgroundColor(getResources().getColor(R.color.violettttt));
- image2.setBackgroundColor(getResources().getColor(R.color.violettttt));
- image3.setBackgroundColor(getResources().getColor(R.color.violettttt));
- image4.setBackgroundColor(getResources().getColor(R.color.violettttt));
- sentence.setTextColor(getResources().getColor(R.color.violettttt));
+ clockColor(Color);
+ Toast.makeText(getApplicationContext(), "시계 색상이 선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
}
}
- public void setwhite(View v) {
+ public void setwhite(View v) { setColor(R.color.white); }
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 1); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.white));
- image2.setBackgroundColor(getResources().getColor(R.color.white));
- image3.setBackgroundColor(getResources().getColor(R.color.white));
- image4.setBackgroundColor(getResources().getColor(R.color.white));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
- }
+ public void setblack(View v) { setColor(R.color.black); }
- public void setblack(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 2); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.black));
- image2.setBackgroundColor(getResources().getColor(R.color.black));
- image3.setBackgroundColor(getResources().getColor(R.color.black));
- image4.setBackgroundColor(getResources().getColor(R.color.black));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
- }
+ public void claret(View v) { setColor(R.color.claret); }
- public void claret(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 3); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.claret));
- image2.setBackgroundColor(getResources().getColor(R.color.claret));
- image3.setBackgroundColor(getResources().getColor(R.color.claret));
- image4.setBackgroundColor(getResources().getColor(R.color.claret));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
- }
+ public void clarett(View v) { setColor(R.color.clarett); }
- public void clarett(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 4); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.clarett));
- image2.setBackgroundColor(getResources().getColor(R.color.clarett));
- image3.setBackgroundColor(getResources().getColor(R.color.clarett));
- image4.setBackgroundColor(getResources().getColor(R.color.clarett));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
- }
+ public void clarettt(View v) { setColor(R.color.clarettt); }
- public void clarettt(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 5); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.clarettt));
- image2.setBackgroundColor(getResources().getColor(R.color.clarettt));
- image3.setBackgroundColor(getResources().getColor(R.color.clarettt));
- image4.setBackgroundColor(getResources().getColor(R.color.clarettt));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
- }
+ public void red(View v) { setColor(R.color.red); }
- public void red(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 6); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.red));
- image2.setBackgroundColor(getResources().getColor(R.color.red));
- image3.setBackgroundColor(getResources().getColor(R.color.red));
- image4.setBackgroundColor(getResources().getColor(R.color.red));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
- }
+ public void redd(View v) { setColor(R.color.redd); }
- public void redd(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 7); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.redd));
- image2.setBackgroundColor(getResources().getColor(R.color.redd));
- image3.setBackgroundColor(getResources().getColor(R.color.redd));
- image4.setBackgroundColor(getResources().getColor(R.color.redd));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
- }
+ public void reddd(View v) { setColor(R.color.reddd); }
- public void reddd(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 8); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.reddd));
- image2.setBackgroundColor(getResources().getColor(R.color.reddd));
- image3.setBackgroundColor(getResources().getColor(R.color.reddd));
- image4.setBackgroundColor(getResources().getColor(R.color.reddd));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
- }
+ public void pink(View v) { setColor(R.color.pink); }
- public void pink(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 9); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.pink));
- image2.setBackgroundColor(getResources().getColor(R.color.pink));
- image3.setBackgroundColor(getResources().getColor(R.color.pink));
- image4.setBackgroundColor(getResources().getColor(R.color.pink));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
- }
+ public void pinkk(View v) { setColor(R.color.pinkk); }
- public void pinkk(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 10); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.pinkk));
- image2.setBackgroundColor(getResources().getColor(R.color.pinkk));
- image3.setBackgroundColor(getResources().getColor(R.color.pinkk));
- image4.setBackgroundColor(getResources().getColor(R.color.pinkk));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
- }
+ public void orange(View v) { setColor(R.color.orange); }
- public void orange(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 11); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.orange));
- image2.setBackgroundColor(getResources().getColor(R.color.orange));
- image3.setBackgroundColor(getResources().getColor(R.color.orange));
- image4.setBackgroundColor(getResources().getColor(R.color.orange));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
- }
+ public void orangee(View v) { setColor(R.color.orangee); }
- public void orangee(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 12); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.orangee));
- image2.setBackgroundColor(getResources().getColor(R.color.orangee));
- image3.setBackgroundColor(getResources().getColor(R.color.orangee));
- image4.setBackgroundColor(getResources().getColor(R.color.orangee));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
- }
+ public void orangeee(View v) { setColor(R.color.orangeee); }
- public void orangeee(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 13); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.orangeee));
- image2.setBackgroundColor(getResources().getColor(R.color.orangeee));
- image3.setBackgroundColor(getResources().getColor(R.color.orangeee));
- image4.setBackgroundColor(getResources().getColor(R.color.orangeee));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
- }
+ public void yellow(View v) { setColor(R.color.yellow); }
- public void yellow(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 14); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.yellow));
- image2.setBackgroundColor(getResources().getColor(R.color.yellow));
- image3.setBackgroundColor(getResources().getColor(R.color.yellow));
- image4.setBackgroundColor(getResources().getColor(R.color.yellow));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
- }
+ public void yelloww(View v) { setColor(R.color.yelloww); }
- public void yelloww(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 15); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.yelloww));
- image2.setBackgroundColor(getResources().getColor(R.color.yelloww));
- image3.setBackgroundColor(getResources().getColor(R.color.yelloww));
- image4.setBackgroundColor(getResources().getColor(R.color.yelloww));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
- }
+ public void green(View v) { setColor(R.color.green); }
- public void green(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 16); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.green));
- image2.setBackgroundColor(getResources().getColor(R.color.green));
- image3.setBackgroundColor(getResources().getColor(R.color.green));
- image4.setBackgroundColor(getResources().getColor(R.color.green));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
- }
+ public void greenn(View v) { setColor(R.color.greenn); }
- public void greenn(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 17); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.greenn));
- image2.setBackgroundColor(getResources().getColor(R.color.greenn));
- image3.setBackgroundColor(getResources().getColor(R.color.greenn));
- image4.setBackgroundColor(getResources().getColor(R.color.greenn));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
- }
+ public void greennn(View v) { setColor(R.color.greennn); }
- public void greennn(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 18); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.greennn));
- image2.setBackgroundColor(getResources().getColor(R.color.greennn));
- image3.setBackgroundColor(getResources().getColor(R.color.greennn));
- image4.setBackgroundColor(getResources().getColor(R.color.greennn));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
- }
+ public void bluegreen(View v) { setColor(R.color.bluegreen); }
- public void bluegreen(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 19); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.bluegreen));
- image2.setBackgroundColor(getResources().getColor(R.color.bluegreen));
- image3.setBackgroundColor(getResources().getColor(R.color.bluegreen));
- image4.setBackgroundColor(getResources().getColor(R.color.bluegreen));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
- }
+ public void bluegreenn(View v) { setColor(R.color.bluegreenn); }
- public void bluegreenn(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 20); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.bluegreenn));
- image2.setBackgroundColor(getResources().getColor(R.color.bluegreenn));
- image3.setBackgroundColor(getResources().getColor(R.color.bluegreenn));
- image4.setBackgroundColor(getResources().getColor(R.color.bluegreenn));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
- }
+ public void navy(View v) { setColor(R.color.navy); }
- public void navy(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 21); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.navy));
- image2.setBackgroundColor(getResources().getColor(R.color.navy));
- image3.setBackgroundColor(getResources().getColor(R.color.navy));
- image4.setBackgroundColor(getResources().getColor(R.color.navy));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
- }
+ public void navyy(View v) { setColor(R.color.navyy); }
- public void navyy(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 22); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.navyy));
- image2.setBackgroundColor(getResources().getColor(R.color.navyy));
- image3.setBackgroundColor(getResources().getColor(R.color.navyy));
- image4.setBackgroundColor(getResources().getColor(R.color.navyy));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
- }
+ public void darkblue(View v) { setColor(R.color.darkblue); }
- public void darkblue(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 23); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.darkblue));
- image2.setBackgroundColor(getResources().getColor(R.color.darkblue));
- image3.setBackgroundColor(getResources().getColor(R.color.darkblue));
- image4.setBackgroundColor(getResources().getColor(R.color.darkblue));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
- }
+ public void blue(View v) { setColor(R.color.blue); }
- public void blue(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 24); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.blue));
- image2.setBackgroundColor(getResources().getColor(R.color.blue));
- image3.setBackgroundColor(getResources().getColor(R.color.blue));
- image4.setBackgroundColor(getResources().getColor(R.color.blue));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
- }
+ public void bluee(View v) { setColor(R.color.bluee); }
- public void bluee(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 25); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.bluee));
- image2.setBackgroundColor(getResources().getColor(R.color.bluee));
- image3.setBackgroundColor(getResources().getColor(R.color.bluee));
- image4.setBackgroundColor(getResources().getColor(R.color.bluee));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
- }
+ public void violet(View v) { setColor(R.color.violet); }
- public void violet(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 26); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.violet));
- image2.setBackgroundColor(getResources().getColor(R.color.violet));
- image3.setBackgroundColor(getResources().getColor(R.color.violet));
- image4.setBackgroundColor(getResources().getColor(R.color.violet));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
- }
+ public void violett(View v) { setColor(R.color.violett); }
- public void violett(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 27); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.violett));
- image2.setBackgroundColor(getResources().getColor(R.color.violett));
- image3.setBackgroundColor(getResources().getColor(R.color.violett));
- image4.setBackgroundColor(getResources().getColor(R.color.violett));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
- }
+ public void violettt(View v) { setColor(R.color.violettt); }
- public void violettt(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 28); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.violettt));
- image2.setBackgroundColor(getResources().getColor(R.color.violettt));
- image3.setBackgroundColor(getResources().getColor(R.color.violettt));
- image4.setBackgroundColor(getResources().getColor(R.color.violettt));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
- }
+ public void violetttt(View v) { setColor(R.color.violetttt); }
- public void violetttt(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 29); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.violetttt));
- image2.setBackgroundColor(getResources().getColor(R.color.violetttt));
- image3.setBackgroundColor(getResources().getColor(R.color.violetttt));
- image4.setBackgroundColor(getResources().getColor(R.color.violetttt));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
- }
+ public void violettttt(View v) { setColor(R.color.violettttt); }
- public void violettttt(View v) {
- SharedPreferences.Editor editor = sets.edit();
- editor.putInt("color", 30); //ID가"color"인 sharedpreference에 정수 "1"를 저장합니다
- editor.commit();
- sentence.setTextColor(getResources().getColor(R.color.white));
- image1.setBackgroundColor(getResources().getColor(R.color.violettttt));
- image2.setBackgroundColor(getResources().getColor(R.color.violettttt));
- image3.setBackgroundColor(getResources().getColor(R.color.violettttt));
- image4.setBackgroundColor(getResources().getColor(R.color.violettttt));
-
- Toast.makeText(getApplicationContext(), "선택되었습니다", Toast.LENGTH_SHORT).show(); //저장 버튼 클릭시 적용됨을 알리기위해 메세지를 띄웁니다
+ public void frameColor(int Color){
+
+ image1.setBackgroundColor(getResources().getColor(Color));
+ image2.setBackgroundColor(getResources().getColor(Color));
+ image3.setBackgroundColor(getResources().getColor(Color));
+ image4.setBackgroundColor(getResources().getColor(Color));
}
public void mainmenu(View V){
@@ -698,17 +191,9 @@ public void color(View V){
public void sentence(View V){ startActivity(new Intent(this, SentenceActivity.class)); }
- public void weather(View V){ startActivity(new Intent(this, WeatherSetting.class)); }
-
- public void shortcut(View V){
- changeView(4) ;
- sentence.setText("단축버튼을 설정해주세요");
-
- }
-
public void lab(View V){
changeView(5) ;
- sentence.setText("베타기능을 만나보세요");
+ sentence.setText("베타기능입니다");
}
public void home(View V){
diff --git a/app/src/main/java/com/leejoonhee/hangulclockforandroid/Service/Weather/WeatherInfo.java b/app/src/main/java/com/leejoonhee/hangulclockforandroid/Service/Weather/WeatherInfo.java
deleted file mode 100755
index ae391be..0000000
--- a/app/src/main/java/com/leejoonhee/hangulclockforandroid/Service/Weather/WeatherInfo.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.leejoonhee.hangulclockforandroid.Service.Weather;
-
-public class WeatherInfo {
- private String hour; // 시간
- private String day;
- private String temp; // 온도
- private String wfKor; // 상태
- private String pop; // 강수확률
- private String reh; // 습도
- private String tmx;
- private String tmn;
-
- public String getTmx() {
- return tmx;
- }
-
- public void setTmx(String tmx) {
- this.tmx = tmx;
- }
-
- public String getTmn() {
- return tmn;
- }
-
- public void setTmn(String tmn) {
- this.tmn = tmn;
- }
-
- public String getDay() {
- return day;
- }
-
- public void setDay(String day) {
- this.day = day;
- }
-
- public String getReh() {
- return reh;
- }
-
- public void setReh(String reh) {
- this.reh = reh;
- }
-
- public String getPop() {
- return pop;
- }
-
- public void setPop(String pop) {
- this.pop = pop;
- }
-
- public void setHour(String hour) {
- this.hour = hour;
- }
-
- public void setTemp(String temp) {
- this.temp = temp;
- }
-
- public void setWfKor(String wfKor) {
- this.wfKor = wfKor;
- }
-
- public String getHour() {
- return hour;
- }
-
- public String getTemp() {
- return temp;
- }
-
- public String getWfKor() {
- return wfKor;
- }
-}
diff --git a/app/src/main/java/com/leejoonhee/hangulclockforandroid/Service/Weather/WeatherSetting.java b/app/src/main/java/com/leejoonhee/hangulclockforandroid/Service/Weather/WeatherSetting.java
deleted file mode 100644
index 64addf1..0000000
--- a/app/src/main/java/com/leejoonhee/hangulclockforandroid/Service/Weather/WeatherSetting.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.leejoonhee.hangulclockforandroid.Service.Weather;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.Toast;
-
-import com.leejoonhee.hangulclockforandroid.R;
-
-public class WeatherSetting extends AppCompatActivity {
-
- SharedPreferences sets;
-
- EditText text;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.weathersetting);
-
- sets = getSharedPreferences("usersets", Activity.MODE_PRIVATE);
-
- text = (EditText)findViewById(R.id.url);
-
- }
-
- public void gotosite(View v){
- String url ="http://www.weather.go.kr/weather/lifenindustry/sevice_rss.jsp";
- Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
- startActivity(intent);
-
- }
-
- public void saveurl(View v){
- String str = text.getText().toString();
-
- SharedPreferences.Editor editor = sets.edit();
- editor.putString("weatherurl",str);
- editor.commit();
- Toast toast = Toast.makeText(getApplicationContext(),"Url을 저장하였습니다", Toast.LENGTH_SHORT);
- toast.show();
-
- }
-}
diff --git a/app/src/main/java/com/leejoonhee/hangulclockforandroid/lockscreen/LockScreenActivity.java b/app/src/main/java/com/leejoonhee/hangulclockforandroid/lockscreen/LockScreenActivity.java
index 55871f5..fd7baa0 100644
--- a/app/src/main/java/com/leejoonhee/hangulclockforandroid/lockscreen/LockScreenActivity.java
+++ b/app/src/main/java/com/leejoonhee/hangulclockforandroid/lockscreen/LockScreenActivity.java
@@ -3,7 +3,7 @@
import android.content.SharedPreferences;
import android.graphics.Color;
import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
import android.view.Menu;
import android.view.View;
import android.view.WindowManager;
diff --git a/app/src/main/java/com/leejoonhee/hangulclockforandroid/lockscreen/lockset.java b/app/src/main/java/com/leejoonhee/hangulclockforandroid/lockscreen/lockset.java
index 8aa6f59..5e2194f 100644
--- a/app/src/main/java/com/leejoonhee/hangulclockforandroid/lockscreen/lockset.java
+++ b/app/src/main/java/com/leejoonhee/hangulclockforandroid/lockscreen/lockset.java
@@ -1,7 +1,7 @@
package com.leejoonhee.hangulclockforandroid.lockscreen;
import android.content.SharedPreferences;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.widget.CompoundButton;
import android.widget.ToggleButton;
diff --git a/app/src/main/java/com/leejoonhee/hangulclockforandroid/widget/WidgetProvider.java b/app/src/main/java/com/leejoonhee/hangulclockforandroid/widget/WidgetProvider.java
new file mode 100644
index 0000000..5664068
--- /dev/null
+++ b/app/src/main/java/com/leejoonhee/hangulclockforandroid/widget/WidgetProvider.java
@@ -0,0 +1,1479 @@
+package com.leejoonhee.hangulclockforandroid.widget;
+
+import android.annotation.SuppressLint;
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProvider;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.widget.RemoteViews;
+
+import com.leejoonhee.hangulclockforandroid.R;
+
+import java.util.Calendar;
+
+public class WidgetProvider extends AppWidgetProvider {
+
+ private static final int WIDGET_UPDATE_INTERVAL = 1000; //초당 한번씩 update를 합니다
+
+ //시스템에서 지속적으로 액티비티를 끄는것을 방지하기위해 AlarmManager를 사용하여 계속 불러주기위함입니다
+ private static PendingIntent mSender;
+ private static AlarmManager mManager;
+
+ @Override
+ public void onReceive(Context context, Intent intent)
+ {
+ super.onReceive(context, intent);
+
+ String action = intent.getAction();
+
+ if(action.equals("android.appwidget.action.APPWIDGET_UPDATE"))
+ {
+ //Log.w(TAG, "android.appwidget.action.APPWIDGET_UPDATE");
+ removePreviousAlarm();
+
+ long firstTime = System.currentTimeMillis() + WIDGET_UPDATE_INTERVAL;
+ mSender = PendingIntent.getBroadcast(context, 0, intent, 0);
+ mManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
+ mManager.set(AlarmManager.RTC, firstTime, mSender);
+ }
+
+ else if(action.equals("android.appwidget.action.APPWIDGET_DISABLED"))
+ {
+ removePreviousAlarm();//위젯 삭제시 액티비티를 계속 불러주던 알람도 삭제합니다
+ }
+
+ }
+
+ @Override
+ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds)
+ {
+ SharedPreferences sets = context.getSharedPreferences("usersets",0);//MainActivity에서 받아온 sharedpreference의 값들을 받아오기위한 준비입니다
+ SharedPreferences timer = context.getSharedPreferences("time",0);//MainActivity에서 받아온 sharedpreference의 값들을 받아오기위한 준비입니다
+
+ appWidgetIds = appWidgetManager.getAppWidgetIds(new ComponentName(context, getClass()));
+ super.onUpdate(context, appWidgetManager, appWidgetIds);
+
+
+ RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.midsizesmall);
+ appWidgetManager.updateAppWidget(appWidgetIds, views);
+
+ final int N = appWidgetIds.length;
+ for(int i = 0 ; i < N ; i++)
+ {
+ int appWidgetId = appWidgetIds[i];
+
+ if(timer.getInt("min", 0) != 0){
+ views.setTextViewText(R.id.textView1, "타이머 시작하기");
+ }
+
+ Calendar now = Calendar.getInstance(); //calendar에서 현재 시각을 받아옵니다
+
+ int hour = now.get(Calendar.HOUR_OF_DAY); //"시"는 hour에 저장합니다
+
+ int min = now.get(Calendar.MINUTE); //"분"은 min에 저장합니다
+
+ views.setTextViewText(R.id.textView1, sets.getString("title", "언젠가는 빛이 될 당신"));//Onupdate에서 받은 sentence의 값을 new_app_widget의 textview1의 ID를 가진 object에 올려줍니다
+
+ String str = sets.getString("title", "언젠가는 빛이 될 당신");
+
+
+ int color = R.color.white;
+
+ //textcolorselcetion이 1이라면..
+ if (sets.getInt("color", 0) == 1){
+ views.setImageViewResource(R.id.imageView, color);
+ views.setImageViewResource(R.id.imageView2, R.color.white);
+ views.setImageViewResource(R.id.imageView4, R.color.white);
+ views.setImageViewResource(R.id.imageView5, R.color.white);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ if(sets.getInt("color", 0) == 2){
+ views.setImageViewResource(R.id.imageView, R.color.black);
+ views.setImageViewResource(R.id.imageView2, R.color.black);
+ views.setImageViewResource(R.id.imageView4, R.color.black);
+ views.setImageViewResource(R.id.imageView5, R.color.black);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ if(sets.getInt("color", 0) == 3){
+ views.setImageViewResource(R.id.imageView, R.color.claret);
+ views.setImageViewResource(R.id.imageView2, R.color.claret);
+ views.setImageViewResource(R.id.imageView4, R.color.claret);
+ views.setImageViewResource(R.id.imageView5, R.color.claret);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ if(sets.getInt("color", 0) == 4){
+ views.setImageViewResource(R.id.imageView, R.color.clarett);
+ views.setImageViewResource(R.id.imageView2, R.color.clarett);
+ views.setImageViewResource(R.id.imageView4, R.color.clarett);
+ views.setImageViewResource(R.id.imageView5, R.color.clarett);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ if(sets.getInt("color", 0) == 5){
+ views.setImageViewResource(R.id.imageView, R.color.clarettt);
+ views.setImageViewResource(R.id.imageView2, R.color.clarettt);
+ views.setImageViewResource(R.id.imageView4, R.color.clarettt);
+ views.setImageViewResource(R.id.imageView5, R.color.clarettt);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ if(sets.getInt("color", 0) == 6){
+ views.setImageViewResource(R.id.imageView, R.color.red);
+ views.setImageViewResource(R.id.imageView2, R.color.red);
+ views.setImageViewResource(R.id.imageView4, R.color.red);
+ views.setImageViewResource(R.id.imageView5, R.color.red);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ if(sets.getInt("color", 0) == 7){
+ views.setImageViewResource(R.id.imageView, R.color.redd);
+ views.setImageViewResource(R.id.imageView2, R.color.redd);
+ views.setImageViewResource(R.id.imageView4, R.color.redd);
+ views.setImageViewResource(R.id.imageView5, R.color.redd);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ if(sets.getInt("color", 0) == 8){
+ views.setImageViewResource(R.id.imageView, R.color.reddd);
+ views.setImageViewResource(R.id.imageView2, R.color.reddd);
+ views.setImageViewResource(R.id.imageView4, R.color.reddd);
+ views.setImageViewResource(R.id.imageView5, R.color.reddd);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ if(sets.getInt("color", 0) == 9){
+ views.setImageViewResource(R.id.imageView, R.color.pink);
+ views.setImageViewResource(R.id.imageView2, R.color.pink);
+ views.setImageViewResource(R.id.imageView4, R.color.pink);
+ views.setImageViewResource(R.id.imageView5, R.color.pink);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ if(sets.getInt("color", 0) == 10){
+ views.setImageViewResource(R.id.imageView, R.color.pinkk);
+ views.setImageViewResource(R.id.imageView2, R.color.pinkk);
+ views.setImageViewResource(R.id.imageView4, R.color.pinkk);
+ views.setImageViewResource(R.id.imageView5, R.color.pinkk);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ if(sets.getInt("color", 0) == 11){
+ views.setImageViewResource(R.id.imageView, R.color.orange);
+ views.setImageViewResource(R.id.imageView2, R.color.orange);
+ views.setImageViewResource(R.id.imageView4, R.color.orange);
+ views.setImageViewResource(R.id.imageView5, R.color.orange);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ if(sets.getInt("color", 0) == 12){
+ views.setImageViewResource(R.id.imageView, R.color.orangee);
+ views.setImageViewResource(R.id.imageView2, R.color.orangee);
+ views.setImageViewResource(R.id.imageView4, R.color.orangee);
+ views.setImageViewResource(R.id.imageView5, R.color.orangee);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ if(sets.getInt("color", 0) == 13){
+ views.setImageViewResource(R.id.imageView, R.color.orangeee);
+ views.setImageViewResource(R.id.imageView2, R.color.orangeee);
+ views.setImageViewResource(R.id.imageView4, R.color.orangeee);
+ views.setImageViewResource(R.id.imageView5, R.color.orangeee);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ if(sets.getInt("color", 0) == 14){
+ views.setImageViewResource(R.id.imageView, R.color.yellow);
+ views.setImageViewResource(R.id.imageView2, R.color.yellow);
+ views.setImageViewResource(R.id.imageView4, R.color.yellow);
+ views.setImageViewResource(R.id.imageView5, R.color.yellow);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ if(sets.getInt("color", 0) == 15){
+ views.setImageViewResource(R.id.imageView, R.color.yelloww);
+ views.setImageViewResource(R.id.imageView2, R.color.yelloww);
+ views.setImageViewResource(R.id.imageView4, R.color.yelloww);
+ views.setImageViewResource(R.id.imageView5, R.color.yelloww);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ if(sets.getInt("color", 0) == 16){
+ views.setImageViewResource(R.id.imageView, R.color.green);
+ views.setImageViewResource(R.id.imageView2, R.color.green);
+ views.setImageViewResource(R.id.imageView4, R.color.green);
+ views.setImageViewResource(R.id.imageView5, R.color.green);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ if(sets.getInt("color", 0) == 17){
+ views.setImageViewResource(R.id.imageView, R.color.greenn);
+ views.setImageViewResource(R.id.imageView2, R.color.greenn);
+ views.setImageViewResource(R.id.imageView4, R.color.greenn);
+ views.setImageViewResource(R.id.imageView5, R.color.greenn);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ if(sets.getInt("color", 0) == 18){
+ views.setImageViewResource(R.id.imageView, R.color.greennn);
+ views.setImageViewResource(R.id.imageView2, R.color.greennn);
+ views.setImageViewResource(R.id.imageView4, R.color.greennn);
+ views.setImageViewResource(R.id.imageView5, R.color.greennn);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ if(sets.getInt("color", 0) == 19){
+ views.setImageViewResource(R.id.imageView, R.color.bluegreen);
+ views.setImageViewResource(R.id.imageView2, R.color.bluegreen);
+ views.setImageViewResource(R.id.imageView4, R.color.bluegreen);
+ views.setImageViewResource(R.id.imageView5, R.color.bluegreen);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ if(sets.getInt("color", 0) == 20){
+ views.setImageViewResource(R.id.imageView, R.color.bluegreenn);
+ views.setImageViewResource(R.id.imageView2, R.color.bluegreenn);
+ views.setImageViewResource(R.id.imageView4, R.color.bluegreenn);
+ views.setImageViewResource(R.id.imageView5, R.color.bluegreenn);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ if(sets.getInt("color", 0) == 21){
+ views.setImageViewResource(R.id.imageView, R.color.navy);
+ views.setImageViewResource(R.id.imageView2, R.color.navy);
+ views.setImageViewResource(R.id.imageView4, R.color.navy);
+ views.setImageViewResource(R.id.imageView5, R.color.navy);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ if(sets.getInt("color", 0) == 22){
+ views.setImageViewResource(R.id.imageView, R.color.navyy);
+ views.setImageViewResource(R.id.imageView2, R.color.navyy);
+ views.setImageViewResource(R.id.imageView4, R.color.navyy);
+ views.setImageViewResource(R.id.imageView5, R.color.navyy);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ if(sets.getInt("color", 0) == 23){
+ views.setImageViewResource(R.id.imageView, R.color.darkblue);
+ views.setImageViewResource(R.id.imageView2, R.color.darkblue);
+ views.setImageViewResource(R.id.imageView4, R.color.darkblue);
+ views.setImageViewResource(R.id.imageView5, R.color.darkblue);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ if(sets.getInt("color", 0) == 24){
+ views.setImageViewResource(R.id.imageView, R.color.blue);
+ views.setImageViewResource(R.id.imageView2, R.color.blue);
+ views.setImageViewResource(R.id.imageView4, R.color.blue);
+ views.setImageViewResource(R.id.imageView5, R.color.blue);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ if(sets.getInt("color", 0) == 25){
+ views.setImageViewResource(R.id.imageView, R.color.bluee);
+ views.setImageViewResource(R.id.imageView2, R.color.bluee);
+ views.setImageViewResource(R.id.imageView4, R.color.bluee);
+ views.setImageViewResource(R.id.imageView5, R.color.bluee);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ if(sets.getInt("color", 0) == 26){
+ views.setImageViewResource(R.id.imageView, R.color.violet);
+ views.setImageViewResource(R.id.imageView2, R.color.violet);
+ views.setImageViewResource(R.id.imageView4, R.color.violet);
+ views.setImageViewResource(R.id.imageView5, R.color.violet);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ if(sets.getInt("color", 0) == 27){
+ views.setImageViewResource(R.id.imageView, R.color.violett);
+ views.setImageViewResource(R.id.imageView2, R.color.violett);
+ views.setImageViewResource(R.id.imageView4, R.color.violett);
+ views.setImageViewResource(R.id.imageView5, R.color.violett);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ if(sets.getInt("color", 0) == 28){
+ views.setImageViewResource(R.id.imageView, R.color.violettt);
+ views.setImageViewResource(R.id.imageView2, R.color.violettt);
+ views.setImageViewResource(R.id.imageView4, R.color.violettt);
+ views.setImageViewResource(R.id.imageView5, R.color.violettt);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ if(sets.getInt("color", 0) == 29){
+ views.setImageViewResource(R.id.imageView, R.color.violetttt);
+ views.setImageViewResource(R.id.imageView2, R.color.violetttt);
+ views.setImageViewResource(R.id.imageView4, R.color.violetttt);
+ views.setImageViewResource(R.id.imageView5, R.color.violetttt);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ if(sets.getInt("color", 0) == 30){
+ views.setImageViewResource(R.id.imageView, R.color.violettttt);
+ views.setImageViewResource(R.id.imageView2, R.color.violettttt);
+ views.setImageViewResource(R.id.imageView4, R.color.violettttt);
+ views.setImageViewResource(R.id.imageView5, R.color.violettttt);
+ views.setTextColor(R.id.textView1, Color.WHITE);
+ }
+
+ views.setTextColor(R.id.aa, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.ab, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.ac, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.ba, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.bb, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.bc, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.ca, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.cb, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.cc, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.da, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.db, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.dc, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.ea, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.eb, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.ec, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.fa, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.fb, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.fc, Color.WHITE);
+
+ if(hour == 1 || hour == 13){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.aa, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.aa, Color.WHITE);
+ }
+ }
+
+ if(hour == 2 || hour == 14){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.ba, Color.BLACK);
+ views.setTextColor(R.id.fc, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.ba, Color.WHITE);
+ }
+
+ }
+
+ if(hour == 3 || hour == 15){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.ca, Color.BLACK);
+ views.setTextColor(R.id.fc, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.ca, Color.WHITE);
+ }
+ }
+
+ if(hour == 4 || hour == 16){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.da, Color.BLACK);
+ views.setTextColor(R.id.fc, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.da, Color.WHITE);
+ }
+
+ }
+
+ if(hour == 5 || hour == 17){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.ea, Color.BLACK);
+ views.setTextColor(R.id.fa, Color.BLACK);
+ views.setTextColor(R.id.fc, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.ea, Color.WHITE);
+ views.setTextColor(R.id.fa, Color.WHITE);
+ }
+ }
+
+ if(hour == 6 || hour == 18){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.ab, Color.BLACK);
+ views.setTextColor(R.id.bb, Color.BLACK);
+ views.setTextColor(R.id.fc, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.ab, Color.WHITE);
+ views.setTextColor(R.id.bb, Color.WHITE);
+ }
+
+ }
+
+ if(hour == 7 || hour == 19){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.cb, Color.BLACK);
+ views.setTextColor(R.id.db, Color.BLACK);
+ views.setTextColor(R.id.fc, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.cb, Color.WHITE);
+ views.setTextColor(R.id.db, Color.WHITE);
+ }
+ }
+
+ if(hour == 8 || hour == 20){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.eb, Color.BLACK);
+ views.setTextColor(R.id.fb, Color.BLACK);
+ views.setTextColor(R.id.fc, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.eb, Color.WHITE);
+ views.setTextColor(R.id.fb, Color.WHITE);
+ }
+ }
+
+ if(hour == 9 || hour == 21){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.ac, Color.BLACK);
+ views.setTextColor(R.id.bc, Color.BLACK);
+ views.setTextColor(R.id.fc, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.ac, Color.WHITE);
+ views.setTextColor(R.id.bc, Color.WHITE);
+ }
+ }
+
+ if(hour == 10 || hour == 22){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.cc, Color.BLACK);
+ views.setTextColor(R.id.fc, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.cc, Color.WHITE);
+ }
+ }
+
+ if(hour == 11 || hour == 23){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.cc, Color.BLACK);
+ views.setTextColor(R.id.dc, Color.BLACK);
+ views.setTextColor(R.id.fc, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.cc, Color.WHITE);
+ views.setTextColor(R.id.dc, Color.WHITE);
+ }
+ }
+
+ if(hour == 12 || hour == 24 || hour == 0){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.cc, Color.BLACK);
+ views.setTextColor(R.id.ec, Color.BLACK);
+ views.setTextColor(R.id.fc, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.cc, Color.WHITE);
+ views.setTextColor(R.id.ec, Color.WHITE);
+ }
+ }
+
+ views.setTextColor(R.id.ad, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.ae, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.af, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.bd, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.be, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.bf, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.cd, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.ce, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.cf, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.dd, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.de, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.df, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.ed, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.ee, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.ef, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.fd, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.fe, Color.argb(65, 67, 70, 90));
+ views.setTextColor(R.id.ff, Color.argb(65, 67, 70, 90));
+
+ if(min == 1){
+
+ if(sets.getInt("color", 1) == 1)//white
+ {
+ views.setTextColor(R.id.be, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.be, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.be, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 2){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.ce, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.ce, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 3){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.de, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.de, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 4){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.ee, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.ee, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 5){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.bf, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.bf, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 6){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.fe, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.fe, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 7){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.cf, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.cf, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 8){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.df, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.df, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 9){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.ef, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.ef, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 10){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 11){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.be, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.be, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 12){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.ce, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.ce, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 13){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.de, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.de, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 14){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.ee, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.ee, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 15){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.bf, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.bf, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 16){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.fe, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.fe, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 17){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.cf, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.cf, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 18){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.df, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.df, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 19){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.ef, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.ef, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 20){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.bd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.bd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 21){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.bd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.be, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.bd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.be, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 22){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.bd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.ce, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.bd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.ce, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 23){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.bd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.de, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.bd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.de, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 24){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.bd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.ee, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.bd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.ee, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 25){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.bd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.bf, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.bd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.bf, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 26){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.bd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.fe, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.bd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.fe, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 27){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.bd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.cf, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.bd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.cf, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 28){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.bd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.df, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.bd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.df, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 29){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.bd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.ef, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.bd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.ef, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 30){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.cd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.cd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 31){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.cd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.be, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.cd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.be, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 32){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.cd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.ce, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.cd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.ce, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 33){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.cd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.de, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.cd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.de, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 34){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.cd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.ee, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.cd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.ee, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 35){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.cd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.bf, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.cd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.bf, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 36){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.cd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.fe, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.cd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.fe, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 37){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.cd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.cf, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.cd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.cf, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 38){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.cd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.df, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.cd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.df, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 39){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.cd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.ef, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.cd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.ef, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 40){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.dd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.dd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 41){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.dd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.be, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.dd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.be, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 42){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.dd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.ce, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.dd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.ce, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 43){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.dd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.de, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.dd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.de, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 44){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.dd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.ee, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.dd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.ee, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 45){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.dd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.bf, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.dd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.bf, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 46){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.dd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.fe, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.dd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.fe, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 47){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.dd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.cf, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.dd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.cf, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 48){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.dd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.df, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.dd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.df, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 49){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.dd, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.ef, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.dd, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.ef, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 50){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.ed, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.ed, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 51){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.ed, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.be, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.ed, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.be, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 52){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.ed, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.ce, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.ed, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.ce, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 53){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.ed, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.de, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.ed, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.de, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 54){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.ed, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.ee, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.ed, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.ee, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 55){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.ed, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.bf, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.ed, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.bf, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 56){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.ed, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.fe, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.ed, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.fe, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 57){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.ed, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.cf, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.ed, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.cf, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 58){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.ed, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.df, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.ed, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.df, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 59){
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.ed, Color.BLACK);
+ views.setTextColor(R.id.fd, Color.BLACK);
+ views.setTextColor(R.id.ef, Color.BLACK);
+ views.setTextColor(R.id.ff, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.ed, Color.WHITE);
+ views.setTextColor(R.id.fd, Color.WHITE);
+ views.setTextColor(R.id.ef, Color.WHITE);
+ views.setTextColor(R.id.ff, Color.WHITE);
+ }
+ }
+
+ if(min == 60 || min == 0){
+
+ if(hour == 12)//정오
+ {
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.ae, Color.BLACK);
+ views.setTextColor(R.id.af, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.ae, Color.WHITE);
+ views.setTextColor(R.id.af, Color.WHITE);
+ }
+ }
+
+ if(hour == 60 || hour ==0)//자정
+ {
+ if(sets.getInt("color", 1) == 2)//black
+ {
+ views.setTextColor(R.id.ad, Color.WHITE);
+ views.setTextColor(R.id.ae, Color.BLACK);
+ }
+ else{
+ views.setTextColor(R.id.ad, Color.WHITE);
+ views.setTextColor(R.id.ae, Color.WHITE);
+ }
+ }
+
+ }
+ appWidgetManager.updateAppWidget(appWidgetId, views);
+ }
+ }
+
+ public void removePreviousAlarm()
+ {
+ if(mManager != null && mSender != null)
+ {
+ mSender.cancel();
+ mManager.cancel(mSender);
+ }
+ }
+
+ @SuppressLint({"NewApi" })
+ @Override
+ public void onAppWidgetOptionsChanged(Context context, AppWidgetManager appWidgetManager, int appWidgetId, Bundle newOptions) {
+ super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId,newOptions);
+
+ int minWidth = newOptions.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH);
+ int maxWidth = newOptions.getInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH);
+ int minHeight = newOptions.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT);
+ int maxHeight = newOptions.getInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT);
+ RemoteViews rv = null;
+
+ if(minWidth == 350 && maxWidth == 400 && minHeight == 420 && maxHeight == 470){
+ rv = new RemoteViews(context.getPackageName(), R.layout.bigsizefull);
+ }
+
+ if(minWidth == 310 && maxWidth == 349 && minHeight == 370 && maxHeight == 419){
+ rv = new RemoteViews(context.getPackageName(), R.layout.bigsizemid);
+ }
+
+ if(minWidth == 270 && maxWidth == 309 && minHeight == 320 && maxHeight == 369){
+ rv = new RemoteViews(context.getPackageName(), R.layout.bigsizesmall);
+ }
+
+ if(minWidth == 220 && maxWidth == 269 && minHeight == 270 && maxHeight == 319){
+ rv = new RemoteViews(context.getPackageName(), R.layout.midsizefull);
+ }
+
+ if(minWidth == 150 && maxWidth == 219 && minHeight == 190 && maxHeight == 269){
+ rv = new RemoteViews(context.getPackageName(), R.layout.midsizesmall);
+ }
+
+ else{
+ rv = new RemoteViews(context.getPackageName(), R.layout.fatversion);
+ }
+
+ appWidgetManager.updateAppWidget(appWidgetId, rv);
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/leejoonhee/hangulclockforandroid/widget/bigsizefull.java b/app/src/main/java/com/leejoonhee/hangulclockforandroid/widget/bigsizefull.java
index 2c312f4..28c23ca 100644
--- a/app/src/main/java/com/leejoonhee/hangulclockforandroid/widget/bigsizefull.java
+++ b/app/src/main/java/com/leejoonhee/hangulclockforandroid/widget/bigsizefull.java
@@ -16,6 +16,9 @@
import java.util.Calendar;
+/**
+ * Implementation of App Widget functionality.
+ */
public class bigsizefull extends AppWidgetProvider {
private static final int WIDGET_UPDATE_INTERVAL = 1000; //초당 한번씩 update를 합니다
@@ -24,6 +27,8 @@ public class bigsizefull extends AppWidgetProvider {
private static PendingIntent mSender;
private static AlarmManager mManager;
+ RemoteViews views;
+
@Override
public void onReceive(Context context, Intent intent)
{
@@ -63,7 +68,7 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a
{
int appWidgetId = appWidgetIds[i];
- RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.bigsizefull);//new_app_widget의 objects들의 값을 변경하기위함입니다
+ views = new RemoteViews(context.getPackageName(), R.layout.bigsizefull);//new_app_widget의 objects들의 값을 변경하기위함입니다
if(timer.getInt("min", 0) != 0){
views.setTextViewText(R.id.textView1, "타이머 시작하기");
@@ -77,255 +82,13 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a
views.setTextViewText(R.id.textView1, sets.getString("title", "언젠가는 빛이 될 당신"));//Onupdate에서 받은 sentence의 값을 new_app_widget의 textview1의 ID를 가진 object에 올려줍니다
- String str = sets.getString("title", "언젠가는 빛이 될 당신");
-
- if(str.contains("**weather**")){
- new MainActivity.ReceiveShortWeather().execute();
- String inst = MainActivity.weathersaved.replaceAll("강수량","");
- views.setTextViewText(R.id.textView1, inst);
- }
-
- //textcolorselcetion이 1이라면..
- if (sets.getInt("color", 0) == 1){
- views.setImageViewResource(R.id.imageView, R.color.white);
- views.setImageViewResource(R.id.imageView2, R.color.white);
- views.setImageViewResource(R.id.imageView4, R.color.white);
- views.setImageViewResource(R.id.imageView5, R.color.white);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 2){
- views.setImageViewResource(R.id.imageView, R.color.black);
- views.setImageViewResource(R.id.imageView2, R.color.black);
- views.setImageViewResource(R.id.imageView4, R.color.black);
- views.setImageViewResource(R.id.imageView5, R.color.black);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 3){
- views.setImageViewResource(R.id.imageView, R.color.claret);
- views.setImageViewResource(R.id.imageView2, R.color.claret);
- views.setImageViewResource(R.id.imageView4, R.color.claret);
- views.setImageViewResource(R.id.imageView5, R.color.claret);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 4){
- views.setImageViewResource(R.id.imageView, R.color.clarett);
- views.setImageViewResource(R.id.imageView2, R.color.clarett);
- views.setImageViewResource(R.id.imageView4, R.color.clarett);
- views.setImageViewResource(R.id.imageView5, R.color.clarett);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 5){
- views.setImageViewResource(R.id.imageView, R.color.clarettt);
- views.setImageViewResource(R.id.imageView2, R.color.clarettt);
- views.setImageViewResource(R.id.imageView4, R.color.clarettt);
- views.setImageViewResource(R.id.imageView5, R.color.clarettt);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 6){
- views.setImageViewResource(R.id.imageView, R.color.red);
- views.setImageViewResource(R.id.imageView2, R.color.red);
- views.setImageViewResource(R.id.imageView4, R.color.red);
- views.setImageViewResource(R.id.imageView5, R.color.red);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 7){
- views.setImageViewResource(R.id.imageView, R.color.redd);
- views.setImageViewResource(R.id.imageView2, R.color.redd);
- views.setImageViewResource(R.id.imageView4, R.color.redd);
- views.setImageViewResource(R.id.imageView5, R.color.redd);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 8){
- views.setImageViewResource(R.id.imageView, R.color.reddd);
- views.setImageViewResource(R.id.imageView2, R.color.reddd);
- views.setImageViewResource(R.id.imageView4, R.color.reddd);
- views.setImageViewResource(R.id.imageView5, R.color.reddd);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 9){
- views.setImageViewResource(R.id.imageView, R.color.pink);
- views.setImageViewResource(R.id.imageView2, R.color.pink);
- views.setImageViewResource(R.id.imageView4, R.color.pink);
- views.setImageViewResource(R.id.imageView5, R.color.pink);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 10){
- views.setImageViewResource(R.id.imageView, R.color.pinkk);
- views.setImageViewResource(R.id.imageView2, R.color.pinkk);
- views.setImageViewResource(R.id.imageView4, R.color.pinkk);
- views.setImageViewResource(R.id.imageView5, R.color.pinkk);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 11){
- views.setImageViewResource(R.id.imageView, R.color.orange);
- views.setImageViewResource(R.id.imageView2, R.color.orange);
- views.setImageViewResource(R.id.imageView4, R.color.orange);
- views.setImageViewResource(R.id.imageView5, R.color.orange);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 12){
- views.setImageViewResource(R.id.imageView, R.color.orangee);
- views.setImageViewResource(R.id.imageView2, R.color.orangee);
- views.setImageViewResource(R.id.imageView4, R.color.orangee);
- views.setImageViewResource(R.id.imageView5, R.color.orangee);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 13){
- views.setImageViewResource(R.id.imageView, R.color.orangeee);
- views.setImageViewResource(R.id.imageView2, R.color.orangeee);
- views.setImageViewResource(R.id.imageView4, R.color.orangeee);
- views.setImageViewResource(R.id.imageView5, R.color.orangeee);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 14){
- views.setImageViewResource(R.id.imageView, R.color.yellow);
- views.setImageViewResource(R.id.imageView2, R.color.yellow);
- views.setImageViewResource(R.id.imageView4, R.color.yellow);
- views.setImageViewResource(R.id.imageView5, R.color.yellow);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 15){
- views.setImageViewResource(R.id.imageView, R.color.yelloww);
- views.setImageViewResource(R.id.imageView2, R.color.yelloww);
- views.setImageViewResource(R.id.imageView4, R.color.yelloww);
- views.setImageViewResource(R.id.imageView5, R.color.yelloww);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 16){
- views.setImageViewResource(R.id.imageView, R.color.green);
- views.setImageViewResource(R.id.imageView2, R.color.green);
- views.setImageViewResource(R.id.imageView4, R.color.green);
- views.setImageViewResource(R.id.imageView5, R.color.green);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 17){
- views.setImageViewResource(R.id.imageView, R.color.greenn);
- views.setImageViewResource(R.id.imageView2, R.color.greenn);
- views.setImageViewResource(R.id.imageView4, R.color.greenn);
- views.setImageViewResource(R.id.imageView5, R.color.greenn);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 18){
- views.setImageViewResource(R.id.imageView, R.color.greennn);
- views.setImageViewResource(R.id.imageView2, R.color.greennn);
- views.setImageViewResource(R.id.imageView4, R.color.greennn);
- views.setImageViewResource(R.id.imageView5, R.color.greennn);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 19){
- views.setImageViewResource(R.id.imageView, R.color.bluegreen);
- views.setImageViewResource(R.id.imageView2, R.color.bluegreen);
- views.setImageViewResource(R.id.imageView4, R.color.bluegreen);
- views.setImageViewResource(R.id.imageView5, R.color.bluegreen);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 20){
- views.setImageViewResource(R.id.imageView, R.color.bluegreenn);
- views.setImageViewResource(R.id.imageView2, R.color.bluegreenn);
- views.setImageViewResource(R.id.imageView4, R.color.bluegreenn);
- views.setImageViewResource(R.id.imageView5, R.color.bluegreenn);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 21){
- views.setImageViewResource(R.id.imageView, R.color.navy);
- views.setImageViewResource(R.id.imageView2, R.color.navy);
- views.setImageViewResource(R.id.imageView4, R.color.navy);
- views.setImageViewResource(R.id.imageView5, R.color.navy);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 22){
- views.setImageViewResource(R.id.imageView, R.color.navyy);
- views.setImageViewResource(R.id.imageView2, R.color.navyy);
- views.setImageViewResource(R.id.imageView4, R.color.navyy);
- views.setImageViewResource(R.id.imageView5, R.color.navyy);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 23){
- views.setImageViewResource(R.id.imageView, R.color.darkblue);
- views.setImageViewResource(R.id.imageView2, R.color.darkblue);
- views.setImageViewResource(R.id.imageView4, R.color.darkblue);
- views.setImageViewResource(R.id.imageView5, R.color.darkblue);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 24){
- views.setImageViewResource(R.id.imageView, R.color.blue);
- views.setImageViewResource(R.id.imageView2, R.color.blue);
- views.setImageViewResource(R.id.imageView4, R.color.blue);
- views.setImageViewResource(R.id.imageView5, R.color.blue);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 25){
- views.setImageViewResource(R.id.imageView, R.color.bluee);
- views.setImageViewResource(R.id.imageView2, R.color.bluee);
- views.setImageViewResource(R.id.imageView4, R.color.bluee);
- views.setImageViewResource(R.id.imageView5, R.color.bluee);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 26){
- views.setImageViewResource(R.id.imageView, R.color.violet);
- views.setImageViewResource(R.id.imageView2, R.color.violet);
- views.setImageViewResource(R.id.imageView4, R.color.violet);
- views.setImageViewResource(R.id.imageView5, R.color.violet);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 27){
- views.setImageViewResource(R.id.imageView, R.color.violett);
- views.setImageViewResource(R.id.imageView2, R.color.violett);
- views.setImageViewResource(R.id.imageView4, R.color.violett);
- views.setImageViewResource(R.id.imageView5, R.color.violett);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 28){
- views.setImageViewResource(R.id.imageView, R.color.violettt);
- views.setImageViewResource(R.id.imageView2, R.color.violettt);
- views.setImageViewResource(R.id.imageView4, R.color.violettt);
- views.setImageViewResource(R.id.imageView5, R.color.violettt);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 29){
- views.setImageViewResource(R.id.imageView, R.color.violetttt);
- views.setImageViewResource(R.id.imageView2, R.color.violetttt);
- views.setImageViewResource(R.id.imageView4, R.color.violetttt);
- views.setImageViewResource(R.id.imageView5, R.color.violetttt);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 30){
- views.setImageViewResource(R.id.imageView, R.color.violettttt);
- views.setImageViewResource(R.id.imageView2, R.color.violettttt);
- views.setImageViewResource(R.id.imageView4, R.color.violettttt);
- views.setImageViewResource(R.id.imageView5, R.color.violettttt);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
+ int colorAlpha = sets.getInt("colorAlpha", 255);
+ int colorRed = sets.getInt("colorRed", 255);
+ int colorGreen = sets.getInt("colorGreen", 255);
+ int colorBlue = sets.getInt("colorBlue", 255);
+ views.setTextColor(R.id.textView1, Color.argb(colorAlpha, colorRed, colorGreen, colorBlue));
+ frameColor(sets.getInt("color", R.color.white));
views.setTextColor(R.id.aa, Color.argb(65, 67, 70, 90));
views.setTextColor(R.id.ab, Color.argb(65, 67, 70, 90));
@@ -1430,6 +1193,13 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a
}
}
+ void frameColor(int Color){
+ views.setImageViewResource(R.id.imageView, Color);
+ views.setImageViewResource(R.id.imageView2, Color);
+ views.setImageViewResource(R.id.imageView4, Color);
+ views.setImageViewResource(R.id.imageView5, Color);
+ }
+
public void removePreviousAlarm()
{
if(mManager != null && mSender != null)
@@ -1438,6 +1208,4 @@ public void removePreviousAlarm()
mManager.cancel(mSender);
}
}
-
-}
-
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/leejoonhee/hangulclockforandroid/widget/bigsizemid.java b/app/src/main/java/com/leejoonhee/hangulclockforandroid/widget/bigsizemid.java
index 5a98711..7a6529d 100644
--- a/app/src/main/java/com/leejoonhee/hangulclockforandroid/widget/bigsizemid.java
+++ b/app/src/main/java/com/leejoonhee/hangulclockforandroid/widget/bigsizemid.java
@@ -27,6 +27,8 @@ public class bigsizemid extends AppWidgetProvider {
private static PendingIntent mSender;
private static AlarmManager mManager;
+ RemoteViews views;
+
@Override
public void onReceive(Context context, Intent intent)
{
@@ -66,7 +68,7 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a
{
int appWidgetId = appWidgetIds[i];
- RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.bigsizemid);//new_app_widget의 objects들의 값을 변경하기위함입니다
+ views = new RemoteViews(context.getPackageName(), R.layout.bigsizemid);//new_app_widget의 objects들의 값을 변경하기위함입니다
if(timer.getInt("min", 0) != 0){
views.setTextViewText(R.id.textView1, "타이머 시작하기");
@@ -82,252 +84,13 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a
String str = sets.getString("title", "언젠가는 빛이 될 당신");
- if(str.contains("**weather**")){
- new MainActivity.ReceiveShortWeather().execute();
- String inst = MainActivity.weathersaved.replaceAll("강수량","");
- views.setTextViewText(R.id.textView1, inst);
- }
-
- //textcolorselcetion이 1이라면..
- if (sets.getInt("color", 0) == 1){
- views.setImageViewResource(R.id.imageView, R.color.white);
- views.setImageViewResource(R.id.imageView2, R.color.white);
- views.setImageViewResource(R.id.imageView4, R.color.white);
- views.setImageViewResource(R.id.imageView5, R.color.white);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 2){
- views.setImageViewResource(R.id.imageView, R.color.black);
- views.setImageViewResource(R.id.imageView2, R.color.black);
- views.setImageViewResource(R.id.imageView4, R.color.black);
- views.setImageViewResource(R.id.imageView5, R.color.black);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 3){
- views.setImageViewResource(R.id.imageView, R.color.claret);
- views.setImageViewResource(R.id.imageView2, R.color.claret);
- views.setImageViewResource(R.id.imageView4, R.color.claret);
- views.setImageViewResource(R.id.imageView5, R.color.claret);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 4){
- views.setImageViewResource(R.id.imageView, R.color.clarett);
- views.setImageViewResource(R.id.imageView2, R.color.clarett);
- views.setImageViewResource(R.id.imageView4, R.color.clarett);
- views.setImageViewResource(R.id.imageView5, R.color.clarett);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 5){
- views.setImageViewResource(R.id.imageView, R.color.clarettt);
- views.setImageViewResource(R.id.imageView2, R.color.clarettt);
- views.setImageViewResource(R.id.imageView4, R.color.clarettt);
- views.setImageViewResource(R.id.imageView5, R.color.clarettt);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 6){
- views.setImageViewResource(R.id.imageView, R.color.red);
- views.setImageViewResource(R.id.imageView2, R.color.red);
- views.setImageViewResource(R.id.imageView4, R.color.red);
- views.setImageViewResource(R.id.imageView5, R.color.red);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 7){
- views.setImageViewResource(R.id.imageView, R.color.redd);
- views.setImageViewResource(R.id.imageView2, R.color.redd);
- views.setImageViewResource(R.id.imageView4, R.color.redd);
- views.setImageViewResource(R.id.imageView5, R.color.redd);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 8){
- views.setImageViewResource(R.id.imageView, R.color.reddd);
- views.setImageViewResource(R.id.imageView2, R.color.reddd);
- views.setImageViewResource(R.id.imageView4, R.color.reddd);
- views.setImageViewResource(R.id.imageView5, R.color.reddd);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 9){
- views.setImageViewResource(R.id.imageView, R.color.pink);
- views.setImageViewResource(R.id.imageView2, R.color.pink);
- views.setImageViewResource(R.id.imageView4, R.color.pink);
- views.setImageViewResource(R.id.imageView5, R.color.pink);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 10){
- views.setImageViewResource(R.id.imageView, R.color.pinkk);
- views.setImageViewResource(R.id.imageView2, R.color.pinkk);
- views.setImageViewResource(R.id.imageView4, R.color.pinkk);
- views.setImageViewResource(R.id.imageView5, R.color.pinkk);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 11){
- views.setImageViewResource(R.id.imageView, R.color.orange);
- views.setImageViewResource(R.id.imageView2, R.color.orange);
- views.setImageViewResource(R.id.imageView4, R.color.orange);
- views.setImageViewResource(R.id.imageView5, R.color.orange);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 12){
- views.setImageViewResource(R.id.imageView, R.color.orangee);
- views.setImageViewResource(R.id.imageView2, R.color.orangee);
- views.setImageViewResource(R.id.imageView4, R.color.orangee);
- views.setImageViewResource(R.id.imageView5, R.color.orangee);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 13){
- views.setImageViewResource(R.id.imageView, R.color.orangeee);
- views.setImageViewResource(R.id.imageView2, R.color.orangeee);
- views.setImageViewResource(R.id.imageView4, R.color.orangeee);
- views.setImageViewResource(R.id.imageView5, R.color.orangeee);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 14){
- views.setImageViewResource(R.id.imageView, R.color.yellow);
- views.setImageViewResource(R.id.imageView2, R.color.yellow);
- views.setImageViewResource(R.id.imageView4, R.color.yellow);
- views.setImageViewResource(R.id.imageView5, R.color.yellow);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
+ int colorAlpha = sets.getInt("colorAlpha", 255);
+ int colorRed = sets.getInt("colorRed", 255);
+ int colorGreen = sets.getInt("colorGreen", 255);
+ int colorBlue = sets.getInt("colorBlue", 255);
- if(sets.getInt("color", 0) == 15){
- views.setImageViewResource(R.id.imageView, R.color.yelloww);
- views.setImageViewResource(R.id.imageView2, R.color.yelloww);
- views.setImageViewResource(R.id.imageView4, R.color.yelloww);
- views.setImageViewResource(R.id.imageView5, R.color.yelloww);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 16){
- views.setImageViewResource(R.id.imageView, R.color.green);
- views.setImageViewResource(R.id.imageView2, R.color.green);
- views.setImageViewResource(R.id.imageView4, R.color.green);
- views.setImageViewResource(R.id.imageView5, R.color.green);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 17){
- views.setImageViewResource(R.id.imageView, R.color.greenn);
- views.setImageViewResource(R.id.imageView2, R.color.greenn);
- views.setImageViewResource(R.id.imageView4, R.color.greenn);
- views.setImageViewResource(R.id.imageView5, R.color.greenn);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 18){
- views.setImageViewResource(R.id.imageView, R.color.greennn);
- views.setImageViewResource(R.id.imageView2, R.color.greennn);
- views.setImageViewResource(R.id.imageView4, R.color.greennn);
- views.setImageViewResource(R.id.imageView5, R.color.greennn);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 19){
- views.setImageViewResource(R.id.imageView, R.color.bluegreen);
- views.setImageViewResource(R.id.imageView2, R.color.bluegreen);
- views.setImageViewResource(R.id.imageView4, R.color.bluegreen);
- views.setImageViewResource(R.id.imageView5, R.color.bluegreen);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 20){
- views.setImageViewResource(R.id.imageView, R.color.bluegreenn);
- views.setImageViewResource(R.id.imageView2, R.color.bluegreenn);
- views.setImageViewResource(R.id.imageView4, R.color.bluegreenn);
- views.setImageViewResource(R.id.imageView5, R.color.bluegreenn);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 21){
- views.setImageViewResource(R.id.imageView, R.color.navy);
- views.setImageViewResource(R.id.imageView2, R.color.navy);
- views.setImageViewResource(R.id.imageView4, R.color.navy);
- views.setImageViewResource(R.id.imageView5, R.color.navy);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 22){
- views.setImageViewResource(R.id.imageView, R.color.navyy);
- views.setImageViewResource(R.id.imageView2, R.color.navyy);
- views.setImageViewResource(R.id.imageView4, R.color.navyy);
- views.setImageViewResource(R.id.imageView5, R.color.navyy);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 23){
- views.setImageViewResource(R.id.imageView, R.color.darkblue);
- views.setImageViewResource(R.id.imageView2, R.color.darkblue);
- views.setImageViewResource(R.id.imageView4, R.color.darkblue);
- views.setImageViewResource(R.id.imageView5, R.color.darkblue);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 24){
- views.setImageViewResource(R.id.imageView, R.color.blue);
- views.setImageViewResource(R.id.imageView2, R.color.blue);
- views.setImageViewResource(R.id.imageView4, R.color.blue);
- views.setImageViewResource(R.id.imageView5, R.color.blue);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 25){
- views.setImageViewResource(R.id.imageView, R.color.bluee);
- views.setImageViewResource(R.id.imageView2, R.color.bluee);
- views.setImageViewResource(R.id.imageView4, R.color.bluee);
- views.setImageViewResource(R.id.imageView5, R.color.bluee);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 26){
- views.setImageViewResource(R.id.imageView, R.color.violet);
- views.setImageViewResource(R.id.imageView2, R.color.violet);
- views.setImageViewResource(R.id.imageView4, R.color.violet);
- views.setImageViewResource(R.id.imageView5, R.color.violet);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 27){
- views.setImageViewResource(R.id.imageView, R.color.violett);
- views.setImageViewResource(R.id.imageView2, R.color.violett);
- views.setImageViewResource(R.id.imageView4, R.color.violett);
- views.setImageViewResource(R.id.imageView5, R.color.violett);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 28){
- views.setImageViewResource(R.id.imageView, R.color.violettt);
- views.setImageViewResource(R.id.imageView2, R.color.violettt);
- views.setImageViewResource(R.id.imageView4, R.color.violettt);
- views.setImageViewResource(R.id.imageView5, R.color.violettt);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 29){
- views.setImageViewResource(R.id.imageView, R.color.violetttt);
- views.setImageViewResource(R.id.imageView2, R.color.violetttt);
- views.setImageViewResource(R.id.imageView4, R.color.violetttt);
- views.setImageViewResource(R.id.imageView5, R.color.violetttt);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 30){
- views.setImageViewResource(R.id.imageView, R.color.violettttt);
- views.setImageViewResource(R.id.imageView2, R.color.violettttt);
- views.setImageViewResource(R.id.imageView4, R.color.violettttt);
- views.setImageViewResource(R.id.imageView5, R.color.violettttt);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
+ views.setTextColor(R.id.textView1, Color.argb(colorAlpha, colorRed, colorGreen, colorBlue));
+ frameColor(sets.getInt("color", R.color.white));
views.setTextColor(R.id.aa, Color.argb(65, 67, 70, 90));
views.setTextColor(R.id.ab, Color.argb(65, 67, 70, 90));
@@ -1432,6 +1195,13 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a
}
}
+ void frameColor(int Color){
+ views.setImageViewResource(R.id.imageView, Color);
+ views.setImageViewResource(R.id.imageView2, Color);
+ views.setImageViewResource(R.id.imageView4, Color);
+ views.setImageViewResource(R.id.imageView5, Color);
+ }
+
public void removePreviousAlarm()
{
if(mManager != null && mSender != null)
diff --git a/app/src/main/java/com/leejoonhee/hangulclockforandroid/widget/bigsizesmall.java b/app/src/main/java/com/leejoonhee/hangulclockforandroid/widget/bigsizesmall.java
index 8c278e4..be05175 100644
--- a/app/src/main/java/com/leejoonhee/hangulclockforandroid/widget/bigsizesmall.java
+++ b/app/src/main/java/com/leejoonhee/hangulclockforandroid/widget/bigsizesmall.java
@@ -27,6 +27,8 @@ public class bigsizesmall extends AppWidgetProvider {
private static PendingIntent mSender;
private static AlarmManager mManager;
+ RemoteViews views;
+
@Override
public void onReceive(Context context, Intent intent)
{
@@ -66,7 +68,7 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a
{
int appWidgetId = appWidgetIds[i];
- RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.bigsizesmall);//new_app_widget의 objects들의 값을 변경하기위함입니다
+ views = new RemoteViews(context.getPackageName(), R.layout.bigsizesmall);//new_app_widget의 objects들의 값을 변경하기위함입니다
if(timer.getInt("min", 0) != 0){
views.setTextViewText(R.id.textView1, "타이머 시작하기");
@@ -82,252 +84,13 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a
String str = sets.getString("title", "언젠가는 빛이 될 당신");
- if(str.contains("**weather**")){
- new MainActivity.ReceiveShortWeather().execute();
- String inst = MainActivity.weathersaved.replaceAll("강수량","");
- views.setTextViewText(R.id.textView1, inst);
- }
-
- //textcolorselcetion이 1이라면..
- if (sets.getInt("color", 0) == 1){
- views.setImageViewResource(R.id.imageView, R.color.white);
- views.setImageViewResource(R.id.imageView2, R.color.white);
- views.setImageViewResource(R.id.imageView4, R.color.white);
- views.setImageViewResource(R.id.imageView5, R.color.white);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 2){
- views.setImageViewResource(R.id.imageView, R.color.black);
- views.setImageViewResource(R.id.imageView2, R.color.black);
- views.setImageViewResource(R.id.imageView4, R.color.black);
- views.setImageViewResource(R.id.imageView5, R.color.black);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 3){
- views.setImageViewResource(R.id.imageView, R.color.claret);
- views.setImageViewResource(R.id.imageView2, R.color.claret);
- views.setImageViewResource(R.id.imageView4, R.color.claret);
- views.setImageViewResource(R.id.imageView5, R.color.claret);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 4){
- views.setImageViewResource(R.id.imageView, R.color.clarett);
- views.setImageViewResource(R.id.imageView2, R.color.clarett);
- views.setImageViewResource(R.id.imageView4, R.color.clarett);
- views.setImageViewResource(R.id.imageView5, R.color.clarett);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 5){
- views.setImageViewResource(R.id.imageView, R.color.clarettt);
- views.setImageViewResource(R.id.imageView2, R.color.clarettt);
- views.setImageViewResource(R.id.imageView4, R.color.clarettt);
- views.setImageViewResource(R.id.imageView5, R.color.clarettt);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 6){
- views.setImageViewResource(R.id.imageView, R.color.red);
- views.setImageViewResource(R.id.imageView2, R.color.red);
- views.setImageViewResource(R.id.imageView4, R.color.red);
- views.setImageViewResource(R.id.imageView5, R.color.red);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 7){
- views.setImageViewResource(R.id.imageView, R.color.redd);
- views.setImageViewResource(R.id.imageView2, R.color.redd);
- views.setImageViewResource(R.id.imageView4, R.color.redd);
- views.setImageViewResource(R.id.imageView5, R.color.redd);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 8){
- views.setImageViewResource(R.id.imageView, R.color.reddd);
- views.setImageViewResource(R.id.imageView2, R.color.reddd);
- views.setImageViewResource(R.id.imageView4, R.color.reddd);
- views.setImageViewResource(R.id.imageView5, R.color.reddd);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 9){
- views.setImageViewResource(R.id.imageView, R.color.pink);
- views.setImageViewResource(R.id.imageView2, R.color.pink);
- views.setImageViewResource(R.id.imageView4, R.color.pink);
- views.setImageViewResource(R.id.imageView5, R.color.pink);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 10){
- views.setImageViewResource(R.id.imageView, R.color.pinkk);
- views.setImageViewResource(R.id.imageView2, R.color.pinkk);
- views.setImageViewResource(R.id.imageView4, R.color.pinkk);
- views.setImageViewResource(R.id.imageView5, R.color.pinkk);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 11){
- views.setImageViewResource(R.id.imageView, R.color.orange);
- views.setImageViewResource(R.id.imageView2, R.color.orange);
- views.setImageViewResource(R.id.imageView4, R.color.orange);
- views.setImageViewResource(R.id.imageView5, R.color.orange);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 12){
- views.setImageViewResource(R.id.imageView, R.color.orangee);
- views.setImageViewResource(R.id.imageView2, R.color.orangee);
- views.setImageViewResource(R.id.imageView4, R.color.orangee);
- views.setImageViewResource(R.id.imageView5, R.color.orangee);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 13){
- views.setImageViewResource(R.id.imageView, R.color.orangeee);
- views.setImageViewResource(R.id.imageView2, R.color.orangeee);
- views.setImageViewResource(R.id.imageView4, R.color.orangeee);
- views.setImageViewResource(R.id.imageView5, R.color.orangeee);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 14){
- views.setImageViewResource(R.id.imageView, R.color.yellow);
- views.setImageViewResource(R.id.imageView2, R.color.yellow);
- views.setImageViewResource(R.id.imageView4, R.color.yellow);
- views.setImageViewResource(R.id.imageView5, R.color.yellow);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
+ int colorAlpha = sets.getInt("colorAlpha", 255);
+ int colorRed = sets.getInt("colorRed", 255);
+ int colorGreen = sets.getInt("colorGreen", 255);
+ int colorBlue = sets.getInt("colorBlue", 255);
- if(sets.getInt("color", 0) == 15){
- views.setImageViewResource(R.id.imageView, R.color.yelloww);
- views.setImageViewResource(R.id.imageView2, R.color.yelloww);
- views.setImageViewResource(R.id.imageView4, R.color.yelloww);
- views.setImageViewResource(R.id.imageView5, R.color.yelloww);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 16){
- views.setImageViewResource(R.id.imageView, R.color.green);
- views.setImageViewResource(R.id.imageView2, R.color.green);
- views.setImageViewResource(R.id.imageView4, R.color.green);
- views.setImageViewResource(R.id.imageView5, R.color.green);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 17){
- views.setImageViewResource(R.id.imageView, R.color.greenn);
- views.setImageViewResource(R.id.imageView2, R.color.greenn);
- views.setImageViewResource(R.id.imageView4, R.color.greenn);
- views.setImageViewResource(R.id.imageView5, R.color.greenn);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 18){
- views.setImageViewResource(R.id.imageView, R.color.greennn);
- views.setImageViewResource(R.id.imageView2, R.color.greennn);
- views.setImageViewResource(R.id.imageView4, R.color.greennn);
- views.setImageViewResource(R.id.imageView5, R.color.greennn);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 19){
- views.setImageViewResource(R.id.imageView, R.color.bluegreen);
- views.setImageViewResource(R.id.imageView2, R.color.bluegreen);
- views.setImageViewResource(R.id.imageView4, R.color.bluegreen);
- views.setImageViewResource(R.id.imageView5, R.color.bluegreen);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 20){
- views.setImageViewResource(R.id.imageView, R.color.bluegreenn);
- views.setImageViewResource(R.id.imageView2, R.color.bluegreenn);
- views.setImageViewResource(R.id.imageView4, R.color.bluegreenn);
- views.setImageViewResource(R.id.imageView5, R.color.bluegreenn);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 21){
- views.setImageViewResource(R.id.imageView, R.color.navy);
- views.setImageViewResource(R.id.imageView2, R.color.navy);
- views.setImageViewResource(R.id.imageView4, R.color.navy);
- views.setImageViewResource(R.id.imageView5, R.color.navy);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 22){
- views.setImageViewResource(R.id.imageView, R.color.navyy);
- views.setImageViewResource(R.id.imageView2, R.color.navyy);
- views.setImageViewResource(R.id.imageView4, R.color.navyy);
- views.setImageViewResource(R.id.imageView5, R.color.navyy);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 23){
- views.setImageViewResource(R.id.imageView, R.color.darkblue);
- views.setImageViewResource(R.id.imageView2, R.color.darkblue);
- views.setImageViewResource(R.id.imageView4, R.color.darkblue);
- views.setImageViewResource(R.id.imageView5, R.color.darkblue);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 24){
- views.setImageViewResource(R.id.imageView, R.color.blue);
- views.setImageViewResource(R.id.imageView2, R.color.blue);
- views.setImageViewResource(R.id.imageView4, R.color.blue);
- views.setImageViewResource(R.id.imageView5, R.color.blue);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 25){
- views.setImageViewResource(R.id.imageView, R.color.bluee);
- views.setImageViewResource(R.id.imageView2, R.color.bluee);
- views.setImageViewResource(R.id.imageView4, R.color.bluee);
- views.setImageViewResource(R.id.imageView5, R.color.bluee);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 26){
- views.setImageViewResource(R.id.imageView, R.color.violet);
- views.setImageViewResource(R.id.imageView2, R.color.violet);
- views.setImageViewResource(R.id.imageView4, R.color.violet);
- views.setImageViewResource(R.id.imageView5, R.color.violet);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 27){
- views.setImageViewResource(R.id.imageView, R.color.violett);
- views.setImageViewResource(R.id.imageView2, R.color.violett);
- views.setImageViewResource(R.id.imageView4, R.color.violett);
- views.setImageViewResource(R.id.imageView5, R.color.violett);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 28){
- views.setImageViewResource(R.id.imageView, R.color.violettt);
- views.setImageViewResource(R.id.imageView2, R.color.violettt);
- views.setImageViewResource(R.id.imageView4, R.color.violettt);
- views.setImageViewResource(R.id.imageView5, R.color.violettt);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 29){
- views.setImageViewResource(R.id.imageView, R.color.violetttt);
- views.setImageViewResource(R.id.imageView2, R.color.violetttt);
- views.setImageViewResource(R.id.imageView4, R.color.violetttt);
- views.setImageViewResource(R.id.imageView5, R.color.violetttt);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 30){
- views.setImageViewResource(R.id.imageView, R.color.violettttt);
- views.setImageViewResource(R.id.imageView2, R.color.violettttt);
- views.setImageViewResource(R.id.imageView4, R.color.violettttt);
- views.setImageViewResource(R.id.imageView5, R.color.violettttt);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
+ views.setTextColor(R.id.textView1, Color.argb(colorAlpha, colorRed, colorGreen, colorBlue));
+ frameColor(sets.getInt("color", R.color.white));
views.setTextColor(R.id.aa, Color.argb(65, 67, 70, 90));
views.setTextColor(R.id.ab, Color.argb(65, 67, 70, 90));
@@ -1432,6 +1195,13 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a
}
}
+ void frameColor(int Color){
+ views.setImageViewResource(R.id.imageView, Color);
+ views.setImageViewResource(R.id.imageView2, Color);
+ views.setImageViewResource(R.id.imageView4, Color);
+ views.setImageViewResource(R.id.imageView5, Color);
+ }
+
public void removePreviousAlarm()
{
if(mManager != null && mSender != null)
diff --git a/app/src/main/java/com/leejoonhee/hangulclockforandroid/widget/fatversion.java b/app/src/main/java/com/leejoonhee/hangulclockforandroid/widget/fatversion.java
index 74fc366..8020fdd 100644
--- a/app/src/main/java/com/leejoonhee/hangulclockforandroid/widget/fatversion.java
+++ b/app/src/main/java/com/leejoonhee/hangulclockforandroid/widget/fatversion.java
@@ -27,6 +27,8 @@ public class fatversion extends AppWidgetProvider {
private static PendingIntent mSender;
private static AlarmManager mManager;
+ RemoteViews views;
+
@Override
public void onReceive(Context context, Intent intent)
{
@@ -66,7 +68,7 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a
{
int appWidgetId = appWidgetIds[i];
- RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.fatversion);//new_app_widget의 objects들의 값을 변경하기위함입니다
+ views = new RemoteViews(context.getPackageName(), R.layout.fatversion);//new_app_widget의 objects들의 값을 변경하기위함입니다
if(timer.getInt("min", 0) != 0){
views.setTextViewText(R.id.textView1, "타이머 시작하기");
@@ -82,252 +84,13 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a
String str = sets.getString("title", "언젠가는 빛이 될 당신");
- if(str.contains("**weather**")){
- new MainActivity.ReceiveShortWeather().execute();
- String inst = MainActivity.weathersaved.replaceAll("강수량","");
- views.setTextViewText(R.id.textView1, inst);
- }
-
- //textcolorselcetion이 1이라면..
- if (sets.getInt("color", 0) == 1){
- views.setImageViewResource(R.id.imageView, R.color.white);
- views.setImageViewResource(R.id.imageView2, R.color.white);
- views.setImageViewResource(R.id.imageView4, R.color.white);
- views.setImageViewResource(R.id.imageView5, R.color.white);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 2){
- views.setImageViewResource(R.id.imageView, R.color.black);
- views.setImageViewResource(R.id.imageView2, R.color.black);
- views.setImageViewResource(R.id.imageView4, R.color.black);
- views.setImageViewResource(R.id.imageView5, R.color.black);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 3){
- views.setImageViewResource(R.id.imageView, R.color.claret);
- views.setImageViewResource(R.id.imageView2, R.color.claret);
- views.setImageViewResource(R.id.imageView4, R.color.claret);
- views.setImageViewResource(R.id.imageView5, R.color.claret);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 4){
- views.setImageViewResource(R.id.imageView, R.color.clarett);
- views.setImageViewResource(R.id.imageView2, R.color.clarett);
- views.setImageViewResource(R.id.imageView4, R.color.clarett);
- views.setImageViewResource(R.id.imageView5, R.color.clarett);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 5){
- views.setImageViewResource(R.id.imageView, R.color.clarettt);
- views.setImageViewResource(R.id.imageView2, R.color.clarettt);
- views.setImageViewResource(R.id.imageView4, R.color.clarettt);
- views.setImageViewResource(R.id.imageView5, R.color.clarettt);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 6){
- views.setImageViewResource(R.id.imageView, R.color.red);
- views.setImageViewResource(R.id.imageView2, R.color.red);
- views.setImageViewResource(R.id.imageView4, R.color.red);
- views.setImageViewResource(R.id.imageView5, R.color.red);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 7){
- views.setImageViewResource(R.id.imageView, R.color.redd);
- views.setImageViewResource(R.id.imageView2, R.color.redd);
- views.setImageViewResource(R.id.imageView4, R.color.redd);
- views.setImageViewResource(R.id.imageView5, R.color.redd);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 8){
- views.setImageViewResource(R.id.imageView, R.color.reddd);
- views.setImageViewResource(R.id.imageView2, R.color.reddd);
- views.setImageViewResource(R.id.imageView4, R.color.reddd);
- views.setImageViewResource(R.id.imageView5, R.color.reddd);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 9){
- views.setImageViewResource(R.id.imageView, R.color.pink);
- views.setImageViewResource(R.id.imageView2, R.color.pink);
- views.setImageViewResource(R.id.imageView4, R.color.pink);
- views.setImageViewResource(R.id.imageView5, R.color.pink);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 10){
- views.setImageViewResource(R.id.imageView, R.color.pinkk);
- views.setImageViewResource(R.id.imageView2, R.color.pinkk);
- views.setImageViewResource(R.id.imageView4, R.color.pinkk);
- views.setImageViewResource(R.id.imageView5, R.color.pinkk);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 11){
- views.setImageViewResource(R.id.imageView, R.color.orange);
- views.setImageViewResource(R.id.imageView2, R.color.orange);
- views.setImageViewResource(R.id.imageView4, R.color.orange);
- views.setImageViewResource(R.id.imageView5, R.color.orange);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 12){
- views.setImageViewResource(R.id.imageView, R.color.orangee);
- views.setImageViewResource(R.id.imageView2, R.color.orangee);
- views.setImageViewResource(R.id.imageView4, R.color.orangee);
- views.setImageViewResource(R.id.imageView5, R.color.orangee);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 13){
- views.setImageViewResource(R.id.imageView, R.color.orangeee);
- views.setImageViewResource(R.id.imageView2, R.color.orangeee);
- views.setImageViewResource(R.id.imageView4, R.color.orangeee);
- views.setImageViewResource(R.id.imageView5, R.color.orangeee);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 14){
- views.setImageViewResource(R.id.imageView, R.color.yellow);
- views.setImageViewResource(R.id.imageView2, R.color.yellow);
- views.setImageViewResource(R.id.imageView4, R.color.yellow);
- views.setImageViewResource(R.id.imageView5, R.color.yellow);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
+ int colorAlpha = sets.getInt("colorAlpha", 255);
+ int colorRed = sets.getInt("colorRed", 255);
+ int colorGreen = sets.getInt("colorGreen", 255);
+ int colorBlue = sets.getInt("colorBlue", 255);
- if(sets.getInt("color", 0) == 15){
- views.setImageViewResource(R.id.imageView, R.color.yelloww);
- views.setImageViewResource(R.id.imageView2, R.color.yelloww);
- views.setImageViewResource(R.id.imageView4, R.color.yelloww);
- views.setImageViewResource(R.id.imageView5, R.color.yelloww);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 16){
- views.setImageViewResource(R.id.imageView, R.color.green);
- views.setImageViewResource(R.id.imageView2, R.color.green);
- views.setImageViewResource(R.id.imageView4, R.color.green);
- views.setImageViewResource(R.id.imageView5, R.color.green);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 17){
- views.setImageViewResource(R.id.imageView, R.color.greenn);
- views.setImageViewResource(R.id.imageView2, R.color.greenn);
- views.setImageViewResource(R.id.imageView4, R.color.greenn);
- views.setImageViewResource(R.id.imageView5, R.color.greenn);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 18){
- views.setImageViewResource(R.id.imageView, R.color.greennn);
- views.setImageViewResource(R.id.imageView2, R.color.greennn);
- views.setImageViewResource(R.id.imageView4, R.color.greennn);
- views.setImageViewResource(R.id.imageView5, R.color.greennn);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 19){
- views.setImageViewResource(R.id.imageView, R.color.bluegreen);
- views.setImageViewResource(R.id.imageView2, R.color.bluegreen);
- views.setImageViewResource(R.id.imageView4, R.color.bluegreen);
- views.setImageViewResource(R.id.imageView5, R.color.bluegreen);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 20){
- views.setImageViewResource(R.id.imageView, R.color.bluegreenn);
- views.setImageViewResource(R.id.imageView2, R.color.bluegreenn);
- views.setImageViewResource(R.id.imageView4, R.color.bluegreenn);
- views.setImageViewResource(R.id.imageView5, R.color.bluegreenn);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 21){
- views.setImageViewResource(R.id.imageView, R.color.navy);
- views.setImageViewResource(R.id.imageView2, R.color.navy);
- views.setImageViewResource(R.id.imageView4, R.color.navy);
- views.setImageViewResource(R.id.imageView5, R.color.navy);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 22){
- views.setImageViewResource(R.id.imageView, R.color.navyy);
- views.setImageViewResource(R.id.imageView2, R.color.navyy);
- views.setImageViewResource(R.id.imageView4, R.color.navyy);
- views.setImageViewResource(R.id.imageView5, R.color.navyy);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 23){
- views.setImageViewResource(R.id.imageView, R.color.darkblue);
- views.setImageViewResource(R.id.imageView2, R.color.darkblue);
- views.setImageViewResource(R.id.imageView4, R.color.darkblue);
- views.setImageViewResource(R.id.imageView5, R.color.darkblue);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 24){
- views.setImageViewResource(R.id.imageView, R.color.blue);
- views.setImageViewResource(R.id.imageView2, R.color.blue);
- views.setImageViewResource(R.id.imageView4, R.color.blue);
- views.setImageViewResource(R.id.imageView5, R.color.blue);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 25){
- views.setImageViewResource(R.id.imageView, R.color.bluee);
- views.setImageViewResource(R.id.imageView2, R.color.bluee);
- views.setImageViewResource(R.id.imageView4, R.color.bluee);
- views.setImageViewResource(R.id.imageView5, R.color.bluee);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 26){
- views.setImageViewResource(R.id.imageView, R.color.violet);
- views.setImageViewResource(R.id.imageView2, R.color.violet);
- views.setImageViewResource(R.id.imageView4, R.color.violet);
- views.setImageViewResource(R.id.imageView5, R.color.violet);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 27){
- views.setImageViewResource(R.id.imageView, R.color.violett);
- views.setImageViewResource(R.id.imageView2, R.color.violett);
- views.setImageViewResource(R.id.imageView4, R.color.violett);
- views.setImageViewResource(R.id.imageView5, R.color.violett);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 28){
- views.setImageViewResource(R.id.imageView, R.color.violettt);
- views.setImageViewResource(R.id.imageView2, R.color.violettt);
- views.setImageViewResource(R.id.imageView4, R.color.violettt);
- views.setImageViewResource(R.id.imageView5, R.color.violettt);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 29){
- views.setImageViewResource(R.id.imageView, R.color.violetttt);
- views.setImageViewResource(R.id.imageView2, R.color.violetttt);
- views.setImageViewResource(R.id.imageView4, R.color.violetttt);
- views.setImageViewResource(R.id.imageView5, R.color.violetttt);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 30){
- views.setImageViewResource(R.id.imageView, R.color.violettttt);
- views.setImageViewResource(R.id.imageView2, R.color.violettttt);
- views.setImageViewResource(R.id.imageView4, R.color.violettttt);
- views.setImageViewResource(R.id.imageView5, R.color.violettttt);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
+ views.setTextColor(R.id.textView1, Color.argb(colorAlpha, colorRed, colorGreen, colorBlue));
+ frameColor(sets.getInt("color", R.color.white));
views.setTextColor(R.id.aa, Color.argb(65, 67, 70, 90));
views.setTextColor(R.id.ab, Color.argb(65, 67, 70, 90));
@@ -1432,6 +1195,13 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a
}
}
+ void frameColor(int Color){
+ views.setImageViewResource(R.id.imageView, Color);
+ views.setImageViewResource(R.id.imageView2, Color);
+ views.setImageViewResource(R.id.imageView4, Color);
+ views.setImageViewResource(R.id.imageView5, Color);
+ }
+
public void removePreviousAlarm()
{
if(mManager != null && mSender != null)
diff --git a/app/src/main/java/com/leejoonhee/hangulclockforandroid/widget/midsizefull.java b/app/src/main/java/com/leejoonhee/hangulclockforandroid/widget/midsizefull.java
index 2f30a5b..15ad0d4 100755
--- a/app/src/main/java/com/leejoonhee/hangulclockforandroid/widget/midsizefull.java
+++ b/app/src/main/java/com/leejoonhee/hangulclockforandroid/widget/midsizefull.java
@@ -27,6 +27,8 @@ public class midsizefull extends AppWidgetProvider {
private static PendingIntent mSender;
private static AlarmManager mManager;
+ RemoteViews views;
+
@Override
public void onReceive(Context context, Intent intent)
{
@@ -66,7 +68,7 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a
{
int appWidgetId = appWidgetIds[i];
- RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.midsizefull);//new_app_widget의 objects들의 값을 변경하기위함입니다
+ views = new RemoteViews(context.getPackageName(), R.layout.midsizefull);//new_app_widget의 objects들의 값을 변경하기위함입니다
if(timer.getInt("min", 0) != 0){
views.setTextViewText(R.id.textView1, "타이머 시작하기");
@@ -82,252 +84,13 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a
String str = sets.getString("title", "언젠가는 빛이 될 당신");
- if(str.contains("**weather**")){
- new MainActivity.ReceiveShortWeather().execute();
- String inst = MainActivity.weathersaved.replaceAll("강수량","");
- views.setTextViewText(R.id.textView1, inst);
- }
-
- //textcolorselcetion이 1이라면..
- if (sets.getInt("color", 0) == 1){
- views.setImageViewResource(R.id.imageView, R.color.white);
- views.setImageViewResource(R.id.imageView2, R.color.white);
- views.setImageViewResource(R.id.imageView4, R.color.white);
- views.setImageViewResource(R.id.imageView5, R.color.white);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 2){
- views.setImageViewResource(R.id.imageView, R.color.black);
- views.setImageViewResource(R.id.imageView2, R.color.black);
- views.setImageViewResource(R.id.imageView4, R.color.black);
- views.setImageViewResource(R.id.imageView5, R.color.black);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 3){
- views.setImageViewResource(R.id.imageView, R.color.claret);
- views.setImageViewResource(R.id.imageView2, R.color.claret);
- views.setImageViewResource(R.id.imageView4, R.color.claret);
- views.setImageViewResource(R.id.imageView5, R.color.claret);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 4){
- views.setImageViewResource(R.id.imageView, R.color.clarett);
- views.setImageViewResource(R.id.imageView2, R.color.clarett);
- views.setImageViewResource(R.id.imageView4, R.color.clarett);
- views.setImageViewResource(R.id.imageView5, R.color.clarett);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 5){
- views.setImageViewResource(R.id.imageView, R.color.clarettt);
- views.setImageViewResource(R.id.imageView2, R.color.clarettt);
- views.setImageViewResource(R.id.imageView4, R.color.clarettt);
- views.setImageViewResource(R.id.imageView5, R.color.clarettt);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 6){
- views.setImageViewResource(R.id.imageView, R.color.red);
- views.setImageViewResource(R.id.imageView2, R.color.red);
- views.setImageViewResource(R.id.imageView4, R.color.red);
- views.setImageViewResource(R.id.imageView5, R.color.red);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 7){
- views.setImageViewResource(R.id.imageView, R.color.redd);
- views.setImageViewResource(R.id.imageView2, R.color.redd);
- views.setImageViewResource(R.id.imageView4, R.color.redd);
- views.setImageViewResource(R.id.imageView5, R.color.redd);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 8){
- views.setImageViewResource(R.id.imageView, R.color.reddd);
- views.setImageViewResource(R.id.imageView2, R.color.reddd);
- views.setImageViewResource(R.id.imageView4, R.color.reddd);
- views.setImageViewResource(R.id.imageView5, R.color.reddd);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 9){
- views.setImageViewResource(R.id.imageView, R.color.pink);
- views.setImageViewResource(R.id.imageView2, R.color.pink);
- views.setImageViewResource(R.id.imageView4, R.color.pink);
- views.setImageViewResource(R.id.imageView5, R.color.pink);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 10){
- views.setImageViewResource(R.id.imageView, R.color.pinkk);
- views.setImageViewResource(R.id.imageView2, R.color.pinkk);
- views.setImageViewResource(R.id.imageView4, R.color.pinkk);
- views.setImageViewResource(R.id.imageView5, R.color.pinkk);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 11){
- views.setImageViewResource(R.id.imageView, R.color.orange);
- views.setImageViewResource(R.id.imageView2, R.color.orange);
- views.setImageViewResource(R.id.imageView4, R.color.orange);
- views.setImageViewResource(R.id.imageView5, R.color.orange);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 12){
- views.setImageViewResource(R.id.imageView, R.color.orangee);
- views.setImageViewResource(R.id.imageView2, R.color.orangee);
- views.setImageViewResource(R.id.imageView4, R.color.orangee);
- views.setImageViewResource(R.id.imageView5, R.color.orangee);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 13){
- views.setImageViewResource(R.id.imageView, R.color.orangeee);
- views.setImageViewResource(R.id.imageView2, R.color.orangeee);
- views.setImageViewResource(R.id.imageView4, R.color.orangeee);
- views.setImageViewResource(R.id.imageView5, R.color.orangeee);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 14){
- views.setImageViewResource(R.id.imageView, R.color.yellow);
- views.setImageViewResource(R.id.imageView2, R.color.yellow);
- views.setImageViewResource(R.id.imageView4, R.color.yellow);
- views.setImageViewResource(R.id.imageView5, R.color.yellow);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
+ int colorAlpha = sets.getInt("colorAlpha", 255);
+ int colorRed = sets.getInt("colorRed", 255);
+ int colorGreen = sets.getInt("colorGreen", 255);
+ int colorBlue = sets.getInt("colorBlue", 255);
- if(sets.getInt("color", 0) == 15){
- views.setImageViewResource(R.id.imageView, R.color.yelloww);
- views.setImageViewResource(R.id.imageView2, R.color.yelloww);
- views.setImageViewResource(R.id.imageView4, R.color.yelloww);
- views.setImageViewResource(R.id.imageView5, R.color.yelloww);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 16){
- views.setImageViewResource(R.id.imageView, R.color.green);
- views.setImageViewResource(R.id.imageView2, R.color.green);
- views.setImageViewResource(R.id.imageView4, R.color.green);
- views.setImageViewResource(R.id.imageView5, R.color.green);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 17){
- views.setImageViewResource(R.id.imageView, R.color.greenn);
- views.setImageViewResource(R.id.imageView2, R.color.greenn);
- views.setImageViewResource(R.id.imageView4, R.color.greenn);
- views.setImageViewResource(R.id.imageView5, R.color.greenn);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 18){
- views.setImageViewResource(R.id.imageView, R.color.greennn);
- views.setImageViewResource(R.id.imageView2, R.color.greennn);
- views.setImageViewResource(R.id.imageView4, R.color.greennn);
- views.setImageViewResource(R.id.imageView5, R.color.greennn);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 19){
- views.setImageViewResource(R.id.imageView, R.color.bluegreen);
- views.setImageViewResource(R.id.imageView2, R.color.bluegreen);
- views.setImageViewResource(R.id.imageView4, R.color.bluegreen);
- views.setImageViewResource(R.id.imageView5, R.color.bluegreen);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 20){
- views.setImageViewResource(R.id.imageView, R.color.bluegreenn);
- views.setImageViewResource(R.id.imageView2, R.color.bluegreenn);
- views.setImageViewResource(R.id.imageView4, R.color.bluegreenn);
- views.setImageViewResource(R.id.imageView5, R.color.bluegreenn);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 21){
- views.setImageViewResource(R.id.imageView, R.color.navy);
- views.setImageViewResource(R.id.imageView2, R.color.navy);
- views.setImageViewResource(R.id.imageView4, R.color.navy);
- views.setImageViewResource(R.id.imageView5, R.color.navy);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 22){
- views.setImageViewResource(R.id.imageView, R.color.navyy);
- views.setImageViewResource(R.id.imageView2, R.color.navyy);
- views.setImageViewResource(R.id.imageView4, R.color.navyy);
- views.setImageViewResource(R.id.imageView5, R.color.navyy);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 23){
- views.setImageViewResource(R.id.imageView, R.color.darkblue);
- views.setImageViewResource(R.id.imageView2, R.color.darkblue);
- views.setImageViewResource(R.id.imageView4, R.color.darkblue);
- views.setImageViewResource(R.id.imageView5, R.color.darkblue);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 24){
- views.setImageViewResource(R.id.imageView, R.color.blue);
- views.setImageViewResource(R.id.imageView2, R.color.blue);
- views.setImageViewResource(R.id.imageView4, R.color.blue);
- views.setImageViewResource(R.id.imageView5, R.color.blue);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 25){
- views.setImageViewResource(R.id.imageView, R.color.bluee);
- views.setImageViewResource(R.id.imageView2, R.color.bluee);
- views.setImageViewResource(R.id.imageView4, R.color.bluee);
- views.setImageViewResource(R.id.imageView5, R.color.bluee);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 26){
- views.setImageViewResource(R.id.imageView, R.color.violet);
- views.setImageViewResource(R.id.imageView2, R.color.violet);
- views.setImageViewResource(R.id.imageView4, R.color.violet);
- views.setImageViewResource(R.id.imageView5, R.color.violet);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 27){
- views.setImageViewResource(R.id.imageView, R.color.violett);
- views.setImageViewResource(R.id.imageView2, R.color.violett);
- views.setImageViewResource(R.id.imageView4, R.color.violett);
- views.setImageViewResource(R.id.imageView5, R.color.violett);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 28){
- views.setImageViewResource(R.id.imageView, R.color.violettt);
- views.setImageViewResource(R.id.imageView2, R.color.violettt);
- views.setImageViewResource(R.id.imageView4, R.color.violettt);
- views.setImageViewResource(R.id.imageView5, R.color.violettt);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 29){
- views.setImageViewResource(R.id.imageView, R.color.violetttt);
- views.setImageViewResource(R.id.imageView2, R.color.violetttt);
- views.setImageViewResource(R.id.imageView4, R.color.violetttt);
- views.setImageViewResource(R.id.imageView5, R.color.violetttt);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 30){
- views.setImageViewResource(R.id.imageView, R.color.violettttt);
- views.setImageViewResource(R.id.imageView2, R.color.violettttt);
- views.setImageViewResource(R.id.imageView4, R.color.violettttt);
- views.setImageViewResource(R.id.imageView5, R.color.violettttt);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
+ views.setTextColor(R.id.textView1, Color.argb(colorAlpha, colorRed, colorGreen, colorBlue));
+ frameColor(sets.getInt("color", R.color.white));
views.setTextColor(R.id.aa, Color.argb(65, 67, 70, 90));
views.setTextColor(R.id.ab, Color.argb(65, 67, 70, 90));
@@ -1432,6 +1195,13 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a
}
}
+ void frameColor(int Color){
+ views.setImageViewResource(R.id.imageView, Color);
+ views.setImageViewResource(R.id.imageView2, Color);
+ views.setImageViewResource(R.id.imageView4, Color);
+ views.setImageViewResource(R.id.imageView5, Color);
+ }
+
public void removePreviousAlarm()
{
if(mManager != null && mSender != null)
diff --git a/app/src/main/java/com/leejoonhee/hangulclockforandroid/widget/midsizesmall.java b/app/src/main/java/com/leejoonhee/hangulclockforandroid/widget/midsizesmall.java
index ebcb129..3d95265 100644
--- a/app/src/main/java/com/leejoonhee/hangulclockforandroid/widget/midsizesmall.java
+++ b/app/src/main/java/com/leejoonhee/hangulclockforandroid/widget/midsizesmall.java
@@ -27,6 +27,8 @@ public class midsizesmall extends AppWidgetProvider {
private static PendingIntent mSender;
private static AlarmManager mManager;
+ RemoteViews views;
+
@Override
public void onReceive(Context context, Intent intent)
{
@@ -66,7 +68,7 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a
{
int appWidgetId = appWidgetIds[i];
- RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.midsizesmall);//new_app_widget의 objects들의 값을 변경하기위함입니다
+ views = new RemoteViews(context.getPackageName(), R.layout.midsizesmall);//new_app_widget의 objects들의 값을 변경하기위함입니다
if(timer.getInt("min", 0) != 0){
views.setTextViewText(R.id.textView1, "타이머 시작하기");
@@ -80,254 +82,13 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a
views.setTextViewText(R.id.textView1, sets.getString("title", "언젠가는 빛이 될 당신"));//Onupdate에서 받은 sentence의 값을 new_app_widget의 textview1의 ID를 가진 object에 올려줍니다
- String str = sets.getString("title", "언젠가는 빛이 될 당신");
-
- if(str.contains("**weather**")){
- new MainActivity.ReceiveShortWeather().execute();
- String inst = MainActivity.weathersaved.replaceAll("강수량","");
- views.setTextViewText(R.id.textView1, inst);
- }
-
- //textcolorselcetion이 1이라면..
- if (sets.getInt("color", 0) == 1){
- views.setImageViewResource(R.id.imageView, R.color.white);
- views.setImageViewResource(R.id.imageView2, R.color.white);
- views.setImageViewResource(R.id.imageView4, R.color.white);
- views.setImageViewResource(R.id.imageView5, R.color.white);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 2){
- views.setImageViewResource(R.id.imageView, R.color.black);
- views.setImageViewResource(R.id.imageView2, R.color.black);
- views.setImageViewResource(R.id.imageView4, R.color.black);
- views.setImageViewResource(R.id.imageView5, R.color.black);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 3){
- views.setImageViewResource(R.id.imageView, R.color.claret);
- views.setImageViewResource(R.id.imageView2, R.color.claret);
- views.setImageViewResource(R.id.imageView4, R.color.claret);
- views.setImageViewResource(R.id.imageView5, R.color.claret);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 4){
- views.setImageViewResource(R.id.imageView, R.color.clarett);
- views.setImageViewResource(R.id.imageView2, R.color.clarett);
- views.setImageViewResource(R.id.imageView4, R.color.clarett);
- views.setImageViewResource(R.id.imageView5, R.color.clarett);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 5){
- views.setImageViewResource(R.id.imageView, R.color.clarettt);
- views.setImageViewResource(R.id.imageView2, R.color.clarettt);
- views.setImageViewResource(R.id.imageView4, R.color.clarettt);
- views.setImageViewResource(R.id.imageView5, R.color.clarettt);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 6){
- views.setImageViewResource(R.id.imageView, R.color.red);
- views.setImageViewResource(R.id.imageView2, R.color.red);
- views.setImageViewResource(R.id.imageView4, R.color.red);
- views.setImageViewResource(R.id.imageView5, R.color.red);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 7){
- views.setImageViewResource(R.id.imageView, R.color.redd);
- views.setImageViewResource(R.id.imageView2, R.color.redd);
- views.setImageViewResource(R.id.imageView4, R.color.redd);
- views.setImageViewResource(R.id.imageView5, R.color.redd);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 8){
- views.setImageViewResource(R.id.imageView, R.color.reddd);
- views.setImageViewResource(R.id.imageView2, R.color.reddd);
- views.setImageViewResource(R.id.imageView4, R.color.reddd);
- views.setImageViewResource(R.id.imageView5, R.color.reddd);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 9){
- views.setImageViewResource(R.id.imageView, R.color.pink);
- views.setImageViewResource(R.id.imageView2, R.color.pink);
- views.setImageViewResource(R.id.imageView4, R.color.pink);
- views.setImageViewResource(R.id.imageView5, R.color.pink);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 10){
- views.setImageViewResource(R.id.imageView, R.color.pinkk);
- views.setImageViewResource(R.id.imageView2, R.color.pinkk);
- views.setImageViewResource(R.id.imageView4, R.color.pinkk);
- views.setImageViewResource(R.id.imageView5, R.color.pinkk);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 11){
- views.setImageViewResource(R.id.imageView, R.color.orange);
- views.setImageViewResource(R.id.imageView2, R.color.orange);
- views.setImageViewResource(R.id.imageView4, R.color.orange);
- views.setImageViewResource(R.id.imageView5, R.color.orange);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 12){
- views.setImageViewResource(R.id.imageView, R.color.orangee);
- views.setImageViewResource(R.id.imageView2, R.color.orangee);
- views.setImageViewResource(R.id.imageView4, R.color.orangee);
- views.setImageViewResource(R.id.imageView5, R.color.orangee);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 13){
- views.setImageViewResource(R.id.imageView, R.color.orangeee);
- views.setImageViewResource(R.id.imageView2, R.color.orangeee);
- views.setImageViewResource(R.id.imageView4, R.color.orangeee);
- views.setImageViewResource(R.id.imageView5, R.color.orangeee);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 14){
- views.setImageViewResource(R.id.imageView, R.color.yellow);
- views.setImageViewResource(R.id.imageView2, R.color.yellow);
- views.setImageViewResource(R.id.imageView4, R.color.yellow);
- views.setImageViewResource(R.id.imageView5, R.color.yellow);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 15){
- views.setImageViewResource(R.id.imageView, R.color.yelloww);
- views.setImageViewResource(R.id.imageView2, R.color.yelloww);
- views.setImageViewResource(R.id.imageView4, R.color.yelloww);
- views.setImageViewResource(R.id.imageView5, R.color.yelloww);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 16){
- views.setImageViewResource(R.id.imageView, R.color.green);
- views.setImageViewResource(R.id.imageView2, R.color.green);
- views.setImageViewResource(R.id.imageView4, R.color.green);
- views.setImageViewResource(R.id.imageView5, R.color.green);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 17){
- views.setImageViewResource(R.id.imageView, R.color.greenn);
- views.setImageViewResource(R.id.imageView2, R.color.greenn);
- views.setImageViewResource(R.id.imageView4, R.color.greenn);
- views.setImageViewResource(R.id.imageView5, R.color.greenn);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 18){
- views.setImageViewResource(R.id.imageView, R.color.greennn);
- views.setImageViewResource(R.id.imageView2, R.color.greennn);
- views.setImageViewResource(R.id.imageView4, R.color.greennn);
- views.setImageViewResource(R.id.imageView5, R.color.greennn);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 19){
- views.setImageViewResource(R.id.imageView, R.color.bluegreen);
- views.setImageViewResource(R.id.imageView2, R.color.bluegreen);
- views.setImageViewResource(R.id.imageView4, R.color.bluegreen);
- views.setImageViewResource(R.id.imageView5, R.color.bluegreen);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 20){
- views.setImageViewResource(R.id.imageView, R.color.bluegreenn);
- views.setImageViewResource(R.id.imageView2, R.color.bluegreenn);
- views.setImageViewResource(R.id.imageView4, R.color.bluegreenn);
- views.setImageViewResource(R.id.imageView5, R.color.bluegreenn);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 21){
- views.setImageViewResource(R.id.imageView, R.color.navy);
- views.setImageViewResource(R.id.imageView2, R.color.navy);
- views.setImageViewResource(R.id.imageView4, R.color.navy);
- views.setImageViewResource(R.id.imageView5, R.color.navy);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 22){
- views.setImageViewResource(R.id.imageView, R.color.navyy);
- views.setImageViewResource(R.id.imageView2, R.color.navyy);
- views.setImageViewResource(R.id.imageView4, R.color.navyy);
- views.setImageViewResource(R.id.imageView5, R.color.navyy);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 23){
- views.setImageViewResource(R.id.imageView, R.color.darkblue);
- views.setImageViewResource(R.id.imageView2, R.color.darkblue);
- views.setImageViewResource(R.id.imageView4, R.color.darkblue);
- views.setImageViewResource(R.id.imageView5, R.color.darkblue);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 24){
- views.setImageViewResource(R.id.imageView, R.color.blue);
- views.setImageViewResource(R.id.imageView2, R.color.blue);
- views.setImageViewResource(R.id.imageView4, R.color.blue);
- views.setImageViewResource(R.id.imageView5, R.color.blue);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 25){
- views.setImageViewResource(R.id.imageView, R.color.bluee);
- views.setImageViewResource(R.id.imageView2, R.color.bluee);
- views.setImageViewResource(R.id.imageView4, R.color.bluee);
- views.setImageViewResource(R.id.imageView5, R.color.bluee);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 26){
- views.setImageViewResource(R.id.imageView, R.color.violet);
- views.setImageViewResource(R.id.imageView2, R.color.violet);
- views.setImageViewResource(R.id.imageView4, R.color.violet);
- views.setImageViewResource(R.id.imageView5, R.color.violet);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 27){
- views.setImageViewResource(R.id.imageView, R.color.violett);
- views.setImageViewResource(R.id.imageView2, R.color.violett);
- views.setImageViewResource(R.id.imageView4, R.color.violett);
- views.setImageViewResource(R.id.imageView5, R.color.violett);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 28){
- views.setImageViewResource(R.id.imageView, R.color.violettt);
- views.setImageViewResource(R.id.imageView2, R.color.violettt);
- views.setImageViewResource(R.id.imageView4, R.color.violettt);
- views.setImageViewResource(R.id.imageView5, R.color.violettt);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
-
- if(sets.getInt("color", 0) == 29){
- views.setImageViewResource(R.id.imageView, R.color.violetttt);
- views.setImageViewResource(R.id.imageView2, R.color.violetttt);
- views.setImageViewResource(R.id.imageView4, R.color.violetttt);
- views.setImageViewResource(R.id.imageView5, R.color.violetttt);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
+ int colorAlpha = sets.getInt("colorAlpha", 255);
+ int colorRed = sets.getInt("colorRed", 255);
+ int colorGreen = sets.getInt("colorGreen", 255);
+ int colorBlue = sets.getInt("colorBlue", 255);
- if(sets.getInt("color", 0) == 30){
- views.setImageViewResource(R.id.imageView, R.color.violettttt);
- views.setImageViewResource(R.id.imageView2, R.color.violettttt);
- views.setImageViewResource(R.id.imageView4, R.color.violettttt);
- views.setImageViewResource(R.id.imageView5, R.color.violettttt);
- views.setTextColor(R.id.textView1, Color.WHITE);
- }
+ views.setTextColor(R.id.textView1, Color.argb(colorAlpha, colorRed, colorGreen, colorBlue));
+ frameColor(sets.getInt("color", R.color.white));
views.setTextColor(R.id.aa, Color.argb(65, 67, 70, 90));
views.setTextColor(R.id.ab, Color.argb(65, 67, 70, 90));
@@ -1432,6 +1193,13 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a
}
}
+ void frameColor(int Color){
+ views.setImageViewResource(R.id.imageView, Color);
+ views.setImageViewResource(R.id.imageView2, Color);
+ views.setImageViewResource(R.id.imageView4, Color);
+ views.setImageViewResource(R.id.imageView5, Color);
+ }
+
public void removePreviousAlarm()
{
if(mManager != null && mSender != null)
diff --git a/app/src/main/res/layout/activity_help.xml b/app/src/main/res/layout/activity_help.xml
index 3d7b4b9..1402f0e 100644
--- a/app/src/main/res/layout/activity_help.xml
+++ b/app/src/main/res/layout/activity_help.xml
@@ -36,7 +36,7 @@
android:layout_width="match_parent"
android:layout_height="0dp">
-
@@ -48,7 +48,7 @@
android:text="홈화면에서 배경화면을 길게 터치합니다"/>
-
+
@@ -78,7 +78,7 @@
android:layout_width="match_parent"
android:layout_height="0dp">
-
@@ -90,7 +90,7 @@
android:text="위젯 메뉴를 터치합니다"/>
-
+
@@ -120,7 +120,7 @@
android:layout_width="match_parent"
android:layout_height="0dp">
-
@@ -132,7 +132,7 @@
android:text="한글시계 위젯을 찾습니다"/>
-
+
@@ -162,7 +162,7 @@
android:layout_width="match_parent"
android:layout_height="0dp">
-
@@ -174,7 +174,7 @@
android:text="원하는 크기를 길게 터치하여 끌어옵니다"/>
-
+
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index f87986e..4d837cd 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,663 +7,608 @@
android:orientation="vertical"
android:background="@color/lightgray">
-
+
-
+ android:layout_height="match_parent">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_height="500dp"
+ android:background="@drawable/wall">
-
-
+ android:layout_marginTop="20dp"
+ android:layout_weight="1">
+ android:text="네가 있어 행복한 오늘 한글시계"
+ android:textColor="@color/white"
+ android:textSize="20dp" />
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
-
+
+
@@ -679,7 +624,7 @@
android:layout_marginLeft="12dp"
android:layout_marginTop="12dp"
android:layout_weight="1"
- android:text="업데이트 상황" />
+ android:text="지금 한글시계는" />
-
+
-
+
-
+ android:layout_marginRight="10dp"
+ android:layout_marginBottom="3dp"
+ android:layout_weight="2"
+ android:orientation="vertical"
+ android:theme="@style/Theme.AppCompat.Light"
+ app:cardCornerRadius="15dp">
+ android:layout_height="match_parent"
+ android:orientation="vertical">
-
+ android:layout_height="0dp"
+ android:layout_marginLeft="12dp"
+ android:layout_marginTop="12dp"
+ android:layout_weight="1"
+ android:text="업데이트 상황" />
+
+
+
+
+
+
+
+
+
+
+ android:layout_height="match_parent"
+ android:layout_margin="8dp"
+ android:orientation="vertical">
-
+ android:layout_height="0dp"
+ android:layout_marginBottom="5dp"
+ android:layout_weight="4">
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+ android:layout_margin="10dp"
+ android:orientation="vertical"
+ android:theme="@style/Theme.AppCompat.Light"
+ app:cardCornerRadius="15dp">
-
-
-
-
+ android:layout_height="wrap_content"
+ android:layout_marginTop="20dp"
+ android:gravity="center"
+ android:orientation="vertical">
-
+
-
+
-
+
-
+
+
-
-
-
-
-
+
-
+
-
-
+
+
+
+
+
-
+
-
-
-
-
+
-
+
-
+
-
+ android:layout_margin="10dp"
+ android:orientation="vertical">
-
+
-
+
-
+
+
+
+
+
+
-
+
+
+
+
+
-
-
+
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
index fd29cef..74b388e 100644
--- a/app/src/main/res/layout/activity_setting.xml
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -583,7 +583,7 @@
android:layout_height="wrap_content"
android:gravity="center">
-
-
+
diff --git a/app/src/main/res/layout/bigsizefull.xml b/app/src/main/res/layout/bigsizefull.xml
index 1945d5d..6c684d4 100644
--- a/app/src/main/res/layout/bigsizefull.xml
+++ b/app/src/main/res/layout/bigsizefull.xml
@@ -1,586 +1,549 @@
+ android:resizeMode="horizontal|vertical">
+ android:textSize="27dp"
+ android:textStyle="bold"
+ android:textColor="#ffffff"/>
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_height="fill_parent"
+ android:layout_weight="1"
+ android:orientation="vertical">
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/bigsizemid.xml b/app/src/main/res/layout/bigsizemid.xml
index 945da3d..557e9d4 100644
--- a/app/src/main/res/layout/bigsizemid.xml
+++ b/app/src/main/res/layout/bigsizemid.xml
@@ -1,13 +1,11 @@
+ android:resizeMode="horizontal|vertical">
+ android:resizeMode="horizontal|vertical">
+
+
+
+
+
+
+
+
-
-
+
-
-
+
`
-
-
+
-
-
+
-
-
+
@@ -149,7 +175,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:gravity="center">
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
@@ -237,7 +263,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:gravity="center">
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
@@ -325,7 +351,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:gravity="center">
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
@@ -413,7 +439,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:gravity="center">
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
@@ -501,7 +527,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:gravity="center">
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
diff --git a/app/src/main/res/layout/fatversion.xml b/app/src/main/res/layout/fatversion.xml
index c210053..ccf6555 100644
--- a/app/src/main/res/layout/fatversion.xml
+++ b/app/src/main/res/layout/fatversion.xml
@@ -1,13 +1,10 @@
+ android:gravity="center">
+
+
+
+
+
+
+
+
+ android:text="잠"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/widget_provider.xml b/app/src/main/res/layout/widget_provider.xml
new file mode 100644
index 0000000..2dc2e20
--- /dev/null
+++ b/app/src/main/res/layout/widget_provider.xml
@@ -0,0 +1,11 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/xml/widgetprovider_info.xml b/app/src/main/res/xml/widgetprovider_info.xml
new file mode 100644
index 0000000..42e0c32
--- /dev/null
+++ b/app/src/main/res/xml/widgetprovider_info.xml
@@ -0,0 +1,10 @@
+
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 3e0c393..c33eaed 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,8 +10,8 @@ buildscript {
}
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.4.2'
- classpath 'com.google.gms:google-services:4.3.0'
+ classpath 'com.android.tools.build:gradle:4.0.0'
+ classpath 'com.google.gms:google-services:4.0.1'
// NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle.properties b/gradle.properties
index 77ed50d..9e3a2d1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,6 +9,8 @@
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 66fe3a1..86cb680 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jul 08 17:31:50 KST 2019
+#Thu Aug 06 15:55:40 KST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip