Migrate deprecated HttpClient use to URLConnection

This commit is contained in:
Trevor Slocum 2015-10-26 02:10:16 -07:00
parent 02a3a88b0c
commit c1497926d8
87 changed files with 909 additions and 942 deletions

View File

@ -1,6 +1,7 @@
1.2.8:
- Hide analytics preference when applicable
- Add widgets to open source release
- Migrate deprecated HttpClient use to URLConnection
1.2.7: (First release on F-Droid)
- Fix crash on non-English devices

View File

@ -3,7 +3,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.3.0'
classpath 'com.android.tools.build:gradle:1.3.1'
}
}
@ -15,12 +15,12 @@ repositories {
}
android {
compileSdkVersion 19
buildToolsVersion '22.0.1'
compileSdkVersion 23
buildToolsVersion '23.0.1'
defaultConfig {
minSdkVersion 14
targetSdkVersion 22
targetSdkVersion 23
versionCode 128
versionName "1.2.8"
@ -74,33 +74,28 @@ android {
}
dependencies {
compile 'com.android.support:support-v4:19.0.0'
compile 'com.android.support:support-v4:23.1.0'
freeCompile 'com.google.android.gms:play-services-base:8.1.0'
fullCompile 'com.google.android.gms:play-services-base:8.1.0'
freeCompile 'com.google.android.gms:play-services-identity:8.1.0'
fullCompile 'com.google.android.gms:play-services-identity:8.1.0'
freeCompile 'com.google.android.gms:play-services-analytics:8.1.0'
fullCompile 'com.google.android.gms:play-services-analytics:8.1.0'
freeCompile 'com.google.android.gms:play-services-ads:8.1.0'
fullCompile 'com.google.android.gms:play-services-ads:8.1.0'
freeCompile 'com.google.android.gms:play-services-wearable:8.1.0'
fullCompile 'com.google.android.gms:play-services-wearable:8.1.0'
freeCompile 'com.google.android.gms:play-services-appinvite:8.1.0'
fullCompile 'com.google.android.gms:play-services-appinvite:8.1.0'
freeCompile 'com.google.android.gms:play-services-fitness:8.1.0'
fullCompile 'com.google.android.gms:play-services-fitness:8.1.0'
//noinspection GradleDynamicVersion
compile 'ch.acra:acra:4.6.2'
compile 'com.github.amlcurran.showcaseview:library:5.0.0'
//wearApp project(':MeditationAssistantWear')
// TODO: Uncomment when Wear app is ready
compile 'com.android.support:recyclerview-v7:21.0.0'
compile 'com.android.support:recyclerview-v7:23.1.0'
}

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<lint>
<ignore path="build/**" />
<ignore path="build/**"/>
</lint>

View File

@ -8,33 +8,33 @@
<meta-data
android:name="com.google.android.backup.api_key"
android:value="AEdPqrEAAAAIqq_HCa56eFzfQpNSwYUIIytAyO6bh4fFUFUcYA" />
android:value="AEdPqrEAAAAIqq_HCa56eFzfQpNSwYUIIytAyO6bh4fFUFUcYA"/>
<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />
android:value="@integer/google_play_services_version"/>
<meta-data
android:name="com.google.android.gms.analytics.globalConfigResource"
android:resource="@xml/analytics" />
android:resource="@xml/analytics"/>
<receiver
android:name="com.google.android.gms.analytics.AnalyticsReceiver"
android:enabled="true"
tools:ignore="ExportedReceiver">
<intent-filter>
<action android:name="com.google.android.gms.analytics.ANALYTICS_DISPATCH" />
<action android:name="com.google.android.gms.analytics.ANALYTICS_DISPATCH"/>
</intent-filter>
</receiver>
<service
android:name="com.google.android.gms.analytics.AnalyticsService"
android:enabled="true"
android:exported="false" />
android:exported="false"/>
<!-- Register Wear data layer service -->
<service android:name=".WearListenerService">
<intent-filter>
<action android:name="com.google.android.gms.wearable.BIND_LISTENER" />
<action android:name="com.google.android.gms.wearable.BIND_LISTENER"/>
</intent-filter>
</service>
@ -42,7 +42,7 @@
<activity
android:name="com.google.android.gms.ads.AdActivity"
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
android:theme="@android:style/Theme.Translucent" />
android:theme="@android:style/Theme.Translucent"/>
</application>

View File

@ -8,33 +8,33 @@
<meta-data
android:name="com.google.android.backup.api_key"
android:value="AEdPqrEAAAAImiscQeePK7-fr6JMj14zZX47kvR0lSKdCgjnXQ" />
android:value="AEdPqrEAAAAImiscQeePK7-fr6JMj14zZX47kvR0lSKdCgjnXQ"/>
<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />
android:value="@integer/google_play_services_version"/>
<meta-data
android:name="com.google.android.gms.analytics.globalConfigResource"
android:resource="@xml/analytics" />
android:resource="@xml/analytics"/>
<receiver
android:name="com.google.android.gms.analytics.AnalyticsReceiver"
android:enabled="true"
tools:ignore="ExportedReceiver">
<intent-filter>
<action android:name="com.google.android.gms.analytics.ANALYTICS_DISPATCH" />
<action android:name="com.google.android.gms.analytics.ANALYTICS_DISPATCH"/>
</intent-filter>
</receiver>
<service
android:name="com.google.android.gms.analytics.AnalyticsService"
android:enabled="true"
android:exported="false" />
android:exported="false"/>
<!-- Register Wear data layer service -->
<service android:name=".WearListenerService">
<intent-filter>
<action android:name="com.google.android.gms.wearable.BIND_LISTENER" />
<action android:name="com.google.android.gms.wearable.BIND_LISTENER"/>
</intent-filter>
</service>
@ -55,23 +55,23 @@
android:name=".MeditationProvider2"
android:label="@string/widget2x1">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
</intent-filter>
<meta-data
android:name="android.appwidget.provider"
android:resource="@xml/widget_2" />
android:resource="@xml/widget_2"/>
</receiver>
<receiver
android:name=".MeditationProvider3"
android:label="@string/widget3x1">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
</intent-filter>
<meta-data
android:name="android.appwidget.provider"
android:resource="@xml/widget_3" />
android:resource="@xml/widget_3"/>
</receiver>
</application>

View File

@ -6,16 +6,16 @@
<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="22" />
android:targetSdkVersion="22"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.USE_CREDENTIALS" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.GET_ACCOUNTS"/>
<uses-permission android:name="android.permission.USE_CREDENTIALS"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<application
android:name="sh.ftp.rocketninelabs.meditationassistant.MeditationAssistant"
@ -35,14 +35,14 @@
<intent-filter>
<action android:name="sh.ftp.rocketninelabs.meditationassistant.DAILY_NOTIFICATION"></action>
<action android:name="sh.ftp.rocketninelabs.meditationassistant.DAILY_NOTIFICATION_UPDATED"></action>
<action android:name="android.intent.action.EXTERNAL_APPLICATIONS_AVAILABLE" />
<action android:name="android.intent.action.BOOT_COMPLETED" />
<action android:name="android.intent.action.EXTERNAL_APPLICATIONS_AVAILABLE"/>
<action android:name="android.intent.action.BOOT_COMPLETED"/>
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.PACKAGE_REPLACED" />
<action android:name="android.intent.action.PACKAGE_REPLACED"/>
<data
android:path="${applicationId}"
android:scheme="package" />
android:scheme="package"/>
</intent-filter>
</receiver>
@ -53,8 +53,8 @@
android:label="@string/appNameShort"
android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
<intent-filter>
<action android:name="sh.ftp.rocketninelabs.meditationassistant.ALARM"></action>
@ -69,7 +69,7 @@
tools:ignore="UnusedAttribute">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="sh.ftp.rocketninelabs.meditationassistant.MainActivity" />
android:value="sh.ftp.rocketninelabs.meditationassistant.MainActivity"/>
</activity>
<activity
android:name="sh.ftp.rocketninelabs.meditationassistant.MediNETActivity"
@ -78,7 +78,7 @@
android:launchMode="singleTop">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="sh.ftp.rocketninelabs.meditationassistant.MainActivity" />
android:value="sh.ftp.rocketninelabs.meditationassistant.MainActivity"/>
</activity>
<activity
android:name="sh.ftp.rocketninelabs.meditationassistant.CompleteActivity"
@ -86,7 +86,7 @@
android:label="@string/sessioncomplete">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="sh.ftp.rocketninelabs.meditationassistant.MainActivity" />
android:value="sh.ftp.rocketninelabs.meditationassistant.MainActivity"/>
</activity>
<activity
android:name="sh.ftp.rocketninelabs.meditationassistant.AboutActivity"
@ -94,7 +94,7 @@
android:label="@string/about">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="sh.ftp.rocketninelabs.meditationassistant.MainActivity" />
android:value="sh.ftp.rocketninelabs.meditationassistant.MainActivity"/>
</activity>
<activity
android:name="sh.ftp.rocketninelabs.meditationassistant.ProgressActivity"
@ -102,7 +102,7 @@
android:label="@string/progress">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="sh.ftp.rocketninelabs.meditationassistant.MainActivity" />
android:value="sh.ftp.rocketninelabs.meditationassistant.MainActivity"/>
</activity>
</application>

View File

@ -69,13 +69,11 @@ public class AboutActivity extends Activity {
if (!getMeditationAssistant().getMarketName().equals("google")) {
MenuItem share = menu.findItem(R.id.action_share_app);
share.setVisible(false);
invalidateOptionsMenu();
}
if (getMeditationAssistant().getMarketName().equals("fdroid")) {
MenuItem rate = menu.findItem(R.id.action_rate);
rate.setVisible(false);
invalidateOptionsMenu();
}
return true;

View File

@ -62,14 +62,14 @@ public class ListPreferenceSound extends ListPreference {
return mEntries;
}
public void setEntries(CharSequence[] entries) {
mEntries = entries;
}
public void setEntries(int entriesResId) {
setEntries(getContext().getResources().getTextArray(entriesResId));
}
public void setEntries(CharSequence[] entries) {
mEntries = entries;
}
public CharSequence getEntry() {
int index = getValueIndex();
return index >= 0 && mEntries != null ? mEntries[index] : null;
@ -79,15 +79,15 @@ public class ListPreferenceSound extends ListPreference {
return mEntryValues;
}
public void setEntryValues(CharSequence[] entryValues) {
mEntryValues = entryValues;
}
public void setEntryValues(int entryValuesResId) {
setEntryValues(getContext().getResources().getTextArray(
entryValuesResId));
}
public void setEntryValues(CharSequence[] entryValues) {
mEntryValues = entryValues;
}
@Override
public CharSequence getSummary() {
final CharSequence entry = getEntry();

View File

@ -17,18 +17,13 @@ import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.Window;
import android.webkit.CookieManager;
import android.webkit.CookieSyncManager;
import android.webkit.WebChromeClient;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.FrameLayout;
import android.widget.RelativeLayout;
import org.apache.http.cookie.Cookie;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
public class MediNETActivity extends Activity {
@ -202,22 +197,6 @@ public class MediNETActivity extends Activity {
"MA");
webView.getSettings().setJavaScriptEnabled(true);
// Cookies
List<Cookie> cookies = getMeditationAssistant().getHttpClient()
.getCookieStore().getCookies();
if (!cookies.isEmpty()) {
CookieManager cookieManager = CookieManager.getInstance();
for (Cookie cookie : cookies) {
String cookieString = cookie.getName() + "="
+ cookie.getValue() + "; domain="
+ cookie.getDomain();
cookieManager.setCookie("medinet.ftp.sh", cookieString);
CookieSyncManager.getInstance().sync();
}
}
webView.setWebViewClient(new WebViewClient() {
@Override
public void onPageFinished(WebView view, String url) {
@ -430,8 +409,7 @@ public class MediNETActivity extends Activity {
@Override
protected void onPause() {
getMeditationAssistant().utility.pauseAd(this);
CookieSyncManager.getInstance().stopSync();
super.onStop();
super.onPause();
}
@Override
@ -462,7 +440,6 @@ public class MediNETActivity extends Activity {
@Override
protected void onResume() {
CookieSyncManager.getInstance().startSync();
super.onResume();
getMeditationAssistant().utility.resumeAd(this);
}

View File

@ -5,24 +5,23 @@ import android.os.AsyncTask;
import android.support.v4.app.FragmentActivity;
import android.util.Log;
import org.apache.http.HttpResponse;
import org.apache.http.NameValuePair;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.message.BasicNameValuePair;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.List;
import java.util.HashMap;
import java.util.TimeZone;
public class MediNETTask extends AsyncTask<MediNET, Integer, MediNET> {
@ -31,9 +30,7 @@ public class MediNETTask extends AsyncTask<MediNET, Integer, MediNET> {
public String action = "";
public String actionextra = "";
public MediNET medinet;
public String x;
public FragmentActivity fragment_activity = null;
private BufferedReader webReader;
private MeditationAssistant ma = null;
private Crypt crypt = new Crypt();
@ -71,33 +68,31 @@ public class MediNETTask extends AsyncTask<MediNET, Integer, MediNET> {
Log.d("MeditationAssistant", "URL => " + this.nextURL);
HttpPost httpPost = new HttpPost(this.nextURL);
HttpResponse webResponse = null;
ArrayList<SessionSQL> sessionssql = null;
HashMap<String, String> postData = new HashMap<String, String>();
try {
List<NameValuePair> nameValuePairs = new ArrayList<NameValuePair>(2);
nameValuePairs.add(new BasicNameValuePair("x", medinet
.getMeditationAssistant().getMediNETKey()));
postData.put("x", medinet
.getMeditationAssistant().getMediNETKey());
if (action.equals("connect")) {
nameValuePairs.add(new BasicNameValuePair("action", "connect"));
postData.put("action", "connect");
} else if (action.equals("postsession")) {
nameValuePairs.add(new BasicNameValuePair("postsession", Crypt
postData.put("postsession", Crypt
.bytesToHex(crypt.encrypt(medinet.getSession().export()
.toString()))));
.toString())));
if (actionextra.equals("manualposting")) {
nameValuePairs.add(new BasicNameValuePair("manualposting",
"true"));
postData.put("manualposting",
"true");
}
} else if (action.equals("deletesession")) {
nameValuePairs.add(new BasicNameValuePair("action",
"deletesession")); // Session start time
nameValuePairs.add(new BasicNameValuePair("session",
actionextra));
postData.put("action",
"deletesession"); // Session start time
postData.put("session",
actionextra);
} else if (action.equals("syncsessions")) {
nameValuePairs.add(new BasicNameValuePair("action",
"syncsessions"));
postData.put("action",
"syncsessions");
} else if (action.equals("uploadsessions")) {
JSONArray jsonsessions = new JSONArray();
sessionssql = getMeditationAssistant().db.getAllLocalSessions();
@ -124,20 +119,11 @@ public class MediNETTask extends AsyncTask<MediNET, Integer, MediNET> {
Log.d("MeditationAssistant", jsonsessions.toString());
nameValuePairs.add(new BasicNameValuePair("uploadsessions", Crypt
.bytesToHex(crypt.encrypt(jsonsessions.toString()))));
postData.put("uploadsessions", Crypt
.bytesToHex(crypt.encrypt(jsonsessions.toString())));
} else if (action.equals("signout")) {
nameValuePairs
.add(new BasicNameValuePair("signout", "signout"));
postData.put("signout", "signout");
}
Log.d("MeditationAssistant", "Post to " + this.nextURL + ", "
+ nameValuePairs.toString());
httpPost.setEntity(new UrlEncodedFormEntity(nameValuePairs));
webResponse = getMeditationAssistant().getHttpClient().execute(
httpPost, getMeditationAssistant().getHttpContext());
} catch (ClientProtocolException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
} catch (Exception e) {
@ -145,37 +131,69 @@ public class MediNETTask extends AsyncTask<MediNET, Integer, MediNET> {
e.printStackTrace();
}
if (webResponse == null) {
Log.d("MeditationAssistant", "Unable to connect to MediNET");
medinet.status = "disconnected";
/*
if (!getMeditationAssistant().getMediNETKey().equals("")
&& medinet.activity != null) {
getMeditationAssistant().longToast(medinet.activity,
getMeditationAssistant().getString(R.string.unableToConnect));
medinet.activity.updateTextsAsync();
}
return medinet;
}
Log.d("MeditationAssistant", "Post to " + this.nextURL + ", "
+ postData.toString());
httpPost.setEntity(new UrlEncodedFormEntity(postData));
webResponse = getMeditationAssistant().getHttpClient().execute(
httpPost);
HttpPost httpPost = new HttpPost(this.nextURL);
HttpResponse webResponse = null;
*/
String result = "";
HttpURLConnection medinetConnection = null;
try {
this.webReader = new BufferedReader(new InputStreamReader(
webResponse.getEntity().getContent()));
} catch (IllegalStateException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
URL medinetURL = new URL(this.nextURL);
medinetConnection = (HttpURLConnection) medinetURL.openConnection();
String line;
try {
while ((line = this.webReader.readLine()) != null) {
result += line + "\n";
medinetConnection.setChunkedStreamingMode(0);
medinetConnection.setRequestMethod("POST");
medinetConnection.setDoInput(true);
medinetConnection.setDoOutput(true);
OutputStream os = medinetConnection.getOutputStream();
BufferedWriter writer = new BufferedWriter(
new OutputStreamWriter(os, "UTF-8"));
writer.write(getMeditationAssistant().getPostDataString(postData));
medinetConnection.connect();
writer.flush();
writer.close();
os.close();
int responseCode = medinetConnection.getResponseCode();
if (responseCode == HttpURLConnection.HTTP_OK) {
String line;
BufferedReader br = new BufferedReader(new InputStreamReader(medinetConnection.getInputStream()));
while ((line = br.readLine()) != null) {
result += line;
}
} else {
result = "";
}
} catch (IOException e) {
if (result.equals("")) {
Log.d("MeditationAssistant", "Unable to connect to MediNET");
medinet.status = "disconnected";
if (!getMeditationAssistant().getMediNETKey().equals("")
&& medinet.activity != null) {
getMeditationAssistant().longToast(medinet.activity,
getMeditationAssistant().getString(R.string.unableToConnect));
medinet.activity.updateTextsAsync();
}
}
} catch (Exception e) {
e.printStackTrace();
return medinet;
}
Calendar date = new GregorianCalendar();
@ -191,20 +209,17 @@ public class MediNETTask extends AsyncTask<MediNET, Integer, MediNET> {
);
Log.d("MeditationAssistant", "Result: " + result);
if (webResponse.getFirstHeader("x-MediNET") != null) {
if (webResponse.getFirstHeader("x-MediNET").getValue()
if (medinetConnection.getHeaderField("x-MediNET") != null) {
if (medinetConnection.getHeaderField("x-MediNET")
.equals("signin")) {
this.medinet.askToSignIn();
} else {
if (action.equals("signin") && webResponse.getFirstHeader("x-MediNET-Key") != null) {
if (action.equals("signin") && medinetConnection.getHeaderField("x-MediNET-Key") != null) {
/* Oauth2 sign in */
Log.d("MeditationAssistant", "Header key: "
+ webResponse.getFirstHeader("x-MediNET-Key")
.getValue());
if (!webResponse.getFirstHeader("x-MediNET-Key")
.getValue().equals("")) {
getMeditationAssistant().setMediNETKey(webResponse.getFirstHeader("x-MediNET-Key")
.getValue(), "Google");
+ medinetConnection.getHeaderField("x-MediNET-Key"));
if (!medinetConnection.getHeaderField("x-MediNET-Key").equals("")) {
getMeditationAssistant().setMediNETKey(medinetConnection.getHeaderField("x-MediNET-Key"), "Google");
//getMeditationAssistant().getMediNET().connect();
try {
@ -215,31 +230,25 @@ public class MediNETTask extends AsyncTask<MediNET, Integer, MediNET> {
e.printStackTrace();
}
}
} else if (webResponse.getFirstHeader("x-MediNET-Streak") != null) {
} else if (medinetConnection.getHeaderField("x-MediNET-Streak") != null) {
Log.d("MeditationAssistant", "Header streak: "
+ webResponse.getFirstHeader("x-MediNET-Streak")
.getValue());
if (!webResponse.getFirstHeader("x-MediNET-Streak")
.getValue().equals("")) {
String streak_header = webResponse.getFirstHeader(
"x-MediNET-Streak").getValue();
+ medinetConnection.getHeaderField("x-MediNET-Streak"));
if (!medinetConnection.getHeaderField("x-MediNET-Streak").equals("")) {
String streak_header = medinetConnection.getHeaderField("x-MediNET-Streak");
if (streak_header.contains(",")) {
getMeditationAssistant().setMeditationStreak(Integer.valueOf(streak_header.split(",")[0]), Integer.valueOf(streak_header.split(",")[1]));
getMeditationAssistant().recalculateMeditationStreak();
}
}
}
if (webResponse.getFirstHeader("x-MediNET-Meditating") != null) {
if (!webResponse.getFirstHeader("x-MediNET-Meditating")
.getValue().equals("")) {
if (medinetConnection.getHeaderField("x-MediNET-Meditating") != null) {
if (!medinetConnection.getHeaderField("x-MediNET-Meditating").equals("")) {
// TODO: Was this going to be a meditating-now feature?
}
}
if (webResponse.getFirstHeader("x-MediNET-MaxStreak") != null) {
if (!webResponse.getFirstHeader("x-MediNET-MaxStreak")
.getValue().equals("")) {
Integer maxstreak = Integer.valueOf(webResponse.getFirstHeader("x-MediNET-MaxStreak")
.getValue());
if (medinetConnection.getHeaderField("x-MediNET-MaxStreak") != null) {
if (!medinetConnection.getHeaderField("x-MediNET-MaxStreak").equals("")) {
Integer maxstreak = Integer.valueOf(medinetConnection.getHeaderField("x-MediNET-MaxStreak"));
if (maxstreak > getMeditationAssistant().getLongestMeditationStreak()) {
getMeditationAssistant().setLongestMeditationStreak(maxstreak);
}
@ -247,7 +256,7 @@ public class MediNETTask extends AsyncTask<MediNET, Integer, MediNET> {
}
}
Log.d("MeditationAssistant", "Header: "
+ webResponse.getFirstHeader("x-MediNET").getValue());
+ medinetConnection.getHeaderField("x-MediNET"));
if (!result.equals("")
&& !result.trim().startsWith("<")) {
@ -434,6 +443,7 @@ public class MediNETTask extends AsyncTask<MediNET, Integer, MediNET> {
t.printStackTrace();
}
medinetConnection.disconnect();
return medinet;
}

View File

@ -38,25 +38,23 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.WindowManager;
import android.webkit.CookieSyncManager;
import android.widget.ImageButton;
import android.widget.Toast;
import org.acra.ACRA;
import org.acra.annotation.ReportsCrashes;
import org.apache.http.client.protocol.ClientContext;
import org.apache.http.conn.ClientConnectionManager;
import org.apache.http.impl.client.BasicCookieStore;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
import org.apache.http.params.HttpParams;
import org.apache.http.protocol.BasicHttpContext;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.CookieHandler;
import java.net.CookieManager;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.HashMap;
import java.util.Map;
import java.util.TimeZone;
@ReportsCrashes(
@ -76,9 +74,6 @@ public class MeditationAssistant extends Application {
public long pausetime = 0;
public int previousRingerMode = -1;
public String toastText = "";
public DefaultHttpClient httpClient = null;
public BasicCookieStore cookieStore = null;
public BasicHttpContext httpContext = null;
public String pendingNotificationAction = "";
public Boolean asktorate = false;
public DatabaseHandler db = null;
@ -122,16 +117,6 @@ public class MeditationAssistant extends Application {
resources.getDisplayMetrics());
}
public static DefaultHttpClient getThreadSafeHttpClient() {
DefaultHttpClient client = new DefaultHttpClient();
ClientConnectionManager mgr = client.getConnectionManager();
HttpParams params = client.getParams();
client = new DefaultHttpClient(new ThreadSafeClientConnManager(params,
mgr.getSchemeRegistry()), params);
return client;
}
public static void setAlphaCompat(View view, float alpha) {
view.setAlpha(alpha);
}
@ -270,26 +255,6 @@ public class MeditationAssistant extends Application {
editingduration = bool;
}
public DefaultHttpClient getHttpClient() {
if (httpClient == null) {
httpClient = getThreadSafeHttpClient();
httpClient.setCookieStore(cookieStore);
}
return httpClient;
}
public BasicHttpContext getHttpContext() {
if (cookieStore == null) {
cookieStore = new BasicCookieStore();
httpContext = new BasicHttpContext();
// Bind custom cookie store to the local context
httpContext.setAttribute(ClientContext.COOKIE_STORE, cookieStore);
}
return httpContext;
}
public int getMATextColor(Boolean enabled) {
if (enabled) {
if (!getMAThemeString().equals("dark") && !getMAThemeString().equals("buddhism")) {
@ -781,6 +746,9 @@ public class MeditationAssistant extends Application {
utility.ma = this;
CookieManager cookieManager = new CookieManager();
CookieHandler.setDefault(cookieManager);
Integer applaunches = getPrefs().getInt("applaunches", 0) + 1;
getPrefs().edit().putInt("applaunches", applaunches).apply();
@ -816,7 +784,6 @@ public class MeditationAssistant extends Application {
}*/
db = DatabaseHandler.getInstance(getApplicationContext());
CookieSyncManager.createInstance(getApplicationContext());
reminderAlarmManager = (AlarmManager) getSystemService(Context.ALARM_SERVICE);
@ -827,6 +794,23 @@ public class MeditationAssistant extends Application {
sendBroadcast(intent);
}
public String getPostDataString(HashMap<String, String> params) throws UnsupportedEncodingException {
StringBuilder result = new StringBuilder();
boolean first = true;
for (Map.Entry<String, String> entry : params.entrySet()) {
if (first)
first = false;
else
result.append("&");
result.append(URLEncoder.encode(entry.getKey(), "UTF-8"));
result.append("=");
result.append(URLEncoder.encode(entry.getValue(), "UTF-8"));
}
return result.toString();
}
public boolean sendUsageReports() {
if (sendusage == null) {
sendusage = getPrefs().getBoolean("pref_sendusage", true);
@ -1046,7 +1030,7 @@ public class MeditationAssistant extends Application {
}
names[i] = getString(R.string.signInWithOpenID);
AlertDialog accountsAlertDialog = new AlertDialog.Builder(activity)
AlertDialog accountsAlertDialog = new AlertDialog.Builder(signin_activity)
.setTitle(getString(R.string.signInWith))
.setItems(names, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
@ -1064,7 +1048,7 @@ public class MeditationAssistant extends Application {
}));
}
} else {
showOpenIDSignInDialog(activity);
showOpenIDSignInDialog(signin_activity);
}
}
})
@ -1073,7 +1057,7 @@ public class MeditationAssistant extends Application {
return accountsAlertDialog;
} else {
return showOpenIDSignInDialog(activity);
return showOpenIDSignInDialog(signin_activity);
}
}

View File

@ -18,7 +18,6 @@ package sh.ftp.rocketninelabs.meditationassistant;
import android.content.Context;
import android.hardware.SensorManager;
import android.util.FloatMath;
import android.view.ViewConfiguration;
import android.view.animation.AnimationUtils;
import android.view.animation.Interpolator;
@ -400,7 +399,7 @@ public class Scroller {
float dx = (float) (mFinalX - mStartX);
float dy = (float) (mFinalY - mStartY);
float hyp = FloatMath.sqrt(dx * dx + dy * dy);
float hyp = (float) Math.sqrt(dx * dx + dy * dy);
float ndx = dx / hyp;
float ndy = dy / hyp;
@ -417,7 +416,7 @@ public class Scroller {
mMode = FLING_MODE;
mFinished = false;
float velocity = FloatMath.sqrt(velocityX * velocityX + velocityY * velocityY);
float velocity = (float) Math.sqrt(velocityX * velocityX + velocityY * velocityY);
mVelocity = velocity;
final double l = Math.log(START_TENSION * velocity / ALPHA);

View File

@ -6,6 +6,6 @@
android:fromAlpha="0.0"
android:interpolator="@android:anim/decelerate_interpolator"
android:repeatCount="0"
android:toAlpha="1.0" />
android:toAlpha="1.0"/>
</set>

View File

@ -6,6 +6,6 @@
android:fromAlpha="1.0"
android:interpolator="@android:anim/accelerate_interpolator"
android:repeatCount="0"
android:toAlpha="0.0" />
android:toAlpha="0.0"/>
</set>

View File

@ -9,7 +9,7 @@
android:pivotY="50%"
android:repeatCount="infinite"
android:startOffset="0"
android:toDegrees="359" />
android:toDegrees="359"/>
<rotate
android:duration="500"
android:fromDegrees="0"
@ -18,7 +18,7 @@
android:pivotY="50%"
android:repeatCount="infinite"
android:startOffset="0"
android:toDegrees="180" />
android:toDegrees="180"/>
<rotate
android:duration="575"
android:fromDegrees="0"
@ -27,7 +27,7 @@
android:pivotY="50%"
android:repeatCount="infinite"
android:startOffset="0"
android:toDegrees="-144" />
android:toDegrees="-144"/>
<scale
android:duration="450"
@ -37,28 +37,28 @@
android:interpolator="@android:anim/accelerate_interpolator"
android:repeatCount="infinite"
android:toXScale="1.0"
android:toYScale="1.0" />
android:toYScale="1.0"/>
<translate
android:duration="700"
android:fromXDelta="-200"
android:fromYDelta="-200"
android:interpolator="@android:anim/accelerate_interpolator" />
android:interpolator="@android:anim/accelerate_interpolator"/>
<translate
android:duration="4000"
android:interpolator="@android:anim/accelerate_interpolator"
android:toXDelta="200"
android:toYDelta="200" />
android:toYDelta="200"/>
<translate
android:duration="818"
android:fromXDelta="-30"
android:fromYDelta="2121"
android:interpolator="@android:anim/accelerate_interpolator" />
android:interpolator="@android:anim/accelerate_interpolator"/>
<translate
android:duration="2214"
android:interpolator="@android:anim/accelerate_interpolator"
android:toXDelta="414"
android:toYDelta="177" />
android:toYDelta="177"/>
<scale
android:duration="3777"
@ -68,6 +68,6 @@
android:interpolator="@android:anim/accelerate_interpolator"
android:repeatCount="infinite"
android:toXScale="0.0"
android:toYScale="0.0" />
android:toYScale="0.0"/>
</set>

View File

@ -16,5 +16,5 @@
-->
<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
android:src="@drawable/ab_texture_tile_buddhism"
android:tileMode="repeat" />
android:src="@drawable/ab_texture_tile_buddhism"
android:tileMode="repeat"/>

View File

@ -17,7 +17,7 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/btn_cab_done_pressed_buddhism" android:state_pressed="true" />
<item android:drawable="@drawable/btn_cab_done_focused_buddhism" android:state_enabled="true" android:state_focused="true" />
<item android:drawable="@drawable/btn_cab_done_default_buddhism" android:state_enabled="true" />
<item android:drawable="@drawable/btn_cab_done_pressed_buddhism" android:state_pressed="true"/>
<item android:drawable="@drawable/btn_cab_done_focused_buddhism" android:state_enabled="true" android:state_focused="true"/>
<item android:drawable="@drawable/btn_cab_done_default_buddhism" android:state_enabled="true"/>
</selector>

View File

@ -14,6 +14,6 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/buddhism_list_activated_holo" android:state_activated="true" />
<item android:drawable="@android:color/transparent" />
<item android:drawable="@drawable/buddhism_list_activated_holo" android:state_activated="true"/>
<item android:drawable="@android:color/transparent"/>
</selector>

View File

@ -17,28 +17,28 @@
<!-- Enabled states -->
<item android:drawable="@drawable/buddhism_btn_check_on_holo_light" android:state_checked="true" android:state_enabled="true" android:state_window_focused="false" />
<item android:drawable="@drawable/buddhism_btn_check_off_holo_light" android:state_checked="false" android:state_enabled="true" android:state_window_focused="false" />
<item android:drawable="@drawable/buddhism_btn_check_on_holo_light" android:state_checked="true" android:state_enabled="true" android:state_window_focused="false"/>
<item android:drawable="@drawable/buddhism_btn_check_off_holo_light" android:state_checked="false" android:state_enabled="true" android:state_window_focused="false"/>
<item android:drawable="@drawable/buddhism_btn_check_on_pressed_holo_light" android:state_checked="true" android:state_enabled="true" android:state_pressed="true" />
<item android:drawable="@drawable/buddhism_btn_check_off_pressed_holo_light" android:state_checked="false" android:state_enabled="true" android:state_pressed="true" />
<item android:drawable="@drawable/buddhism_btn_check_on_pressed_holo_light" android:state_checked="true" android:state_enabled="true" android:state_pressed="true"/>
<item android:drawable="@drawable/buddhism_btn_check_off_pressed_holo_light" android:state_checked="false" android:state_enabled="true" android:state_pressed="true"/>
<item android:drawable="@drawable/buddhism_btn_check_on_focused_holo_light" android:state_checked="true" android:state_enabled="true" android:state_focused="true" />
<item android:drawable="@drawable/buddhism_btn_check_off_focused_holo_light" android:state_checked="false" android:state_enabled="true" android:state_focused="true" />
<item android:drawable="@drawable/buddhism_btn_check_on_focused_holo_light" android:state_checked="true" android:state_enabled="true" android:state_focused="true"/>
<item android:drawable="@drawable/buddhism_btn_check_off_focused_holo_light" android:state_checked="false" android:state_enabled="true" android:state_focused="true"/>
<item android:drawable="@drawable/buddhism_btn_check_off_holo_light" android:state_checked="false" android:state_enabled="true" />
<item android:drawable="@drawable/buddhism_btn_check_on_holo_light" android:state_checked="true" android:state_enabled="true" />
<item android:drawable="@drawable/buddhism_btn_check_off_holo_light" android:state_checked="false" android:state_enabled="true"/>
<item android:drawable="@drawable/buddhism_btn_check_on_holo_light" android:state_checked="true" android:state_enabled="true"/>
<!-- Disabled states -->
<item android:drawable="@drawable/buddhism_btn_check_on_disabled_holo_light" android:state_checked="true" android:state_window_focused="false" />
<item android:drawable="@drawable/buddhism_btn_check_off_disabled_holo_light" android:state_checked="false" android:state_window_focused="false" />
<item android:drawable="@drawable/buddhism_btn_check_on_disabled_holo_light" android:state_checked="true" android:state_window_focused="false"/>
<item android:drawable="@drawable/buddhism_btn_check_off_disabled_holo_light" android:state_checked="false" android:state_window_focused="false"/>
<item android:drawable="@drawable/buddhism_btn_check_on_disabled_focused_holo_light" android:state_checked="true" android:state_focused="true" />
<item android:drawable="@drawable/buddhism_btn_check_off_disabled_focused_holo_light" android:state_checked="false" android:state_focused="true" />
<item android:drawable="@drawable/buddhism_btn_check_on_disabled_focused_holo_light" android:state_checked="true" android:state_focused="true"/>
<item android:drawable="@drawable/buddhism_btn_check_off_disabled_focused_holo_light" android:state_checked="false" android:state_focused="true"/>
<item android:drawable="@drawable/buddhism_btn_check_off_disabled_holo_light" android:state_checked="false" />
<item android:drawable="@drawable/buddhism_btn_check_on_disabled_holo_light" android:state_checked="true" />
<item android:drawable="@drawable/buddhism_btn_check_off_disabled_holo_light" android:state_checked="false"/>
<item android:drawable="@drawable/buddhism_btn_check_on_disabled_holo_light" android:state_checked="true"/>
</selector>

View File

@ -14,11 +14,11 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/buddhism_btn_default_normal_holo_light" android:state_enabled="true" android:state_window_focused="false" />
<item android:drawable="@drawable/buddhism_btn_default_disabled_holo_light" android:state_enabled="false" android:state_window_focused="false" />
<item android:drawable="@drawable/buddhism_btn_default_pressed_holo_light" android:state_pressed="true" />
<item android:drawable="@drawable/buddhism_btn_default_focused_holo_light" android:state_enabled="true" android:state_focused="true" />
<item android:drawable="@drawable/buddhism_btn_default_normal_holo_light" android:state_enabled="true" />
<item android:drawable="@drawable/buddhism_btn_default_disabled_focused_holo_light" android:state_focused="true" />
<item android:drawable="@drawable/buddhism_btn_default_disabled_holo_light" />
<item android:drawable="@drawable/buddhism_btn_default_normal_holo_light" android:state_enabled="true" android:state_window_focused="false"/>
<item android:drawable="@drawable/buddhism_btn_default_disabled_holo_light" android:state_enabled="false" android:state_window_focused="false"/>
<item android:drawable="@drawable/buddhism_btn_default_pressed_holo_light" android:state_pressed="true"/>
<item android:drawable="@drawable/buddhism_btn_default_focused_holo_light" android:state_enabled="true" android:state_focused="true"/>
<item android:drawable="@drawable/buddhism_btn_default_normal_holo_light" android:state_enabled="true"/>
<item android:drawable="@drawable/buddhism_btn_default_disabled_focused_holo_light" android:state_focused="true"/>
<item android:drawable="@drawable/buddhism_btn_default_disabled_holo_light"/>
</selector>

View File

@ -14,27 +14,27 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/buddhism_btn_radio_on_holo_light" android:state_checked="true" android:state_enabled="true" android:state_window_focused="false" />
<item android:drawable="@drawable/buddhism_btn_radio_off_holo_light" android:state_checked="false" android:state_enabled="true" android:state_window_focused="false" />
<item android:drawable="@drawable/buddhism_btn_radio_on_holo_light" android:state_checked="true" android:state_enabled="true" android:state_window_focused="false"/>
<item android:drawable="@drawable/buddhism_btn_radio_off_holo_light" android:state_checked="false" android:state_enabled="true" android:state_window_focused="false"/>
<item android:drawable="@drawable/buddhism_btn_radio_on_pressed_holo_light" android:state_checked="true" android:state_enabled="true" android:state_pressed="true" />
<item android:drawable="@drawable/buddhism_btn_radio_off_pressed_holo_light" android:state_checked="false" android:state_enabled="true" android:state_pressed="true" />
<item android:drawable="@drawable/buddhism_btn_radio_on_pressed_holo_light" android:state_checked="true" android:state_enabled="true" android:state_pressed="true"/>
<item android:drawable="@drawable/buddhism_btn_radio_off_pressed_holo_light" android:state_checked="false" android:state_enabled="true" android:state_pressed="true"/>
<item android:drawable="@drawable/buddhism_btn_radio_on_focused_holo_light" android:state_checked="true" android:state_enabled="true" android:state_focused="true" />
<item android:drawable="@drawable/buddhism_btn_radio_off_focused_holo_light" android:state_checked="false" android:state_enabled="true" android:state_focused="true" />
<item android:drawable="@drawable/buddhism_btn_radio_on_focused_holo_light" android:state_checked="true" android:state_enabled="true" android:state_focused="true"/>
<item android:drawable="@drawable/buddhism_btn_radio_off_focused_holo_light" android:state_checked="false" android:state_enabled="true" android:state_focused="true"/>
<item android:drawable="@drawable/buddhism_btn_radio_off_holo_light" android:state_checked="false" android:state_enabled="true" />
<item android:drawable="@drawable/buddhism_btn_radio_on_holo_light" android:state_checked="true" android:state_enabled="true" />
<item android:drawable="@drawable/buddhism_btn_radio_off_holo_light" android:state_checked="false" android:state_enabled="true"/>
<item android:drawable="@drawable/buddhism_btn_radio_on_holo_light" android:state_checked="true" android:state_enabled="true"/>
<!-- Disabled states -->
<item android:drawable="@drawable/buddhism_btn_radio_on_disabled_holo_light" android:state_checked="true" android:state_window_focused="false" />
<item android:drawable="@drawable/buddhism_btn_radio_off_disabled_holo_light" android:state_checked="false" android:state_window_focused="false" />
<item android:drawable="@drawable/buddhism_btn_radio_on_disabled_holo_light" android:state_checked="true" android:state_window_focused="false"/>
<item android:drawable="@drawable/buddhism_btn_radio_off_disabled_holo_light" android:state_checked="false" android:state_window_focused="false"/>
<item android:drawable="@drawable/buddhism_btn_radio_on_disabled_focused_holo_light" android:state_checked="true" android:state_focused="true" />
<item android:drawable="@drawable/buddhism_btn_radio_off_disabled_focused_holo_light" android:state_checked="false" android:state_focused="true" />
<item android:drawable="@drawable/buddhism_btn_radio_on_disabled_focused_holo_light" android:state_checked="true" android:state_focused="true"/>
<item android:drawable="@drawable/buddhism_btn_radio_off_disabled_focused_holo_light" android:state_checked="false" android:state_focused="true"/>
<item android:drawable="@drawable/buddhism_btn_radio_off_disabled_holo_light" android:state_checked="false" />
<item android:drawable="@drawable/buddhism_btn_radio_on_disabled_holo_light" android:state_checked="true" />
<item android:drawable="@drawable/buddhism_btn_radio_off_disabled_holo_light" android:state_checked="false"/>
<item android:drawable="@drawable/buddhism_btn_radio_on_disabled_holo_light" android:state_checked="true"/>
</selector>

View File

@ -14,19 +14,19 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/buddhism_btn_toggle_on_normal_holo_light" android:state_checked="true" android:state_enabled="true" android:state_window_focused="false" />
<item android:drawable="@drawable/buddhism_btn_toggle_on_disabled_holo_light" android:state_checked="true" android:state_enabled="false" android:state_window_focused="false" />
<item android:drawable="@drawable/buddhism_btn_toggle_on_pressed_holo_light" android:state_checked="true" android:state_pressed="true" />
<item android:drawable="@drawable/buddhism_btn_toggle_on_focused_holo_light" android:state_checked="true" android:state_enabled="true" android:state_focused="true" />
<item android:drawable="@drawable/buddhism_btn_toggle_on_normal_holo_light" android:state_checked="true" android:state_enabled="true" />
<item android:drawable="@drawable/buddhism_btn_toggle_on_disabled_focused_holo_light" android:state_checked="true" android:state_focused="true" />
<item android:drawable="@drawable/buddhism_btn_toggle_on_disabled_holo_light" android:state_checked="true" />
<item android:drawable="@drawable/buddhism_btn_toggle_on_normal_holo_light" android:state_checked="true" android:state_enabled="true" android:state_window_focused="false"/>
<item android:drawable="@drawable/buddhism_btn_toggle_on_disabled_holo_light" android:state_checked="true" android:state_enabled="false" android:state_window_focused="false"/>
<item android:drawable="@drawable/buddhism_btn_toggle_on_pressed_holo_light" android:state_checked="true" android:state_pressed="true"/>
<item android:drawable="@drawable/buddhism_btn_toggle_on_focused_holo_light" android:state_checked="true" android:state_enabled="true" android:state_focused="true"/>
<item android:drawable="@drawable/buddhism_btn_toggle_on_normal_holo_light" android:state_checked="true" android:state_enabled="true"/>
<item android:drawable="@drawable/buddhism_btn_toggle_on_disabled_focused_holo_light" android:state_checked="true" android:state_focused="true"/>
<item android:drawable="@drawable/buddhism_btn_toggle_on_disabled_holo_light" android:state_checked="true"/>
<item android:drawable="@drawable/buddhism_btn_toggle_off_normal_holo_light" android:state_enabled="true" android:state_window_focused="false" />
<item android:drawable="@drawable/buddhism_btn_toggle_off_disabled_holo_light" android:state_enabled="false" android:state_window_focused="false" />
<item android:drawable="@drawable/buddhism_btn_toggle_off_pressed_holo_light" android:state_pressed="true" />
<item android:drawable="@drawable/buddhism_btn_toggle_off_focused_holo_light" android:state_enabled="true" android:state_focused="true" />
<item android:drawable="@drawable/buddhism_btn_toggle_off_normal_holo_light" android:state_enabled="true" />
<item android:drawable="@drawable/buddhism_btn_toggle_off_disabled_focused_holo_light" android:state_focused="true" />
<item android:drawable="@drawable/buddhism_btn_toggle_off_disabled_holo_light" />
<item android:drawable="@drawable/buddhism_btn_toggle_off_normal_holo_light" android:state_enabled="true" android:state_window_focused="false"/>
<item android:drawable="@drawable/buddhism_btn_toggle_off_disabled_holo_light" android:state_enabled="false" android:state_window_focused="false"/>
<item android:drawable="@drawable/buddhism_btn_toggle_off_pressed_holo_light" android:state_pressed="true"/>
<item android:drawable="@drawable/buddhism_btn_toggle_off_focused_holo_light" android:state_enabled="true" android:state_focused="true"/>
<item android:drawable="@drawable/buddhism_btn_toggle_off_normal_holo_light" android:state_enabled="true"/>
<item android:drawable="@drawable/buddhism_btn_toggle_off_disabled_focused_holo_light" android:state_focused="true"/>
<item android:drawable="@drawable/buddhism_btn_toggle_off_disabled_holo_light"/>
</selector>

View File

@ -14,11 +14,11 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/buddhism_textfield_default_holo_light" android:state_enabled="true" android:state_window_focused="false" />
<item android:drawable="@drawable/buddhism_textfield_disabled_holo_light" android:state_enabled="false" android:state_window_focused="false" />
<item android:drawable="@drawable/buddhism_textfield_activated_holo_light" android:state_enabled="true" android:state_focused="true" />
<item android:drawable="@drawable/buddhism_textfield_focused_holo_light" android:state_activated="true" android:state_enabled="true" />
<item android:drawable="@drawable/buddhism_textfield_default_holo_light" android:state_enabled="true" />
<item android:drawable="@drawable/buddhism_textfield_disabled_focused_holo_light" android:state_focused="true" />
<item android:drawable="@drawable/buddhism_textfield_disabled_holo_light" />
<item android:drawable="@drawable/buddhism_textfield_default_holo_light" android:state_enabled="true" android:state_window_focused="false"/>
<item android:drawable="@drawable/buddhism_textfield_disabled_holo_light" android:state_enabled="false" android:state_window_focused="false"/>
<item android:drawable="@drawable/buddhism_textfield_activated_holo_light" android:state_enabled="true" android:state_focused="true"/>
<item android:drawable="@drawable/buddhism_textfield_focused_holo_light" android:state_activated="true" android:state_enabled="true"/>
<item android:drawable="@drawable/buddhism_textfield_default_holo_light" android:state_enabled="true"/>
<item android:drawable="@drawable/buddhism_textfield_disabled_focused_holo_light" android:state_focused="true"/>
<item android:drawable="@drawable/buddhism_textfield_disabled_holo_light"/>
</selector>

View File

@ -14,6 +14,6 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/buddhism_fastscroll_thumb_pressed_holo" android:state_pressed="true" />
<item android:drawable="@drawable/buddhism_fastscroll_thumb_default_holo" />
<item android:drawable="@drawable/buddhism_fastscroll_thumb_pressed_holo" android:state_pressed="true"/>
<item android:drawable="@drawable/buddhism_fastscroll_thumb_default_holo"/>
</selector>

View File

@ -16,10 +16,10 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
<item android:drawable="@drawable/buddhism_list_selector_disabled_holo_light" android:state_enabled="false" android:state_focused="true" android:state_pressed="true" />
<item android:drawable="@drawable/buddhism_list_selector_disabled_holo_light" android:state_enabled="false" android:state_focused="true" />
<item android:drawable="@drawable/buddhism_list_selector_background_transition_holo_light" android:state_focused="true" android:state_pressed="true" />
<item android:drawable="@drawable/buddhism_list_selector_background_transition_holo_light" android:state_focused="false" android:state_pressed="true" />
<item android:drawable="@drawable/buddhism_list_focused_holo" android:state_focused="true" />
<item android:drawable="@android:color/transparent" />
<item android:drawable="@drawable/buddhism_list_selector_disabled_holo_light" android:state_enabled="false" android:state_focused="true" android:state_pressed="true"/>
<item android:drawable="@drawable/buddhism_list_selector_disabled_holo_light" android:state_enabled="false" android:state_focused="true"/>
<item android:drawable="@drawable/buddhism_list_selector_background_transition_holo_light" android:state_focused="true" android:state_pressed="true"/>
<item android:drawable="@drawable/buddhism_list_selector_background_transition_holo_light" android:state_focused="false" android:state_pressed="true"/>
<item android:drawable="@drawable/buddhism_list_focused_holo" android:state_focused="true"/>
<item android:drawable="@android:color/transparent"/>
</selector>

View File

@ -14,6 +14,6 @@
-->
<transition xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/buddhism_list_pressed_holo_light" />
<item android:drawable="@drawable/buddhism_list_longpressed_holo" />
<item android:drawable="@drawable/buddhism_list_pressed_holo_light"/>
<item android:drawable="@drawable/buddhism_list_longpressed_holo"/>
</transition>

View File

@ -15,13 +15,13 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@android:color/transparent" android:state_window_focused="false" />
<item android:drawable="@android:color/transparent" android:state_window_focused="false"/>
<!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
<item android:drawable="@drawable/buddhism_list_selector_disabled_holo_light" android:state_enabled="false" android:state_focused="true" android:state_pressed="true" />
<item android:drawable="@drawable/buddhism_list_selector_disabled_holo_light" android:state_enabled="false" android:state_focused="true" />
<item android:drawable="@drawable/buddhism_list_selector_background_transition_holo_light" android:state_focused="true" android:state_pressed="true" />
<item android:drawable="@drawable/buddhism_list_selector_background_transition_holo_light" android:state_focused="false" android:state_pressed="true" />
<item android:drawable="@drawable/buddhism_list_focused_holo" android:state_focused="true" />
<item android:drawable="@drawable/buddhism_list_selector_disabled_holo_light" android:state_enabled="false" android:state_focused="true" android:state_pressed="true"/>
<item android:drawable="@drawable/buddhism_list_selector_disabled_holo_light" android:state_enabled="false" android:state_focused="true"/>
<item android:drawable="@drawable/buddhism_list_selector_background_transition_holo_light" android:state_focused="true" android:state_pressed="true"/>
<item android:drawable="@drawable/buddhism_list_selector_background_transition_holo_light" android:state_focused="false" android:state_pressed="true"/>
<item android:drawable="@drawable/buddhism_list_focused_holo" android:state_focused="true"/>
</selector>

View File

@ -17,18 +17,18 @@
<item
android:id="@android:id/background"
android:drawable="@drawable/buddhism_progress_bg_holo_light" />
android:drawable="@drawable/buddhism_progress_bg_holo_light"/>
<item android:id="@android:id/secondaryProgress">
<scale
android:drawable="@drawable/buddhism_progress_secondary_holo_light"
android:scaleWidth="100%" />
android:scaleWidth="100%"/>
</item>
<item android:id="@android:id/progress">
<scale
android:drawable="@drawable/buddhism_progress_primary_holo_light"
android:scaleWidth="100%" />
android:scaleWidth="100%"/>
</item>
</layer-list>

View File

@ -16,29 +16,29 @@
*/
-->
<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
android:oneshot="false">
android:oneshot="false">
<item
android:drawable="@drawable/buddhism_progressbar_indeterminate_holo1"
android:duration="50" />
android:duration="50"/>
<item
android:drawable="@drawable/buddhism_progressbar_indeterminate_holo2"
android:duration="50" />
android:duration="50"/>
<item
android:drawable="@drawable/buddhism_progressbar_indeterminate_holo3"
android:duration="50" />
android:duration="50"/>
<item
android:drawable="@drawable/buddhism_progressbar_indeterminate_holo4"
android:duration="50" />
android:duration="50"/>
<item
android:drawable="@drawable/buddhism_progressbar_indeterminate_holo5"
android:duration="50" />
android:duration="50"/>
<item
android:drawable="@drawable/buddhism_progressbar_indeterminate_holo6"
android:duration="50" />
android:duration="50"/>
<item
android:drawable="@drawable/buddhism_progressbar_indeterminate_holo7"
android:duration="50" />
android:duration="50"/>
<item
android:drawable="@drawable/buddhism_progressbar_indeterminate_holo8"
android:duration="50" />
android:duration="50"/>
</animation-list>

View File

@ -14,8 +14,8 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/buddhism_spinner_disabled_holo_light" android:state_enabled="false" />
<item android:drawable="@drawable/buddhism_spinner_pressed_holo_light" android:state_pressed="true" />
<item android:drawable="@drawable/buddhism_spinner_focused_holo_light" android:state_focused="true" android:state_pressed="false" />
<item android:drawable="@drawable/buddhism_spinner_default_holo_light" />
<item android:drawable="@drawable/buddhism_spinner_disabled_holo_light" android:state_enabled="false"/>
<item android:drawable="@drawable/buddhism_spinner_pressed_holo_light" android:state_pressed="true"/>
<item android:drawable="@drawable/buddhism_spinner_focused_holo_light" android:state_focused="true" android:state_pressed="false"/>
<item android:drawable="@drawable/buddhism_spinner_default_holo_light"/>
</selector>

View File

@ -15,19 +15,19 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Non focused states -->
<item android:drawable="@drawable/buddhism_tab_unselected_holo" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
<item android:drawable="@drawable/buddhism_tab_selected_holo" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
<item android:drawable="@drawable/buddhism_tab_unselected_holo" android:state_focused="false" android:state_pressed="false" android:state_selected="false"/>
<item android:drawable="@drawable/buddhism_tab_selected_holo" android:state_focused="false" android:state_pressed="false" android:state_selected="true"/>
<!-- Focused states -->
<item android:drawable="@drawable/buddhism_tab_unselected_focused_holo" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
<item android:drawable="@drawable/buddhism_tab_selected_focused_holo" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
<item android:drawable="@drawable/buddhism_tab_unselected_focused_holo" android:state_focused="true" android:state_pressed="false" android:state_selected="false"/>
<item android:drawable="@drawable/buddhism_tab_selected_focused_holo" android:state_focused="true" android:state_pressed="false" android:state_selected="true"/>
<!-- Pressed -->
<!-- Non focused states -->
<item android:drawable="@drawable/buddhism_tab_unselected_pressed_holo" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
<item android:drawable="@drawable/buddhism_tab_selected_pressed_holo" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
<item android:drawable="@drawable/buddhism_tab_unselected_pressed_holo" android:state_focused="false" android:state_pressed="true" android:state_selected="false"/>
<item android:drawable="@drawable/buddhism_tab_selected_pressed_holo" android:state_focused="false" android:state_pressed="true" android:state_selected="true"/>
<!-- Focused states -->
<item android:drawable="@drawable/buddhism_tab_unselected_pressed_holo" android:state_focused="true" android:state_pressed="true" android:state_selected="false" />
<item android:drawable="@drawable/buddhism_tab_selected_pressed_holo" android:state_focused="true" android:state_pressed="true" android:state_selected="true" />
<item android:drawable="@drawable/buddhism_tab_unselected_pressed_holo" android:state_focused="true" android:state_pressed="true" android:state_selected="false"/>
<item android:drawable="@drawable/buddhism_tab_selected_pressed_holo" android:state_focused="true" android:state_pressed="true" android:state_selected="true"/>
</selector>

View File

@ -16,10 +16,10 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
<item android:drawable="@drawable/list_selector_disabled_holo_dark" android:state_enabled="false" android:state_focused="true" android:state_pressed="true" />
<item android:drawable="@drawable/list_selector_disabled_holo_dark" android:state_enabled="false" android:state_focused="true" />
<item android:drawable="@drawable/list_selector_background_transition_holo_dark" android:state_focused="true" android:state_pressed="true" />
<item android:drawable="@drawable/list_selector_background_transition_holo_dark" android:state_focused="false" android:state_pressed="true" />
<item android:drawable="@drawable/list_focused_holo" android:state_focused="true" />
<item android:drawable="@color/transparent" />
<item android:drawable="@drawable/list_selector_disabled_holo_dark" android:state_enabled="false" android:state_focused="true" android:state_pressed="true"/>
<item android:drawable="@drawable/list_selector_disabled_holo_dark" android:state_enabled="false" android:state_focused="true"/>
<item android:drawable="@drawable/list_selector_background_transition_holo_dark" android:state_focused="true" android:state_pressed="true"/>
<item android:drawable="@drawable/list_selector_background_transition_holo_dark" android:state_focused="false" android:state_pressed="true"/>
<item android:drawable="@drawable/list_focused_holo" android:state_focused="true"/>
<item android:drawable="@color/transparent"/>
</selector>

View File

@ -16,10 +16,10 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
<item android:drawable="@drawable/list_selector_disabled_holo_light" android:state_enabled="false" android:state_focused="true" android:state_pressed="true" />
<item android:drawable="@drawable/list_selector_disabled_holo_light" android:state_enabled="false" android:state_focused="true" />
<item android:drawable="@drawable/list_selector_background_transition_holo_light" android:state_focused="true" android:state_pressed="true" />
<item android:drawable="@drawable/list_selector_background_transition_holo_light" android:state_focused="false" android:state_pressed="true" />
<item android:drawable="@drawable/list_focused_holo" android:state_focused="true" />
<item android:drawable="@color/transparent" />
<item android:drawable="@drawable/list_selector_disabled_holo_light" android:state_enabled="false" android:state_focused="true" android:state_pressed="true"/>
<item android:drawable="@drawable/list_selector_disabled_holo_light" android:state_enabled="false" android:state_focused="true"/>
<item android:drawable="@drawable/list_selector_background_transition_holo_light" android:state_focused="true" android:state_pressed="true"/>
<item android:drawable="@drawable/list_selector_background_transition_holo_light" android:state_focused="false" android:state_pressed="true"/>
<item android:drawable="@drawable/list_focused_holo" android:state_focused="true"/>
<item android:drawable="@color/transparent"/>
</selector>

View File

@ -14,6 +14,6 @@
-->
<transition xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/list_pressed_holo_dark" />
<item android:drawable="@drawable/list_longpressed_holo" />
<item android:drawable="@drawable/list_pressed_holo_dark"/>
<item android:drawable="@drawable/list_longpressed_holo"/>
</transition>

View File

@ -14,6 +14,6 @@
-->
<transition xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/list_pressed_holo_light" />
<item android:drawable="@drawable/list_longpressed_holo" />
<item android:drawable="@drawable/list_pressed_holo_light"/>
<item android:drawable="@drawable/list_longpressed_holo"/>
</transition>

View File

@ -20,18 +20,18 @@
<item
android:id="@android:id/background"
android:drawable="@drawable/progress_bg_buddhism" />
android:drawable="@drawable/progress_bg_buddhism"/>
<item android:id="@android:id/secondaryProgress">
<scale
android:drawable="@drawable/progress_secondary_buddhism"
android:scaleWidth="100%" />
android:scaleWidth="100%"/>
</item>
<item android:id="@android:id/progress">
<scale
android:drawable="@drawable/progress_primary_buddhism"
android:scaleWidth="100%" />
android:scaleWidth="100%"/>
</item>
</layer-list>

View File

@ -17,7 +17,7 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_mediumAnimTime">
<item android:drawable="@drawable/list_focused_buddhism" android:state_focused="true" android:state_pressed="false" />
<item android:drawable="@drawable/list_pressed_buddhism" android:state_pressed="true" />
<item android:drawable="@android:color/transparent" />
<item android:drawable="@drawable/list_focused_buddhism" android:state_focused="true" android:state_pressed="false"/>
<item android:drawable="@drawable/list_pressed_buddhism" android:state_pressed="true"/>
<item android:drawable="@android:color/transparent"/>
</selector>

View File

@ -17,8 +17,8 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/spinner_ab_disabled_buddhism" android:state_enabled="false" />
<item android:drawable="@drawable/spinner_ab_pressed_buddhism" android:state_pressed="true" />
<item android:drawable="@drawable/spinner_ab_focused_buddhism" android:state_focused="true" android:state_pressed="false" />
<item android:drawable="@drawable/spinner_ab_default_buddhism" />
<item android:drawable="@drawable/spinner_ab_disabled_buddhism" android:state_enabled="false"/>
<item android:drawable="@drawable/spinner_ab_pressed_buddhism" android:state_pressed="true"/>
<item android:drawable="@drawable/spinner_ab_focused_buddhism" android:state_focused="true" android:state_pressed="false"/>
<item android:drawable="@drawable/spinner_ab_default_buddhism"/>
</selector>

View File

@ -18,19 +18,19 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Non focused states -->
<item android:drawable="@drawable/tab_unselected_buddhism" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
<item android:drawable="@drawable/tab_selected_buddhism" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
<item android:drawable="@drawable/tab_unselected_buddhism" android:state_focused="false" android:state_pressed="false" android:state_selected="false"/>
<item android:drawable="@drawable/tab_selected_buddhism" android:state_focused="false" android:state_pressed="false" android:state_selected="true"/>
<!-- Focused states -->
<item android:drawable="@drawable/tab_unselected_focused_buddhism" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
<item android:drawable="@drawable/tab_selected_focused_buddhism" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
<item android:drawable="@drawable/tab_unselected_focused_buddhism" android:state_focused="true" android:state_pressed="false" android:state_selected="false"/>
<item android:drawable="@drawable/tab_selected_focused_buddhism" android:state_focused="true" android:state_pressed="false" android:state_selected="true"/>
<!-- Pressed -->
<!-- Non focused states -->
<item android:drawable="@drawable/tab_unselected_pressed_buddhism" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
<item android:drawable="@drawable/tab_selected_pressed_buddhism" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
<item android:drawable="@drawable/tab_unselected_pressed_buddhism" android:state_focused="false" android:state_pressed="true" android:state_selected="false"/>
<item android:drawable="@drawable/tab_selected_pressed_buddhism" android:state_focused="false" android:state_pressed="true" android:state_selected="true"/>
<!-- Focused states -->
<item android:drawable="@drawable/tab_unselected_pressed_buddhism" android:state_focused="true" android:state_pressed="true" android:state_selected="false" />
<item android:drawable="@drawable/tab_selected_pressed_buddhism" android:state_focused="true" android:state_pressed="true" android:state_selected="true" />
<item android:drawable="@drawable/tab_unselected_pressed_buddhism" android:state_focused="true" android:state_pressed="true" android:state_selected="false"/>
<item android:drawable="@drawable/tab_selected_pressed_buddhism" android:state_focused="true" android:state_pressed="true" android:state_selected="true"/>
</selector>

View File

@ -1,8 +1,8 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="false"
android:focusable="false">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="false"
android:focusable="false">
<ScrollView
android:layout_width="fill_parent"
@ -37,7 +37,7 @@
android:gravity="center"
android:text=""
android:textAppearance="?android:attr/textAppearanceLarge"
android:textSize="25sp" />
android:textSize="25sp"/>
<TextView
android:id="@+id/txtAboutAppVersion"
@ -46,7 +46,7 @@
android:layout_marginBottom="108dp"
android:gravity="center"
android:text=""
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceSmall"/>
<TextView
android:layout_width="fill_parent"
@ -54,7 +54,7 @@
android:gravity="center"
android:text="@string/byTrevorSlocum"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textSize="21sp" />
android:textSize="21sp"/>
<TextView
android:layout_width="fill_parent"
@ -63,7 +63,7 @@
android:gravity="center"
android:text="@string/availableForHire"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="15sp" />
android:textSize="15sp"/>
<TextView
android:layout_width="fill_parent"
@ -72,7 +72,7 @@
android:gravity="center"
android:text="@string/myEmailAddress"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textSize="12sp" />
android:textSize="12sp"/>
</LinearLayout>
@ -100,14 +100,14 @@
android:clickable="false"
android:gravity="center"
android:text="@string/tapToSendEmail"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceSmall"/>
<View
android:layout_width="fill_parent"
android:layout_height="1dp"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<Button
android:id="@+id/btnHowToMeditate"
@ -118,14 +118,14 @@
android:paddingBottom="7dp"
android:paddingTop="7dp"
android:text="@string/howToMeditate"
android:textAppearance="?android:attr/textAppearanceMedium" />
android:textAppearance="?android:attr/textAppearanceMedium"/>
<View
android:layout_width="fill_parent"
android:layout_height="1dp"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<Button
android:id="@+id/btnTranslate"
@ -136,7 +136,7 @@
android:paddingBottom="7dp"
android:paddingTop="7dp"
android:text="@string/translate"
android:textAppearance="?android:attr/textAppearanceMedium" />
android:textAppearance="?android:attr/textAppearanceMedium"/>
</LinearLayout>
</LinearLayout>
@ -155,6 +155,6 @@
android:contentDescription="@string/charis"
android:scaleType="fitCenter"
android:src="@drawable/charis"
android:visibility="gone" />
android:visibility="gone"/>
</RelativeLayout>

View File

@ -1,14 +1,14 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:descendantFocusability="beforeDescendants"
android:focusableInTouchMode="true"
android:paddingBottom="0dp"
android:paddingLeft="0dp"
android:paddingRight="0dp"
android:paddingTop="0dp"
tools:context=".CompleteActivity$PlaceholderFragment">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:descendantFocusability="beforeDescendants"
android:focusableInTouchMode="true"
android:paddingBottom="0dp"
android:paddingLeft="0dp"
android:paddingRight="0dp"
android:paddingTop="0dp"
tools:context=".CompleteActivity$PlaceholderFragment">
<ScrollView
android:layout_width="fill_parent"
@ -37,7 +37,7 @@
android:singleLine="true"
android:text=""
android:textAppearance="?android:attr/textAppearanceLarge"
android:textSize="153sp" />
android:textSize="153sp"/>
<RelativeLayout
android:layout_width="match_parent"
@ -57,7 +57,7 @@
android:singleLine="true"
android:text=""
android:textAppearance="?android:attr/textAppearanceSmall"
android:visibility="gone" />
android:visibility="gone"/>
<EditText
android:id="@+id/editSessionMessage"
@ -76,7 +76,7 @@
android:scrollbars="vertical"
android:singleLine="false"
android:text=""
android:textAppearance="?android:attr/textAppearanceLarge" />
android:textAppearance="?android:attr/textAppearanceLarge"/>
<RelativeLayout
android:layout_width="wrap_content"
@ -90,7 +90,7 @@
android:layout_height="1dp"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<LinearLayout
android:id="@+id/layLowerSessionComplete"
@ -112,14 +112,14 @@
android:minHeight="48dip"
android:onClick="dismiss"
android:text="@string/discard"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceSmall"/>
<View
android:layout_width="1dp"
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<Button
android:id="@+id/btnSave"
@ -129,14 +129,14 @@
android:background="?android:attr/selectableItemBackground"
android:onClick="saveMediNET"
android:text="@string/save"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceSmall"/>
<View
android:layout_width="1dp"
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<Button
android:id="@+id/btnPost"
@ -146,7 +146,7 @@
android:background="?android:attr/selectableItemBackground"
android:onClick="postMediNET"
android:text="@string/post"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceSmall"/>
</LinearLayout>
<RelativeLayout

View File

@ -1,12 +1,12 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="0dp"
android:paddingLeft="0dp"
android:paddingRight="0dp"
android:paddingTop="0dp"
tools:context=".MainActivity$PlaceholderFragment">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="0dp"
android:paddingLeft="0dp"
android:paddingRight="0dp"
android:paddingTop="0dp"
tools:context=".MainActivity$PlaceholderFragment">
<LinearLayout
android:layout_width="match_parent"
@ -57,7 +57,7 @@
android:lineSpacingMultiplier="0.9"
android:singleLine="true"
android:text=""
android:textAppearance="?android:attr/textAppearanceLarge" />
android:textAppearance="?android:attr/textAppearanceLarge"/>
<RelativeLayout
android:id="@+id/layEditDuration"
@ -79,13 +79,13 @@
android:maxLength="5"
android:singleLine="true"
android:textSize="153sp"
android:visibility="gone" />
android:visibility="gone"/>
<sh.ftp.rocketninelabs.meditationassistant.TimePicker
android:id="@+id/timepickerDuration"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center" />
android:gravity="center"/>
</RelativeLayout>
</ViewSwitcher>
@ -99,7 +99,7 @@
android:singleLine="true"
android:text=""
android:textAppearance="?android:attr/textAppearanceLarge"
android:textSize="33sp" />
android:textSize="33sp"/>
<RelativeLayout
android:id="@+id/layLowerViews"
@ -148,7 +148,7 @@
android:clickable="false"
android:gravity="center"
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium" />
android:textAppearance="?android:attr/textAppearanceMedium"/>
<View
android:id="@+id/divstreakUpper2"
@ -157,7 +157,7 @@
android:layout_below="@+id/txtMainStatus"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<Button
android:id="@+id/btnMeditate"
@ -171,7 +171,7 @@
android:paddingBottom="10dp"
android:paddingTop="10dp"
android:text="@string/meditate"
android:textSize="33sp" />
android:textSize="33sp"/>
<View
android:id="@+id/divstreakUpper"
@ -180,7 +180,7 @@
android:layout_below="@+id/btnMeditate"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<Button
android:id="@+id/btnMeditationStreak"
@ -194,7 +194,7 @@
android:onClick="pressMediNET"
android:paddingBottom="1dp"
android:text="@string/signInToMediNET"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceSmall"/>
<View
android:id="@+id/divMainControls"
@ -203,7 +203,7 @@
android:layout_below="@+id/btnMeditationStreak"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<LinearLayout
android:layout_width="wrap_content"
@ -223,14 +223,14 @@
android:background="?android:attr/selectableItemBackground"
android:onClick="openProgress"
android:text="@string/progress"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceSmall"/>
<View
android:layout_width="1dp"
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<Button
android:id="@+id/btnCommunity"
@ -241,7 +241,7 @@
android:background="?android:attr/selectableItemBackground"
android:onClick="pressCommunity"
android:text="@string/community"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceSmall"/>
</LinearLayout>
</RelativeLayout>
</RelativeLayout>
@ -261,7 +261,7 @@
android:layout_height="1dp"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<RelativeLayout
android:id="@+id/layUseTimerControls"
@ -296,7 +296,7 @@
android:scrollHorizontally="true"
android:singleLine="true"
android:text="@string/timed"
tools:ignore="RtlSymmetry" />
tools:ignore="RtlSymmetry"/>
</RelativeLayout>
<View
@ -304,7 +304,7 @@
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<RelativeLayout
android:id="@+id/layMainEndAt"
@ -329,7 +329,7 @@
android:scrollHorizontally="true"
android:singleLine="true"
android:text="@string/endAt"
tools:ignore="RtlSymmetry" />
tools:ignore="RtlSymmetry"/>
</RelativeLayout>
<View
@ -337,7 +337,7 @@
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<RelativeLayout
android:id="@+id/layMainUntimed"
@ -360,7 +360,7 @@
android:scrollHorizontally="true"
android:singleLine="true"
android:text="@string/untimed"
tools:ignore="RtlSymmetry" />
tools:ignore="RtlSymmetry"/>
</RelativeLayout>
</RadioGroup>
@ -397,7 +397,7 @@
android:layout_height="1dp"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<LinearLayout
android:id="@+id/layPresets"
@ -417,14 +417,14 @@
android:scrollHorizontally="true"
android:singleLine="true"
android:text="@string/setPreset"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceSmall"/>
<View
android:layout_width="1dp"
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<Button
android:id="@+id/btnPreset2"
@ -438,14 +438,14 @@
android:scrollHorizontally="true"
android:singleLine="true"
android:text="@string/setPreset"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceSmall"/>
<View
android:layout_width="1dp"
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<Button
android:id="@+id/btnPreset3"
@ -458,7 +458,7 @@
android:onClick="pressPreset"
android:singleLine="true"
android:text="@string/setPreset"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceSmall"/>
</LinearLayout>
@ -468,7 +468,7 @@
android:layout_height="1dp"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<LinearLayout
android:id="@+id/layBottomEditingControls"
@ -483,7 +483,7 @@
android:layout_weight="1"
android:background="?android:attr/selectableItemBackground"
android:onClick="cancelSetDuration"
android:text="@string/cancel" />
android:text="@string/cancel"/>
<View
android:id="@+id/divMainEditing"
@ -491,7 +491,7 @@
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<Button
android:id="@+id/btnSetDuration"
@ -500,7 +500,7 @@
android:layout_weight="1"
android:background="?android:attr/selectableItemBackground"
android:onClick="setDuration"
android:text="@string/confirm" />
android:text="@string/confirm"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>

View File

@ -14,7 +14,7 @@
<FrameLayout
android:id="@+id/webViewPlaceholder"
android:layout_width="match_parent"
android:layout_height="fill_parent" />
android:layout_height="fill_parent"/>
</LinearLayout>

View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
@ -21,7 +21,7 @@
<android.support.v4.view.PagerTabStrip
android:id="@+id/titles"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"/>
</android.support.v4.view.ViewPager>

View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="7dp">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="7dp">
<TextView
android:id="@+id/session_length"
@ -13,7 +13,7 @@
android:layout_gravity="left"
android:gravity="left"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="37sp" />
android:textSize="37sp"/>
<LinearLayout
android:layout_width="match_parent"
@ -28,7 +28,7 @@
android:layout_height="wrap_content"
android:layout_gravity="right"
android:gravity="right"
android:textAppearance="?android:attr/textAppearanceMedium" />
android:textAppearance="?android:attr/textAppearanceMedium"/>
<TextView
android:id="@+id/session_started_time"
@ -36,7 +36,7 @@
android:layout_height="wrap_content"
android:layout_gravity="right"
android:gravity="right"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceSmall"/>
</LinearLayout>
</LinearLayout>

View File

@ -28,13 +28,13 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:contentDescription="@null"
android:visibility="gone" />
android:visibility="gone"/>
<TextView
android:id="@android:id/title"
style="@style/TabTextBuddhism"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical" />
android:layout_gravity="center_vertical"/>
</LinearLayout>

View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:fillViewport="true"
android:orientation="vertical">
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:fillViewport="true"
android:orientation="vertical">
<TextView
android:id="@+id/txtOtherStatistics"
@ -16,14 +16,14 @@
android:scrollHorizontally="true"
android:singleLine="true"
android:text="@string/sessions"
android:textAppearance="?android:attr/textAppearanceLarge" />
android:textAppearance="?android:attr/textAppearanceLarge"/>
<View
android:layout_width="fill_parent"
android:layout_height="1dp"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<LinearLayout
android:layout_width="fill_parent"
@ -38,14 +38,14 @@
android:gravity="center"
android:singleLine="true"
android:text="@string/totalSessions"
android:textAppearance="?android:attr/textAppearanceMedium" />
android:textAppearance="?android:attr/textAppearanceMedium"/>
<View
android:layout_width="1dp"
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<TextView
android:id="@+id/txtOtherStatisticsSessions"
@ -56,7 +56,7 @@
android:gravity="center"
android:singleLine="true"
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium" />
android:textAppearance="?android:attr/textAppearanceMedium"/>
</LinearLayout>
@ -65,7 +65,7 @@
android:layout_height="1dp"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<LinearLayout
android:layout_width="fill_parent"
@ -80,14 +80,14 @@
android:gravity="center"
android:singleLine="true"
android:text="@string/longestDuration"
android:textAppearance="?android:attr/textAppearanceMedium" />
android:textAppearance="?android:attr/textAppearanceMedium"/>
<View
android:layout_width="1dp"
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<TextView
android:id="@+id/txtOtherStatisticsLongestDuration"
@ -98,7 +98,7 @@
android:gravity="center"
android:singleLine="true"
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium" />
android:textAppearance="?android:attr/textAppearanceMedium"/>
</LinearLayout>
@ -107,7 +107,7 @@
android:layout_height="1dp"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<LinearLayout
android:layout_width="fill_parent"
@ -122,14 +122,14 @@
android:gravity="center"
android:singleLine="true"
android:text="@string/averageDuration"
android:textAppearance="?android:attr/textAppearanceMedium" />
android:textAppearance="?android:attr/textAppearanceMedium"/>
<View
android:layout_width="1dp"
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<TextView
android:id="@+id/txtOtherStatisticsAverageDuration"
@ -140,7 +140,7 @@
android:gravity="center"
android:singleLine="true"
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium" />
android:textAppearance="?android:attr/textAppearanceMedium"/>
</LinearLayout>
@ -149,7 +149,7 @@
android:layout_height="1dp"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<LinearLayout
android:layout_width="fill_parent"
@ -164,14 +164,14 @@
android:gravity="center"
android:singleLine="true"
android:text="@string/longestStreak"
android:textAppearance="?android:attr/textAppearanceMedium" />
android:textAppearance="?android:attr/textAppearanceMedium"/>
<View
android:layout_width="1dp"
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<TextView
android:id="@+id/txtOtherStatisticsLongestStreak"
@ -182,7 +182,7 @@
android:gravity="center"
android:singleLine="true"
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium" />
android:textAppearance="?android:attr/textAppearanceMedium"/>
</LinearLayout>
@ -191,7 +191,7 @@
android:layout_height="1dp"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<TextView
android:id="@+id/txtTimeSpentMeditating"
@ -205,14 +205,14 @@
android:scrollHorizontally="true"
android:singleLine="true"
android:text="@string/totalTimeSpentMeditating"
android:textAppearance="?android:attr/textAppearanceLarge" />
android:textAppearance="?android:attr/textAppearanceLarge"/>
<View
android:layout_width="fill_parent"
android:layout_height="1dp"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<LinearLayout
android:layout_width="fill_parent"
@ -227,14 +227,14 @@
android:gravity="center"
android:singleLine="true"
android:text="@string/days"
android:textAppearance="?android:attr/textAppearanceMedium" />
android:textAppearance="?android:attr/textAppearanceMedium"/>
<View
android:layout_width="1dp"
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<TextView
android:id="@+id/txtTimeSpentMeditatingDays"
@ -245,7 +245,7 @@
android:gravity="center"
android:singleLine="true"
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium" />
android:textAppearance="?android:attr/textAppearanceMedium"/>
</LinearLayout>
@ -254,7 +254,7 @@
android:layout_height="1dp"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<LinearLayout
android:layout_width="fill_parent"
@ -269,14 +269,14 @@
android:gravity="center"
android:singleLine="true"
android:text="@string/hours"
android:textAppearance="?android:attr/textAppearanceMedium" />
android:textAppearance="?android:attr/textAppearanceMedium"/>
<View
android:layout_width="1dp"
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<TextView
android:id="@+id/txtTimeSpentMeditatingHours"
@ -287,7 +287,7 @@
android:gravity="center"
android:singleLine="true"
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium" />
android:textAppearance="?android:attr/textAppearanceMedium"/>
</LinearLayout>
@ -296,7 +296,7 @@
android:layout_height="1dp"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<LinearLayout
android:layout_width="fill_parent"
@ -311,14 +311,14 @@
android:gravity="center"
android:singleLine="true"
android:text="@string/minutes"
android:textAppearance="?android:attr/textAppearanceMedium" />
android:textAppearance="?android:attr/textAppearanceMedium"/>
<View
android:layout_width="1dp"
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<TextView
android:id="@+id/txtTimeSpentMeditatingMinutes"
@ -329,7 +329,7 @@
android:gravity="center"
android:singleLine="true"
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium" />
android:textAppearance="?android:attr/textAppearanceMedium"/>
</LinearLayout>
@ -338,6 +338,6 @@
android:layout_height="1dp"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
</LinearLayout>

View File

@ -38,7 +38,7 @@
android:layout_weight="1"
android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/google"
android:scaleType="fitCenter" />
android:scaleType="fitCenter"/>
</LinearLayout>
<View
@ -46,7 +46,7 @@
android:layout_height="1dp"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<LinearLayout
android:layout_width="fill_parent"
@ -61,7 +61,7 @@
android:layout_weight="1"
android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/facebook"
android:scaleType="fitCenter" />
android:scaleType="fitCenter"/>
</LinearLayout>
<View
@ -69,7 +69,7 @@
android:layout_height="1dp"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<LinearLayout
android:layout_width="fill_parent"
@ -85,14 +85,14 @@
android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/twitter"
android:onClick="selectProvider"
android:scaleType="fitCenter" />
android:scaleType="fitCenter"/>
<View
android:layout_width="1dp"
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<ImageButton
android:id="@+id/btnLive"
@ -103,7 +103,7 @@
android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/windowsLive"
android:onClick="selectProvider"
android:scaleType="fitCenter" />
android:scaleType="fitCenter"/>
</LinearLayout>
<View
@ -111,7 +111,7 @@
android:layout_height="1dp"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<LinearLayout
android:layout_width="fill_parent"
@ -128,14 +128,14 @@
android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/aol"
android:onClick="selectProvider"
android:scaleType="fitCenter" />
android:scaleType="fitCenter"/>
<View
android:layout_width="1dp"
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
android:background="?android:attr/listDivider" />
android:background="?android:attr/listDivider"/>
<ImageButton
android:id="@+id/btnOpenID"
@ -147,7 +147,7 @@
android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/openID"
android:onClick="selectProvider"
android:scaleType="fitCenter" />
android:scaleType="fitCenter"/>
</LinearLayout>
</LinearLayout>
</RelativeLayout>

View File

@ -27,6 +27,6 @@
android:gravity="center"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorPrimary" />
android:textColor="?android:attr/textColorPrimary"/>
</merge>

View File

@ -1,186 +1,186 @@
<RelativeLayout
android:id="@+id/sessionAdd_root"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:descendantFocusability="beforeDescendants"
android:focusableInTouchMode="true">
<ScrollView
android:id="@+id/scroll"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fillViewport="true">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:orientation="vertical"
android:padding="4dp">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<Button
android:id="@+id/btnSetDateStarted"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
android:gravity="center"
android:padding="7dp"
android:singleLine="true"
android:text=""
android:textAppearance="?android:attr/textAppearanceSmall" />
<View
android:layout_width="1dp"
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
android:background="?android:attr/listDivider" />
<Button
android:id="@+id/btnSetTimeStarted"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
android:gravity="center"
android:padding="7dp"
android:singleLine="true"
android:text=""
android:textAppearance="?android:attr/textAppearanceSmall" />
<View
android:layout_width="1dp"
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
android:background="?android:attr/listDivider" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:clickable="false"
android:gravity="left|center_vertical"
android:includeFontPadding="true"
android:paddingLeft="7dp"
android:singleLine="true"
android:text="@string/started"
android:textAppearance="?android:attr/textAppearanceSmall"
tools:ignore="RtlSymmetry" />
</LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="1dp"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:background="?android:attr/listDivider" />
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<Button
android:id="@+id/btnSetDateCompleted"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
android:gravity="center"
android:singleLine="true"
android:text=""
android:textAppearance="?android:attr/textAppearanceSmall" />
<View
android:layout_width="1dp"
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
android:background="?android:attr/listDivider" />
<Button
android:id="@+id/btnSetTimeCompleted"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
android:gravity="center"
android:singleLine="true"
android:text=""
android:textAppearance="?android:attr/textAppearanceSmall" />
<View
android:layout_width="1dp"
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
android:background="?android:attr/listDivider" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:clickable="false"
android:gravity="left|center_vertical"
android:includeFontPadding="true"
android:paddingLeft="7dp"
android:singleLine="true"
android:text="@string/completed"
android:textAppearance="?android:attr/textAppearanceSmall"
tools:ignore="RtlSymmetry" />
</LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="1dp"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:background="?android:attr/listDivider" />
<EditText
android:id="@+id/editAddSessionMessage"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="top"
android:hint="@string/sessionMessagePlaceholder"
android:inputType="textMultiLine"
android:lines="2"
android:maxLength="160"
android:nextFocusLeft="@+id/addSessionMessage"
android:nextFocusUp="@+id/addSessionMessage"
android:scrollbars="vertical"
android:singleLine="false"
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
</RelativeLayout>
</ScrollView>
<RelativeLayout
android:id="@+id/sessionAdd_root"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:descendantFocusability="beforeDescendants"
android:focusableInTouchMode="true">
<ScrollView
android:id="@+id/scroll"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fillViewport="true">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:orientation="vertical"
android:padding="4dp">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<Button
android:id="@+id/btnSetDateStarted"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
android:gravity="center"
android:padding="7dp"
android:singleLine="true"
android:text=""
android:textAppearance="?android:attr/textAppearanceSmall"/>
<View
android:layout_width="1dp"
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
android:background="?android:attr/listDivider"/>
<Button
android:id="@+id/btnSetTimeStarted"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
android:gravity="center"
android:padding="7dp"
android:singleLine="true"
android:text=""
android:textAppearance="?android:attr/textAppearanceSmall"/>
<View
android:layout_width="1dp"
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
android:background="?android:attr/listDivider"/>
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:clickable="false"
android:gravity="left|center_vertical"
android:includeFontPadding="true"
android:paddingLeft="7dp"
android:singleLine="true"
android:text="@string/started"
android:textAppearance="?android:attr/textAppearanceSmall"
tools:ignore="RtlSymmetry"/>
</LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="1dp"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:background="?android:attr/listDivider"/>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<Button
android:id="@+id/btnSetDateCompleted"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
android:gravity="center"
android:singleLine="true"
android:text=""
android:textAppearance="?android:attr/textAppearanceSmall"/>
<View
android:layout_width="1dp"
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
android:background="?android:attr/listDivider"/>
<Button
android:id="@+id/btnSetTimeCompleted"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
android:gravity="center"
android:singleLine="true"
android:text=""
android:textAppearance="?android:attr/textAppearanceSmall"/>
<View
android:layout_width="1dp"
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
android:background="?android:attr/listDivider"/>
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:clickable="false"
android:gravity="left|center_vertical"
android:includeFontPadding="true"
android:paddingLeft="7dp"
android:singleLine="true"
android:text="@string/completed"
android:textAppearance="?android:attr/textAppearanceSmall"
tools:ignore="RtlSymmetry"/>
</LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="1dp"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:background="?android:attr/listDivider"/>
<EditText
android:id="@+id/editAddSessionMessage"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="top"
android:hint="@string/sessionMessagePlaceholder"
android:inputType="textMultiLine"
android:lines="2"
android:maxLength="160"
android:nextFocusLeft="@+id/addSessionMessage"
android:nextFocusUp="@+id/addSessionMessage"
android:scrollbars="vertical"
android:singleLine="false"
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium"/>
</LinearLayout>
</RelativeLayout>
</ScrollView>
</RelativeLayout>

View File

@ -1,60 +1,60 @@
<RelativeLayout
android:id="@+id/sessionDetails_root"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ScrollView
android:id="@+id/scroll"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fillViewport="true">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:orientation="vertical">
<TextView
android:id="@+id/txtSessionDetailsStarted"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_gravity="center_vertical"
android:clickable="false"
android:gravity="center"
android:padding="7dp"
android:singleLine="true"
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium" />
<View
android:id="@+id/divSessionDetailsMessage"
android:layout_width="fill_parent"
android:layout_height="1dp"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:background="?android:attr/listDivider" />
<TextView
android:id="@+id/txtSessionDetailsMessage"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_gravity="center_vertical"
android:clickable="false"
android:gravity="center"
android:padding="7dp"
android:singleLine="false"
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
</RelativeLayout>
</ScrollView>
<RelativeLayout
android:id="@+id/sessionDetails_root"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ScrollView
android:id="@+id/scroll"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fillViewport="true">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:orientation="vertical">
<TextView
android:id="@+id/txtSessionDetailsStarted"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_gravity="center_vertical"
android:clickable="false"
android:gravity="center"
android:padding="7dp"
android:singleLine="true"
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium"/>
<View
android:id="@+id/divSessionDetailsMessage"
android:layout_width="fill_parent"
android:layout_height="1dp"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:background="?android:attr/listDivider"/>
<TextView
android:id="@+id/txtSessionDetailsMessage"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_gravity="center_vertical"
android:clickable="false"
android:gravity="center"
android:padding="7dp"
android:singleLine="false"
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium"/>
</LinearLayout>
</RelativeLayout>
</ScrollView>
</RelativeLayout>

View File

@ -26,7 +26,7 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="@string/label"
android:textAppearance="?android:attr/textAppearanceMedium" />
android:textAppearance="?android:attr/textAppearanceMedium"/>
<EditText
android:id="@+id/editPresetTitle"
@ -36,7 +36,7 @@
android:layout_marginLeft="21dp"
android:singleLine="true"
android:text=""
android:textAppearance="?android:attr/textAppearanceLarge" />
android:textAppearance="?android:attr/textAppearanceLarge"/>
</LinearLayout>
@ -47,7 +47,7 @@
android:includeFontPadding="false"
android:text="@string/setPresetTip"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textSize="13sp" />
android:textSize="13sp"/>
</LinearLayout>

View File

@ -21,4 +21,4 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" />
android:layout_gravity="center_horizontal"/>

View File

@ -19,11 +19,11 @@
<!-- Layout of time picker -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="horizontal">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
@ -41,7 +41,7 @@
android:layout_marginRight="6dp"
android:layout_marginTop="16dip"
android:focusable="true"
android:focusableInTouchMode="true" />
android:focusableInTouchMode="true"/>
<!--android:layout_marginStart="16dip"
android:layout_marginEnd="6dip"-->
@ -52,7 +52,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:importantForAccessibility="no"
tools:ignore="UnusedAttribute" />
tools:ignore="UnusedAttribute"/>
<!-- minute -->
<sh.ftp.rocketninelabs.meditationassistant.NumberPicker
@ -64,7 +64,7 @@
android:layout_marginRight="8dp"
android:layout_marginTop="16dip"
android:focusable="true"
android:focusableInTouchMode="true" />
android:focusableInTouchMode="true"/>
<!--android:layout_marginStart="6dip"
android:layout_marginEnd="8dip"-->
@ -80,7 +80,7 @@
android:layout_marginRight="16dp"
android:layout_marginTop="16dip"
android:focusable="true"
android:focusableInTouchMode="true" />
android:focusableInTouchMode="true"/>
<!--android:layout_marginStart="8dip"
android:layout_marginEnd="16dip"-->

View File

@ -20,7 +20,7 @@
android:gravity="center"
android:text=""
android:textAppearance="?android:attr/textAppearanceLarge"
android:textSize="37sp" />
android:textSize="37sp"/>
<TextView
android:id="@+id/txtWidgetText"
@ -32,7 +32,7 @@
android:gravity="right"
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="18sp" />
android:textSize="18sp"/>
</LinearLayout>
</FrameLayout>

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/widget_margin">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/widget_margin">
<LinearLayout
android:id="@+id/layWidget1x1"
@ -18,7 +18,7 @@
android:gravity="center"
android:text=""
android:textAppearance="?android:attr/textAppearanceLarge"
android:textSize="32sp" />
android:textSize="32sp"/>
<TextView
android:id="@+id/txtWidgetLabel2"
@ -30,7 +30,7 @@
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="18sp"
android:visibility="gone" />
android:visibility="gone"/>
</LinearLayout>
</FrameLayout>

View File

@ -1,17 +1,17 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:context=".AboutActivity">
xmlns:tools="http://schemas.android.com/tools"
tools:context=".AboutActivity">
<item
android:id="@+id/action_rate"
android:icon="?attr/actionIconNotImportant"
android:showAsAction="always"
android:title="@string/rate" />
android:title="@string/rate"/>
<item
android:id="@+id/action_share_app"
android:icon="?attr/actionIconShare"
android:showAsAction="always"
android:title="@string/share" />
android:title="@string/share"/>
</menu>

View File

@ -1,2 +1,2 @@
<menu xmlns:tools="http://schemas.android.com/tools"
tools:context=".CompleteActivity"></menu>
tools:context=".CompleteActivity"></menu>

View File

@ -5,6 +5,6 @@
android:icon="?attr/actionIconSettings"
android:orderInCategory="100"
android:showAsAction="always"
android:title="@string/settings" />
android:title="@string/settings"/>
</menu>

View File

@ -1,13 +1,13 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:context=".MediNETActivity">
xmlns:tools="http://schemas.android.com/tools"
tools:context=".MediNETActivity">
<item
android:id="@+id/refreshMediNET"
android:icon="?attr/actionIconRefresh"
android:showAsAction="always"
android:title="@string/refresh"
tools:ignore="AlwaysShowAction" />
tools:ignore="AlwaysShowAction"/>
<item
android:id="@+id/menuMediNET"
android:icon="?attr/actionIconSortBySize"
@ -19,37 +19,37 @@
android:id="@+id/menuMediNETCommunity"
android:icon="?attr/actionIconWebsite"
android:showAsAction="never"
android:title="@string/community" />
android:title="@string/community"/>
<item
android:id="@+id/menuMediNETSessions"
android:icon="?attr/actionIconViewAsList"
android:showAsAction="never"
android:title="@string/sessions" />
android:title="@string/sessions"/>
<item
android:id="@+id/menuMediNETAccount"
android:icon="?attr/actionIconPerson"
android:showAsAction="never"
android:title="@string/account" />
android:title="@string/account"/>
<item
android:id="@+id/menuMediNETGroups"
android:icon="?attr/actionIconGroup"
android:showAsAction="never"
android:title="@string/groups" />
android:title="@string/groups"/>
<item
android:id="@+id/menuMediNETForum"
android:icon="?attr/actionIconChat"
android:showAsAction="never"
android:title="@string/forum" />
android:title="@string/forum"/>
</menu>
</item>
<item
android:id="@+id/menuMediNETForward"
android:showAsAction="never"
android:title="@string/forward" />
android:title="@string/forward"/>
<item
android:id="@+id/menuMediNETBack"
android:showAsAction="never"
android:title="@string/back" />
android:title="@string/back"/>
</menu>

View File

@ -4,6 +4,6 @@
android:id="@+id/addSession"
android:icon="?attr/actionIconNew"
android:showAsAction="always"
android:title="@string/addSession" />
android:title="@string/addSession"/>
</menu>

View File

@ -1,17 +1,17 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
xmlns:tools="http://schemas.android.com/tools">
<item
android:id="@+id/action_about"
android:icon="?attr/actionIconInfo"
android:showAsAction="always"
android:title="@string/about"
tools:ignore="AlwaysShowAction" />
tools:ignore="AlwaysShowAction"/>
<item
android:id="@+id/action_accountsettings"
android:icon="?attr/actionIconPerson"
android:showAsAction="always"
android:title="@string/account"
tools:ignore="AlwaysShowAction" />
tools:ignore="AlwaysShowAction"/>
</menu>

View File

@ -1,33 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<attr name="actionIconTime" format="reference" />
<attr name="actionIconVolumeOn" format="reference" />
<attr name="actionIconNotImportant" format="reference" />
<attr name="actionIconInfo" format="reference" />
<attr name="actionIconSettings" format="reference" />
<attr name="actionIconNetworkCell" format="reference" />
<attr name="actionIconBrightnessLow" format="reference" />
<attr name="actionIconFullScreen" format="reference" />
<attr name="actionIconSignOut" format="reference" />
<attr name="actionIconAccounts" format="reference" />
<attr name="actionIconRefresh" format="reference" />
<attr name="actionIconSortBySize" format="reference" />
<attr name="actionIconForward" format="reference" />
<attr name="actionIconGoToToday" format="reference" />
<attr name="actionIconViewAsList" format="reference" />
<attr name="actionIconWebsite" format="reference" />
<attr name="actionIconPerson" format="reference" />
<attr name="actionIconGroup" format="reference" />
<attr name="actionIconShare" format="reference" />
<attr name="actionIconPreviousItem" format="reference" />
<attr name="actionIconNextItem" format="reference" />
<attr name="actionIconDownCloud" format="reference" />
<attr name="actionIconUpCloud" format="reference" />
<attr name="actionIconChat" format="reference" />
<attr name="actionIconRingVolume" format="reference" />
<attr name="actionIconNew" format="reference" />
<attr name="actionIconFlashOn" format="reference" />
<attr name="actionIconTime" format="reference"/>
<attr name="actionIconVolumeOn" format="reference"/>
<attr name="actionIconNotImportant" format="reference"/>
<attr name="actionIconInfo" format="reference"/>
<attr name="actionIconSettings" format="reference"/>
<attr name="actionIconNetworkCell" format="reference"/>
<attr name="actionIconBrightnessLow" format="reference"/>
<attr name="actionIconFullScreen" format="reference"/>
<attr name="actionIconSignOut" format="reference"/>
<attr name="actionIconAccounts" format="reference"/>
<attr name="actionIconRefresh" format="reference"/>
<attr name="actionIconSortBySize" format="reference"/>
<attr name="actionIconForward" format="reference"/>
<attr name="actionIconGoToToday" format="reference"/>
<attr name="actionIconViewAsList" format="reference"/>
<attr name="actionIconWebsite" format="reference"/>
<attr name="actionIconPerson" format="reference"/>
<attr name="actionIconGroup" format="reference"/>
<attr name="actionIconShare" format="reference"/>
<attr name="actionIconPreviousItem" format="reference"/>
<attr name="actionIconNextItem" format="reference"/>
<attr name="actionIconDownCloud" format="reference"/>
<attr name="actionIconUpCloud" format="reference"/>
<attr name="actionIconChat" format="reference"/>
<attr name="actionIconRingVolume" format="reference"/>
<attr name="actionIconNew" format="reference"/>
<attr name="actionIconFlashOn" format="reference"/>
<declare-styleable name="ListPreference">
<attr name="entries" format="string"></attr>
@ -42,6 +42,6 @@
</declare-styleable>
<!-- The TimePicker style. -->
<attr name="timePickerStyle" format="reference" />
<attr name="timePickerStyle" format="reference"/>
</resources>

View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item name="editDuration" type="id" />
<item name="calendarDate" type="id" />
<item name="editDuration" type="id"/>
<item name="calendarDate" type="id"/>
<!-- NumberPicker -->
<item name="np__increment" type="id" />
<item name="np__decrement" type="id" />
<item name="np__increment" type="id"/>
<item name="np__decrement" type="id"/>
</resources>

View File

@ -7,29 +7,29 @@
-->
<!-- Don't touch this -->
<attr name="numberPickerStyle" format="reference" />
<attr name="numberPickerStyle" format="reference"/>
<declare-styleable name="NumberPicker">
<!-- @hide Color for the solid color background if such for optimized rendering. -->
<attr name="solidColor" format="color|reference" />
<attr name="solidColor" format="color|reference"/>
<!-- @hide The divider for making the selection area. -->
<attr name="selectionDivider" format="reference" />
<attr name="selectionDivider" format="reference"/>
<!-- @hide The height of the selection divider. -->
<attr name="selectionDividerHeight" format="dimension" />
<attr name="selectionDividerHeight" format="dimension"/>
<!-- @hide The distance between the two selection dividers. -->
<attr name="selectionDividersDistance" format="dimension" />
<attr name="selectionDividersDistance" format="dimension"/>
<!-- @hide The min height of the NumberPicker. -->
<attr name="internalMinHeight" format="dimension" />
<attr name="internalMinHeight" format="dimension"/>
<!-- @hide The max height of the NumberPicker. -->
<attr name="internalMaxHeight" format="dimension" />
<attr name="internalMaxHeight" format="dimension"/>
<!-- @hide The min width of the NumberPicker. -->
<attr name="internalMinWidth" format="dimension" />
<attr name="internalMinWidth" format="dimension"/>
<!-- @hide The max width of the NumberPicker. -->
<attr name="internalMaxWidth" format="dimension" />
<attr name="internalMaxWidth" format="dimension"/>
<!-- @hide The layout of the number picker. -->
<attr name="internalLayout" format="reference" />
<attr name="internalLayout" format="reference"/>
<!-- @hide The drawable for pressed virtual (increment/decrement) buttons. -->
<attr name="virtualButtonPressedDrawable" format="reference" />
<attr name="virtualButtonPressedDrawable" format="reference"/>
</declare-styleable>
<style name="NPWidget">

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools"
tools:ignore="TypographyDashes">
tools:ignore="TypographyDashes">
<!-- the Local LogLevel for Analytics -->
<string name="ga_logLevel">verbose</string>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools"
tools:ignore="TypographyDashes,UnusedResources">
tools:ignore="TypographyDashes,UnusedResources">
<!-- Replace placeholder ID with your tracking ID -->
<string name="ga_trackingId">UA-71983-51</string>

View File

@ -4,22 +4,22 @@
<header
android:fragment="sh.ftp.rocketninelabs.meditationassistant.SettingsActivity$SessionPreferenceFragment"
android:title="@string/session" />
android:title="@string/session"/>
<header
android:fragment="sh.ftp.rocketninelabs.meditationassistant.SettingsActivity$ReminderPreferenceFragment"
android:title="@string/pref_daily_reminder" />
android:title="@string/pref_daily_reminder"/>
<header
android:fragment="sh.ftp.rocketninelabs.meditationassistant.SettingsActivity$MeditationPreferenceFragment"
android:title="@string/meditation" />
android:title="@string/meditation"/>
<header
android:fragment="sh.ftp.rocketninelabs.meditationassistant.SettingsActivity$MediNETPreferenceFragment"
android:title="@string/mediNET" />
android:title="@string/mediNET"/>
<header
android:fragment="sh.ftp.rocketninelabs.meditationassistant.SettingsActivity$MiscellaneousPreferenceFragment"
android:title="@string/miscellaneous" />
android:title="@string/miscellaneous"/>
</preference-headers>

View File

@ -4,34 +4,34 @@
android:defaultValue="false"
android:key="pref_autosignin"
android:summary="@string/pref_autosignin_summary"
android:title="@string/pref_autosignin" />
android:title="@string/pref_autosignin"/>
<CheckBoxPreference
android:defaultValue="true"
android:key="pref_rememberme"
android:summary="@string/pref_rememberme_summary"
android:title="@string/pref_rememberme" />
android:title="@string/pref_rememberme"/>
<CheckBoxPreference
android:defaultValue="false"
android:key="pref_remembermessage"
android:summary="@string/pref_remembermessage_summary"
android:title="@string/pref_remembermessage" />
android:title="@string/pref_remembermessage"/>
<CheckBoxPreference
android:defaultValue="true"
android:key="pref_askdismiss"
android:summary="@string/pref_askdismiss_summary"
android:title="@string/pref_askdismiss" />
android:title="@string/pref_askdismiss"/>
<Preference
android:icon="?attr/actionIconUpCloud"
android:key="uploadsessions"
android:summary="@string/uploadsessions_summary"
android:title="@string/uploadsessions" />
android:title="@string/uploadsessions"/>
<Preference
android:icon="?attr/actionIconDownCloud"
android:key="importsessions"
android:summary="@string/importsessions_summary"
android:title="@string/importsessions" />
android:title="@string/importsessions"/>
<!-- A 'parent' preference, which enables/disables child preferences (below)
when checked/unchecked.

View File

@ -4,31 +4,31 @@
android:defaultValue="true"
android:key="pref_display_seconds"
android:summary="@string/pref_display_seconds_summary"
android:title="@string/pref_display_seconds" />
android:title="@string/pref_display_seconds"/>
<CheckBoxPreference
android:defaultValue="true"
android:key="pref_showstreak"
android:summary="@string/pref_showstreak_summary"
android:title="@string/pref_showstreak" />
android:title="@string/pref_showstreak"/>
<CheckBoxPreference
android:defaultValue="true"
android:key="pref_notification"
android:summary="@string/pref_notification_summary"
android:title="@string/pref_notification" />
android:title="@string/pref_notification"/>
<CheckBoxPreference
android:defaultValue="false"
android:key="pref_full_screen"
android:summary="@string/pref_full_screen_summary"
android:title="@string/pref_full_screen" />
android:title="@string/pref_full_screen"/>
<CheckBoxPreference
android:defaultValue="false"
android:key="pref_usetimepicker"
android:summary="@string/pref_usetimepicker_summary"
android:title="@string/pref_usetimepicker" />
android:title="@string/pref_usetimepicker"/>
<ListPreference
android:defaultValue="dim"
@ -36,7 +36,7 @@
android:entries="@array/screencontrol"
android:entryValues="@array/screencontrol_values"
android:key="pref_screencontrol"
android:title="@string/pref_screencontrol" />
android:title="@string/pref_screencontrol"/>
<ListPreference
android:defaultValue="normal"
@ -44,7 +44,7 @@
android:entryValues="@array/text_sizes_values"
android:key="pref_text_size"
android:summary=""
android:title="@string/pref_text_size" />
android:title="@string/pref_text_size"/>
<ListPreference
android:defaultValue="calendar"
@ -52,6 +52,6 @@
android:entryValues="@array/progresstabs_values"
android:key="pref_progresstab"
android:summary=""
android:title="@string/pref_progresstab" />
android:title="@string/pref_progresstab"/>
</PreferenceScreen>

View File

@ -6,12 +6,12 @@
android:entryValues="@array/mathemes_values"
android:key="pref_theme"
android:summary=""
android:title="@string/pref_theme" />
android:title="@string/pref_theme"/>
<CheckBoxPreference
android:defaultValue="true"
android:key="pref_sendusage"
android:summary="@string/pref_sendusage_summary"
android:title="@string/pref_sendusage" />
android:title="@string/pref_sendusage"/>
</PreferenceScreen>

View File

@ -1,38 +1,38 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto">
<CheckBoxPreference
android:defaultValue="false"
android:key="pref_daily_reminder"
android:summary="@string/pref_daily_reminder_summary"
android:title="@string/pref_daily_reminder_title" />
android:title="@string/pref_daily_reminder_title"/>
<CheckBoxPreference
android:defaultValue="true"
android:dependency="pref_daily_reminder"
android:key="pref_sound_reminder"
android:summary="@string/pref_sound_reminder_summary"
android:title="@string/pref_sound_reminder" />
android:title="@string/pref_sound_reminder"/>
<CheckBoxPreference
android:defaultValue="true"
android:dependency="pref_daily_reminder"
android:key="pref_vibrate_reminder"
android:summary="@string/pref_vibrate_reminder_summary"
android:title="@string/pref_vibrate" />
android:title="@string/pref_vibrate"/>
<EditTextPreference
android:defaultValue=""
android:dependency="pref_daily_reminder"
android:key="pref_daily_reminder_text"
android:summary=""
android:title="@string/pref_daily_reminder_text" />
android:title="@string/pref_daily_reminder_text"/>
<sh.ftp.rocketninelabs.meditationassistant.TimePreference
android:defaultValue="19:00"
android:dependency="pref_daily_reminder"
android:key="pref_daily_reminder_time"
android:title="@string/pref_daily_reminder_time"
app:is24hour="false" />
app:is24hour="false"/>
</PreferenceScreen>

View File

@ -1,9 +1,9 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto">
<PreferenceCategory
android:key="pref_cat_session"
android:title="@string/session" />
android:title="@string/session"/>
<sh.ftp.rocketninelabs.meditationassistant.TimePreference
android:defaultValue="00:15"
@ -13,7 +13,7 @@
android:summary=""
android:title="@string/pref_delay"
app:is24hour="true"
app:maxHours="90" />
app:maxHours="90"/>
<sh.ftp.rocketninelabs.meditationassistant.ListPreferenceSound
android:defaultValue="gong"
@ -22,7 +22,7 @@
android:entryValues="@array/meditation_sounds_values"
android:icon="?attr/actionIconVolumeOn"
android:key="pref_meditation_sound_start"
android:title="@string/pref_meditation_sound_start" />
android:title="@string/pref_meditation_sound_start"/>
<sh.ftp.rocketninelabs.meditationassistant.TimePreference
android:defaultValue="00:00"
@ -32,7 +32,7 @@
android:summary=""
android:title="@string/pref_interval"
app:is24hour="true"
app:maxHours="90" />
app:maxHours="90"/>
<sh.ftp.rocketninelabs.meditationassistant.ListPreferenceSound
android:defaultValue="gong"
@ -41,7 +41,7 @@
android:entryValues="@array/meditation_sounds_values"
android:icon="?attr/actionIconVolumeOn"
android:key="pref_meditation_sound_interval"
android:title="@string/pref_meditation_sound_interval" />
android:title="@string/pref_meditation_sound_interval"/>
<EditTextPreference
android:defaultValue=""
android:dialogIcon="?attr/actionIconRefresh"
@ -49,7 +49,7 @@
android:inputType="number"
android:key="pref_interval_count"
android:summary=""
android:title="@string/pref_interval_count" />
android:title="@string/pref_interval_count"/>
<sh.ftp.rocketninelabs.meditationassistant.ListPreferenceSound
android:defaultValue="gong"
@ -58,7 +58,7 @@
android:entryValues="@array/meditation_sounds_values"
android:icon="?attr/actionIconVolumeOn"
android:key="pref_meditation_sound_finish"
android:title="@string/pref_meditation_sound_finish" />
android:title="@string/pref_meditation_sound_finish"/>
<ListPreference
android:defaultValue=""
@ -67,21 +67,21 @@
android:entryValues="@array/notificationcontrol_values"
android:icon="?attr/actionIconRingVolume"
android:key="pref_notificationcontrol"
android:title="@string/pref_notificationcontrol" />
android:title="@string/pref_notificationcontrol"/>
<CheckBoxPreference
android:defaultValue="false"
android:icon="?attr/actionIconTime"
android:key="pref_softfinish"
android:summary="@string/pref_softfinish_summary"
android:title="@string/pref_softfinish" />
android:title="@string/pref_softfinish"/>
<CheckBoxPreference
android:defaultValue="false"
android:icon="?attr/actionIconFlashOn"
android:key="pref_vibrate"
android:summary="@string/pref_vibrate_summary"
android:title="@string/pref_vibrate" />
android:title="@string/pref_vibrate"/>
<MultiSelectListPreference
android:defaultValue="@array/presetsettings_default"
@ -89,6 +89,6 @@
android:entries="@array/presetsettings"
android:entryValues="@array/presetsettings_values"
android:key="pref_presetsettings"
android:title="@string/presetsettings" />
android:title="@string/presetsettings"/>
</PreferenceScreen>

View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:initialLayout="@layout/widget_layout"
android:minHeight="40dp"
android:minWidth="40dp"
android:resizeMode="horizontal"
android:theme="@style/MeditationDarkTheme"
android:updatePeriodMillis="18000000"
android:widgetCategory="keyguard|home_screen"
tools:ignore="UnusedAttribute">
xmlns:tools="http://schemas.android.com/tools"
android:initialLayout="@layout/widget_layout"
android:minHeight="40dp"
android:minWidth="40dp"
android:resizeMode="horizontal"
android:theme="@style/MeditationDarkTheme"
android:updatePeriodMillis="18000000"
android:widgetCategory="keyguard|home_screen"
tools:ignore="UnusedAttribute">
</appwidget-provider>

View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:initialLayout="@layout/widget_layout"
android:minHeight="40dp"
android:minWidth="110dp"
android:resizeMode="horizontal"
android:theme="@style/MeditationDarkTheme"
android:updatePeriodMillis="18000000"
android:widgetCategory="keyguard|home_screen"
tools:ignore="UnusedAttribute">
xmlns:tools="http://schemas.android.com/tools"
android:initialLayout="@layout/widget_layout"
android:minHeight="40dp"
android:minWidth="110dp"
android:resizeMode="horizontal"
android:theme="@style/MeditationDarkTheme"
android:updatePeriodMillis="18000000"
android:widgetCategory="keyguard|home_screen"
tools:ignore="UnusedAttribute">
</appwidget-provider>

View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:initialLayout="@layout/widget_layout"
android:minHeight="40dp"
android:minWidth="180dp"
android:resizeMode="horizontal"
android:theme="@style/MeditationDarkTheme"
android:updatePeriodMillis="18000000"
android:widgetCategory="keyguard|home_screen"
tools:ignore="UnusedAttribute">
xmlns:tools="http://schemas.android.com/tools"
android:initialLayout="@layout/widget_layout"
android:minHeight="40dp"
android:minWidth="180dp"
android:resizeMode="horizontal"
android:theme="@style/MeditationDarkTheme"
android:updatePeriodMillis="18000000"
android:widgetCategory="keyguard|home_screen"
tools:ignore="UnusedAttribute">
</appwidget-provider>

View File

@ -7,7 +7,7 @@
<meta-data
android:name="com.google.android.backup.api_key"
android:value="AEdPqrEAAAAIAUEb3SC2bBJt6pLanNwm7yB1Qy2WFS_nm7pHuw" />
android:value="AEdPqrEAAAAIAUEb3SC2bBJt6pLanNwm7yB1Qy2WFS_nm7pHuw"/>
<!-- Widgets -->
<!--
@ -26,23 +26,23 @@
android:name=".MeditationProvider2"
android:label="@string/widget2x1">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
</intent-filter>
<meta-data
android:name="android.appwidget.provider"
android:resource="@xml/widget_2" />
android:resource="@xml/widget_2"/>
</receiver>
<receiver
android:name=".MeditationProvider3"
android:label="@string/widget3x1">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
</intent-filter>
<meta-data
android:name="android.appwidget.provider"
android:resource="@xml/widget_3" />
android:resource="@xml/widget_3"/>
</receiver>
</application>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<lint>
<ignore path="build/**" />
<ignore path="build/**"/>
</lint>

View File

@ -3,7 +3,7 @@
package="sh.ftp.rocketninelabs.meditationassistant"
xmlns:android="http://schemas.android.com/apk/res/android">
<uses-feature android:name="android.hardware.type.watch" />
<uses-feature android:name="android.hardware.type.watch"/>
<application
android:name=".WearMeditationAssistant"
@ -17,8 +17,8 @@
android:label="@string/app_name"
android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity

View File

@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.wearable.view.WatchViewStub xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.wearable.view.WatchViewStub
android:id="@+id/watch_view_stub"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/watch_view_stub"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:rectLayout="@layout/wear_editduration_rect"

View File

@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".WearEditDurationActivity"
tools:deviceIds="wear_square">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".WearEditDurationActivity"
tools:deviceIds="wear_square">
<TimePicker
android:id="@+id/editWearDuration"
android:layout_gravity="center_horizontal"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="40dp"
android:layout_marginTop="-20dp" />
android:layout_marginTop="-20dp"/>
<Button
android:id="@+id/setDuration"
android:layout_alignParentBottom="true"
android:layout_width="fill_parent"
android:layout_height="60dp"
android:text="@string/set"
android:onClick="setDuration"></Button>
android:layout_alignParentBottom="true"
android:onClick="setDuration"
android:text="@string/set"></Button>
</RelativeLayout>

View File

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
<RelativeLayout
android:id="@+id/wear_editduration_layout"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".WearEditDurationActivity"
@ -9,17 +10,17 @@
<TimePicker
android:id="@+id/editWearDuration"
android:layout_gravity="center_horizontal"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="40dp"
android:layout_marginTop="-20dp" />
android:layout_marginTop="-20dp"/>
<Button
android:id="@+id/setDuration"
android:layout_alignParentBottom="true"
android:layout_width="fill_parent"
android:layout_height="60dp"
android:text="@string/set"
android:onClick="setDuration"></Button>
android:layout_alignParentBottom="true"
android:onClick="setDuration"
android:text="@string/set"></Button>
</RelativeLayout>

View File

@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.wearable.view.WatchViewStub xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.wearable.view.WatchViewStub
android:id="@+id/watch_view_stub"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/watch_view_stub"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:rectLayout="@layout/wear_main_rect"

View File

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".MainActivity"
tools:deviceIds="wear_square">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".MainActivity"
tools:deviceIds="wear_square">
<TextView
android:id="@+id/wearTimer"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textAppearance="?android:attr/textAppearanceLarge" />
android:textAppearance="?android:attr/textAppearanceLarge"/>
</LinearLayout>

View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity"
tools:deviceIds="wear_round">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity"
tools:deviceIds="wear_round">
<TextView
android:id="@+id/wearTimer"
@ -12,5 +12,5 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:textAppearance="?android:attr/textAppearanceLarge" />
android:textAppearance="?android:attr/textAppearanceLarge"/>
</RelativeLayout>

View File

@ -3,7 +3,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.google.gms:google-services:1.3.0-beta1'
classpath 'com.google.gms:google-services:1.3.1'
}
}

View File

@ -1,6 +1,6 @@
#Fri Feb 20 13:57:58 PST 2015
#Mon Oct 26 00:30:44 PDT 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip