settings screen
This commit is contained in:
parent
7bc22c5c7c
commit
62ddb35743
13 changed files with 133 additions and 145 deletions
|
|
@ -22,8 +22,7 @@
|
|||
<activity
|
||||
android:name=".Settings"
|
||||
android:exported="false"
|
||||
android:label="@string/title_activity_settings"
|
||||
android:theme="@style/Theme.AsgardiusS3Manager.NoActionBar">
|
||||
android:label="@string/settings">
|
||||
<meta-data
|
||||
android:name="android.app.lib_name"
|
||||
android:value="" />
|
||||
|
|
|
|||
|
|
@ -273,12 +273,12 @@ public class MainActivity extends AppCompatActivity {
|
|||
});
|
||||
|
||||
//This is to view app credits
|
||||
Button about = (Button)findViewById(R.id.about_button);
|
||||
about.setOnClickListener(new View.OnClickListener(){
|
||||
Button settings = (Button)findViewById(R.id.settings_button);
|
||||
settings.setOnClickListener(new View.OnClickListener(){
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
//buttonaction
|
||||
aboutPage();
|
||||
settingsPage();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
@ -311,11 +311,11 @@ public class MainActivity extends AppCompatActivity {
|
|||
|
||||
}
|
||||
|
||||
private void aboutPage () {
|
||||
private void settingsPage() {
|
||||
|
||||
Intent intent = new Intent(this, WebBrowser.class);
|
||||
intent.putExtra("web_url", "file:///android_asset/about.htm");
|
||||
intent.putExtra("title", getResources().getString(R.string.about_button));
|
||||
Intent intent = new Intent(this, Settings.class);
|
||||
//intent.putExtra("web_url", "file:///android_asset/about.htm");
|
||||
//intent.putExtra("title", getResources().getString(R.string.about_button));
|
||||
startActivity(intent);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,12 @@
|
|||
package asgardius.page.s3manager;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
|
||||
import com.google.android.material.appbar.CollapsingToolbarLayout;
|
||||
import com.google.android.material.floatingactionbutton.FloatingActionButton;
|
||||
import com.google.android.material.snackbar.Snackbar;
|
||||
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.appcompat.widget.Toolbar;
|
||||
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
|
||||
import asgardius.page.s3manager.databinding.ActivitySettingsBinding;
|
||||
|
||||
|
|
@ -23,5 +20,34 @@ public class Settings extends AppCompatActivity {
|
|||
|
||||
binding = ActivitySettingsBinding.inflate(getLayoutInflater());
|
||||
setContentView(binding.getRoot());
|
||||
//This is to add new user account
|
||||
Button saveprefs = (Button)findViewById(R.id.saveprefs);
|
||||
saveprefs.setOnClickListener(new View.OnClickListener(){
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
//buttonaction
|
||||
//This launch account add screen
|
||||
//addaccount(false);
|
||||
}
|
||||
});
|
||||
|
||||
//This is to view app credits
|
||||
Button about = (Button)findViewById(R.id.settings_button);
|
||||
about.setOnClickListener(new View.OnClickListener(){
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
//buttonaction
|
||||
aboutPage();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void aboutPage () {
|
||||
|
||||
Intent intent = new Intent(this, WebBrowser.class);
|
||||
intent.putExtra("web_url", "file:///android_asset/about.htm");
|
||||
intent.putExtra("title", getResources().getString(R.string.about_button));
|
||||
startActivity(intent);
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -27,11 +27,11 @@
|
|||
style="?android:attr/buttonStyle" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/about_button"
|
||||
android:id="@+id/settings_button"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/about_button"
|
||||
android:text="@string/settings"
|
||||
tools:ignore="MissingConstraints"
|
||||
style="?android:attr/buttonStyle" />
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,69 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
<RelativeLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:fitsSystemWindows="true"
|
||||
tools:context=".Settings">
|
||||
|
||||
<include
|
||||
android:id="@+id/include"
|
||||
layout="@layout/content_settings"
|
||||
app:layout_anchor="@+id/include"
|
||||
app:layout_anchorGravity="center" />
|
||||
<androidx.core.widget.NestedScrollView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/videocache"
|
||||
android:textAlignment="center"
|
||||
android:textSize="25sp"/>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/videocache"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="48dp"
|
||||
android:focusable="true"
|
||||
android:hint="@string/videocache"
|
||||
android:inputType="number"
|
||||
android:textColorHint="?attr/colorOnSecondary"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/videotime"
|
||||
android:textAlignment="center"
|
||||
android:textSize="25sp"/>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/videotime"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="48dp"
|
||||
android:layout_weight="1"
|
||||
android:focusable="true"
|
||||
android:hint="@string/videotime"
|
||||
android:inputType="number"
|
||||
android:textColorHint="?attr/colorOnSecondary"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/saveprefs"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="70dp"
|
||||
android:text="@string/save_settings"
|
||||
android:textColor="#ffffff"
|
||||
android:textSize="24sp" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/settings_button"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="70dp"
|
||||
android:text="@string/about_button"
|
||||
android:textColor="#ffffff"
|
||||
android:textSize="24sp" />
|
||||
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
</RelativeLayout>
|
||||
|
|
@ -17,10 +17,29 @@
|
|||
tools:layout_editor_absoluteX="20dp">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="@dimen/text_margin"
|
||||
android:text="@string/large_text" />
|
||||
android:text="@string/expiration_date"
|
||||
android:textAlignment="center"
|
||||
android:textSize="25sp" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/saveprefs"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/accountadd_button"
|
||||
tools:ignore="MissingConstraints"
|
||||
style="?android:attr/buttonStyle" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/settings_button"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/about_button"
|
||||
tools:ignore="MissingConstraints"
|
||||
style="?android:attr/buttonStyle" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
tools:context="asgardius.page.s3manager.Settings">
|
||||
<item
|
||||
android:id="@+id/action_settings"
|
||||
android:orderInCategory="100"
|
||||
android:title="@string/action_settings"
|
||||
app:showAsAction="never" />
|
||||
</menu>
|
||||
|
|
@ -85,4 +85,8 @@
|
|||
<string name="file_count">Archivos</string>
|
||||
<string name="null_expiration_date">Debe establecer una fecha de expiración para compartir archivos</string>
|
||||
<string name="download_canceled">Descarga cancelada</string>
|
||||
<string name="settings">Ajustes</string>
|
||||
<string name="save_settings">Guardar ajustes</string>
|
||||
<string name="videocache">Tamaño máximo de cache multimedia (en MiB)</string>
|
||||
<string name="videotime">Tiempo de expiración para visor multimedia (en horas)</string>
|
||||
</resources>
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
<resources>
|
||||
<dimen name="fab_margin">48dp</dimen>
|
||||
<dimen name="text_margin">48dp</dimen>
|
||||
</resources>
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
<resources>
|
||||
<dimen name="fab_margin">200dp</dimen>
|
||||
</resources>
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
<resources>
|
||||
<dimen name="fab_margin">48dp</dimen>
|
||||
<dimen name="text_margin">48dp</dimen>
|
||||
</resources>
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
<resources>
|
||||
<dimen name="app_bar_height">180dp</dimen>
|
||||
<dimen name="fab_margin">16dp</dimen>
|
||||
<dimen name="text_margin">16dp</dimen>
|
||||
</resources>
|
||||
|
|
@ -89,95 +89,8 @@
|
|||
<string name="about_button">About this app</string>
|
||||
<string name="dummy_button">Dummy Button</string>
|
||||
<string name="dummy_content">DUMMY\nCONTENT</string>
|
||||
<string name="title_activity_settings">Settings</string>
|
||||
<string name="large_text">
|
||||
"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"
|
||||
</string>
|
||||
<string name="action_settings">Settings</string>
|
||||
<string name="settings">Settings</string>
|
||||
<string name="save_settings">Save settings</string>
|
||||
<string name="videocache">Max media cache size (in MiB)</string>
|
||||
<string name="videotime">Expiration time for media viewer (in hours)</string>
|
||||
</resources>
|
||||
Loading…
Reference in a new issue