From 7fef360ced0b0abf5abec03b0f70afb5164cba8f Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Sat, 10 Sep 2022 07:50:20 -0700 Subject: [PATCH] interface fix --- .../page/s3manager/BucketSelect.java | 4 +-- .../asgardius/page/s3manager/ImageViewer.java | 2 +- .../page/s3manager/MainActivity.java | 6 ---- .../main/res/layout/activity_account_add.xml | 33 +++++++------------ .../main/res/layout/activity_image_viewer.xml | 5 +-- app/src/main/res/layout/activity_main.xml | 13 ++++---- app/src/main/res/values-night/themes.xml | 2 +- app/src/main/res/values/strings.xml | 1 + 8 files changed, 26 insertions(+), 40 deletions(-) diff --git a/app/src/main/java/asgardius/page/s3manager/BucketSelect.java b/app/src/main/java/asgardius/page/s3manager/BucketSelect.java index 5897586..f3410f6 100644 --- a/app/src/main/java/asgardius/page/s3manager/BucketSelect.java +++ b/app/src/main/java/asgardius/page/s3manager/BucketSelect.java @@ -112,13 +112,13 @@ public class BucketSelect extends AppCompatActivity { recyclerView.addOnItemTouchListener(new RecyclerTouchListener(getApplicationContext(), recyclerView, new RecyclerTouchListener.ClickListener() { @Override public void onClick(View view, int position) { - System.out.println("Click on "+Name.get(position).toString()); + //System.out.println("Click on "+Name.get(position).toString()); explorer(Name.get(position).toString()); } @Override public void onLongClick(View view, int position) { - System.out.println("Long click on "+Name.get(position).toString()); + //System.out.println("Long click on "+Name.get(position).toString()); } })); } diff --git a/app/src/main/java/asgardius/page/s3manager/ImageViewer.java b/app/src/main/java/asgardius/page/s3manager/ImageViewer.java index 746d2c1..758d7eb 100644 --- a/app/src/main/java/asgardius/page/s3manager/ImageViewer.java +++ b/app/src/main/java/asgardius/page/s3manager/ImageViewer.java @@ -23,7 +23,7 @@ public class ImageViewer extends AppCompatActivity { final ProgressBar simpleProgressBar = (ProgressBar) findViewById(R.id.simpleProgressBar); String videoURL = getIntent().getStringExtra("video_url"); ImageView iv=(ImageView) findViewById(R.id.imageViewer); - System.out.println(videoURL); + //System.out.println(videoURL); Thread imgread = new Thread(new Runnable() { @Override diff --git a/app/src/main/java/asgardius/page/s3manager/MainActivity.java b/app/src/main/java/asgardius/page/s3manager/MainActivity.java index d00f020..50cdeff 100644 --- a/app/src/main/java/asgardius/page/s3manager/MainActivity.java +++ b/app/src/main/java/asgardius/page/s3manager/MainActivity.java @@ -42,7 +42,6 @@ public class MainActivity extends AppCompatActivity { db = dbHelper.getWritableDatabase(); if (db != null) { // Database Queries - System.out.println("Database OK"); Name = new ArrayList(); Img = new ArrayList(); String query = "SELECT id FROM account"; @@ -62,9 +61,6 @@ public class MainActivity extends AppCompatActivity { public void run() { try { //Your code goes here - - System.out.println(Name); - runOnUiThread(new Runnable() { @Override @@ -101,10 +97,8 @@ public class MainActivity extends AppCompatActivity { db = dbHelper.getWritableDatabase(); if (db != null) { // Database Queries - System.out.println("Database OK"); try { String query = "SELECT endpoint, username, password, region FROM account where id=\""+ Name.get(position).toString()+ "\""; - System.out.println(query); Cursor cursor = db.rawQuery(query,null); if (cursor.moveToNext()){ endpoint = cursor.getString(0); diff --git a/app/src/main/res/layout/activity_account_add.xml b/app/src/main/res/layout/activity_account_add.xml index 8373475..bd484b8 100644 --- a/app/src/main/res/layout/activity_account_add.xml +++ b/app/src/main/res/layout/activity_account_add.xml @@ -1,33 +1,29 @@ - @@ -40,7 +36,7 @@ android:hint="@string/accountadd_endpoint" android:importantForAutofill="no" android:inputType="textUri" - app:layout_constraintTop_toTopOf="parent" + android:textColorHint="?attr/colorOnSecondary" tools:ignore="MissingConstraints" /> @@ -61,28 +57,22 @@ android:id="@+id/username" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentStart="true" - android:layout_alignParentEnd="true" - android:layout_marginTop="96dp" android:autofillHints="username" android:focusable="true" android:hint="@string/accountadd_username" android:inputType="textNoSuggestions" - app:layout_constraintTop_toTopOf="parent" + android:textColorHint="?attr/colorOnSecondary" tools:ignore="MissingConstraints" /> @@ -113,4 +102,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_image_viewer.xml b/app/src/main/res/layout/activity_image_viewer.xml index 5285ebb..4b5dce5 100644 --- a/app/src/main/res/layout/activity_image_viewer.xml +++ b/app/src/main/res/layout/activity_image_viewer.xml @@ -10,10 +10,11 @@ android:id="@+id/imageViewer" android:layout_width="fill_parent" android:layout_height="fill_parent" + android:contentDescription="@string/Image" app:srcCompat="@drawable/empty" + tools:ignore="MissingConstraints" tools:layout_editor_absoluteX="0dp" - tools:layout_editor_absoluteY="82dp" - tools:ignore="MissingConstraints" /> + tools:layout_editor_absoluteY="82dp" /> - + + @color/teal_200 @color/teal_200 - @color/black + @color/white ?attr/colorPrimaryVariant diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6b16f5b..e68f78e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5,6 +5,7 @@ Account list Bucket list Object list + Image Local database is corrupted. Please reinstall this app This feature is not implemented yet Open in