mirror/AuroraStore
1
0
Fork 0
mirror of https://github.com/whyorean/AuroraStore.git synced 2026-06-19 21:19:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move MyApps and Updates to NavDrawer

Browse Source
This commit is contained in:
Mr. Dragon
2018-02-02 14:16:03 +05:30
parent d8b8470229
commit e4c2a71b04
6 changed files with 49 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/in/dragons/galaxy/AppListActivity.java
View File

@@ -174,6 +174,12 @@ abstract public class AppListActivity extends GalaxyActivity implements Navigati
@Override
public boolean onNavigationItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.action_myapps:
startActivity(new Intent(this, InstalledAppsActivity.class));
break;
case R.id.action_updates:
startActivity(new Intent(this, UpdatableAppsActivity.class));
break;
case R.id.action_categories:
startActivity(new Intent(this, CategoryListActivity.class));
break;

21
app/src/main/java/in/dragons/galaxy/InstalledAppsActivity.java
View File

@@ -1,14 +1,10 @@
package in.dragons.galaxy;
import android.app.ActivityOptions;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.widget.CardView;
import android.view.ContextMenu;
import android.view.Menu;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
import in.dragons.galaxy.fragment.FilterMenu;
import in.dragons.galaxy.model.App;
@@ -24,23 +20,6 @@ public class InstalledAppsActivity extends AppListActivity {
super.onCreate(savedInstanceState);
ActivityOptions.makeSceneTransitionAnimation(this).toBundle();
setTitle(R.string.activity_title_updates_and_other_apps);
Button button =(Button) findViewById(R.id.main_button);
TextView textView = (TextView) findViewById(R.id.main_button_txt);
CardView cardView = (CardView) findViewById(R.id.list_card);
button.setEnabled(true);
textView.setEnabled(true);
button.setVisibility(View.VISIBLE);
textView.setVisibility(View.VISIBLE);
cardView.setVisibility(View.VISIBLE);
button.setText(R.string.list_check_updates);
textView.setText(R.string.list_check_updates_txt);
button.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
startActivity(new Intent(getApplicationContext(), UpdatableAppsActivity.class));
}
});
}
@Override

9
app/src/main/res/drawable/ic_update.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M21,10.12H14.22L16.96,7.3C14.23,4.6 9.81,4.5 7.08,7.2C4.35,9.91 4.35,14.28 7.08,17C9.81,19.7 14.23,19.7 16.96,17C18.32,15.65 19,14.08 19,12.1H21C21,14.08 20.12,16.65 18.36,18.39C14.85,21.87 9.15,21.87 5.64,18.39C2.14,14.92 2.11,9.28 5.62,5.81C9.13,2.34 14.76,2.34 18.27,5.81L21,3V10.12M12.5,8V12.25L16,14.33L15.28,15.54L11,13V8H12.5Z"/>
</vector>

2
app/src/main/res/layout/activity_main.xml
View File

@@ -22,5 +22,5 @@
android:layout_gravity="start"
android:fitsSystemWindows="true"
app:headerLayout="@layout/nav_header_main"
app:menu="@menu/nav_menu" />
app:menu="@menu/nav_menu"/>
</android.support.v4.widget.DrawerLayout>

49
app/src/main/res/menu/nav_menu.xml
View File

@@ -1,19 +1,32 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_categories"
android:title="@string/action_categories"
android:icon="@drawable/ic_categories" />
<item
android:id="@+id/action_settings"
android:title="@string/action_settings"
android:icon="@drawable/ic_settings" />
<item
android:id="@+id/action_logout"
android:title="@string/action_logout"
android:icon="@drawable/ic_logout" />
<item
android:id="@+id/action_about"
android:title="@string/action_about"
android:icon="@drawable/ic_about" />
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<group android:id="@+id/group1">
<item
android:id="@+id/action_myapps"
android:icon="@drawable/ic_apps"
android:title="@string/action_apps" />
<item
android:id="@+id/action_updates"
android:icon="@drawable/ic_update"
android:title="@string/action_updates" />
</group>
<group android:id="@+id/group2">
<item
android:id="@+id/action_categories"
android:icon="@drawable/ic_categories"
android:title="@string/action_categories" />
<item
android:id="@+id/action_settings"
android:icon="@drawable/ic_settings"
android:title="@string/action_settings" />
<item
android:id="@+id/action_logout"
android:icon="@drawable/ic_logout"
android:title="@string/action_logout" />
<item
android:id="@+id/action_about"
android:icon="@drawable/ic_about"
android:title="@string/action_about" />
</group>
</menu>

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

@@ -27,6 +27,7 @@
<string name="action_filter_category">"Category: %1$s"</string>
<string name="action_filter_rating">"Rating: %1$s"</string>
<string name="action_filter_downloads">"Downloads: %1$s"</string>
<string name="action_apps">"My apps &amp; games"</string>
<string name="action_logout">Log out</string>
<string name="action_search">Search</string>
<string name="action_updates">Updates</string>
@@ -124,7 +125,7 @@
<string name="credentials_logo_txt">Sign in</string>
<string name="credentials_message">Use your Google account.\n\nKeep in mind that using this app violates Play Store T&amp;C. \nIt would probably be safer to use a throwaway Google account which has logged in to Play Store at least once and has accepted Play Store T&amp;C.</string>
<string name="activity_title_updates_only">Updates</string>
<string name="activity_title_updates_and_other_apps">Your apps</string>
<string name="activity_title_updates_and_other_apps">"My apps &amp; games"</string>
<string name="activity_title_search">"Results for %1$s"</string>
<string name="notification_installation_complete">Update installed.</string>
<string name="notification_installation_failed">Update installation failed.</string>