Disroot/disapp
Disroot
/
disapp
8
8
Fork 3
Code Issues 3 Pull Requests 1 Projects Releases 7 Wiki Activity

Home button animates dashboard 

Pad icon redirects to Padland
added disroot state
This commit is contained in:
Massimiliano Lentini 2018-09-08 03:39:01 +02:00
parent 31976007bc
commit c66b7de5f7
11 changed files with 405 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/assetWizardSettings.xml
View File

@ -14,8 +14,8 @@
<option name="values">
<map>
<entry key="assetSourceType" value="FILE" />
<entry key="outputName" value="ic_about" />
<entry key="sourceFile" value="$PROJECT_DIR$/../DisIcons/about.svg" />
<entry key="outputName" value="ic_user" />
<entry key="sourceFile" value="$PROJECT_DIR$/../DisIcons/user.svg" />
</map>
</option>
</PersistentState>

5
CHANGELOG.md
View File

@ -12,4 +12,7 @@
* Non disroor.org domains open in external browser
* Fixed blank page on board.disroot.org
* Long press on mail icon shows info
*
* Home button animates dashboard
* Pad icon redirects to Padland
* Added link to disroot's state
* Fixed Blank loading of Taiga board

254
app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
View File

@ -17,10 +17,12 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.view.animation.TranslateAnimation;
import android.webkit.WebView;
import android.widget.Button;
import android.widget.FrameLayout;
import android.widget.RelativeLayout;
import android.widget.ScrollView;
import android.widget.TextView;
import android.widget.Toast;
@ -45,20 +47,19 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
setupToolbar();
FrameLayout frameLayoutContainer = (FrameLayout) findViewById(R.id.framelayout_container);
ViewGroup viewLoading = (ViewGroup) findViewById(R.id.linearlayout_view_loading_container);
setupWebView(savedInstanceState, frameLayoutContainer, viewLoading);
// enables the activity icon as a 'home' button. required if "android:targetSdkVersion" > 14
//getActionBar().setHomeButtonEnabled(true);
final RelativeLayout dashboard = (RelativeLayout)findViewById(R.id.dashboard);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
final ScrollView dashboard = (ScrollView)findViewById(R.id.dashboard);
//Set buttons
// Locate the button in activity_main.xml
button = (Button) findViewById(R.id.MailBtn);
button = (Button) findViewById(R.id.MailBtn);//MailBtn
button.setOnLongClickListener(new View.OnLongClickListener() {
@Override
@ -70,7 +71,6 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
// Capture button clicks
button.setOnClickListener(new View.OnClickListener() {
public void onClick(View arg0) {
// Start NewActivity.class
String k9 = "com.fsck.k9";
Intent mail = getPackageManager().getLaunchIntentForPackage(k9);
@ -81,13 +81,31 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
}
});
// Locate the button in activity_main.xml
button = (Button) findViewById(R.id.DiasporaBtn);
// Capture button clicks
button = (Button) findViewById(R.id.CloudBtn);//CloudBtn
button.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
showCloudInfo();
return true;
}
});
button.setOnClickListener(new View.OnClickListener() {
public void onClick(View arg0) {
String nc = "com.nextcloud.client";
Intent cloud = getPackageManager().getLaunchIntentForPackage(nc);
if(cloud == null) {
cloud = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id="+nc));
}
startActivity(cloud);
}
// Start NewActivity.class
});
button = (Button) findViewById(R.id.DiasporaBtn);//DiasporaBtn
button.setOnClickListener(new View.OnClickListener() {
public void onClick(View arg0) {
String Diaspora = "com.github.dfa.diaspora_android";
Intent pod = getPackageManager().getLaunchIntentForPackage(Diaspora);
if(pod == null) {
@ -98,27 +116,125 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
});
// Locate the button in activity_main.xml
button = (Button) findViewById(R.id.PadBtn);
// Capture button clicks
button = (Button) findViewById(R.id.ForumBtn);//ForumBtn
button.setOnClickListener(new View.OnClickListener() {
public void onClick(View arg0) {
// Start NewActivity.class
webView.loadUrl(Constants.URL_DisApp_PAD);
webView.loadUrl(Constants.URL_DisApp_FORUM);
webView.setVisibility(View.VISIBLE);
dashboard.setVisibility(View.GONE);
}
});
// Locate the button in activity_main.xml
button = (Button) findViewById(R.id.AboudBtn);
// Capture button clicks
button = (Button) findViewById(R.id.ChatBtn);//ChatBtn
button.setOnClickListener(new View.OnClickListener() {
public void onClick(View arg0) {
String Conversations = "eu.siacs.conversations";
Intent xmpp = getPackageManager().getLaunchIntentForPackage(Conversations);
if(xmpp == null) {
xmpp = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id="+Conversations));
}
startActivity(xmpp);
}
// Start NewActivity.class
});
button = (Button) findViewById(R.id.PadBtn);//PadBtn
button.setOnClickListener(new View.OnClickListener() {
public void onClick(View arg0) {
String Padland = "com.mikifus.padland";
Intent pad = getPackageManager().getLaunchIntentForPackage(Padland);
if(pad == null) {
pad = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id="+Padland));
}
startActivity(pad);
}
});
button = (Button) findViewById(R.id.CalcBtn);//CalcBtn
button.setOnClickListener(new View.OnClickListener() {
public void onClick(View arg0) {
webView.loadUrl(Constants.URL_DisApp_CALC);
webView.setVisibility(View.VISIBLE);
dashboard.setVisibility(View.GONE);
}
});
button = (Button) findViewById(R.id.BinBtn);//BinBtn
button.setOnClickListener(new View.OnClickListener() {
public void onClick(View arg0) {
webView.loadUrl(Constants.URL_DisApp_BIN);
webView.setVisibility(View.VISIBLE);
dashboard.setVisibility(View.GONE);
}
});
button = (Button) findViewById(R.id.UploadBtn);//UploadBtn
button.setOnClickListener(new View.OnClickListener() {
public void onClick(View arg0) {
webView.loadUrl(Constants.URL_DisApp_UPLOAD);
webView.setVisibility(View.VISIBLE);
dashboard.setVisibility(View.GONE);
}
});
button = (Button) findViewById(R.id.SearxBtn);//SearxBtn
button.setOnClickListener(new View.OnClickListener() {
public void onClick(View arg0) {
webView.loadUrl(Constants.URL_DisApp_SEARX);
webView.setVisibility(View.VISIBLE);
dashboard.setVisibility(View.GONE);
}
});
button = (Button) findViewById(R.id.PollsBtn);//PollsBtn
button.setOnClickListener(new View.OnClickListener() {
public void onClick(View arg0) {
webView.loadUrl(Constants.URL_DisApp_POLL);
webView.setVisibility(View.VISIBLE);
dashboard.setVisibility(View.GONE);
}
});
button = (Button) findViewById(R.id.BoardBtn);//BoardBtn
button.setOnClickListener(new View.OnClickListener() {
public void onClick(View arg0) {
webView.loadUrl(Constants.URL_DisApp_BOARD);
webView.setVisibility(View.VISIBLE);
dashboard.setVisibility(View.GONE);
}
});
button = (Button) findViewById(R.id.UserBtn);//UserBtn
button.setOnClickListener(new View.OnClickListener() {
public void onClick(View arg0) {
webView.loadUrl(Constants.URL_DisApp_USER);
webView.setVisibility(View.VISIBLE);
dashboard.setVisibility(View.GONE);
}
});
button = (Button) findViewById(R.id.StateBtn);//UserBtn
button.setOnClickListener(new View.OnClickListener() {
public void onClick(View arg0) {
webView.loadUrl(Constants.URL_DisApp_STATE);
webView.setVisibility(View.VISIBLE);
dashboard.setVisibility(View.GONE);
}
});
button = (Button) findViewById(R.id.AboudBtn);//AboutBtn
button.setOnClickListener(new View.OnClickListener() {
public void onClick(View arg0) {
Intent goAbout = new Intent(MainActivity.this, AboutActivity.class);
MainActivity.this.startActivity(goAbout);
}
@ -126,6 +242,15 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
});
}
private void showCloudInfo() {
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
builder.setTitle(R.string.MailInfoTitle);
//builder.setMessage(getString(R.string.activity_main_manteiners, DeviceProvider.getAppVersion(this)));
builder.setMessage(getString(R.string.MailInfo));
builder.setPositiveButton(R.string.global_ok, null);
builder.show();
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
@ -201,16 +326,36 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
@Override
public boolean onOptionsItemSelected(MenuItem item) {
RelativeLayout dashboard = (RelativeLayout)findViewById(R.id.dashboard);
ScrollView dashboard = (ScrollView)findViewById(R.id.dashboard);
TranslateAnimation animateup = new TranslateAnimation(0,0,-2*dashboard.getHeight(),0);
TranslateAnimation animatedown = new TranslateAnimation(0,0,0,-dashboard.getHeight());
switch (item.getItemId()) {
case R.id.action_share:
shareCurrentPage();
return true;
case R.id.action_home:
webView.loadUrl(null);
webView.setVisibility(View.GONE);
dashboard.setVisibility(View.VISIBLE);
if(webView.getVisibility()==View.VISIBLE){
//animation
animateup.setDuration(500);
animateup.setFillAfter(false);
dashboard.startAnimation(animateup);
dashboard.setVisibility(View.VISIBLE);
webView.setVisibility(View.GONE);
return true;
}
if (webView.getVisibility()==View.GONE && webView.getUrl()!=null){
//animation
animatedown.setDuration(500);
animatedown.setFillAfter(false);
dashboard.startAnimation(animatedown);
dashboard.setVisibility(View.GONE);
webView.setVisibility(View.VISIBLE);
return true;
}
else
return true;
/**
case R.id.action_mail:
String k9 = "com.fsck.k9";
Intent mail = getPackageManager().getLaunchIntentForPackage(k9);
@ -237,8 +382,11 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
return true;
case R.id.action_forum:
webView.loadUrl(Constants.URL_DisApp_FORUM);
webView.setVisibility(View.VISIBLE);
animatedown.setDuration(500);
animatedown.setFillAfter(true);
dashboard.startAnimation(animatedown);
dashboard.setVisibility(View.GONE);
webView.setVisibility(View.VISIBLE);
return true;
case R.id.action_chat:
String Conversations = "eu.siacs.conversations";
@ -250,28 +398,43 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
return true;
case R.id.action_pad:
webView.loadUrl(Constants.URL_DisApp_PAD);
webView.setVisibility(View.VISIBLE);
animatedown.setDuration(500);
animatedown.setFillAfter(true);
dashboard.startAnimation(animatedown);
dashboard.setVisibility(View.GONE);
webView.setVisibility(View.VISIBLE);
return true;
case R.id.action_calc:
webView.loadUrl(Constants.URL_DisApp_CALC);
webView.setVisibility(View.VISIBLE);
animatedown.setDuration(500);
animatedown.setFillAfter(true);
dashboard.startAnimation(animatedown);
dashboard.setVisibility(View.GONE);
webView.setVisibility(View.VISIBLE);
return true;
case R.id.action_bin:
webView.loadUrl(Constants.URL_DisApp_BIN);
webView.setVisibility(View.VISIBLE);
animatedown.setDuration(500);
animatedown.setFillAfter(true);
dashboard.startAnimation(animatedown);
dashboard.setVisibility(View.GONE);
webView.setVisibility(View.VISIBLE);
return true;
case R.id.action_upload:
webView.loadUrl(Constants.URL_DisApp_UPLOAD);
webView.setVisibility(View.VISIBLE);
animatedown.setDuration(500);
animatedown.setFillAfter(true);
dashboard.startAnimation(animatedown);
dashboard.setVisibility(View.GONE);
webView.setVisibility(View.VISIBLE);
return true;
case R.id.action_searx:
webView.loadUrl(Constants.URL_DisApp_SEARX);
webView.setVisibility(View.VISIBLE);
animatedown.setDuration(500);
animatedown.setFillAfter(true);
dashboard.startAnimation(animatedown);
dashboard.setVisibility(View.GONE);
webView.setVisibility(View.VISIBLE);
return true;
case R.id.action_poll:
webView.loadUrl(Constants.URL_DisApp_POLL);
@ -280,14 +443,21 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
return true;
case R.id.action_board:
webView.loadUrl(Constants.URL_DisApp_BOARD);
webView.setVisibility(View.VISIBLE);
animatedown.setDuration(500);
animatedown.setFillAfter(true);
dashboard.startAnimation(animatedown);
dashboard.setVisibility(View.GONE);
webView.setVisibility(View.VISIBLE);
return true;
case R.id.action_user:
webView.loadUrl(Constants.URL_DisApp_USER);
webView.setVisibility(View.VISIBLE);
animatedown.setDuration(500);
animatedown.setFillAfter(true);
dashboard.startAnimation(animatedown);
dashboard.setVisibility(View.GONE);
webView.setVisibility(View.VISIBLE);
return true;
**/
case R.id.action_about:
Intent goAbout = new Intent(MainActivity.this, AboutActivity.class);
MainActivity.this.startActivity(goAbout);
@ -296,15 +466,15 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
return super.onOptionsItemSelected(item);
}
}
public void setupToolbar() {
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
((TextView) toolbar.findViewById(R.id.textview_toolbar_title)).setText(R.string.app_name);
setSupportActionBar(toolbar);
ActionBar actionBar = getSupportActionBar();
if (actionBar != null)
actionBar.setTitle("");
}
/**
* public void setupToolbar() {
* Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
* ((TextView) toolbar.findViewById(R.id.textview_toolbar_title)).setText(R.string.app_name);
* setSupportActionBar(toolbar);
* ActionBar actionBar = getSupportActionBar();
* if (actionBar != null)
* actionBar.setTitle("");
}*/
private void setupWebView(Bundle savedInstanceState, FrameLayout customViewContainer, ViewGroup viewLoading) {
disWebChromeClient = new DisWebChromeClient(this, webView, customViewContainer);
webView = (WebView) findViewById(R.id.webView_content);
@ -312,7 +482,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
webView.setWebChromeClient(disWebChromeClient);
webView.getSettings().setJavaScriptEnabled(true);
webView.getSettings().setDomStorageEnabled(true);//solves taiga board \o/
webView.setVerticalScrollBarEnabled(false);
webView.setVerticalScrollBarEnabled(true);
webView.getSettings().setAppCacheEnabled(true);
webView.getSettings().setBuiltInZoomControls(true);
webView.getSettings().setSaveFormData(true);

1
app/src/main/java/org/disroot/disrootapp/utils/Constants.java
View File

@ -21,4 +21,5 @@ public class Constants {
public static final String URL_DisApp_POLL = "https://poll.disroot.org";
public static final String URL_DisApp_BOARD = "https://board.disroot.org";
public static final String URL_DisApp_USER = "https://user.disroot.org";
public static final String URL_DisApp_STATE = "https://state.disroot.org";
}

9
app/src/main/res/drawable/ic_state.xml Normal file
View File

@ -0,0 +1,9 @@
<vector android:height="24dp" android:viewportHeight="48"
android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillAlpha="1" android:fillColor="#000000"
android:pathData="M6.1071,28.3929 L2.7589,24.4286 17.8365,9.5231 35.5172,13.4954l9.7239,10.9332 -2.7857,3.4286 -16.4406,12.8992z"
android:strokeAlpha="1" android:strokeColor="#00000000"
android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="1"/>
<path android:fillAlpha="1" android:fillColor="#ffffff"
android:pathData="m34.2857,27.8571h8.1696c-0.3214,0.3482 -0.5357,0.5357 -0.5893,0.5893l-16.6875,16.0714C24.8571,44.8393 24.4286,45 24,45 23.5714,45 23.1429,44.8393 22.8214,44.5179L6.1071,28.3929c-0.0536,-0.0268 -0.2679,-0.2143 -0.5625,-0.5357h9.8839c0.7768,0 1.4732,-0.5357 1.6607,-1.2857l1.875,-7.5268 5.0893,17.8661c0.2143,0.7232 0.8839,1.2321 1.6607,1.2321 0.75,0 1.4196,-0.5089 1.6339,-1.2321l3.9107,-12.9911 1.5,3c0.2946,0.5625 0.8839,0.9375 1.5268,0.9375zM48,16.3929c0,3.0803 -1.3393,5.8928 -2.7589,8.0357h-9.8839l-2.9732,-5.9196c-0.2946,-0.6161 -0.9911,-0.9911 -1.6607,-0.9375 -0.7232,0.0804 -1.3125,0.5357 -1.5,1.2321l-3.4554,11.5179 -5.25,-18.375c-0.2143,-0.7232 -0.8839,-1.2321 -1.6875,-1.2321 -0.7768,0 -1.4464,0.5357 -1.6339,1.2857L14.0893,24.4286H2.7589C1.3393,22.2857 0,19.4732 0,16.3929 0,8.5446 4.7946,3.8571 12.8036,3.8571 17.4911,3.8571 21.8839,7.5536 24,9.6429 26.1161,7.5536 30.5089,3.8571 35.1964,3.8571 43.2054,3.8571 48,8.5446 48,16.3929Z" android:strokeWidth="0.02678571"/>
</vector>

BIN
app/src/main/res/drawable/logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

204
app/src/main/res/layout/activity_main.xml
View File

@ -17,69 +17,197 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="invisible" />
<include layout="@layout/view_loading"/>
<RelativeLayout
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/dashboard"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
android:stackFromBottom="true"
android:transcriptMode="alwaysScroll"
android:visibility="visible">
<RelativeLayout
android:id="@+id/dashLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#203140"
android:visibility="visible"
android:gravity="center_horizontal"
>
android:gravity="center_horizontal">
<ImageButton
android:id="@+id/logo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginBottom="30dp"
style="?android:attr/borderlessButtonStyle"
android:src="@drawable/logo" />
<Button
style="?android:attr/borderlessButtonStyle"
android:id="@+id/MailBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/logo"
android:textColor="#ffffff"
android:layout_weight="1"
android:text="@string/action_mail"
android:layout_marginTop="50dp"
android:drawableTop="@drawable/ic_mail"
/>
android:drawableTop="@drawable/ic_mail"/>
<Button
android:id="@+id/CloudBtn"
style="?android:attr/borderlessButtonStyle"
android:id="@+id/PadBtn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#ffffff"
android:layout_weight="1"
android:text="@string/action_pad"
android:layout_marginTop="50dp"
android:drawableTop="@drawable/ic_pad"
android:layout_toRightOf="@+id/DiasporaBtn"/>
android:layout_toRightOf="@id/MailBtn"
android:layout_below="@id/logo"
android:drawableTop="@drawable/ic_cloud"
android:text="@string/action_cloud"
android:textColor="#ffffff" />
<Button
style="?android:attr/borderlessButtonStyle"
android:id="@+id/DiasporaBtn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#ffffff"
android:layout_weight="1"
android:text="@string/action_diaspora"
android:layout_marginTop="50dp"
android:drawableTop="@drawable/ic_diaspora"
android:layout_toRightOf="@+id/MailBtn"/>
<Button
style="?android:attr/borderlessButtonStyle"
android:id="@+id/AboudBtn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#ffffff"
android:layout_weight="1"
android:text="@string/action_about"
android:layout_marginTop="50dp"
android:layout_below="@+id/logo"
android:layout_toRightOf="@+id/CloudBtn"
android:drawableTop="@drawable/ic_diaspora"
android:text="@string/action_diaspora"
android:textColor="#ffffff" />
<Button
android:id="@+id/ForumBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/logo"
android:layout_toRightOf="@+id/DiasporaBtn"
android:drawableTop="@drawable/ic_forum"
android:text="@string/action_forum"
android:textColor="#ffffff" />
<Button
android:id="@+id/ChatBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/MailBtn"
android:drawableTop="@drawable/ic_chat"
android:text="@string/action_chat"
android:textColor="#ffffff" />
<Button
android:id="@+id/PadBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/CloudBtn"
android:layout_toRightOf="@+id/ChatBtn"
android:drawableTop="@drawable/ic_pad"
android:text="@string/action_pad"
android:textColor="#ffffff" />
<Button
android:id="@+id/CalcBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/DiasporaBtn"
android:layout_toRightOf="@+id/PadBtn"
android:drawableTop="@drawable/ic_calc"
android:text="@string/action_calc"
android:textColor="#ffffff" />
<Button
android:id="@+id/BinBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/ForumBtn"
android:layout_toRightOf="@+id/CalcBtn"
android:drawableTop="@drawable/ic_bin"
android:text="@string/action_bin"
android:textColor="#ffffff" />
<Button
android:id="@+id/UploadBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/ChatBtn"
android:drawableTop="@drawable/ic_upload"
android:text="@string/action_upload"
android:textColor="#ffffff" />
<Button
android:id="@+id/SearxBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/PadBtn"
android:layout_toRightOf="@+id/UploadBtn"
android:drawableTop="@drawable/ic_searx"
android:text="@string/action_searx"
android:textColor="#ffffff" />
<Button
android:id="@+id/PollsBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/CalcBtn"
android:layout_toRightOf="@+id/SearxBtn"
android:drawableTop="@drawable/ic_poll"
android:text="@string/action_poll"
android:textColor="#ffffff" />
<Button
android:id="@+id/BoardBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/BinBtn"
android:layout_toRightOf="@+id/PollsBtn"
android:drawableTop="@drawable/ic_board"
android:text="@string/action_board"
android:textColor="#ffffff" />
<Button
android:id="@+id/UserBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/UploadBtn"
android:drawableTop="@drawable/ic_poll"
android:text="@string/action_user"
android:textColor="#ffffff" />
<Button
android:id="@+id/StateBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/SearxBtn"
android:layout_toRightOf="@+id/UserBtn"
android:drawableTop="@drawable/ic_state"
android:text="@string/action_state"
android:textColor="#ffffff" />
<Button
android:id="@+id/AboudBtn"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/BoardBtn"
android:layout_toRightOf="@+id/StateBtn"
android:drawableTop="@drawable/ic_about"
android:layout_toRightOf="@+id/PadBtn"/>
android:text="@string/action_about"
android:textColor="#ffffff" />
</RelativeLayout>
</ScrollView>
</FrameLayout>
</LinearLayout>

BIN
app/src/main/res/logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

13
app/src/main/res/menu/menu_main.xml
View File

@ -3,6 +3,11 @@
xmlns:tools="http://schemas.android.com/tools"
tools:context=".MainActivity">
<item
android:id="@+id/action_home"
android:icon="@drawable/ic_home"
android:title="@string/action_home"
app:showAsAction="always"/>
<item
android:id="@+id/action_share"
android:orderInCategory="1"
@ -12,11 +17,8 @@
<group
android:orderInCategory="101"
android:showAsAction="always">
<item
android:icon="@drawable/ic_home"
android:id="@+id/action_home"
android:title="@string/action_home"/>
app:showAsAction="never">
<!--
<item
android:icon="@drawable/ic_mail"
android:id="@+id/action_mail"
@ -69,6 +71,7 @@
android:icon="@drawable/ic_user"
android:id="@+id/action_user"
android:title="@string/action_user" />
-->
<item
android:icon="@drawable/ic_about"
android:id="@+id/action_about"

1
app/src/main/res/values/strings.xml
View File

@ -14,6 +14,7 @@
<string name="action_poll">Poll</string>
<string name="action_board">Board</string>
<string name="action_user">Password</string>
<string name="action_state">State</string>
<string name="action_about">About</string>
<string name="action_share">Share</string>

6
app/src/main/res/values/styles.xml
View File

@ -13,14 +13,12 @@
<style name="Widget.MyApp.ActionBar" parent="Widget.AppCompat.ActionBar">
<item name="theme">@style/ThemeOverlay.MyApp.ActionBar</item>
<item name="popupTheme">@style/ThemeOverlay.AppCompat.Dark
</item> <!--change theme for actionbar poupmenu-->
<item name="popupTheme">@style/ThemeOverlay.AppCompat.Dark</item> <!--change theme for actionbar poupmenu-->
</style>
<style name="ThemeOverlay.MyApp.ActionBar" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
<item name="android:textColorPrimary">@android:color/white</item>
<item name="android:actionMenuTextColor">@android:color/white</item>
<!--<item name="android:textSize">18sp</item>-->
<item name="android:actionMenuTextColor">@android:color/white</item><!--<item name="android:textSize">18sp</item>-->
</style>
<style name="DisTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />