diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0b9cce0..f3c1f83 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -11,8 +11,8 @@ android { applicationId = "uk.kagurach.android101" minSdk = 31 targetSdk = 34 - versionCode = 157 - versionName = "1.5.7" + versionCode = 158 + versionName = "1.5.8" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7ec36ca..3c90c5b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,7 +55,7 @@ android:label="@string/title_activity_add_page" android:theme="@style/Theme.TODOList" /> diff --git a/app/src/main/java/uk/kagurach/android101/MainActivity2.java b/app/src/main/java/uk/kagurach/android101/MainActivity2.java index 8c5e358..eb47bef 100644 --- a/app/src/main/java/uk/kagurach/android101/MainActivity2.java +++ b/app/src/main/java/uk/kagurach/android101/MainActivity2.java @@ -4,6 +4,7 @@ import android.annotation.SuppressLint; import android.content.Context; import android.graphics.Color; import android.os.Bundle; +import android.os.IBinder; import android.util.TypedValue; import android.view.MotionEvent; import android.view.View; @@ -20,6 +21,7 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.core.graphics.Insets; import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsCompat; +import androidx.room.util.StringUtil; public class MainActivity2 extends AppCompatActivity { @@ -156,7 +158,9 @@ public class MainActivity2 extends AppCompatActivity { private void updateCurrentSettingShower(){ TextView tv = findViewById(R.id.P2SettingResult); - String sb = "Color = #" + Integer.toString(_text_color&0xffffff, 16) + + String sb = "Color = #" + + String.format("%6s",Integer.toString(_text_color&0xffffff, 16)) + .replace(" ","0") + "; TextSize = " + _text_size + "." + @@ -169,6 +173,11 @@ public class MainActivity2 extends AppCompatActivity { public void onClick(View v) { FrameLayout fl = findViewById(R.id.P2SettingPage); fl.setVisibility(View.VISIBLE); + + // Disable NextPage Button + Button nextPageButton = findViewById(R.id.next_page_nav_2); + nextPageButton.setEnabled(false); + } } @@ -177,6 +186,13 @@ public class MainActivity2 extends AppCompatActivity { public void onClick(View v) { FrameLayout fl = findViewById(R.id.P2SettingPage); fl.setVisibility(View.GONE); + + // Close Input Method + InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + imm.hideSoftInputFromWindow(v.getWindowToken(), 0); + + Button nextPageButton = findViewById(R.id.next_page_nav_2); + nextPageButton.setEnabled(true); } } @@ -223,6 +239,14 @@ public class MainActivity2 extends AppCompatActivity { @Override public boolean dispatchTouchEvent(MotionEvent ev) { if (getCurrentFocus() != null) { + // If the Setting float window shows, do nothing + FrameLayout fl = findViewById(R.id.P2SettingPage); + if (fl!=null){ + if (fl.getVisibility() == View.VISIBLE){ + return super.dispatchTouchEvent(ev); + } + } + InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); imm.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0); } diff --git a/app/src/main/java/uk/kagurach/android101/Page5.java b/app/src/main/java/uk/kagurach/android101/Page5.java index c377e24..c2f18c1 100644 --- a/app/src/main/java/uk/kagurach/android101/Page5.java +++ b/app/src/main/java/uk/kagurach/android101/Page5.java @@ -27,7 +27,7 @@ public class Page5 extends AppCompatActivity { AnimalTypeAutoCompleteHelper completeHelper = null; final AnimalDatabaseHelper dbHelper = new AnimalDatabaseHelper(this); - + PageHelper pageHelper; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -39,6 +39,8 @@ public class Page5 extends AppCompatActivity { return insets; }); + pageHelper = new PageHelper(this, Page4.class,null); + // Set auto-suggestions for animals AutoCompleteTextView autoCompleteTextView = findViewById(R.id.AnimalTypeAutoCompleteInput); try { @@ -64,6 +66,10 @@ public class Page5 extends AppCompatActivity { Button P5QueryButton = findViewById(R.id.P5QueryButton); P5QueryButton.setOnClickListener(new QueryButtonHandler()); + + Button P5NextPage = findViewById(R.id.P5NextPage); + P5NextPage.setOnClickListener(pageHelper.pageButtonHandler); + P5NextPage.setOnLongClickListener(pageHelper.longClickHandler); } class AddAnimalButtonHandler implements View.OnClickListener { diff --git a/app/src/main/java/uk/kagurach/android101/PageHelper.java b/app/src/main/java/uk/kagurach/android101/PageHelper.java index 90e23af..75f8515 100644 --- a/app/src/main/java/uk/kagurach/android101/PageHelper.java +++ b/app/src/main/java/uk/kagurach/android101/PageHelper.java @@ -10,6 +10,7 @@ import android.view.View; public class PageHelper { public final LongClickHandler longClickHandler = new LongClickHandler(); public final PageButtonHandler pageButtonHandler = new PageButtonHandler(); + private final Context _curr; private final Class _prev; private final Class _next; diff --git a/app/src/main/java/uk/kagurach/android101/todoList/AddPage.kt b/app/src/main/java/uk/kagurach/android101/todoList/AddPage.kt index f8169ae..07d07fe 100644 --- a/app/src/main/java/uk/kagurach/android101/todoList/AddPage.kt +++ b/app/src/main/java/uk/kagurach/android101/todoList/AddPage.kt @@ -171,7 +171,7 @@ class AddPage() : ComponentActivity() { timePickerState.minute.toString() ) loader.changeItem(todoItem) - val myIntent = Intent(context, MainActivity::class.java) + val myIntent = Intent(context, TodoListMainActivity::class.java) ContextCompat.startActivity(context, myIntent, null) } }, diff --git a/app/src/main/java/uk/kagurach/android101/todoList/MainActivity.kt b/app/src/main/java/uk/kagurach/android101/todoList/TodoListMainActivity.kt similarity index 95% rename from app/src/main/java/uk/kagurach/android101/todoList/MainActivity.kt rename to app/src/main/java/uk/kagurach/android101/todoList/TodoListMainActivity.kt index 898e5dc..9cc65ba 100644 --- a/app/src/main/java/uk/kagurach/android101/todoList/MainActivity.kt +++ b/app/src/main/java/uk/kagurach/android101/todoList/TodoListMainActivity.kt @@ -24,7 +24,7 @@ import androidx.compose.ui.platform.LocalContext import androidx.core.content.ContextCompat import uk.kagurach.android101.todoList.ui.theme.LightBlue100 -class MainActivity : ComponentActivity() { +class TodoListMainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { val loader = TodoItemLoader(this) val tmpList = loader.getTodoItems() @@ -65,6 +65,7 @@ fun LayOut(tmpList: List?) { floatingActionButton = { NextPage { val myIntent = Intent(context, AddPage::class.java) + myIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) ContextCompat.startActivity(context, myIntent, null) } }, diff --git a/app/src/main/res/drawable/p2_settings_layout.xml b/app/src/main/res/drawable/p2_settings_layout.xml index 8a193de..8685858 100644 --- a/app/src/main/res/drawable/p2_settings_layout.xml +++ b/app/src/main/res/drawable/p2_settings_layout.xml @@ -6,4 +6,5 @@ android:top="20dp" android:right="20dp" android:bottom="20dp"/> + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main2.xml b/app/src/main/res/layout/activity_main2.xml index 5e93191..9ac6e9d 100644 --- a/app/src/main/res/layout/activity_main2.xml +++ b/app/src/main/res/layout/activity_main2.xml @@ -98,7 +98,7 @@ android:textAllCaps="false" android:text="@string/font_size" android:textSize="18sp" - android:layout_marginTop="18dp"/> + android:layout_marginTop="5dp"/>