Page Menu
Home
GitPull.it
Search
Configure Global Search
Log In
Files
F15184757
D266.1794989020.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Authored By
Unknown
Size
7 KB
Referenced Files
None
Subscribers
None
D266.1794989020.diff
View Options
diff --git a/app/src/main/java/it/reyboz/bustorino/ActivityAbout.kt b/app/src/main/java/it/reyboz/bustorino/ActivityAbout.kt
--- a/app/src/main/java/it/reyboz/bustorino/ActivityAbout.kt
+++ b/app/src/main/java/it/reyboz/bustorino/ActivityAbout.kt
@@ -35,8 +35,9 @@
import androidx.core.view.updatePadding
import it.reyboz.bustorino.backend.utils
import it.reyboz.bustorino.middleware.BarcodeScanUtils
+import it.reyboz.bustorino.middleware.GeneralChildActivity
-class ActivityAbout : AppCompatActivity() {
+class ActivityAbout : GeneralChildActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_about)
diff --git a/app/src/main/java/it/reyboz/bustorino/ActivityBackup.kt b/app/src/main/java/it/reyboz/bustorino/ActivityBackup.kt
--- a/app/src/main/java/it/reyboz/bustorino/ActivityBackup.kt
+++ b/app/src/main/java/it/reyboz/bustorino/ActivityBackup.kt
@@ -1,14 +1,17 @@
package it.reyboz.bustorino
import android.os.Bundle
+import android.view.MenuItem
import android.view.View
import androidx.appcompat.widget.Toolbar
+import androidx.core.app.NavUtils
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.updatePadding
import it.reyboz.bustorino.fragments.BackupImportFragment
import it.reyboz.bustorino.middleware.GeneralActivity
+
class ActivityBackup : GeneralActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@@ -18,10 +21,8 @@
setSupportActionBar(mToolbar)
val actionBar = supportActionBar
- if (actionBar != null) {
- actionBar.setDisplayHomeAsUpEnabled(true)
- //actionBar.setIcon(R.drawable.ic_launcher)
- }
+ actionBar?.setDisplayHomeAsUpEnabled(true)
+
if (savedInstanceState == null) {
supportFragmentManager.beginTransaction()
.setReorderingAllowed(true)
diff --git a/app/src/main/java/it/reyboz/bustorino/ActivityExperiments.java b/app/src/main/java/it/reyboz/bustorino/ActivityExperiments.java
--- a/app/src/main/java/it/reyboz/bustorino/ActivityExperiments.java
+++ b/app/src/main/java/it/reyboz/bustorino/ActivityExperiments.java
@@ -24,9 +24,9 @@
import androidx.fragment.app.FragmentTransaction;
import it.reyboz.bustorino.backend.Stop;
import it.reyboz.bustorino.fragments.*;
-import it.reyboz.bustorino.middleware.GeneralActivity;
+import it.reyboz.bustorino.middleware.GeneralChildActivity;
-public class ActivityExperiments extends GeneralActivity implements CommonFragmentListener {
+public class ActivityExperiments extends GeneralChildActivity implements CommonFragmentListener {
final static String DEBUG_TAG = "ExperimentsActivity";
diff --git a/app/src/main/java/it/reyboz/bustorino/ActivityIntro.kt b/app/src/main/java/it/reyboz/bustorino/ActivityIntro.kt
--- a/app/src/main/java/it/reyboz/bustorino/ActivityIntro.kt
+++ b/app/src/main/java/it/reyboz/bustorino/ActivityIntro.kt
@@ -18,8 +18,9 @@
import it.reyboz.bustorino.data.PreferencesHolder
import it.reyboz.bustorino.fragments.IntroFragment
import it.reyboz.bustorino.middleware.GeneralActivity
+import it.reyboz.bustorino.middleware.GeneralChildActivity
-class ActivityIntro : GeneralActivity(), IntroFragment.IntroListener {
+class ActivityIntro : GeneralChildActivity(), IntroFragment.IntroListener {
private lateinit var viewPager : ViewPager2
private lateinit var btnForward: ImageButton
diff --git a/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java b/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java
--- a/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java
+++ b/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java
@@ -118,7 +118,10 @@
R.id.drawer_action_info, () ->
startActivity(new Intent(this, ActivityAbout.class)),
- R.id.nav_nearby, this::openNearbyStopsFragment
+ R.id.nav_nearby, this::openNearbyStopsFragment,
+ R.id.drawer_action_backup, () ->
+ startActivity(new Intent(this, ActivityBackup.class))
+
);
diff --git a/app/src/main/java/it/reyboz/bustorino/ActivitySettings.java b/app/src/main/java/it/reyboz/bustorino/ActivitySettings.java
--- a/app/src/main/java/it/reyboz/bustorino/ActivitySettings.java
+++ b/app/src/main/java/it/reyboz/bustorino/ActivitySettings.java
@@ -1,7 +1,6 @@
package it.reyboz.bustorino;
import android.os.Bundle;
-import android.view.ViewGroup;
import androidx.appcompat.widget.Toolbar;
import androidx.core.graphics.Insets;
import androidx.core.view.ViewCompat;
@@ -9,12 +8,11 @@
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
import android.util.Log;
import it.reyboz.bustorino.fragments.SettingsFragment;
-import it.reyboz.bustorino.middleware.GeneralActivity;
+import it.reyboz.bustorino.middleware.GeneralChildActivity;
-public class ActivitySettings extends GeneralActivity {
+public class ActivitySettings extends GeneralChildActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/java/it/reyboz/bustorino/middleware/GeneralChildActivity.kt b/app/src/main/java/it/reyboz/bustorino/middleware/GeneralChildActivity.kt
new file mode 100644
--- /dev/null
+++ b/app/src/main/java/it/reyboz/bustorino/middleware/GeneralChildActivity.kt
@@ -0,0 +1,19 @@
+package it.reyboz.bustorino.middleware
+
+import android.view.MenuItem
+
+/**
+ * A GeneralActivity which finishes by default when back button is pressed
+ */
+abstract class GeneralChildActivity() : GeneralActivity() {
+
+
+ override fun onOptionsItemSelected(item: MenuItem): Boolean {
+ if (item.getItemId() == android.R.id.home) {
+ //NavUtils.navigateUpFromSameTask(this)
+ finish()
+ return true
+ }
+ return super.onOptionsItemSelected(item)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_backup_solid.xml b/app/src/main/res/drawable/ic_backup_solid.xml
new file mode 100644
--- /dev/null
+++ b/app/src/main/res/drawable/ic_backup_solid.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="36dp"
+ android:height="36dp"
+ android:viewportWidth="36"
+ android:viewportHeight="36">
+ <path
+ android:pathData="M2,24v6a2,2 0,0 0,2 2h28a2,2 0,0 0,2 -2v-6ZM30,29h-4v-2h4Z"
+ android:fillColor="#000"/>
+ <path
+ android:pathData="M30.84,13.37A1.94,1.94 0,0 0,28.93 12H21v6a3,3 0,1 1,-6 0v-6H7.07a1.92,1.92 0,0 0,-1.9 1.32c-2.31,6.36 -2.93,8.11 -3.1,8.68h31.86c-0.16,-0.57 -0.79,-2.31 -3.09,-8.63"
+ android:fillColor="#000"/>
+ <path
+ android:pathData="M13,9.92L17,6v12a1,1 0,1 0,2 0V6l4,3.95a1,1 0,1 0,1.38 -1.45L18,2.16L11.61,8.5A1,1 0,0 0,13 9.92"
+ android:fillColor="#000"/>
+</vector>
diff --git a/app/src/main/res/menu/drawer_main.xml b/app/src/main/res/menu/drawer_main.xml
--- a/app/src/main/res/menu/drawer_main.xml
+++ b/app/src/main/res/menu/drawer_main.xml
@@ -25,6 +25,11 @@
/>
</group>
+ <item android:id="@+id/drawer_action_backup"
+ android:icon="@drawable/ic_backup_solid"
+ android:title="@string/backup_restore"
+ />
+
<item android:id="@+id/drawer_action_settings"
android:title="@string/action_settings"
android:icon="@drawable/ic_baseline_settings_24"
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Wed, Nov 18, 08:03 (22 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2265394
Default Alt Text
D266.1794989020.diff (7 KB)
Attached To
Mode
D266: Improve design of backup screen, fix issues with child activities
Attached
Detach File
Event Timeline