From 234335e696557b43f847c92fc8856b856c670d34 Mon Sep 17 00:00:00 2001 From: Gregor Santner Date: Sat, 4 Jun 2016 11:11:51 +0200 Subject: [PATCH] Refactor layout & menu files, dialogs --- .../activity/MainActivity.java | 44 ++++++------------- .../activity/PodSelectionActivity.java | 14 ++---- .../activity/ShareActivity.java | 24 ++-------- .../activity/SplashActivity.java | 2 +- .../ui/ContextMenuWebView.java | 4 +- .../{activity_main.xml => main__activity.xml} | 6 +-- .../{app_bar_main.xml => main__app_bar.xml} | 2 +- .../{content_main.xml => main__content.xml} | 2 +- ...in_nav_header.xml => main__nav_header.xml} | 16 +++---- ...ctivity.xml => podselection__activity.xml} | 2 +- ...lash_activity.xml => splash__activity.xml} | 0 ..._chooser.xml => ui__font_size_chooser.xml} | 0 .../menu/{menu_main.xml => main__menu.xml} | 0 ...navdrawer_main.xml => main__navdrawer.xml} | 0 app/src/main/res/menu/menu_compose.xml | 20 --------- .../menu/{menu_pods.xml => pods__menu.xml} | 0 app/src/main/res/values-de/strings.xml | 6 +-- app/src/main/res/values/strings.xml | 10 ++--- 18 files changed, 43 insertions(+), 109 deletions(-) rename app/src/main/res/layout/{activity_main.xml => main__activity.xml} (86%) rename app/src/main/res/layout/{app_bar_main.xml => main__app_bar.xml} (98%) rename app/src/main/res/layout/{content_main.xml => main__content.xml} (97%) rename app/src/main/res/layout/{main_nav_header.xml => main__nav_header.xml} (93%) rename app/src/main/res/layout/{podselection_activity.xml => podselection__activity.xml} (98%) rename app/src/main/res/layout/{splash_activity.xml => splash__activity.xml} (100%) rename app/src/main/res/layout/{font_size_chooser.xml => ui__font_size_chooser.xml} (100%) rename app/src/main/res/menu/{menu_main.xml => main__menu.xml} (100%) rename app/src/main/res/menu/{navdrawer_main.xml => main__navdrawer.xml} (100%) delete mode 100644 app/src/main/res/menu/menu_compose.xml rename app/src/main/res/menu/{menu_pods.xml => pods__menu.xml} (100%) diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java index 4f288183..40890a42 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java @@ -145,7 +145,7 @@ public class MainActivity extends AppCompatActivity WebView.enableSlowWholeDocumentDraw(); // Bind UI - setContentView(R.layout.activity_main); + setContentView(R.layout.main__activity); ButterKnife.bind(this); app = (App) getApplication(); @@ -476,7 +476,7 @@ public class MainActivity extends AppCompatActivity } else { Snackbar snackbar = Snackbar .make(swipeRefreshLayout, R.string.confirm_exit, Snackbar.LENGTH_LONG) - .setAction(R.string.yes, new View.OnClickListener() { + .setAction(android.R.string.yes, new View.OnClickListener() { @Override public void onClick(View view) { moveTaskToBack(true); @@ -504,7 +504,7 @@ public class MainActivity extends AppCompatActivity @Override public boolean onCreateOptionsMenu(Menu menu) { - getMenuInflater().inflate(R.menu.menu_main, menu); + getMenuInflater().inflate(R.menu.main__menu, menu); return true; } @@ -579,7 +579,7 @@ public class MainActivity extends AppCompatActivity if (!shouldShowRequestPermissionRationale(Manifest.permission.WRITE_EXTERNAL_STORAGE)) { new AlertDialog.Builder(MainActivity.this) .setMessage(R.string.permissions_screenshot) - .setPositiveButton(getString(R.string.yes), new DialogInterface.OnClickListener() { + .setPositiveButton(getString(android.R.string.yes), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { if (android.os.Build.VERSION.SDK_INT >= 23) @@ -587,7 +587,7 @@ public class MainActivity extends AppCompatActivity REQUEST_CODE_ASK_PERMISSIONS); } }) - .setNegativeButton(getString(R.string.no), null) + .setNegativeButton(getString(android.R.string.no), null) .show(); return; } @@ -661,7 +661,7 @@ public class MainActivity extends AppCompatActivity if (!shouldShowRequestPermissionRationale(Manifest.permission.WRITE_EXTERNAL_STORAGE)) { new AlertDialog.Builder(MainActivity.this) .setMessage(R.string.permissions_screenshot) - .setPositiveButton(getString(R.string.yes), new DialogInterface.OnClickListener() { + .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { if (android.os.Build.VERSION.SDK_INT >= 23) @@ -669,7 +669,7 @@ public class MainActivity extends AppCompatActivity REQUEST_CODE_ASK_PERMISSIONS); } }) - .setNegativeButton(getString(R.string.no), null) + .setNegativeButton(android.R.string.no, null) .show(); return; } @@ -744,7 +744,7 @@ public class MainActivity extends AppCompatActivity * res/layout/form_elements.xml */ LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE); - final View formElementsView = inflater.inflate(R.layout.font_size_chooser, + final View formElementsView = inflater.inflate(R.layout.ui__font_size_chooser, null, false); final RadioGroup rgFontSize = (RadioGroup) formElementsView @@ -754,9 +754,7 @@ public class MainActivity extends AppCompatActivity new AlertDialog.Builder(MainActivity.this).setView(formElementsView) .setTitle("Set Font Size") .setNegativeButton("OK", new DialogInterface.OnClickListener() { - @TargetApi(11) public void onClick(DialogInterface dialog, int id) { - int selectedId = rgFontSize .getCheckedRadioButtonId(); @@ -779,7 +777,6 @@ public class MainActivity extends AppCompatActivity } else { Snackbar.make(swipeRefreshLayout, R.string.no_internet, Snackbar.LENGTH_LONG).show(); } - dialog.cancel(); } }).show(); } @@ -824,7 +821,7 @@ public class MainActivity extends AppCompatActivity item.setIcon(R.drawable.ic_bell_ring_white_24dp); Snackbar snackbar = Snackbar .make(swipeRefreshLayout, R.string.new_notifications, Snackbar.LENGTH_LONG) - .setAction(R.string.yes, new View.OnClickListener() { + .setAction(android.R.string.yes, new View.OnClickListener() { @Override public void onClick(View view) { if (Helpers.isOnline(MainActivity.this)) { @@ -870,7 +867,7 @@ public class MainActivity extends AppCompatActivity item.setIcon(R.drawable.ic_message_text_white_24dp); Snackbar snackbar = Snackbar .make(swipeRefreshLayout, R.string.new_conversations, Snackbar.LENGTH_LONG) - .setAction(R.string.yes, new View.OnClickListener() { + .setAction(android.R.string.yes, new View.OnClickListener() { @Override public void onClick(View view) { if (Helpers.isOnline(MainActivity.this)) { @@ -1067,12 +1064,7 @@ public class MainActivity extends AppCompatActivity 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(); + .setPositiveButton(android.R.string.yes, null).show(); d.show(); ((TextView) d.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance()); } @@ -1082,12 +1074,7 @@ public class MainActivity extends AppCompatActivity 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(); + .setPositiveButton(android.R.string.yes, null).show(); d.show(); ((TextView) d.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance()); } @@ -1095,12 +1082,7 @@ public class MainActivity extends AppCompatActivity new AlertDialog.Builder(MainActivity.this) .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(); - } - }).show(); + .setPositiveButton(android.R.string.yes,null).show(); } } }).show(); diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/PodSelectionActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/PodSelectionActivity.java index df32e9e8..ea210376 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/PodSelectionActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/PodSelectionActivity.java @@ -72,7 +72,7 @@ public class PodSelectionActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.podselection_activity); + setContentView(R.layout.podselection__activity); ButterKnife.bind(this); app = (App) getApplication(); setSupportActionBar(toolbar); @@ -168,19 +168,13 @@ public class PodSelectionActivity extends AppCompatActivity { new AlertDialog.Builder(PodSelectionActivity.this) .setTitle(getString(R.string.confirmation)) .setMessage(dialogMessage) - .setPositiveButton(R.string.yes, + .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { - dialog.cancel(); onPodSelectionConfirmed(selectedPod); } }) - .setNegativeButton(R.string.no, new DialogInterface.OnClickListener() { - @TargetApi(11) - public void onClick(DialogInterface dialog, int id) { - dialog.cancel(); - } - }) + .setNegativeButton(android.R.string.no, null) .show(); } @@ -225,7 +219,7 @@ public class PodSelectionActivity extends AppCompatActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { - getMenuInflater().inflate(R.menu.menu_pods, menu); + getMenuInflater().inflate(R.menu.pods__menu, menu); return true; } diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/ShareActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/ShareActivity.java index 76275e88..666f061b 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/ShareActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/ShareActivity.java @@ -68,7 +68,7 @@ public class ShareActivity extends MainActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); + setContentView(R.layout.main__activity); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); if (toolbar != null) { @@ -349,24 +349,6 @@ public class ShareActivity extends MainActivity { ); } - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - getMenuInflater().inflate(R.menu.menu_compose, menu); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - int id = item.getItemId(); - - if (id == R.id.action_exit) { - finish(); - } - - return super.onOptionsItemSelected(item); - } - @Override public void onBackPressed() { fab.collapse(); @@ -375,7 +357,7 @@ public class ShareActivity extends MainActivity { setTitle(R.string.app_name); Snackbar snackbar = Snackbar .make(swipeView, R.string.confirm_exit, Snackbar.LENGTH_LONG) - .setAction(R.string.yes, new View.OnClickListener() { + .setAction(android.R.string.yes, new View.OnClickListener() { @Override public void onClick(View view) { finish(); @@ -385,7 +367,7 @@ public class ShareActivity extends MainActivity { } else { Snackbar snackbar = Snackbar .make(swipeView, R.string.confirm_exit, Snackbar.LENGTH_LONG) - .setAction(R.string.yes, new View.OnClickListener() { + .setAction(android.R.string.yes, new View.OnClickListener() { @Override public void onClick(View view) { finish(); diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/SplashActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/SplashActivity.java index 021caa54..250bbbc3 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/SplashActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/SplashActivity.java @@ -42,7 +42,7 @@ public class SplashActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.splash_activity); + setContentView(R.layout.splash__activity); ButterKnife.bind(this); app = (App) getApplication(); diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/ContextMenuWebView.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/ContextMenuWebView.java index 16291ad5..14431523 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/ui/ContextMenuWebView.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/ContextMenuWebView.java @@ -68,7 +68,7 @@ public class ContextMenuWebView extends WebView { if (!parentActivity.shouldShowRequestPermissionRationale(Manifest.permission.WRITE_EXTERNAL_STORAGE)) { new AlertDialog.Builder(parentActivity) .setMessage(R.string.permissions_image) - .setPositiveButton(context.getText(R.string.yes), new DialogInterface.OnClickListener() { + .setPositiveButton(context.getText(android.R.string.yes), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { if (android.os.Build.VERSION.SDK_INT >= 23) @@ -76,7 +76,7 @@ public class ContextMenuWebView extends WebView { MainActivity.REQUEST_CODE_ASK_PERMISSIONS_SAVE_IMAGE); } }) - .setNegativeButton(context.getText(R.string.no), null) + .setNegativeButton(context.getText(android.R.string.no), null) .show(); } parentActivity.requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/main__activity.xml similarity index 86% rename from app/src/main/res/layout/activity_main.xml rename to app/src/main/res/layout/main__activity.xml index 64684e19..3d1475f5 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/main__activity.xml @@ -9,7 +9,7 @@ tools:openDrawer="start"> @@ -19,7 +19,7 @@ android:layout_height="match_parent" android:layout_gravity="start" android:fitsSystemWindows="true" - app:headerLayout="@layout/main_nav_header" - app:menu="@menu/navdrawer_main" /> + app:headerLayout="@layout/main__nav_header" + app:menu="@menu/main__navdrawer" /> diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/main__app_bar.xml similarity index 98% rename from app/src/main/res/layout/app_bar_main.xml rename to app/src/main/res/layout/main__app_bar.xml index a4037bf1..81724674 100644 --- a/app/src/main/res/layout/app_bar_main.xml +++ b/app/src/main/res/layout/main__app_bar.xml @@ -22,7 +22,7 @@ - + + tools:showIn="@layout/main__app_bar"> + android:layout_alignParentTop="true" + android:layout_marginTop="32dp" + android:orientation="horizontal"> + android:layout_height="match_parent" + android:orientation="vertical"> + tools:showIn="@layout/podselection__activity"> - - - - - - - - - - - - diff --git a/app/src/main/res/menu/menu_pods.xml b/app/src/main/res/menu/pods__menu.xml similarity index 100% rename from app/src/main/res/menu/menu_pods.xml rename to app/src/main/res/menu/pods__menu.xml diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index eb577560..17407c3f 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -13,8 +13,6 @@ Bestätigung Möchtest du wirklich \nhttps://%1$s\nals deinen Diaspora Pod auswählen? Möchtest du die App verlassen? - OK - NEIN Das wird alle Cookies und Session-Daten löschen. Willst du wirklich den Pod wechseln? Du musst der App Zugriff auf den Gerätespeicher gewähren, damit das Bildschirmfoto @@ -130,6 +128,7 @@ <b>Beteiligte:</b><br> • gsantner https://gsantner.github.io<br> + • martinchodev https://github.com/martinchodev<br> • scoute-dich https://github.com/scoute-dich<br> <br> This program is free software: you can redistribute it and/or modify @@ -145,8 +144,7 @@ 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.<br> <br> - <i>Die App ist ein Fork von \"DiasporaNativeWebApp\" - von \"martinchodev\". Die Bilder des Startbildschirms können auf Flickr gefunden werden: + <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.</i> Suche nach Personen … diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 92583ecc..bd2af4f4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -34,8 +34,6 @@ Confirmation Do you really want to use\nhttps://%1$s\nas your Diaspora Pod? Do you want to exit? - YES - NO This will erase all cookies and session data. Do you really want to change pods? D* New message D* Text only @@ -170,10 +168,11 @@ • implemented swipe to refresh - Copyright © 2016 - <b>Contributors:</b><br> + Copyright © 2015–2016 + <b>Main Contributors:</b><br> • gsantner https://gsantner.github.io<br> + • martinchodev https://github.com/martinchodev<br> • scoute-dich https://github.com/scoute-dich<br> <br> This program is free software: you can redistribute it and/or modify @@ -189,8 +188,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses.<br> <br> - <i>This app is a fork of the original \"DiasporaNativeWebApp\" - from \"martinchodev\". The splashscreen images can be found on flickr: + <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.</i>