From 02efb85d06e434cef4b9f7f09fc922ee5373dea3 Mon Sep 17 00:00:00 2001 From: tom79 Date: Thu, 13 Jun 2019 17:55:21 +0200 Subject: [PATCH] Layout --- app/src/main/AndroidManifest.xml | 5 + .../activities/MastodonRegisterActivity.java | 108 ++++++++++++++++++ .../android/client/Entities/InstanceReg.java | 91 +++++++++++++++ app/src/main/res/layout/activity_register.xml | 46 ++++++++ app/src/main/res/values/strings.xml | 10 ++ 5 files changed, 260 insertions(+) create mode 100644 app/src/main/java/app/fedilab/android/activities/MastodonRegisterActivity.java create mode 100644 app/src/main/java/app/fedilab/android/client/Entities/InstanceReg.java create mode 100644 app/src/main/res/layout/activity_register.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b8f775ec..f69f8a04d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -128,6 +128,11 @@ + . */ +package app.fedilab.android.activities; + +import android.annotation.SuppressLint; +import android.content.SharedPreferences; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.widget.Toolbar; +import java.util.HashMap; +import java.util.Map; +import app.fedilab.android.R; +import app.fedilab.android.helper.Helper; + +/** + * Created by Thomas on 13/06/2019. + * Register activity class + */ + +public class MastodonRegisterActivity extends BaseActivity { + + + + + private Map createMap() { + Map categories = new HashMap<>(); + categories.put("general", getString(R.string.category_general)); + categories.put("regional", getString(R.string.category_regional)); + categories.put("art", getString(R.string.category_art)); + categories.put("journalism", getString(R.string.category_journalism)); + categories.put("activism", getString(R.string.category_activism)); + categories.put("lgbt", "LGBTQ+"); + categories.put("games", getString(R.string.category_games)); + categories.put("tech", getString(R.string.category_tech)); + categories.put("adult", getString(R.string.category_adult)); + categories.put("furry", getString(R.string.category_furry)); + categories.put("food", getString(R.string.category_food)); + return categories; + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + + SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE); + int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); + switch (theme){ + case Helper.THEME_LIGHT: + setTheme(R.style.AppTheme); + break; + case Helper.THEME_DARK: + setTheme(R.style.AppThemeDark); + break; + case Helper.THEME_BLACK: + setTheme(R.style.AppThemeBlack); + break; + default: + setTheme(R.style.AppThemeDark); + } + + setContentView(R.layout.activity_login); + ActionBar actionBar = getSupportActionBar(); + if( actionBar != null ) { + LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE); + assert inflater != null; + @SuppressLint("InflateParams") View view = inflater.inflate(R.layout.simple_bar, null); + actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); + actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM); + ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close); + TextView toolbar_title = actionBar.getCustomView().findViewById(R.id.toolbar_title); + toolbar_close.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + toolbar_title.setText(R.string.add_account); + if (theme == Helper.THEME_LIGHT){ + Toolbar toolbar = actionBar.getCustomView().findViewById(R.id.toolbar); + Helper.colorizeToolbar(toolbar, R.color.black, MastodonRegisterActivity.this); + } + } + } + + @Override + protected void onResume(){ + super.onResume(); + } + +} \ No newline at end of file diff --git a/app/src/main/java/app/fedilab/android/client/Entities/InstanceReg.java b/app/src/main/java/app/fedilab/android/client/Entities/InstanceReg.java new file mode 100644 index 000000000..0c4531d3a --- /dev/null +++ b/app/src/main/java/app/fedilab/android/client/Entities/InstanceReg.java @@ -0,0 +1,91 @@ +package app.fedilab.android.client.Entities; +/* Copyright 2019 Thomas Schneider + * + * This file is a part of Fedilab + * + * This program is free software; you can redistribute it and/or modify it under the terms of the + * GNU General Public License as published by the Free Software Foundation; either version 3 of the + * License, or (at your option) any later version. + * + * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even + * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General + * Public License for more details. + * + * You should have received a copy of the GNU General Public License along with Fedilab; if not, + * see . */ + +public class InstanceReg { + + private String domain; + private String version; + private String description; + private String language; + private String category; + private String proxied_thumbnail; + private int total_users; + private int last_week_users; + + public String getDomain() { + return domain; + } + + public void setDomain(String domain) { + this.domain = domain; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getLanguage() { + return language; + } + + public void setLanguage(String language) { + this.language = language; + } + + public String getCategory() { + return category; + } + + public void setCategory(String category) { + this.category = category; + } + + public String getProxied_thumbnail() { + return proxied_thumbnail; + } + + public void setProxied_thumbnail(String proxied_thumbnail) { + this.proxied_thumbnail = proxied_thumbnail; + } + + public int getTotal_users() { + return total_users; + } + + public void setTotal_users(int total_users) { + this.total_users = total_users; + } + + public int getLast_week_users() { + return last_week_users; + } + + public void setLast_week_users(int last_week_users) { + this.last_week_users = last_week_users; + } +} diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml new file mode 100644 index 000000000..d91688512 --- /dev/null +++ b/app/src/main/res/layout/activity_register.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + \ 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 50611d918..afb4ce461 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -991,6 +991,16 @@ Mention the status News Display news from Fedilab\'s account + General + Regional + Art + Journalism + Activism + Gaming + Technology + Adult content + Furry + Food %d vote %d votes