moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 11:12:15 -05:00
Code Issues Releases Wiki Activity

Remove empty layout

Browse Source
This commit is contained in:
Dominik Schürmann 2014-10-25 23:36:48 +02:00
parent 94e7bbb67b
commit 74bac3ea36
3 changed files with 1 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
View File

@ -109,9 +109,6 @@ public class KeyListFragment extends LoaderFragment
private String mQuery; private String mQuery;
private SearchView mSearchView; private SearchView mSearchView;
// empty list layout
private Button mButtonEmptyCreate;
private Button mButtonEmptyImport;
boolean hideMenu = false; boolean hideMenu = false;
@ -126,27 +123,6 @@ public class KeyListFragment extends LoaderFragment
mStickyList = (StickyListHeadersListView) view.findViewById(R.id.key_list_list); mStickyList = (StickyListHeadersListView) view.findViewById(R.id.key_list_list);
mStickyList.setOnItemClickListener(this); mStickyList.setOnItemClickListener(this);
// empty view
mButtonEmptyCreate = (Button) view.findViewById(R.id.key_list_empty_button_create);
mButtonEmptyCreate.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(getActivity(), CreateKeyActivity.class);
startActivityForResult(intent, 0);
}
});
mButtonEmptyImport = (Button) view.findViewById(R.id.key_list_empty_button_import);
mButtonEmptyImport.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(getActivity(), ImportKeysActivity.class);
intent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_FILE_AND_RETURN);
startActivityForResult(intent, 0);
}
});
mSwipeRefreshLayout = (ListAwareSwipeRefreshLayout) view.findViewById(R.id.key_list_swipe_container); mSwipeRefreshLayout = (ListAwareSwipeRefreshLayout) view.findViewById(R.id.key_list_swipe_container);
mSwipeRefreshLayout.setOnRefreshListener(new NoScrollableSwipeRefreshLayout.OnRefreshListener() { mSwipeRefreshLayout.setOnRefreshListener(new NoScrollableSwipeRefreshLayout.OnRefreshListener() {
@Override @Override

44
OpenKeychain/src/main/res/layout/key_list_fragment.xml
View File

@ -36,50 +36,6 @@
android:text="@string/key_list_empty_text1" android:text="@string/key_list_empty_text1"
android:textAppearance="?android:attr/textAppearanceLarge" /> android:textAppearance="?android:attr/textAppearanceLarge" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text=""
android:textAppearance="?android:attr/textAppearanceLarge" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:gravity="center"
android:text="@string/key_list_empty_text2"
android:textAppearance="?android:attr/textAppearanceSmall" />
<Button
android:id="@+id/key_list_empty_button_create"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:textSize="14sp"
android:text="@string/key_list_empty_button_create"
android:drawableLeft="@drawable/ic_action_new_account"
android:drawablePadding="8dp"
android:background="@drawable/button_edgy" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:gravity="center"
android:text="@string/key_list_empty_text3"
android:textAppearance="?android:attr/textAppearanceSmall" />
<Button
android:id="@+id/key_list_empty_button_import"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:textSize="14sp"
android:text="@string/key_list_empty_button_import"
android:drawableLeft="@drawable/ic_action_collection"
android:drawablePadding="8dp"
android:background="@drawable/button_edgy" />
</LinearLayout> </LinearLayout>
</FrameLayout> </FrameLayout>
</org.sufficientlysecure.keychain.ui.widget.ListAwareSwipeRefreshLayout> </org.sufficientlysecure.keychain.ui.widget.ListAwareSwipeRefreshLayout>

6
OpenKeychain/src/main/res/values/strings.xml
View File

@ -506,11 +506,7 @@
<item quantity="other">"%d keys selected."</item> <item quantity="other">"%d keys selected."</item>
</plurals> </plurals>
<string name="key_list_empty_text1">"No keys available yet…"</string> <string name="key_list_empty_text1">"No keys found!"</string>
<string name="key_list_empty_text2">"You can start by"</string>
<string name="key_list_empty_text3">"or"</string>
<string name="key_list_empty_button_create">"creating your own key"</string>
<string name="key_list_empty_button_import">"importing an existing key."</string>
<string name="key_list_filter_show_all">"Show all keys"</string> <string name="key_list_filter_show_all">"Show all keys"</string>
<string name="key_list_filter_show_certified">"Show certified keys only"</string> <string name="key_list_filter_show_certified">"Show certified keys only"</string>