vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2025-12-16 01:01:11 +01:00
Code Issues Releases Wiki Activity

Moved desktop/mobile toggle from settingsactivity to bottom bar, updated german translations, removed unused settings methods

Browse source
This commit is contained in:
vanitasvitae 2016-06-17 19:43:28 +02:00
parent 85e54f03e9
commit b807939652
7 changed files with 33 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
View file

@ -531,6 +531,11 @@ public class MainActivity extends AppCompatActivity
return true;
}
case R.id.action_toggle_desktop_page: {
webView.loadUrl("https://" + podDomain + "/mobile/toggle");
return true;
}
case R.id.action_compose: {
if (Helpers.isOnline(MainActivity.this)) {
webView.loadUrl("https://" + podDomain + "/status_messages/new");
@ -706,7 +711,7 @@ public class MainActivity extends AppCompatActivity
sharingIntent.putExtra(Intent.EXTRA_TEXT, webView.getUrl());
Uri bmpUri = Uri.fromFile(new File(fileSaveDirectory, fileSaveName));
sharingIntent.putExtra(Intent.EXTRA_STREAM, bmpUri);
startActivity(Intent.createChooser(sharingIntent, getString(R.string.share_dotdodot)));
startActivity(Intent.createChooser(sharingIntent, getString(R.string.share_dotdotdot)));
}
else {
// Broadcast that this file is indexable

14
app/src/main/java/com/github/dfa/diaspora_android/data/AppSettings.java
View file

@ -1,5 +1,6 @@
package com.github.dfa.diaspora_android.data;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.SharedPreferences;
import android.util.Log;
@ -73,7 +74,6 @@ public class AppSettings {
public static final String PODUSERPROFILE_ID = "podUserProfile_guid";
public static final String PODDOMAIN = "podDomain";
public static final String PODUSERPROFILE_ASPECTS = "podUserProfile_aspects";
public static final String IS_LOAD_DESKTOP_PAGE = "pref_key_desktop_mode";
public static final String PROXY_ENABLED = "pref_key_proxy_enabled";
public static final String PROXY_WAS_ENABLED = "wasProxyEnabled";
public static final String PROXY_HOST = "pref_key_proxy_host";
@ -92,15 +92,10 @@ public class AppSettings {
setString(prefPod, PREF.PODUSERPROFILE_ID, profileId);
}
public boolean isLoadImages() {
return prefApp.getBoolean(PREF.IS_LOAD_IMAGES, true);
}
public boolean isLoadDesktopPage() {
return prefApp.getBoolean(PREF.IS_LOAD_DESKTOP_PAGE, false);
}
public int getMinimumFontSize() {
switch (prefApp.getString(PREF.MINIMUM_FONT_SIZE, "")) {
case "huge":
@ -164,6 +159,7 @@ public class AppSettings {
return aspects;
}
@SuppressLint("CommitPrefEdits")
public void setProxyEnabled(boolean enabled) {
//commit instead of apply because the app is likely to be killed before apply is called.
prefApp.edit().putBoolean(PREF.PROXY_ENABLED, enabled).commit();
@ -181,6 +177,12 @@ public class AppSettings {
return prefApp.getBoolean(PREF.PROXY_WAS_ENABLED, false);
}
/**
* Needed in order to determine, whether the proxy has just been disabled (trigger app restart)
* or if proxy was disabled before (do not restart app)
* @param b new value
*/
@SuppressLint("CommitPrefEdits")
public void setProxyWasEnabled(boolean b) {
prefApp.edit().putBoolean(PREF.PROXY_WAS_ENABLED, b).commit();
}