mirror of
https://github.com/gsantner/dandelion
synced 2024-12-23 03:18:04 +01:00
Refactor layout & menu files, dialogs
This commit is contained in:
parent
280f5ab1c3
commit
234335e696
18 changed files with 43 additions and 109 deletions
|
@ -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();
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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();
|
||||
|
||||
|
|
|
@ -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},
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
tools:openDrawer="start">
|
||||
|
||||
<include
|
||||
layout="@layout/app_bar_main"
|
||||
layout="@layout/main__app_bar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
|
||||
|
@ -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" />
|
||||
|
||||
</android.support.v4.widget.DrawerLayout>
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
</android.support.design.widget.AppBarLayout>
|
||||
|
||||
<include layout="@layout/content_main" />
|
||||
<include layout="@layout/main__content" />
|
||||
|
||||
<com.getbase.floatingactionbutton.FloatingActionsMenu
|
||||
android:id="@+id/fab_menubutton"
|
|
@ -6,7 +6,7 @@
|
|||
android:layout_height="match_parent"
|
||||
app:layout_behavior="@string/appbar_scrolling_view_behavior"
|
||||
tools:context=".activity.MainActivity"
|
||||
tools:showIn="@layout/app_bar_main">
|
||||
tools:showIn="@layout/main__app_bar">
|
||||
|
||||
<android.support.v4.widget.SwipeRefreshLayout
|
||||
android:id="@+id/swipe"
|
|
@ -15,28 +15,28 @@
|
|||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_marginTop="32dp"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_height="match_parent">
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_marginTop="32dp"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/navheader_user_image"
|
||||
android:layout_gravity="center"
|
||||
android:scaleType="fitCenter"
|
||||
android:layout_width="@android:dimen/notification_large_icon_width"
|
||||
android:layout_height="@android:dimen/notification_large_icon_height"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginEnd="@dimen/activity_horizontal_margin"
|
||||
android:layout_marginStart="@dimen/activity_horizontal_margin"
|
||||
android:scaleType="fitCenter"
|
||||
android:src="@drawable/ic_launcher" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:layout_height="match_parent">
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/navheader_title"
|
|
@ -30,7 +30,7 @@
|
|||
android:paddingRight="@dimen/activity_horizontal_margin"
|
||||
android:paddingTop="@dimen/activity_vertical_margin"
|
||||
app:layout_behavior="@string/appbar_scrolling_view_behavior"
|
||||
tools:showIn="@layout/podselection_activity">
|
||||
tools:showIn="@layout/podselection__activity">
|
||||
|
||||
<ListView
|
||||
android:id="@+id/podselection__listpods"
|
|
@ -1,20 +0,0 @@
|
|||
<menu 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"
|
||||
tools:context="com.github.dfa.diaspora_android.activity.MainActivity">
|
||||
|
||||
<item
|
||||
android:id="@+id/action_exit"
|
||||
android:icon="@drawable/ic_sync_white_24dp"
|
||||
android:title="@string/exit_app"
|
||||
app:showAsAction="never" />
|
||||
|
||||
<!--<item-->
|
||||
<!--android:id="@+id/exit_app"-->
|
||||
<!--android:title="@string/exit_app"-->
|
||||
<!--android:orderInCategory="110"-->
|
||||
<!--android:icon="@drawable/ic_exit_to_app_white_24dp"-->
|
||||
<!--app:showAsAction="always" />-->
|
||||
|
||||
|
||||
</menu>
|
|
@ -13,8 +13,6 @@
|
|||
<string name="confirmation">Bestätigung</string>
|
||||
<string name="confirm_pod">Möchtest du wirklich \nhttps://%1$s\nals deinen Diaspora Pod auswählen?</string>
|
||||
<string name="confirm_exit">Möchtest du die App verlassen?</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>
|
||||
|
||||
<string name="permissions_screenshot">Du musst der App Zugriff auf den Gerätespeicher gewähren, damit das Bildschirmfoto
|
||||
|
@ -130,6 +128,7 @@
|
|||
<string name="license_text"><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></string>
|
||||
<string name="fab2_title_person">Suche nach Personen …</string>
|
||||
|
|
|
@ -34,8 +34,6 @@
|
|||
<string name="confirmation">Confirmation</string>
|
||||
<string name="confirm_pod">Do you really want to use\nhttps://%1$s\nas your Diaspora Pod?</string>
|
||||
<string name="confirm_exit">Do you want to exit?</string>
|
||||
<string name="yes">YES</string>
|
||||
<string name="no">NO</string>
|
||||
<string name="change_pod_warning">This will erase all cookies and session data. Do you really want to change pods?</string>
|
||||
<string name="new_post">D* New message</string>
|
||||
<string name="new_post1">D* Text only</string>
|
||||
|
@ -170,10 +168,11 @@
|
|||
• implemented swipe to refresh
|
||||
</string>
|
||||
|
||||
<string name="license_title" translatable="false">Copyright © 2016</string>
|
||||
<string name="license_text"><b>Contributors:</b><br>
|
||||
<string name="license_title" translatable="false">Copyright © 2015–2016</string>
|
||||
<string name="license_text"><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></string>
|
||||
|
||||
|
|
Loading…
Reference in a new issue