maj/MonsterCards
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes a bunch of lint errors and enables Flipper navigation logging.

Browse Source
This commit is contained in:
Tom Hicks
2021-05-02 02:38:32 -07:00
committed by Tom Hicks
parent c9a7e028ae
commit f2d0e93911
6 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Android/app/src/main/AndroidManifest.xml
View File

@@ -2,6 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.majinnaibu.monstercards">
<uses-permission android:name="android.permission.INTERNET" />
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
@@ -20,6 +22,4 @@
</intent-filter>
</activity>
</application>
<uses-permission android:name="android.permission.INTERNET" />
</manifest>

8
Android/app/src/main/java/com/majinnaibu/monstercards/MainActivity.java
View File

@@ -5,11 +5,13 @@ import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity;
import androidx.navigation.NavController;
import androidx.navigation.Navigation;
import androidx.navigation.fragment.NavHostFragment;
import androidx.navigation.ui.AppBarConfiguration;
import androidx.navigation.ui.NavigationUI;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.majinnaibu.monstercards.init.AppCenterInitializer;
import com.majinnaibu.monstercards.init.FlipperInitializer;
public class MainActivity extends AppCompatActivity {
@@ -34,7 +36,11 @@ public class MainActivity extends AppCompatActivity {
R.id.navigation_collections,
R.id.navigation_library)
.build();
NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment);
NavHostFragment navHostFragment = (NavHostFragment) getSupportFragmentManager().findFragmentById(R.id.nav_host_fragment);
NavController navController = navHostFragment.getNavController();
navController.addOnDestinationChangedListener((controller, destination, arguments) -> {
FlipperInitializer.sendNavigationEvent(controller, destination, arguments);
});
NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration);
NavigationUI.setupWithNavController(navView, navController);
}

29
Android/app/src/main/res/layout/fragment_library.xml
View File

@@ -6,17 +6,26 @@
android:layout_height="match_parent"
tools:context=".ui.library.LibraryFragment">
<TextView
android:id="@+id/text_library"
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/monster_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
app:layoutManager="LinearLayoutManager"
tools:context=".MonsterListFragment"
tools:listitem="@layout/monster_list_content" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:textAlignment="center"
android:textSize="20sp"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
android:contentDescription="@string/action_add_monster"
app:srcCompat="@android:drawable/ic_input_add"
app:tint="@android:color/white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

2
Android/app/src/main/res/values/dimens.xml
View File

@@ -1,7 +1,5 @@
<resources>
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="text_margin">16dp</dimen>
<dimen name="fab_margin">16dp</dimen>

17
Android/app/src/main/res/values/strings.xml
View File

@@ -1,10 +1,17 @@
<resources>
<string name="actions_label">Actions</string>
<string name="app_name">MonsterCards</string>
<string name="title_dashboard">Dashboard</string>
<string name="title_search">Search</string>
<string name="title_collections">Collections</string>
<string name="title_library">Library</string>
<string name="action_search">Search</string>
<string name="charisma_abbreviation">CHA</string>
<string name="constitution_abbreviation">CON</string>
<string name="dexterity_abbreviation">DEX</string>
<string name="intelligence_abbreviation">INT</string>
<string name="label_search_query">Query</string>
<string name="section_divider">section divider</string>
<string name="strength_abbreviation">STR</string>
<string name="title_collections">Collections</string>
<string name="title_dashboard">Dashboard</string>
<string name="title_library">Library</string>
<string name="title_search">Search</string>
<string name="wisdom_abbreviation">WIS</string>
<string name="action_add_monster">Add monster</string>
</resources>

1
Android/app/src/release/java/com/majinnaibu/monstercards/init/FlipperInitializer.java
View File

@@ -6,4 +6,5 @@ public class FlipperInitializer {
public static void init(Context ctx) {}
public static void sendNavigationEvent(NavController controller, NavDestination destination, Bundle arguments) {
}