vanitasvitae
/
dandelion
mirror of https://github.com/gsantner/dandelion
1
0
Fork 0
Code Issues Releases Wiki Activity

v1.1 see changelog

This commit is contained in:
scoute-dich 2016-03-08 15:42:02 +01:00
parent 05bc47c32c
commit ec50f38eb2
7 changed files with 289 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,7 +1,10 @@
### v1.0.1
- new about app and help dialogs
- better snackbar integration
### v1.0.1
- click toolbar to load strem
### v1.0
First release:

4
app/build.gradle
View File

@ -9,8 +9,8 @@ android {
applicationId "de.baumann.diaspora"
minSdkVersion 15
targetSdkVersion 23
versionCode 2
versionName "1.0.1"
versionCode 4
versionName "1.1"
}
buildTypes {
release {

337
app/src/main/java/de/baumann/diaspora/MainActivity.java
View File

@ -48,6 +48,10 @@ import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.app.ActionBarDrawerToggle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.text.Html;
import android.text.SpannableString;
import android.text.method.LinkMovementMethod;
import android.text.util.Linkify;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
@ -116,7 +120,7 @@ public class MainActivity extends AppCompatActivity
webView.loadUrl("https://" + podDomain + "/stream");
setTitle(R.string.jb_stream);
} else {
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_LONG).show();
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_INDEFINITE).show();
}
}
});
@ -186,7 +190,7 @@ public class MainActivity extends AppCompatActivity
if (Helpers.isOnline(MainActivity.this)) {
webView.reload();
} else {
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_LONG).show();
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_INDEFINITE).show();
swipeView.setRefreshing(false);
}
}
@ -278,7 +282,7 @@ public class MainActivity extends AppCompatActivity
webView.loadData("", "text/html", null);
webView.loadUrl("https://"+podDomain);
} else {
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_LONG).show();
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_INDEFINITE).show();
}
}
@ -294,7 +298,7 @@ public class MainActivity extends AppCompatActivity
webView.loadUrl("https://" + podDomain + "/status_messages/new");
setTitle(R.string.fab1_title);
} else {
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_LONG).show();
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_INDEFINITE).show();
}
}
@ -336,7 +340,7 @@ public class MainActivity extends AppCompatActivity
alert.show();
}
else {
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_LONG).show();
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_INDEFINITE).show();
}
}
@ -482,7 +486,7 @@ public class MainActivity extends AppCompatActivity
setTitle(R.string.jb_notifications);
return true;
} else {
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_LONG).show();
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_INDEFINITE).show();
return false;
}
}
@ -493,7 +497,7 @@ public class MainActivity extends AppCompatActivity
setTitle(R.string.jb_conversations);
return true;
} else {
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_LONG).show();
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_INDEFINITE).show();
return false;
}
}
@ -511,7 +515,7 @@ public class MainActivity extends AppCompatActivity
}
if (id == R.id.help_license) {
final CharSequence[] options = { getString(R.string.help_license), getString(R.string.help_help), getString(R.string.help_donate) };
final CharSequence[] options = { getString(R.string.help_license), getString(R.string.help_about), getString(R.string.help_help), getString(R.string.help_donate) };
new AlertDialog.Builder(MainActivity.this)
.setItems(options, new DialogInterface.OnClickListener() {
@ -522,30 +526,48 @@ public class MainActivity extends AppCompatActivity
if (options[item].equals(getString(R.string.help_license)))
{
new AlertDialog.Builder(MainActivity.this)
.setMessage(getString(R.string.about_text))
.setPositiveButton(getString(R.string.about_yes),
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/scoute-dich/Diaspora-Native-WebApp"));
startActivity(i);
dialog.cancel();
}
})
.setNegativeButton(getString(R.string.about_no),
final SpannableString s = new SpannableString(Html.fromHtml(getString(R.string.license_text)));
Linkify.addLinks(s, Linkify.WEB_URLS);
final AlertDialog d = new AlertDialog.Builder(MainActivity.this)
.setTitle(R.string.license_title)
.setMessage( s )
.setPositiveButton(getString(R.string.yes),
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
}
}).show();
d.show();
((TextView)d.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
}
if (options[item].equals(getString(R.string.help_about)))
{
final SpannableString s = new SpannableString(Html.fromHtml(getString(R.string.about_text)));
Linkify.addLinks(s, Linkify.WEB_URLS);
final AlertDialog d = new AlertDialog.Builder(MainActivity.this)
.setTitle(R.string.help_about)
.setMessage(s)
.setPositiveButton(getString(R.string.yes),
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
}
}).show();
d.show();
((TextView)d.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
}
if (options[item].equals(getString(R.string.help_help)))
{
new AlertDialog.Builder(MainActivity.this)
.setMessage(getString(R.string.markdown_text))
.setNegativeButton(getString(R.string.about_no),
.setTitle(R.string.help_help)
.setMessage(Html.fromHtml(getString(R.string.markdown_text)))
.setPositiveButton(getString(R.string.yes),
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
@ -558,19 +580,19 @@ public class MainActivity extends AppCompatActivity
{
new AlertDialog.Builder(MainActivity.this)
.setMessage(getString(R.string.donate_text))
.setPositiveButton(getString(R.string.donate_1),
.setPositiveButton(getString(R.string.yes),
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
}
})
.setNegativeButton(getString(R.string.donate_1),
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse("http://martinv.tip.me/"));
startActivity(i);
dialog.cancel();
}
})
.setNegativeButton(getString(R.string.about_no),
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
}
}).show();
}
@ -581,48 +603,30 @@ public class MainActivity extends AppCompatActivity
if (id == R.id.view) {
final CharSequence[] options = { getString(R.string.settings_font), getString(R.string.settings_view),getString(R.string.settings_image) };
new AlertDialog.Builder(MainActivity.this)
.setItems(options, new DialogInterface.OnClickListener() {
if (Helpers.isOnline(MainActivity.this)) {
new AlertDialog.Builder(MainActivity.this)
.setItems(options, new DialogInterface.OnClickListener() {
@Override
@Override
public void onClick(DialogInterface dialog, int item) {
public void onClick(DialogInterface dialog, int item) {
if (options[item].equals(getString(R.string.settings_font)))
{
if (Helpers.isOnline(MainActivity.this)) {
if (options[item].equals(getString(R.string.settings_font)))
alertFormElements();
} else {
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_LONG).show();
}
}
if (options[item].equals(getString(R.string.settings_view)))
{
if (Helpers.isOnline(MainActivity.this)) {
if (options[item].equals(getString(R.string.settings_view)))
webView.loadUrl("https://" + podDomain + "/mobile/toggle");
} else { // No Internet connection
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_LONG).show();
}
}
if (options[item].equals(getString(R.string.settings_image)))
{
if (Helpers.isOnline(MainActivity.this)) {
if (options[item].equals(getString(R.string.settings_image)))
wSettings.setLoadsImagesAutomatically(!pm.getLoadImages());
pm.setLoadImages(!pm.getLoadImages());
webView.loadUrl(webView.getUrl());
} else {
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_LONG).show();
}
pm.setLoadImages(!pm.getLoadImages());
webView.loadUrl(webView.getUrl());
}
}
}).show();
}).show();
} else {
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_INDEFINITE).show();
}
}
if (id == R.id.share) {
@ -839,7 +843,7 @@ public class MainActivity extends AppCompatActivity
if (Helpers.isOnline(MainActivity.this)) {
webView.loadUrl(webView.getUrl());
} else {
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_LONG).show();
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_INDEFINITE).show();
}
dialog.cancel();
}
@ -859,6 +863,20 @@ public class MainActivity extends AppCompatActivity
if (item != null) {
if (notificationCount > 0) {
item.setIcon(R.drawable.ic_bell_ring_white_24dp);
Snackbar snackbar = Snackbar
.make(swipeView, R.string.new_notifications, Snackbar.LENGTH_INDEFINITE)
.setAction(R.string.yes, new View.OnClickListener() {
@Override
public void onClick(View view) {
if (Helpers.isOnline(MainActivity.this)) {
webView.loadUrl("https://" + podDomain + "/notifications");
setTitle(R.string.jb_notifications);
} else {
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_INDEFINITE).show();
}
}
});
snackbar.show();
} else {
item.setIcon(R.drawable.ic_bell_outline_white_24dp);
}
@ -881,6 +899,21 @@ public class MainActivity extends AppCompatActivity
if (item != null) {
if (conversationCount > 0) {
item.setIcon(R.drawable.ic_message_text_white_24dp);
item.setIcon(R.drawable.ic_bell_ring_white_24dp);
Snackbar snackbar = Snackbar
.make(swipeView, R.string.new_conversations, Snackbar.LENGTH_INDEFINITE)
.setAction(R.string.yes, new View.OnClickListener() {
@Override
public void onClick(View view) {
if (Helpers.isOnline(MainActivity.this)) {
webView.loadUrl("https://" + podDomain + "/conversations");
setTitle(R.string.jb_notifications);
} else {
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_INDEFINITE).show();
}
}
});
snackbar.show();
} else {
item.setIcon(R.drawable.ic_message_text_outline_white_24dp);
}
@ -903,7 +936,7 @@ public class MainActivity extends AppCompatActivity
webView.loadUrl("https://" + podDomain + "/stream");
setTitle(R.string.jb_stream);
} else {
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_LONG).show();
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_INDEFINITE).show();
}
} else if (id == R.id.jb_followed_tags) {
@ -911,7 +944,7 @@ public class MainActivity extends AppCompatActivity
webView.loadUrl("https://" + podDomain + "/followed_tags");
setTitle(R.string.jb_followed_tags);
} else {
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_LONG).show();
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_INDEFINITE).show();
}
} else if (id == R.id.jb_aspects) {
@ -919,7 +952,7 @@ public class MainActivity extends AppCompatActivity
webView.loadUrl("https://" + podDomain + "/aspects");
setTitle(R.string.jb_aspects);
} else {
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_LONG).show();
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_INDEFINITE).show();
}
} else if (id == R.id.jb_activities) {
@ -927,7 +960,7 @@ public class MainActivity extends AppCompatActivity
webView.loadUrl("https://" + podDomain + "/activity");
setTitle(R.string.jb_activities);
} else {
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_LONG).show();
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_INDEFINITE).show();
}
} else if (id == R.id.jb_liked) {
@ -935,7 +968,7 @@ public class MainActivity extends AppCompatActivity
webView.loadUrl("https://" + podDomain + "/liked");
setTitle(R.string.jb_liked);
} else {
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_LONG).show();
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_INDEFINITE).show();
}
} else if (id == R.id.jb_commented) {
@ -943,7 +976,7 @@ public class MainActivity extends AppCompatActivity
webView.loadUrl("https://" + podDomain + "/commented");
setTitle(R.string.jb_commented);
} else {
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_LONG).show();
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_INDEFINITE).show();
}
} else if (id == R.id.jb_mentions) {
@ -951,7 +984,7 @@ public class MainActivity extends AppCompatActivity
webView.loadUrl("https://" + podDomain + "/mentions");
setTitle(R.string.jb_mentions);
} else {
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_LONG).show();
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_INDEFINITE).show();
}
} else if (id == R.id.jb_public) {
@ -959,101 +992,55 @@ public class MainActivity extends AppCompatActivity
webView.loadUrl("https://" + podDomain + "/public");
setTitle(R.string.jb_public);
} else {
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_LONG).show();
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_INDEFINITE).show();
}
} else if (id == R.id.jb_settings_view) {
final CharSequence[] options = { getString(R.string.settings_font), getString(R.string.settings_view),getString(R.string.settings_image) };
new AlertDialog.Builder(MainActivity.this)
.setItems(options, new DialogInterface.OnClickListener() {
if (Helpers.isOnline(MainActivity.this)) {
new AlertDialog.Builder(MainActivity.this)
.setItems(options, new DialogInterface.OnClickListener() {
@Override
@Override
public void onClick(DialogInterface dialog, int item) {
public void onClick(DialogInterface dialog, int item) {
if (options[item].equals(getString(R.string.settings_font)))
{
if (Helpers.isOnline(MainActivity.this)) {
if (options[item].equals(getString(R.string.settings_font)))
alertFormElements();
} else {
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_LONG).show();
}
}
if (options[item].equals(getString(R.string.settings_view)))
{
if (Helpers.isOnline(MainActivity.this)) {
if (options[item].equals(getString(R.string.settings_view)))
webView.loadUrl("https://" + podDomain + "/mobile/toggle");
} else { // No Internet connection
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_LONG).show();
}
}
if (options[item].equals(getString(R.string.settings_image)))
{
if (Helpers.isOnline(MainActivity.this)) {
if (options[item].equals(getString(R.string.settings_image)))
wSettings.setLoadsImagesAutomatically(!pm.getLoadImages());
pm.setLoadImages(!pm.getLoadImages());
webView.loadUrl(webView.getUrl());
} else {
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_LONG).show();
}
pm.setLoadImages(!pm.getLoadImages());
webView.loadUrl(webView.getUrl());
}
}
}).show();
}).show();
} else {
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_INDEFINITE).show();
}
} else if (id == R.id.jb_settings_diaspora) {
final CharSequence[] options2 = { getString(R.string.jb_settings), getString(R.string.jb_manage_tags),
getString(R.string.jb_contacts), getString(R.string.jb_pod) };
new AlertDialog.Builder(MainActivity.this)
.setItems(options2, new DialogInterface.OnClickListener() {
if (Helpers.isOnline(MainActivity.this)) {
new AlertDialog.Builder(MainActivity.this)
.setItems(options2, new DialogInterface.OnClickListener() {
@Override
@Override
public void onClick(DialogInterface dialog, int item) {
public void onClick(DialogInterface dialog, int item) {
if (options2[item].equals(getString(R.string.jb_settings)))
{
setTitle(R.string.jb_settings);
if (Helpers.isOnline(MainActivity.this)) {
if (options2[item].equals(getString(R.string.jb_settings)))
webView.loadUrl("https://" + podDomain + "/user/edit");
} else { // No Internet connection
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_LONG).show();
}
}
if (options2[item].equals(getString(R.string.jb_manage_tags)))
{
setTitle(R.string.jb_manage_tags);
if (Helpers.isOnline(MainActivity.this)) {
if (options2[item].equals(getString(R.string.jb_manage_tags)))
webView.loadUrl("https://" + podDomain + "/tag_followings/manage");
} else { // No Internet connection
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_LONG).show();
}
}
if (options2[item].equals(getString(R.string.jb_contacts)))
{
setTitle(R.string.jb_contacts);
if (Helpers.isOnline(MainActivity.this)) {
if (options2[item].equals(getString(R.string.jb_contacts)))
webView.loadUrl("https://" + podDomain + "/contacts");
} else { // No Internet connection
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_LONG).show();
}
}
if (options2[item].equals(getString(R.string.jb_pod)))
{
if (Helpers.isOnline(MainActivity.this)) {
if (options2[item].equals(getString(R.string.jb_pod)))
new AlertDialog.Builder(MainActivity.this)
.setTitle(getString(R.string.confirmation))
.setMessage(getString(R.string.change_pod_warning))
@ -1074,17 +1061,14 @@ public class MainActivity extends AppCompatActivity
dialog.cancel();
}
}).show();
} else {
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_LONG).show();
}
}
}
}).show();
}).show();
} else {
Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_INDEFINITE).show();
}
} else if (id == R.id.jb_license_help) {
final CharSequence[] options = { getString(R.string.help_license), getString(R.string.help_help), getString(R.string.help_donate) };
final CharSequence[] options = { getString(R.string.help_license), getString(R.string.help_about), getString(R.string.help_help), getString(R.string.help_donate) };
new AlertDialog.Builder(MainActivity.this)
.setItems(options, new DialogInterface.OnClickListener() {
@ -1095,31 +1079,48 @@ public class MainActivity extends AppCompatActivity
if (options[item].equals(getString(R.string.help_license)))
{
new AlertDialog.Builder(MainActivity.this)
.setTitle(R.string.about_title)
.setMessage(getString(R.string.about_text))
.setPositiveButton(getString(R.string.about_yes),
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/scoute-dich/Diaspora-Native-WebApp"));
startActivity(i);
dialog.cancel();
}
})
.setNegativeButton(getString(R.string.about_no),
final SpannableString s = new SpannableString(Html.fromHtml(getString(R.string.license_text)));
Linkify.addLinks(s, Linkify.WEB_URLS);
final AlertDialog d = new AlertDialog.Builder(MainActivity.this)
.setTitle(R.string.license_title)
.setMessage( s )
.setPositiveButton(getString(R.string.yes),
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
}
}).show();
d.show();
((TextView)d.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
}
if (options[item].equals(getString(R.string.help_about)))
{
final SpannableString s = new SpannableString(Html.fromHtml(getString(R.string.about_text)));
Linkify.addLinks(s, Linkify.WEB_URLS);
final AlertDialog d = new AlertDialog.Builder(MainActivity.this)
.setTitle(R.string.help_about)
.setMessage( s )
.setPositiveButton(getString(R.string.yes),
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
}
}).show();
d.show();
((TextView)d.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
}
if (options[item].equals(getString(R.string.help_help)))
{
new AlertDialog.Builder(MainActivity.this)
.setMessage(getString(R.string.markdown_text))
.setNegativeButton(getString(R.string.about_no),
.setTitle(R.string.help_help)
.setMessage(Html.fromHtml(getString(R.string.markdown_text)))
.setPositiveButton(getString(R.string.yes),
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
@ -1132,19 +1133,19 @@ public class MainActivity extends AppCompatActivity
{
new AlertDialog.Builder(MainActivity.this)
.setMessage(getString(R.string.donate_text))
.setPositiveButton(getString(R.string.donate_1),
.setPositiveButton(getString(R.string.yes),
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
}
})
.setNegativeButton(getString(R.string.donate_1),
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse("http://martinv.tip.me/"));
startActivity(i);
dialog.cancel();
}
})
.setNegativeButton(getString(R.string.about_no),
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
}
}).show();
}

8
app/src/main/java/de/baumann/diaspora/PodsActivity.java
View File

@ -77,7 +77,7 @@ public class PodsActivity extends ActionBarActivity {
if (filter.getText().length() > 4 && filter.getText().toString().contains("."))
askConfirmation(filter.getText().toString());
else
Snackbar.make(lv, R.string.valid_pod, Snackbar.LENGTH_LONG).show();
Snackbar.make(lv, R.string.valid_pod, Snackbar.LENGTH_INDEFINITE).show();
}
});
@ -112,7 +112,7 @@ public class PodsActivity extends ActionBarActivity {
if (Helpers.isOnline(PodsActivity.this)) {
progressDialog.show();
} else {
Snackbar.make(lv, R.string.no_internet, Snackbar.LENGTH_LONG).show();
Snackbar.make(lv, R.string.no_internet, Snackbar.LENGTH_INDEFINITE).show();
}
}
@ -207,7 +207,7 @@ public class PodsActivity extends ActionBarActivity {
}).show();
} else {
Snackbar.make(lv, R.string.no_internet, Snackbar.LENGTH_LONG).show();
Snackbar.make(lv, R.string.no_internet, Snackbar.LENGTH_INDEFINITE).show();
}
}
@ -248,7 +248,7 @@ public class PodsActivity extends ActionBarActivity {
startService(i);
return true;
} else {
Snackbar.make(lv, R.string.no_internet, Snackbar.LENGTH_LONG).show();
Snackbar.make(lv, R.string.no_internet, Snackbar.LENGTH_INDEFINITE).show();
return false;
}
}

5
app/src/main/java/de/baumann/diaspora/ShareActivity.java
View File

@ -57,7 +57,6 @@ public class ShareActivity extends MainActivity {
private String podDomain;
private ValueCallback<Uri[]> mFilePathCallback;
private String mCameraPhotoPath;
private com.getbase.floatingactionbutton.FloatingActionsMenu fab;
private TextView txtTitle;
private ProgressBar progressBar;
@ -88,7 +87,7 @@ public class ShareActivity extends MainActivity {
SharedPreferences config = getSharedPreferences("PodSettings", MODE_PRIVATE);
podDomain = config.getString("podDomain", null);
fab = (com.getbase.floatingactionbutton.FloatingActionsMenu) findViewById(R.id.multiple_actions);
com.getbase.floatingactionbutton.FloatingActionsMenu fab = (com.getbase.floatingactionbutton.FloatingActionsMenu) findViewById(R.id.multiple_actions);
fab.setVisibility(View.GONE);
webView = (WebView)findViewById(R.id.webView);
@ -296,7 +295,7 @@ public class ShareActivity extends MainActivity {
webView.reload();
return true;
} else {
Snackbar.make(getWindow().findViewById(R.id.drawer_layout), R.string.no_internet, Snackbar.LENGTH_SHORT).show();
Snackbar.make(getWindow().findViewById(R.id.drawer_layout), R.string.no_internet, Snackbar.LENGTH_INDEFINITE).show();
return false;
}
}

80
app/src/main/res/values-de/strings.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<resources xmlns:re="http://schemas.android.com/tools" xmlns:href="urn:oasis:names:tc:xliff:document:1.2">
<string name="reload">Neu laden</string>
<string name="title_activity_pods">Pod auswählen</string>
<string name="filter_hint">Pod-Domain eingeben</string>
@ -13,7 +13,7 @@
<string name="confirmation">Bestätigung</string>
<string name="confirm_pod">Willst du folgenden Pod benutzen: </string>
<string name="confirm_exit">Möchtest du die App verlassen?</string>
<string name="yes">JA</string>
<string name="yes">OK</string>
<string name="no">NEIN</string>
<string name="change_pod_warning">Das wird alle Cookies und Session-Daten löschen. Willst du wirklich den Pod wechseln?</string>
@ -75,48 +75,58 @@
<string name="toast_screenshot">Bildschirmfoto wird gespeichert...</string>
<string name="jb_settings_diaspora">Diaspora Einstellungen</string>
<string name="jb_settings_view">Ansichtseinstellungen</string>
<string name="about_no">OK</string>
<string name="help_help">Markdown Formatierung</string>
<string name="help_license">Lizenz</string>
<string name="jb_help_license">Lizenz | Hilfe | Spende</string>
<string name="markdown_text">"Auf Diaspora* ist es möglich, dass du deinen Text in Nachrichten, Kommentaren und Unterhaltungen formatierst, indem du ein vereinfachtes Mark-Up-System namens Markdown verwendest. Diese Seite stellt eine kurze Einleitung dar, um grundlegende Formatierungen anwenden zu können.\n\n
<string name="jb_help_license">Über die App | Hilfe</string>
<string name="markdown_text">&lt;i>"Auf Diaspora* ist es möglich, dass du deinen Text in Nachrichten, Kommentaren und
Unterhaltungen formatierst, indem du ein vereinfachtes Mark-Up-System namens Markdown verwendest. Diese Seite stellt
eine kurze Einleitung dar, um grundlegende Formatierungen anwenden zu können.&lt;/i>&lt;br> &lt;br>
Überschriften\n
# das ist eine sehr große Überschrift\n
## halb so groß wie die oben drüber\n
### doppelt so groß wie normaler Text\n\n
&lt;b>Überschriften&lt;/b>&lt;br>
# das ist eine sehr große Überschrift&lt;br>
## halb so groß wie die oben drüber&lt;br>
### doppelt so groß wie normaler Text&lt;br> &lt;br>
Kursiv und fett\n
Kursiv: *Wort* oder _Wort_\n
Fett: **Wort** oder __Wort__\n
Fett kursiv: ***Wort*** oder ___Wort___\n\n
&lt;b>Kursiv und fett&lt;/b>&lt;br>
Kursiv: *Wort* oder _Wort_&lt;br>
Fett: **Wort** oder __Wort__&lt;br>
Fett kursiv: ***Wort*** oder ___Wort___&lt;br> &lt;br>
Aufzählung\n
*, + oder - vor jeder Linie die du als Teil der Aufzählung haben willst oder 1., 2., usw. vor jedem Aufzählungspunkt.\n\n
&lt;b>Aufzählung&lt;/b>&lt;br>
*, + oder - vor jeder Linie die du als Teil der Aufzählung haben willst oder 1., 2., usw. vor jedem
Aufzählungspunkt.&lt;br> &lt;br>
Zitat\n
Wenn du einen Teil eines Artikels oder eines anderen Kommentares zitieren willst, kannst du deinen Text bequem formatieren, indem du die Zeile oder den Abschnitt mit einem > Zeichen beginnst.\n\n
&lt;b>Zitat&lt;/b>&lt;br>
Wenn du einen Teil eines Artikels oder eines anderen Kommentares zitieren willst, kannst du deinen Text bequem formatieren,
indem du die Zeile oder den Abschnitt mit einem > Zeichen beginnst.&lt;br> &lt;br>
Horizontale Linie\n
Um eine horizontale Linie zu erstellen benutzt du mindestens drei - - -, _ _ _ oder * * * in einer separaten Linie. Jede größere Anzahl bewirkt dasselbe und Leerzeichen zwischen den Zeichen stören nicht.\n\n
&lt;b>Horizontale Linie&lt;/b>&lt;br>
Um eine horizontale Linie zu erstellen benutzt du mindestens drei - - -, _ _ _ oder * * * in einer separaten Linie.
Jede größere Anzahl bewirkt dasselbe und Leerzeichen zwischen den Zeichen stören nicht.&lt;br> &lt;br>
Inline Link\n
[displayed text here](http://link.address.here \"alt text\") Der 'alt text' ist optional, und zeigt einen Tool-Tip, wenn der Curser sich über den Link bewegt.\n\n
&lt;b>Inline Link&lt;/b>&lt;br>
[angezeigter Text hier](http://link.addresse.hier \"alt text\") Der 'alt text' ist optional, und zeigt einen Tool-Tip,
wenn der Curser sich über den Link bewegt.&lt;br> &lt;br>
Externe Bilder\n
![Alt text](http://website.com/image.jpg \"optional title\") Der 'alt text' in der eckigen Klammer wird angezeigt, wenn das Bild nicht geladen werden kann. Der optionale Titel zeigt einen Tool-Tip, wenn der Curser sich über den Link bewegt. Beides ist nützlich aber nicht nötig.\n\n
&lt;b>Externe Bilder&lt;/b>&lt;br>
![Alt text](http://website.com/image.jpg \"optionaler Titel\") Der 'alt text' in der eckigen Klammer wird angezeigt,
wenn das Bild nicht geladen werden kann. Der optionale Titel zeigt einen Tool-Tip, wenn der Curser sich über den Link bewegt.
Beides ist nützlich aber nicht nötig.&lt;br> &lt;br>
Escape\n
Wenn du in deiner Nachricht ein Zeichen benutzen willst, das ebenfalls zur Markdownformatierung verwendet wird, kannst du verhindern, dass es von Markdown als Formatcode gelesen wird, indem du es 'escapest'. Um dies zu tun, musst du einen Backslash vor das Zeichen setzen. Du kannst trotzdem 'diaspora*' oder 'D*' schreiben, ohne dass das Sternchen als formatierender Code gelesen wird!\n\n
&lt;b>Escape&lt;/b>&lt;br>
Wenn du in deiner Nachricht ein Zeichen benutzen willst, das ebenfalls zur Markdownformatierung verwendet wird, kannst du
verhindern, dass es von Markdown als Formatcode gelesen wird, indem du es 'escapest'. Um dies zu tun, musst du einen
Backslash vor das Zeichen setzen. Du kannst trotzdem 'diaspora*' oder 'D*' schreiben, ohne dass das Sternchen als
formatierender Code gelesen wird!&lt;br> &lt;br>
Sonderzeichen\n
Du kannst Symbole und Sonderzeichen nutzen, indem du bestimmte Zeichenfolgen verwendest. Z.B.:\n
&lt;b>Sonderzeichen&lt;/b>&lt;br>
Du kannst Symbole und Sonderzeichen nutzen, indem du bestimmte Zeichenfolgen verwendest. Z.B.:&lt;br>
(c) = © ; (r) = ® ; x^2 = x²"</string>
<string name="about_yes">Besuche die Projektseite auf GitHub</string>
<string name="about_text">Zuerst einmal: ich bin kein Entwickler. Ich verstehe ein paar Grundlagen, aber das Meiste meiner
<string name="license_yes">OK</string>
<string name="license_text">&lt;i>Zuerst einmal: ich bin kein Entwickler. Ich verstehe ein paar Grundlagen, aber das Meiste meiner
Arbeit ist mit \"Copy and Paste\" passiert. Diese App ist ein Fork der original \"DiasporaNativeWebApp\"
von \"martinchodev\" (der die allermeiste Arbeit erledigt hat -> mein großer Dank gilt ihm), welche unter der GPL-Lizenz
veröffentlicht wurde.\n\n
veröffentlicht wurde.&lt;/i> &lt;br> &lt;br>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -129,11 +139,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see http://www.gnu.org/licenses/.\n\n
along with this program. If not, see http://www.gnu.org/licenses.&lt;br> &lt;br>
Die Bilder des Startbildschirms können auf Flickr gefunden werden:
https://www.flickr.com/photos/129581906@N06/sets/72157651933980136/with/16594947123/.
Sie wurden von \"Lydia\" veröffentlicht und stehen unter der cc by-nc-sa Lizenz.</string>
&lt;i>Die Bilder des Startbildschirms können auf Flickr gefunden werden:
https://www.flickr.com/photos/129581906@N06/sets/72157651933980136/with/16594947123.
Sie wurden von \"Lydia\" veröffentlicht und stehen unter der cc by-nc-sa Lizenz.&lt;/i></string>
<string name="fab2_title_person">Suche nach Personen ...</string>
<string name="fab2_title_tag">Suche nach Tags ...</string>
<string name="donate_1">per Bitcoin</string>
@ -141,4 +151,6 @@ along with this program. If not, see http://www.gnu.org/licenses/.\n\n
eine Kleinigkeit spenden:</string>
<string name="help_donate">Spenden</string>
<string name="splash_screen_description">Startbildschirm</string>
<string name="new_conversations">Ungelesene Unterhaltung. Öffnen?</string>
<string name="new_notifications">Ungelesene Benachrichtigung. Lesen?</string>
</resources>

95
app/src/main/res/values/strings.xml
View File

@ -6,6 +6,8 @@
<string name="navigation_drawer_close" translatable="false">Close navigation drawer</string>
<string name="app_name" translatable="false">Diaspora</string>
<string name="reload">Reload</string>
<string name="new_notifications">Unread notification. Want to read it?</string>
<string name="new_conversations">Unread conversation. Open it?</string>
<string name="permissions">You must grant \"Access Storage Permission\" to save screenshots. After that you should
completely close the app or restart the phone. If you don\'t permit the storage access but want to use the
screenshot function at a later time, you can grant the permission later. Please open then: systemsettings - apps -
@ -37,7 +39,7 @@
<string name="app_copyright" translatable="false">The community-run distributed social network</string>
<string name="jb_menu_1">Settings</string>
<string name="jb_help_license">License | Help | Donate</string>
<string name="jb_help_license">About the app | Help</string>
<string name="jb_stream">Stream</string>
<string name="jb_notifications">Notifications</string>
<string name="jb_conversations">Conversations</string>
@ -66,6 +68,7 @@
<string name="help_license">License</string>
<string name="help_help">Markdown formating</string>
<string name="help_donate">Donate</string>
<string name="help_about">Changelog</string>
<string name="toast_screenshot">Taking screenshot ...</string>
@ -87,49 +90,75 @@
//Dialog //License
<string name="markdown_text">"On diaspora* it's possible to format your text in status messages, comments and conversations using a simplified mark-up system called Markdown. This page gives an introduction to the codes used to create this formatting.\n\n
<string name="markdown_text">&lt;i>"On diaspora* it's possible to format your text in status messages, comments
and conversations using a simplified mark-up system called Markdown. This page gives an introduction to the
codes used to create this formatting.&lt;/i>&lt;br> &lt;br>
Heading\n
# This is an extremely large header\n
## Half as big as the one above\n
### Twice the size of normal text\n\n
&lt;b>Heading&lt;/b>&lt;br>
# This is an extremely large header&lt;br>
## Half as big as the one above&lt;br>
### Twice the size of normal text&lt;br> &lt;br>
Italics and bold\n
Italics: *word* or _word_\n
Bold: **word** or __word__\n
Bold italics: ***word*** or ___word___\n\n
&lt;b>Italics and bold&lt;/b>&lt;br>
Italics: *word* or _word_&lt;br>
Bold: **word** or __word__&lt;br>
Bold italics: ***word*** or ___word___&lt;br> &lt;br>
Bulleted list\n
*, + or - in front of each line you want as part of the list or 1., 2., etc. in front of the list items\n\n
&lt;b>Bulleted list&lt;/b>&lt;br>
*, + or - in front of each line you want as part of the list or 1., 2., etc. in front of the list items&lt;br> &lt;br>
Quotation\n
When you want to quote an extract of an article or another comment, you can conveniently format your text by starting the line or the paragraph by the > character\n\n
&lt;b>Quotation&lt;/b>&lt;br>
When you want to quote an extract of an article or another comment, you can conveniently format your text by starting the
line or the paragraph by the > character&lt;br> &lt;br>
Horizontal line\n
To create a horizontal line, use at least three - - -, _ _ _ or * * * on a separate line. Any number above three will do the same thing and spaces between the characters do not matter.\n\n
&lt;b>Horizontal line&lt;/b>&lt;br>
To create a horizontal line, use at least three - - -, _ _ _ or * * * on a separate line. Any number above three will do
the same thing and spaces between the characters do not matter.&lt;br> &lt;br>
Inline link\n
[displayed text here](http://link.address.here \"alt text\") The 'alt text' is optional, and is displayed as a tool-tip when the cursor is moved over the link.\n\n
&lt;b>Inline link&lt;/b>&lt;br>
[displayed text here](http://link.address.here \"alt text\") The 'alt text' is optional, and is displayed as a tool-tip
when the cursor is moved over the link.&lt;br> &lt;br>
External images\n
![Alt text](http://website.com/image.jpg \"optional title\") The alternative text in the square brackets is displayed if the image cannot be loaded, and the optional title is displayed as a tool-tip when the cursor is moved over the image; both are useful but not essential.\n\n
&lt;b>External images&lt;/b>&lt;br>
![Alt text](http://website.com/image.jpg \"optional title\") The alternative text in the square brackets is displayed if the image cannot be loaded, and the optional title is displayed as a tool-tip when the cursor is moved over the image; both are useful but not essential.&lt;br> &lt;br>
Escape\n
If you want your message to include a character which is also used in Markdown coding, you can prevent it from being read by Markdown as a formatting code by 'escaping' it. To do this, place a backslash in front of the character. You can, however, type 'diaspora*' or 'D*' without the asterisk becoming a formatting code!\n\n
&lt;b>Escape&lt;/b>&lt;br>
If you want your message to include a character which is also used in Markdown coding, you can prevent it from being read by Markdown as a formatting code by 'escaping' it. To do this, place a backslash in front of the character. You can, however, type 'diaspora*' or 'D*' without the asterisk becoming a formatting code!&lt;br> &lt;br>
Special characters\n
You can create the following symbols and other special characters using a combination of characters:\n
&lt;b>Special characters&lt;/b>&lt;br>
You can create the following symbols and other special characters using a combination of characters:&lt;br>
(c) = © ; (r) = ® ; x^2 = x²"</string>
<string name="donate_text">If you like the app fell free to donate to the devoloper of the original \"DiasporaNativeWebApp\":</string>
<string name="donate_1">Via Bitcoin</string>
<string name="about_yes">Visit projectsite on Github</string>
<string name="about_no">OK</string>
<string name="about_title" translatable="false">Copyright © 2016 by scoute-dich</string>
<string name="about_text">First of all: I am not a developer. I understand a few basics and most of my work is done
<string name="about_text">
&lt;b>v1.1:&lt;/b>&lt;br>
&#8226; new about app and help dialogs&lt;br>
&#8226; better snackbar integration&lt;br>
&#8226; click on titelbar to load stream&lt;br>&lt;br>
&lt;b>v1.0.1:&lt;/b>&lt;br>
&#8226; click on titelbar to load stream&lt;br>&lt;br>
&lt;b>v1.0:&lt;/b>&lt;br>
&#8226; all features of original Diaspora-Native-Webapp&lt;br>
&#8226; popup menus (view settings, diaspora settings, share function)&lt;br>
&#8226; share function (link, screenshot)&lt;br>
&#8226; design improvements&lt;br>
&#8226; implemented android marshmallow perimssion model&lt;br>
&#8226; implemented swipe to refresh&lt;br>&lt;br>
&lt;i>Projectsite on github:&lt;br>
https://github.com/scoute-dich/Diaspora/&lt;/i>
</string>
<string name="license_yes">OK</string>
<string name="license_title" translatable="false">Copyright © 2016 by scoute-dich</string>
<string name="license_text">&lt;i>First of all: I am not a developer. I understand a few basics and most of my work is done
by copy and paste. This app is a fork of the original \"DiasporaNativeWebApp\"
from \"martinchodev\" (who did most of the work -> big thanks to him), which is released under the GPL-license.\n\n
from \"martinchodev\" (who did most of the work -> big thanks to him), which is released under the GPL-license.&lt;/i> &lt;br> &lt;br>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -142,17 +171,17 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see http://www.gnu.org/licenses/.\n\n
along with this program. If not, see http://www.gnu.org/licenses.&lt;br> &lt;br>
The splashscreen images can be found on flickr: https://www.flickr.com/photos/129581906@N06/sets/72157651933980136/with/16594947123/.
They were published by \"Lydia\" and are licensed under cc by-nc-sa.</string>
&lt;i>The splashscreen images can be found on flickr:
https://www.flickr.com/photos/129581906@N06/sets/72157651933980136/with/16594947123.
They were published by \"Lydia\" and are licensed under cc by-nc-sa.&lt;/i></string>
<string name="splash_screen_description">Splash screen</string>
<string name="please_reload">Please reload the stream</string>
<string name="normal">Normal</string>
<string name="large">Large</string>
<string name="huge">Huge</string>
<string name="image">Unable to get image</string>
<array name="splash_images">