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

Refactor layout & menu files, dialogs

Browse source
This commit is contained in:
Gregor Santner 2016-06-04 11:11:51 +02:00
parent 280f5ab1c3
commit 234335e696
18 changed files with 43 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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();

14
app/src/main/java/com/github/dfa/diaspora_android/activity/PodSelectionActivity.java
View file

@ -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;
}

24
app/src/main/java/com/github/dfa/diaspora_android/activity/ShareActivity.java
View file

@ -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();

2
app/src/main/java/com/github/dfa/diaspora_android/activity/SplashActivity.java
View file

@ -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();

4
app/src/main/java/com/github/dfa/diaspora_android/ui/ContextMenuWebView.java
View file

@ -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},