mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-04-04 07:41:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Simplify card shortcut code

Browse Source
This commit is contained in:
Sylvia van Os
2021-12-12 19:18:13 +01:00
parent d92efc020b
commit 8a45222783
3 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/protect/card_locker/CardShortcutConfigure.java
View File

@@ -3,17 +3,13 @@ package protect.card_locker;
import android.database.Cursor;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.Toast;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import androidx.core.content.pm.ShortcutInfoCompat;
import androidx.core.content.pm.ShortcutManagerCompat;
import androidx.recyclerview.widget.DefaultItemAnimator;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
/**
@@ -31,13 +27,9 @@ public class CardShortcutConfigure extends AppCompatActivity implements LoyaltyC
// aback button is pressed.
setResult(RESULT_CANCELED);
setContentView(R.layout.main_activity);
setContentView(R.layout.simple_toolbar_list_activity);
Toolbar toolbar = findViewById(R.id.toolbar);
toolbar.setVisibility(View.GONE);
// Hide new button because it won't work here anyway
FloatingActionButton newFab = findViewById(R.id.fabAdd);
newFab.setVisibility(View.GONE);
toolbar.setTitle(R.string.shortcutSelectCard);
final DBHelper db = new DBHelper(this);
@@ -48,15 +40,10 @@ public class CardShortcutConfigure extends AppCompatActivity implements LoyaltyC
}
final RecyclerView cardList = findViewById(R.id.list);
RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getApplicationContext());
cardList.setLayoutManager(mLayoutManager);
cardList.setItemAnimator(new DefaultItemAnimator());
cardList.setVisibility(View.VISIBLE);
GridLayoutManager layoutManager = (GridLayoutManager) cardList.getLayoutManager();
layoutManager.setSpanCount(getResources().getInteger(R.integer.main_view_card_columns));
Cursor cardCursor = db.getLoyaltyCardCursor();
final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor, this);
cardList.setAdapter(adapter);
}

35
app/src/main/res/layout/simple_toolbar_list_activity.xml Normal file
View File

@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"/>
</com.google.android.material.appbar.AppBarLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/list"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:spanCount="1"
android:layout_height="match_parent"
android:layout_width="match_parent" />
</RelativeLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -258,4 +258,5 @@
<string name="action_show_details">Show details</string>
<string name="action_hide_details">Hide details</string>
<string name="translate_platform">on Weblate</string>
</resources>
<string name="shortcutSelectCard">Select a card</string>
</resources>