From dc360cccd72c7caa199e3ddce3b308deda04bdf7 Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Wed, 5 Oct 2022 05:33:59 -0700 Subject: [PATCH 001/182] bug fix --- app/proguard-rules.pro | 4 +- .../page/s3manager/ObjectSelect.java | 57 ++++++++++++++----- .../java/asgardius/page/s3manager/Share.java | 5 +- 3 files changed, 47 insertions(+), 19 deletions(-) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 481bb43..8a0dc3d 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -14,8 +14,8 @@ # Uncomment this to preserve the line number information for # debugging stack traces. -#-keepattributes SourceFile,LineNumberTable +-keepattributes SourceFile,LineNumberTable # If you keep the line number information, uncomment this to # hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file +-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java b/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java index 3574974..d48f2ab 100644 --- a/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java +++ b/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java @@ -277,21 +277,48 @@ public class ObjectSelect extends AppCompatActivity { pdfread.start(); } } else if (Img.get(position).equals(R.drawable.audiofile) || Img.get(position).equals(R.drawable.videofile)) { - //load media file - try { - Date expiration = new Date(); - Calendar mycal = Calendar.getInstance(); - mycal.setTime(expiration); - //System.out.println("today is " + mycal.getTime()); - mycal.add(Calendar.HOUR, 6); - //System.out.println("Expiration date: " + mycal.getTime()); - expiration = mycal.getTime(); - GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(bucket, prefix + Name.get(position).toString()).withExpiration(expiration);; - URL objectURL = s3client.generatePresignedUrl(request); - videoPlayer(objectURL.toString()); - } catch (Exception e) { - Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); - } + Thread mediaread = new Thread(new Runnable() { + + @Override + public void run() { + try { + //load media file + Date expiration = new Date(); + Calendar mycal = Calendar.getInstance(); + mycal.setTime(expiration); + //System.out.println("today is " + mycal.getTime()); + mycal.add(Calendar.HOUR, 6); + //System.out.println("Expiration date: " + mycal.getTime()); + expiration = mycal.getTime(); + GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(bucket, prefix + Name.get(position).toString()).withExpiration(expiration);; + URL objectURL = s3client.generatePresignedUrl(request); + + runOnUiThread(new Runnable() { + + @Override + public void run() { + // Sending reference and data to Adapter + videoPlayer(objectURL.toString()); + } + }); + //System.out.println("tree "+treelevel); + //System.out.println("prefix "+prefix); + + } catch (Exception e) { + e.printStackTrace(); + runOnUiThread(new Runnable() { + + @Override + public void run() { + Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); + } + }); + //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); + finish(); + } + } + }); + mediaread.start(); } else { Toast.makeText(ObjectSelect.this, getResources().getString(R.string.unsupported_file), Toast.LENGTH_SHORT).show(); } diff --git a/app/src/main/java/asgardius/page/s3manager/Share.java b/app/src/main/java/asgardius/page/s3manager/Share.java index 55b8187..978c075 100644 --- a/app/src/main/java/asgardius/page/s3manager/Share.java +++ b/app/src/main/java/asgardius/page/s3manager/Share.java @@ -35,6 +35,7 @@ public class Share extends AppCompatActivity { Button share, external; GeneratePresignedUrlRequest request; Date expiration; + URL objectURL; public static String URLify(String str) { str = str.trim(); @@ -121,7 +122,7 @@ public class Share extends AppCompatActivity { expiration = mycal.getTime(); //System.out.println(expiration); request = new GeneratePresignedUrlRequest(bucket, object).withExpiration(expiration); - URL objectURL = s3client.generatePresignedUrl(request); + objectURL = s3client.generatePresignedUrl(request); //System.out.println(URLify(objectURL.toString())); Intent shareIntent = new Intent(Intent.ACTION_SEND); shareIntent.setType("text/plain"); @@ -150,7 +151,7 @@ public class Share extends AppCompatActivity { } else { request = new GeneratePresignedUrlRequest(bucket, object); } - URL objectURL = s3client.generatePresignedUrl(request); + objectURL = s3client.generatePresignedUrl(request); //System.out.println(URLify(objectURL.toString())); Intent shareIntent = new Intent(Intent.ACTION_SEND); shareIntent.setType("text/plain"); -- 2.39.2 From 15cfe7730d28cbc7237948cd95474ec5ebb0a8d5 Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Wed, 5 Oct 2022 05:36:07 -0700 Subject: [PATCH 002/182] new release --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 01ca6cb..660d741 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "asgardius.page.s3manager" minSdk 24 targetSdk 33 - versionCode 20 - versionName "0.1.18" + versionCode 21 + versionName "0.1.19" setProperty("archivesBaseName", "s3-manager-$versionName") testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" -- 2.39.2 From 59552f0ebb6424f56ec124cd7914146c3f77d222 Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Wed, 5 Oct 2022 12:39:38 -0700 Subject: [PATCH 003/182] stability fix at main screen --- .../page/s3manager/MainActivity.java | 34 +++++++++---------- .../asgardius/page/s3manager/VideoPlayer.java | 4 +-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/asgardius/page/s3manager/MainActivity.java b/app/src/main/java/asgardius/page/s3manager/MainActivity.java index 99de11f..f2fe71f 100644 --- a/app/src/main/java/asgardius/page/s3manager/MainActivity.java +++ b/app/src/main/java/asgardius/page/s3manager/MainActivity.java @@ -26,6 +26,7 @@ public class MainActivity extends AppCompatActivity { SQLiteDatabase db; ArrayList Name; ArrayList Img; + MyDbHelper dbHelper; @Override protected void onCreate(Bundle savedInstanceState) { @@ -38,29 +39,28 @@ public class MainActivity extends AppCompatActivity { LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getApplicationContext()); recyclerView.setLayoutManager(linearLayoutManager); - MyDbHelper dbHelper = new MyDbHelper(this); - db = dbHelper.getWritableDatabase(); - if (db != null) { - // Database Queries - Name = new ArrayList(); - Img = new ArrayList(); - String query = "SELECT id FROM account"; - Cursor cursor = db.rawQuery(query,null); - while (cursor.moveToNext()){ - Name.add(cursor.getString(0)); - Img.add(R.drawable.account); - } - db.close(); - } else { - Toast.makeText(getApplicationContext(),getResources().getString(R.string.broken_database), Toast.LENGTH_SHORT).show(); - } - + dbHelper = new MyDbHelper(this); Thread listaccount = new Thread(new Runnable() { @Override public void run() { try { //Your code goes here + db = dbHelper.getWritableDatabase(); + if (db != null) { + // Database Queries + Name = new ArrayList(); + Img = new ArrayList(); + String query = "SELECT id FROM account"; + Cursor cursor = db.rawQuery(query,null); + while (cursor.moveToNext()){ + Name.add(cursor.getString(0)); + Img.add(R.drawable.account); + } + db.close(); + } else { + Toast.makeText(getApplicationContext(),getResources().getString(R.string.broken_database), Toast.LENGTH_SHORT).show(); + } runOnUiThread(new Runnable() { @Override diff --git a/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java b/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java index 7b8f20c..e6730fe 100644 --- a/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java +++ b/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java @@ -35,7 +35,7 @@ public class VideoPlayer extends AppCompatActivity { private WifiManager.WifiLock mWifiLock; private PowerManager.WakeLock mWakeLock; private PowerManager powerManager; - private long maxCacheSize = 100 * 1024 * 1024; + private long maxCacheSize = 1024 * 1024 * 1024; SimpleCache simpleCache; ExoPlayer player; @@ -55,7 +55,7 @@ public class VideoPlayer extends AppCompatActivity { player = new ExoPlayer.Builder(this).build(); LeastRecentlyUsedCacheEvictor evictor = new LeastRecentlyUsedCacheEvictor(maxCacheSize); simpleCache = new SimpleCache(new File(this.getCacheDir(), "media"), evictor); - MediaSource mediaSource = new ProgressiveMediaSource.Factory(new CacheDataSourceFactory(this, simpleCache, 512 * 1024 * 1024)) + MediaSource mediaSource = new ProgressiveMediaSource.Factory(new CacheDataSourceFactory(this, simpleCache, maxCacheSize)) .createMediaSource(MediaItem.fromUri(Uri.parse(videoURL))); //MediaSource audioSource = new ProgressiveMediaSource(Uri.parse("url"), // new CacheDataSourceFactory(this, 100 * 1024 * 1024, 5 * 1024 * 1024), new DefaultExtractorsFactory(), null, null); -- 2.39.2 From e38f425e486a283b9c8b0233b4cb59266163dad5 Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Wed, 5 Oct 2022 12:53:25 -0700 Subject: [PATCH 004/182] f-droid metadata --- fastlane/metadata/android/en-US/changelogs/20.txt | 1 + fastlane/metadata/android/en-US/changelogs/21.txt | 1 + 2 files changed, 2 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/20.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/21.txt diff --git a/fastlane/metadata/android/en-US/changelogs/20.txt b/fastlane/metadata/android/en-US/changelogs/20.txt new file mode 100644 index 0000000..77abcb4 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/20.txt @@ -0,0 +1 @@ +Add cache to media player \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/21.txt b/fastlane/metadata/android/en-US/changelogs/21.txt new file mode 100644 index 0000000..a4db5a2 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/21.txt @@ -0,0 +1 @@ +Fix stability issue at loading videos \ No newline at end of file -- 2.39.2 From 6f48eebf77c3698061ae01e83ee1d58c52388048 Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Wed, 5 Oct 2022 16:32:25 -0700 Subject: [PATCH 005/182] new release --- app/build.gradle | 4 ++-- app/src/main/java/asgardius/page/s3manager/AccountAdd.java | 1 - app/src/main/java/asgardius/page/s3manager/Share.java | 2 -- fastlane/metadata/android/en-US/changelogs/22.txt | 1 + 4 files changed, 3 insertions(+), 5 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/22.txt diff --git a/app/build.gradle b/app/build.gradle index 660d741..4ca6fc4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "asgardius.page.s3manager" minSdk 24 targetSdk 33 - versionCode 21 - versionName "0.1.19" + versionCode 22 + versionName "0.1.20" setProperty("archivesBaseName", "s3-manager-$versionName") testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/asgardius/page/s3manager/AccountAdd.java b/app/src/main/java/asgardius/page/s3manager/AccountAdd.java index 6c4de51..abfcf9a 100644 --- a/app/src/main/java/asgardius/page/s3manager/AccountAdd.java +++ b/app/src/main/java/asgardius/page/s3manager/AccountAdd.java @@ -55,7 +55,6 @@ public class AccountAdd extends AppCompatActivity { pdfendpoint = getIntent().getStringExtra("pdfendpoint"); aapick.setText(id); //aapick.setEnabled(false); - aepick.setText(endpoint); aupick.setText(username); appick.setText(password); arpick.setText(location); diff --git a/app/src/main/java/asgardius/page/s3manager/Share.java b/app/src/main/java/asgardius/page/s3manager/Share.java index 978c075..c747286 100644 --- a/app/src/main/java/asgardius/page/s3manager/Share.java +++ b/app/src/main/java/asgardius/page/s3manager/Share.java @@ -126,8 +126,6 @@ public class Share extends AppCompatActivity { //System.out.println(URLify(objectURL.toString())); Intent shareIntent = new Intent(Intent.ACTION_SEND); shareIntent.setType("text/plain"); - shareIntent.putExtra(Intent.EXTRA_TEXT, URLify(objectURL.toString())); - startActivity(Intent.createChooser(shareIntent, "choose one")); } } catch (Exception e) { Toast.makeText(getApplicationContext(),getResources().getString(R.string.invalid_expiration_date), Toast.LENGTH_SHORT).show(); diff --git a/fastlane/metadata/android/en-US/changelogs/22.txt b/fastlane/metadata/android/en-US/changelogs/22.txt new file mode 100644 index 0000000..28a274f --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/22.txt @@ -0,0 +1 @@ +Fix performance issue at main screen \ No newline at end of file -- 2.39.2 From 051be2f31a510bb756ad585ded772d48ece24df4 Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Wed, 5 Oct 2022 17:07:16 -0700 Subject: [PATCH 006/182] new release --- app/build.gradle | 4 ++-- app/src/main/java/asgardius/page/s3manager/Share.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4ca6fc4..6f5063c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "asgardius.page.s3manager" minSdk 24 targetSdk 33 - versionCode 22 - versionName "0.1.20" + versionCode 23 + versionName "0.1.21" setProperty("archivesBaseName", "s3-manager-$versionName") testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/asgardius/page/s3manager/Share.java b/app/src/main/java/asgardius/page/s3manager/Share.java index c747286..978c075 100644 --- a/app/src/main/java/asgardius/page/s3manager/Share.java +++ b/app/src/main/java/asgardius/page/s3manager/Share.java @@ -126,6 +126,8 @@ public class Share extends AppCompatActivity { //System.out.println(URLify(objectURL.toString())); Intent shareIntent = new Intent(Intent.ACTION_SEND); shareIntent.setType("text/plain"); + shareIntent.putExtra(Intent.EXTRA_TEXT, URLify(objectURL.toString())); + startActivity(Intent.createChooser(shareIntent, "choose one")); } } catch (Exception e) { Toast.makeText(getApplicationContext(),getResources().getString(R.string.invalid_expiration_date), Toast.LENGTH_SHORT).show(); -- 2.39.2 From 66d57962699bf9b1742d6cd57e013d4583778e87 Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Wed, 5 Oct 2022 17:08:12 -0700 Subject: [PATCH 007/182] new release --- fastlane/metadata/android/en-US/changelogs/23.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/23.txt diff --git a/fastlane/metadata/android/en-US/changelogs/23.txt b/fastlane/metadata/android/en-US/changelogs/23.txt new file mode 100644 index 0000000..ca1eb00 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/23.txt @@ -0,0 +1 @@ +Fix issue at file sharing screen \ No newline at end of file -- 2.39.2 From 4a571d9326c3ce7dfed890bbde7089619bd6c5a2 Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Thu, 6 Oct 2022 07:51:20 -0700 Subject: [PATCH 008/182] first step --- .../page/s3manager/MainActivity.java | 91 ++++++++++++++++--- .../asgardius/page/s3manager/MyDbHelper.java | 10 +- 2 files changed, 86 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/asgardius/page/s3manager/MainActivity.java b/app/src/main/java/asgardius/page/s3manager/MainActivity.java index f2fe71f..4cebd8d 100644 --- a/app/src/main/java/asgardius/page/s3manager/MainActivity.java +++ b/app/src/main/java/asgardius/page/s3manager/MainActivity.java @@ -27,6 +27,7 @@ public class MainActivity extends AppCompatActivity { ArrayList Name; ArrayList Img; MyDbHelper dbHelper; + int videocache, videotime; @Override protected void onCreate(Bundle savedInstanceState) { @@ -40,6 +41,73 @@ public class MainActivity extends AppCompatActivity { recyclerView.setLayoutManager(linearLayoutManager); dbHelper = new MyDbHelper(this); + Thread getprefs = new Thread(new Runnable() { + + @Override + public void run() { + try { + //Your code goes here + // Database Queries + try { + db = dbHelper.getWritableDatabase(); + String query = "SELECT value FROM preferences where setting='videocache'"; + Cursor cursor = db.rawQuery(query,null); + while (cursor.moveToNext()){ + videocache = (Integer.parseInt(cursor.getString(0))); + } + db.close(); + } catch (Exception e) { + try { + db = dbHelper.getWritableDatabase(); + db.execSQL("INSERT INTO preferences VALUES ('videocache', '300')"); + videocache = 300; + db.close(); + } catch (Exception f) { + db = dbHelper.getWritableDatabase(); + db.execSQL("CREATE TABLE IF NOT EXISTS preferences(setting text UNIQUE, value text)"); + db.execSQL("INSERT INTO preferences VALUES ('videocache', '300')"); + db.execSQL("INSERT INTO preferences VALUES ('videotime', '3')"); + videocache = 300; + //videotime = 3; + db.close(); + } + } + try { + db = dbHelper.getWritableDatabase(); + String query = "SELECT value FROM preferences where setting='videotime'"; + Cursor cursor = db.rawQuery(query,null); + while (cursor.moveToNext()){ + videotime = (Integer.parseInt(cursor.getString(0))); + } + db.close(); + } catch (Exception e) { + try { + db = dbHelper.getWritableDatabase(); + db.execSQL("INSERT INTO preferences VALUES ('videotime', '3')"); + videotime = 3; + db.close(); + } catch (Exception f) { + db = dbHelper.getWritableDatabase(); + db.execSQL("CREATE TABLE IF NOT EXISTS preferences(setting text UNIQUE, value text)"); + db.close(); + } + } + System.out.println("videocache " + videocache); + System.out.println("videotime " + videotime); + } catch (Exception e) { + e.printStackTrace(); + runOnUiThread(new Runnable() { + + @Override + public void run() { + Toast.makeText(getApplicationContext(),getResources().getString(R.string.broken_database), Toast.LENGTH_SHORT).show(); + } + }); + //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); + finish(); + } + } + }); Thread listaccount = new Thread(new Runnable() { @Override @@ -47,20 +115,17 @@ public class MainActivity extends AppCompatActivity { try { //Your code goes here db = dbHelper.getWritableDatabase(); - if (db != null) { - // Database Queries - Name = new ArrayList(); - Img = new ArrayList(); - String query = "SELECT id FROM account"; - Cursor cursor = db.rawQuery(query,null); - while (cursor.moveToNext()){ - Name.add(cursor.getString(0)); - Img.add(R.drawable.account); - } - db.close(); - } else { - Toast.makeText(getApplicationContext(),getResources().getString(R.string.broken_database), Toast.LENGTH_SHORT).show(); + // Database Queries + Name = new ArrayList(); + Img = new ArrayList(); + String query = "SELECT id FROM account"; + Cursor cursor = db.rawQuery(query,null); + while (cursor.moveToNext()){ + Name.add(cursor.getString(0)); + Img.add(R.drawable.account); } + db.close(); + getprefs.start(); runOnUiThread(new Runnable() { @Override diff --git a/app/src/main/java/asgardius/page/s3manager/MyDbHelper.java b/app/src/main/java/asgardius/page/s3manager/MyDbHelper.java index c215b7a..e2f9928 100644 --- a/app/src/main/java/asgardius/page/s3manager/MyDbHelper.java +++ b/app/src/main/java/asgardius/page/s3manager/MyDbHelper.java @@ -5,7 +5,10 @@ import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; public class MyDbHelper extends SQLiteOpenHelper { - private static final String atcreate = "CREATE TABLE IF NOT EXISTS account(id text UNIQUE, endpoint text, username text, password text, region text, pdfendpoint text)"; + private static final String usertable = "CREATE TABLE IF NOT EXISTS account(id text UNIQUE, endpoint text, username text, password text, region text, pdfendpoint text)"; + private static final String preftable = "CREATE TABLE IF NOT EXISTS preferences(setting text UNIQUE, value text)"; + private static final String setvideocache = "INSERT INTO preferences VALUES ('videocache', '300')"; + private static final String setvideotime = "INSERT INTO preferences VALUES ('videotime', '3')"; //private static final String upgrade = "ALTER TABLE account add column pdfendpoint text"; private static final int DATABASE_VERSION = 1; private static final String dbname = "accounts.sqlite3"; @@ -15,7 +18,10 @@ public class MyDbHelper extends SQLiteOpenHelper { } @Override public void onCreate(SQLiteDatabase db) { - db.execSQL(atcreate); + db.execSQL(usertable); + db.execSQL(preftable); + db.execSQL(setvideocache); + db.execSQL(setvideotime); } @Override public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { -- 2.39.2 From 7bc22c5c7cdb14cc1aaf82e66bf1bec625174de3 Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Thu, 6 Oct 2022 08:01:48 -0700 Subject: [PATCH 009/182] settings screen template --- app/src/main/AndroidManifest.xml | 9 ++ .../asgardius/page/s3manager/Settings.java | 27 ++++++ app/src/main/res/layout/activity_settings.xml | 16 ++++ app/src/main/res/layout/content_settings.xml | 27 ++++++ app/src/main/res/menu/menu_settings.xml | 10 ++ app/src/main/res/values-land/dimens.xml | 4 + app/src/main/res/values-w1240dp/dimens.xml | 3 + app/src/main/res/values-w600dp/dimens.xml | 4 + app/src/main/res/values/dimens.xml | 5 + app/src/main/res/values/strings.xml | 91 +++++++++++++++++++ app/src/main/res/values/themes.xml | 9 ++ 11 files changed, 205 insertions(+) create mode 100644 app/src/main/java/asgardius/page/s3manager/Settings.java create mode 100644 app/src/main/res/layout/activity_settings.xml create mode 100644 app/src/main/res/layout/content_settings.xml create mode 100644 app/src/main/res/menu/menu_settings.xml create mode 100644 app/src/main/res/values-land/dimens.xml create mode 100644 app/src/main/res/values-w1240dp/dimens.xml create mode 100644 app/src/main/res/values-w600dp/dimens.xml create mode 100644 app/src/main/res/values/dimens.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1a20301..7f59e8e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,6 +19,15 @@ android:supportsRtl="true" android:theme="@style/Theme.AsgardiusS3Manager" tools:targetApi="31"> + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/content_settings.xml b/app/src/main/res/layout/content_settings.xml new file mode 100644 index 0000000..8edbb86 --- /dev/null +++ b/app/src/main/res/layout/content_settings.xml @@ -0,0 +1,27 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/menu_settings.xml b/app/src/main/res/menu/menu_settings.xml new file mode 100644 index 0000000..c926142 --- /dev/null +++ b/app/src/main/res/menu/menu_settings.xml @@ -0,0 +1,10 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml new file mode 100644 index 0000000..96d25a4 --- /dev/null +++ b/app/src/main/res/values-land/dimens.xml @@ -0,0 +1,4 @@ + + 48dp + 48dp + \ No newline at end of file diff --git a/app/src/main/res/values-w1240dp/dimens.xml b/app/src/main/res/values-w1240dp/dimens.xml new file mode 100644 index 0000000..d73f4a3 --- /dev/null +++ b/app/src/main/res/values-w1240dp/dimens.xml @@ -0,0 +1,3 @@ + + 200dp + \ No newline at end of file diff --git a/app/src/main/res/values-w600dp/dimens.xml b/app/src/main/res/values-w600dp/dimens.xml new file mode 100644 index 0000000..96d25a4 --- /dev/null +++ b/app/src/main/res/values-w600dp/dimens.xml @@ -0,0 +1,4 @@ + + 48dp + 48dp + \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml new file mode 100644 index 0000000..89ef465 --- /dev/null +++ b/app/src/main/res/values/dimens.xml @@ -0,0 +1,5 @@ + + 180dp + 16dp + 16dp + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 995cdd6..bf7b960 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -89,4 +89,95 @@ About this app Dummy Button DUMMY\nCONTENT + Settings + + "Material is the metaphor.\n\n" + + "A material metaphor is the unifying theory of a rationalized space and a system of motion." + "The material is grounded in tactile reality, inspired by the study of paper and ink, yet " + "technologically advanced and open to imagination and magic.\n" + "Surfaces and edges of the material provide visual cues that are grounded in reality. The " + "use of familiar tactile attributes helps users quickly understand affordances. Yet the " + "flexibility of the material creates new affordances that supercede those in the physical " + "world, without breaking the rules of physics.\n" + "The fundamentals of light, surface, and movement are key to conveying how objects move, " + "interact, and exist in space and in relation to each other. Realistic lighting shows " + "seams, divides space, and indicates moving parts.\n\n" + + "Bold, graphic, intentional.\n\n" + + "The foundational elements of print based design typography, grids, space, scale, color, " + "and use of imagery guide visual treatments. These elements do far more than please the " + "eye. They create hierarchy, meaning, and focus. Deliberate color choices, edge to edge " + "imagery, large scale typography, and intentional white space create a bold and graphic " + "interface that immerse the user in the experience.\n" + "An emphasis on user actions makes core functionality immediately apparent and provides " + "waypoints for the user.\n\n" + + "Motion provides meaning.\n\n" + + "Motion respects and reinforces the user as the prime mover. Primary user actions are " + "inflection points that initiate motion, transforming the whole design.\n" + "All action takes place in a single environment. Objects are presented to the user without " + "breaking the continuity of experience even as they transform and reorganize.\n" + "Motion is meaningful and appropriate, serving to focus attention and maintain continuity. " + "Feedback is subtle yet clear. Transitions are efficient yet coherent.\n\n" + + "3D world.\n\n" + + "The material environment is a 3D space, which means all objects have x, y, and z " + "dimensions. The z-axis is perpendicularly aligned to the plane of the display, with the " + "positive z-axis extending towards the viewer. Every sheet of material occupies a single " + "position along the z-axis and has a standard 1dp thickness.\n" + "On the web, the z-axis is used for layering and not for perspective. The 3D world is " + "emulated by manipulating the y-axis.\n\n" + + "Light and shadow.\n\n" + + "Within the material environment, virtual lights illuminate the scene. Key lights create " + "directional shadows, while ambient light creates soft shadows from all angles.\n" + "Shadows in the material environment are cast by these two light sources. In Android " + "development, shadows occur when light sources are blocked by sheets of material at " + "various positions along the z-axis. On the web, shadows are depicted by manipulating the " + "y-axis only. The following example shows the card with a height of 6dp.\n\n" + + "Resting elevation.\n\n" + + "All material objects, regardless of size, have a resting elevation, or default elevation " + "that does not change. If an object changes elevation, it should return to its resting " + "elevation as soon as possible.\n\n" + + "Component elevations.\n\n" + + "The resting elevation for a component type is consistent across apps (e.g., FAB elevation " + "does not vary from 6dp in one app to 16dp in another app).\n" + "Components may have different resting elevations across platforms, depending on the depth " + "of the environment (e.g., TV has a greater depth than mobile or desktop).\n\n" + + "Responsive elevation and dynamic elevation offsets.\n\n" + + "Some component types have responsive elevation, meaning they change elevation in response " + "to user input (e.g., normal, focused, and pressed) or system events. These elevation " + "changes are consistently implemented using dynamic elevation offsets.\n" + "Dynamic elevation offsets are the goal elevation that a component moves towards, relative " + "to the component’s resting state. They ensure that elevation changes are consistent " + "across actions and component types. For example, all components that lift on press have " + "the same elevation change relative to their resting elevation.\n" + "Once the input event is completed or cancelled, the component will return to its resting " + "elevation.\n\n" + + "Avoiding elevation interference.\n\n" + + "Components with responsive elevations may encounter other components as they move between " + "their resting elevations and dynamic elevation offsets. Because material cannot pass " + "through other material, components avoid interfering with one another any number of ways, " + "whether on a per component basis or using the entire app layout.\n" + "On a component level, components can move or be removed before they cause interference. " + "For example, a floating action button (FAB) can disappear or move off screen before a " + "user picks up a card, or it can move if a snackbar appears.\n" + "On the layout level, design your app layout to minimize opportunities for interference. " + "For example, position the FAB to one side of stream of a cards so the FAB won’t interfere " + "when a user tries to pick up one of cards.\n\n" + + Settings \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 1a59a11..a689e45 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -26,4 +26,13 @@ @color/light_blue_600 @color/light_blue_A200 + + + +